diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c1c5ee240c..11b72ccc3d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,62 +1,121 @@
 name: CI
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    # Monthly, to catch runner image and OS changes
+    - cron: '0 6 1 * *'
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  build:
-    name: Build, Upload, Test
+  # Decide whether to run the network-filesystem tests: always for manual and scheduled
+  # runs, and otherwise only when the changes touch the Gecko version or the files
+  # responsible for network-filesystem database handling
+  changes:
+    name: Detect changes
     runs-on: ubuntu-latest
+    if: >
+      github.event_name != 'pull_request'
+      || github.event.pull_request.head.repo.full_name != github.repository
+    outputs:
+      network: ${{ steps.check.outputs.network }}
+    steps:
+      - name: Check for network-filesystem-related changes
+        id: check
+        env:
+          EVENT: ${{ github.event_name }}
+          REPO: ${{ github.repository }}
+          SHA: ${{ github.sha }}
+          BEFORE: ${{ github.event.before }}
+          BASE: ${{ github.event.pull_request.base.sha }}
+        run: |
+          network=false
+          if [[ "$EVENT" == "workflow_dispatch" || "$EVENT" == "schedule" ]]; then
+            network=true
+          else
+            base="$BASE"
+            [[ -z "$base" ]] && base="$BEFORE"
+            git init -q repo && cd repo
+            git remote add origin "https://github.com/$REPO"
+            git fetch -q --depth 1 origin "$SHA"
+            # Run the tests if the base of the change can't be determined (e.g., a new
+            # branch or an unfetchable pre-force-push commit)
+            if [[ -z "$base" || "$base" == 0000000000000000000000000000000000000000 ]] \
+                || ! git fetch -q --depth 1 origin "$base" 2>/dev/null; then
+              network=true
+            elif git diff --name-only "$base" "$SHA" \
+                | grep -qE '^(app/config\.sh|chrome/content/zotero/xpcom/(db|file)\.js|\.github/workflows/ci\.yml)$'; then
+              network=true
+            fi
+          fi
+          echo "network=$network" >> "$GITHUB_OUTPUT"
+
+  test:
+    name: Test (${{ matrix.shard }})
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    needs: changes
+    # Same-repo PRs are covered by the push run, so run pull_request jobs only for forks
+    if: >
+      github.event_name != 'pull_request'
+      || github.event.pull_request.head.repo.full_name != github.repository
+    strategy:
+      matrix:
+        # Numbered shards split the full suite. 'smb' and 'nfs' run the db and file tests
+        # with the test data directory on a loopback CIFS or NFS mount, so that connection
+        # initialization itself runs against a network filesystem, which is where
+        # network-filesystem failures (startup crashes and hangs) occur. The network shards
+        # run only when the 'changes' job detects relevant changes.
+        shard: ${{ fromJSON(needs.changes.outputs.network == 'true'
+          && '["1", "2", "3", "4", "smb", "nfs"]'
+          || '["1", "2", "3", "4"]') }}
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
           lfs: true
-      
+
       - name: Install Node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 24
           #cache: npm
-      
-      # On GitHub
-      - name: Install xvfb
-        if: env.ACT != 'true'
-        run: sudo apt update && sudo apt install -y xvfb
-      
+
       # Local via act
       - name: Install packages for act
         if: env.ACT == 'true'
         run: apt update && apt install -y zstd xvfb dbus-x11 libgtk-3-0 libx11-xcb1 libdbus-glib-1-2 libxt6
-      
+
       - name: Cache xulrunner
         id: xulrunner-cache
         uses: actions/cache@v4
         with:
           path: app/xulrunner/firefox-x86_64
           key: xulrunner-${{ hashFiles('app/config.sh', 'app/scripts/fetch_xulrunner') }}
-      
+
       - name: Fetch xulrunner
         if: steps.xulrunner-cache.outputs.cache-hit != 'true'
         run: app/scripts/fetch_xulrunner -p l
-      
+
       - name: Cache Node modules
         id: node-cache
         uses: actions/cache@v4
         with:
           path: node_modules
-          key: node-modules-${{ hashFiles('package-lock.json') }}
-        
+          key: node-modules-24-${{ hashFiles('package-lock.json') }}
+
       - name: Install Node modules
         if: steps.node-cache.outputs.cache-hit != 'true'
         run: npm install
-        
+
       - name: Build Zotero
         run: npm run build
         # Currently necessary for document-worker Webpack: https://stackoverflow.com/a/69746937
         env:
           NODE_OPTIONS: --openssl-legacy-provider
-      
+
       # Create deployment ZIP from the build output, then replace build/ with the
       # unzipped contents so that tests run against the same artifact that gets
       # deployed. This catches problems that only manifest after a zip round-trip
@@ -74,19 +133,282 @@ jobs:
           cd build
           unzip ../build.zip
 
-      # Build deployment ZIPs from main, version branches (e.g., 9.0, 10.0), and *-hotfix branches
+      - name: Set up SMB share
+        if: matrix.shard == 'smb'
+        timeout-minutes: 10
+        run: |
+          sudo apt install -y --no-install-recommends samba cifs-utils
+          sudo mkdir -p /srv/zotero-smb /mnt/zotero-smb
+          sudo chown $(whoami) /srv/zotero-smb
+          sudo tee -a /etc/samba/smb.conf > /dev/null <<EOF
+          [ztest]
+          path = /srv/zotero-smb
+          read only = no
+          EOF
+          (echo smbtestpass; echo smbtestpass) | sudo smbpasswd -s -a $(whoami)
+          sudo systemctl restart smbd
+          sudo mount -t cifs //127.0.0.1/ztest /mnt/zotero-smb \
+            -o user=$(whoami),pass=smbtestpass,vers=3.0,uid=$(id -u),gid=$(id -g)
+
+      - name: Set up NFS share
+        if: matrix.shard == 'nfs'
+        timeout-minutes: 10
+        run: |
+          sudo apt install -y --no-install-recommends nfs-kernel-server
+          sudo mkdir -p /srv/zotero-nfs /mnt/zotero-nfs
+          sudo chown $(whoami) /srv/zotero-nfs
+          echo "/srv/zotero-nfs localhost(rw,no_subtree_check,insecure)" | sudo tee -a /etc/exports
+          sudo exportfs -ra
+          sudo mount -t nfs4 localhost:/srv/zotero-nfs /mnt/zotero-nfs
+
+      - name: Run tests
+        if: matrix.shard != 'smb' && matrix.shard != 'nfs'
+        run: xvfb-run test/runtests.sh -f -r 3 -p ${{ matrix.shard }}/4
+
+      # The step timeout turns a startup hang into a failure
+      - name: Run tests on network share
+        if: matrix.shard == 'smb' || matrix.shard == 'nfs'
+        timeout-minutes: 10
+        run: TMPDIR=/mnt/zotero-${{ matrix.shard }} xvfb-run test/runtests.sh -f -r 3 -b db file
+
+  # Run the db and file tests on macOS with the test data directory on a loopback NFS
+  # mount. On macOS, SQLite selects locking methods without shared-memory support on
+  # network filesystems, which is what the network-filesystem database handling has to
+  # detect and handle, so this runs the real code path that crashed on SMB/NFS/sshfs
+  # data directories.
+  test-mac:
+    name: Test (macOS NFS)
+    runs-on: macos-15
+    timeout-minutes: 30
+    needs: changes
+    if: >
+      needs.changes.outputs.network == 'true'
+      && (github.event_name != 'pull_request'
+      || github.event.pull_request.head.repo.full_name != github.repository)
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          lfs: true
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Cache xulrunner
+        id: xulrunner-cache
+        uses: actions/cache@v4
+        with:
+          path: app/xulrunner/Firefox.app
+          key: xulrunner-mac-${{ hashFiles('app/config.sh', 'app/scripts/fetch_xulrunner') }}
+
+      - name: Fetch xulrunner
+        if: steps.xulrunner-cache.outputs.cache-hit != 'true'
+        run: app/scripts/fetch_xulrunner -p m
+
+      - name: Cache Node modules
+        id: node-cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-mac-24-${{ hashFiles('package-lock.json') }}
+
+      - name: Install Node modules
+        if: steps.node-cache.outputs.cache-hit != 'true'
+        run: npm install
+
+      - name: Build Zotero
+        run: npm run build
+        # Currently necessary for document-worker Webpack: https://stackoverflow.com/a/69746937
+        env:
+          NODE_OPTIONS: --openssl-legacy-provider
+
+      - name: Set up NFS share
+        run: |
+          sudo mkdir -p /private/var/zotero-nfs
+          sudo chown $(whoami) /private/var/zotero-nfs
+          echo "/private/var/zotero-nfs -mapall=$(whoami) localhost" | sudo tee /etc/exports
+          sudo nfsd enable || sudo nfsd start
+          sleep 2
+          showmount -e localhost
+          mkdir -p "$HOME/zotero-nfs"
+          sudo mount_nfs -o vers=3 localhost:/private/var/zotero-nfs "$HOME/zotero-nfs"
+
+      # The step timeout turns a startup hang into a failure
+      - name: Run tests on network share
+        timeout-minutes: 10
+        run: TMPDIR="$HOME/zotero-nfs" test/runtests.sh -f -r 3 -b db file
+
+  # Boot the Windows build -- which uses custom-built Firefox components (xul.dll) rather
+  # than stock Mozilla binaries -- and run the db and file tests. A Gecko bump commit
+  # updates the custom-component hashes in config.sh along with the version, so this
+  # tests each new set of custom components.
+  test-win:
+    name: Test (Windows ${{ matrix.arch }})
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 40
+    needs: changes
+    if: >
+      needs.changes.outputs.network == 'true'
+      && (github.event_name != 'pull_request'
+      || github.event.pull_request.head.repo.full_name != github.repository)
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: x64
+            os: windows-latest
+          - arch: arm64
+            os: windows-11-arm
+    defaults:
+      run:
+        shell: bash
+    steps:
+      # The repository contains symlinks, which Git checks out as plain files on Windows
+      # by default, breaking the build
+      - name: Enable symlinks
+        run: git config --global core.symlinks true
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          lfs: true
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      # Git Bash has unzip but not zip, which fetch_xulrunner needs to repack omni.ja
+      - name: Install zip
+        run: choco install zip --no-progress -y
+
+      - name: Cache xulrunner
+        id: xulrunner-cache
+        uses: actions/cache@v4
+        with:
+          path: app/xulrunner/firefox-win-${{ matrix.arch }}
+          key: xulrunner-win-${{ matrix.arch }}-${{ hashFiles('app/config.sh', 'app/scripts/fetch_xulrunner') }}
+
+      - name: Fetch xulrunner
+        if: steps.xulrunner-cache.outputs.cache-hit != 'true'
+        run: app/scripts/fetch_xulrunner -p w -a ${{ matrix.arch }}
+
+      - name: Cache Node modules
+        id: node-cache
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-win-24-${{ hashFiles('package-lock.json') }}
+
+      - name: Install Node modules
+        if: steps.node-cache.outputs.cache-hit != 'true'
+        run: npm install
+
+      # Committed symlinks point into node_modules, which doesn't exist at checkout time,
+      # so Git creates the directory ones with the wrong symlink type on Windows. Recreate
+      # them now that the targets exist.
+      - name: Recreate symlinks
+        run: |
+          git ls-files -s | awk '$1 == 120000 { print $4 }' | xargs rm
+          git checkout -- .
+
+      - name: Build Zotero
+        run: npm run build
+        # Currently necessary for document-worker Webpack: https://stackoverflow.com/a/69746937
+        env:
+          NODE_OPTIONS: --openssl-legacy-provider
+
+      # The step timeout turns a startup hang into a failure
+      - name: Run tests
+        timeout-minutes: 15
+        run: test/runtests.sh -f -r 3 -b -x app/staging/Zotero_win-${{ matrix.arch }}/zotero.exe db file
+
+  utilities:
+    name: Utilities Tests
+    runs-on: ubuntu-latest
+    if: >
+      github.event_name != 'pull_request'
+      || github.event.pull_request.head.repo.full_name != github.repository
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Cache utilities Node modules
+        id: utilities-node-cache
+        uses: actions/cache@v4
+        with:
+          path: chrome/content/zotero/xpcom/utilities/node_modules
+          key: utilities-node-modules-24-${{ hashFiles('chrome/content/zotero/xpcom/utilities/package-lock.json') }}
+
+      - name: Install utilities Node modules
+        if: steps.utilities-node-cache.outputs.cache-hit != 'true'
+        run: npm install --prefix chrome/content/zotero/xpcom/utilities
+
+      - name: Run utilities tests
+        run: |
+          npm test --prefix chrome/content/zotero/xpcom/utilities -- -j resource/schema/global/schema.json
+
+  # Build deployment ZIPs from main, version branches (e.g., 9.0, 10.0), and *-hotfix branches
+  deploy:
+    name: Build, Upload
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.repository == 'zotero/zotero'
+    steps:
       - name: Check if deployment branch
         id: check-deploy
-        if: |
-          env.ACT != 'true'
-          && github.repository == 'zotero/zotero'
-          && github.event_name == 'push'
+        if: env.ACT != 'true'
         run: |
           branch="${GITHUB_REF#refs/heads/}"
           if [[ "$branch" == "main" || "$branch" =~ ^[0-9]+\.[0-9]+$ || "$branch" == *-hotfix ]]; then
             echo "deploy=true" >> "$GITHUB_OUTPUT"
           fi
 
+      - uses: actions/checkout@v4
+        if: steps.check-deploy.outputs.deploy == 'true'
+        with:
+          submodules: recursive
+          lfs: true
+
+      - name: Install Node
+        if: steps.check-deploy.outputs.deploy == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: 24
+
+      - name: Cache Node modules
+        id: node-cache
+        if: steps.check-deploy.outputs.deploy == 'true'
+        uses: actions/cache@v4
+        with:
+          path: node_modules
+          key: node-modules-24-${{ hashFiles('package-lock.json') }}
+
+      - name: Install Node modules
+        if: steps.check-deploy.outputs.deploy == 'true' && steps.node-cache.outputs.cache-hit != 'true'
+        run: npm install
+
+      - name: Build Zotero
+        if: steps.check-deploy.outputs.deploy == 'true'
+        run: npm run build
+        # Currently necessary for document-worker Webpack: https://stackoverflow.com/a/69746937
+        env:
+          NODE_OPTIONS: --openssl-legacy-provider
+
+      - name: Create deployment ZIP
+        if: steps.check-deploy.outputs.deploy == 'true'
+        run: |
+          cd build
+          zip -r ../build.zip *
+          cd ..
+
       - uses: ruby/setup-ruby@v1
         if: steps.check-deploy.outputs.deploy == 'true'
         with:
@@ -103,21 +425,3 @@ jobs:
           cp build.zip build-zip/$GITHUB_SHA.zip
           gem install --no-document dpl -v '>= 2.0'
           dpl s3 --bucket zotero-download --local_dir build-zip --upload_dir ci/client --acl public_read
-
-      - name: Run tests
-        run: xvfb-run test/runtests.sh -f -r 3
-
-      - name: Cache utilities Node modules
-        id: utilities-node-cache
-        uses: actions/cache@v4
-        with:
-          path: chrome/content/zotero/xpcom/utilities/node_modules
-          key: utilities-node-modules-${{ hashFiles('chrome/content/zotero/xpcom/utilities/package-lock.json') }}
-
-      - name: Install utilities Node modules
-        if: steps.utilities-node-cache.outputs.cache-hit != 'true'
-        run: npm install --prefix chrome/content/zotero/xpcom/utilities
-
-      - name: Run utilities tests
-        run: |
-          npm test --prefix chrome/content/zotero/xpcom/utilities -- -j resource/schema/global/schema.json
diff --git a/app/assets/application.ini b/app/assets/application.ini
index 802d2f666c..68599e32b6 100644
--- a/app/assets/application.ini
+++ b/app/assets/application.ini
@@ -7,8 +7,8 @@ Copyright=Copyright (c) 2006-2025 Contributors
 ID=zotero@zotero.org
 
 [Gecko]
-MinVersion=140.0
-MaxVersion=140.99.*
+MinVersion=153.0
+MaxVersion=153.99.*
 
 [XRE]
 EnableExtensionManager=1
diff --git a/app/assets/commandLineHandler.js b/app/assets/commandLineHandler.js
index 8fe82c1a2f..e48ae49336 100644
--- a/app/assets/commandLineHandler.js
+++ b/app/assets/commandLineHandler.js
@@ -50,6 +50,7 @@ if (processTestOptions) {
 	TestOptions.bail = cmdLine.handleFlag("bail", false);
 	TestOptions.startAt = cmdLine.handleFlagWithParam("startAtTestFile", false);
 	TestOptions.stopAt = cmdLine.handleFlagWithParam("stopAtTestFile", false);
+	TestOptions.shard = cmdLine.handleFlagWithParam("shard", false);
 	TestOptions.grep = cmdLine.handleFlagWithParam("grep", false);
 	TestOptions.timeout = cmdLine.handleFlagWithParam("ZoteroTestTimeout", false);
 	TestOptions.retries = cmdLine.handleFlagWithParam("retries", false) || 0;
diff --git a/app/build.sh b/app/build.sh
index ff1e862e16..576a2721d6 100755
--- a/app/build.sh
+++ b/app/build.sh
@@ -42,7 +42,7 @@ Options
  -f FILE             ZIP file to build from (cannot be used with -d)
  -t                  add devtools
  -p PLATFORMS        build for platforms PLATFORMS (m=Mac, w=Windows, l=Linux)
- -a ARCH             architecture to build (arm64, x64, i686, win32)
+ -a ARCH             architecture to build (arm64, x64, win32)
                      * Ignored for Mac (always universal)
                      * If omitted on Windows/Linux, all standard archs are built
  -c CHANNEL          use update channel CHANNEL
@@ -59,6 +59,17 @@ function cleanup {
 }
 trap cleanup EXIT
 
+# Copy the contents of a directory into another directory, which may already exist,
+# using rsync if it's available (not on Windows)
+function copy_dir {
+	if command -v rsync > /dev/null; then
+		rsync -a "$1/" "$2/"
+	else
+		mkdir -p "$2"
+		cp -a "$1/." "$2/"
+	fi
+}
+
 function abspath {
 	echo $(cd $(dirname $1); pwd)/$(basename $1);
 }
@@ -210,7 +221,7 @@ if [ $BUILD_LINUX == 1 ]; then
 	if [[ -n $arch ]]; then
 		check_xulrunner_hash l $(get_canonical_arch l $arch)
 	else
-		for _a in x64 arm64 i686; do
+		for _a in x64 arm64; do
 			check_xulrunner_hash l "$_a"
 		done
 	fi
@@ -296,7 +307,7 @@ elif [[ $BUILD_LINUX == 1 ]]; then
 	if [[ -n $arch ]]; then
 		omni_arch=$(get_canonical_arch l $arch)
 	else
-		for cand in x86_64 arm64 i686; do
+		for cand in x86_64 arm64; do
 			[[ -d "${LINUX_RUNTIME_PATH_PREFIX}${cand}" ]] && { omni_arch="$cand"; break; }
 		done
 	fi
@@ -311,7 +322,6 @@ cd $omni_dir
 rm actors/AboutLogins{Parent,Child}.sys.mjs
 rm actors/AboutMessagePreview{Parent,Child}.sys.mjs
 rm actors/AboutNewTab{Parent,Child}.sys.mjs
-rm actors/AboutPocket{Parent,Child}.sys.mjs
 rm actors/AboutPrivateBrowsing{Parent,Child}.sys.mjs
 rm actors/AboutProtections{Parent,Child}.sys.mjs
 rm actors/AboutReader{Parent,Child}.sys.mjs
@@ -350,11 +360,10 @@ browser_keep=(
 	content/browser/parent/ext-browser.js
 	# For spellchecking
 	content/browser/built_in_addons.json
+	# Statically imported by BackupService, which SelectableProfileService pulls in when it's
+	# instantiated as a command-line handler at startup
+	content/browser/backup/backup-constants.mjs
 )
-if [ $BUILD_WIN == 1 ]; then
-	# Windows window controls
-	browser_keep+=(skin/classic/browser/window-controls)
-fi
 for file in "${browser_keep[@]}"; do
 	mkdir -p "$(dirname "chrome/browser-fx/$file")"
 	mv "chrome/browser/$file" "chrome/browser-fx/$file"
@@ -376,11 +385,18 @@ if [ -n "$ZIP_FILE" ]; then
 	echo "Building from $ZIP_FILE"
 	unzip -q $ZIP_FILE -d "$omni_dir"
 else
-	rsync_params=""
-	if [ $include_tests -eq 0 ]; then
-		rsync_params="--exclude /test"
+	if command -v rsync > /dev/null; then
+		rsync_params=""
+		if [ $include_tests -eq 0 ]; then
+			rsync_params="--exclude /test"
+		fi
+		rsync -a $rsync_params "$SOURCE_DIR/" ./
+	else
+		copy_dir "$SOURCE_DIR" .
+		if [ $include_tests -eq 0 ]; then
+			rm -rf ./test
+		fi
 	fi
-	rsync -a $rsync_params "$SOURCE_DIR/" ./
 fi
 
 mv defaults defaults-z
@@ -406,6 +422,8 @@ echo "" >> $prefs_file
 echo "# Zotero extension prefs" >> $prefs_file
 echo "" >> $prefs_file
 cat defaults-z/preferences/zotero.js >> $prefs_file
+# Babel strips the trailing newline, so anything appended below would share a line
+echo "" >> $prefs_file
 
 rm -rf defaults-z
 
@@ -574,11 +592,11 @@ fi
 
 # Copy platform-specific assets
 if [ $BUILD_MAC == 1 ]; then
-	rsync -a "$CALLDIR/assets/mac/" ./
+	copy_dir "$CALLDIR/assets/mac" .
 elif [ $BUILD_WIN == 1 ]; then
-	rsync -a "$CALLDIR/assets/win/" ./
+	copy_dir "$CALLDIR/assets/win" .
 elif [ $BUILD_LINUX == 1 ]; then
-	rsync -a "$CALLDIR/assets/unix/" ./
+	copy_dir "$CALLDIR/assets/unix" .
 fi
 
 # Add word processor plug-ins
@@ -676,8 +694,8 @@ if [ $BUILD_MAC == 1 ]; then
 	
 	# Merge relevant assets from Firefox
 	mkdir "$CONTENTSDIR/MacOS"
-	cp -r "$MAC_RUNTIME_PATH/Contents/MacOS/"!(firefox|firefox-bin|crashreporter.app|minidump-analyzer|nmhproxy|pingsender|updater.app) "$CONTENTSDIR/MacOS"
-	cp -r "$MAC_RUNTIME_PATH/Contents/Resources/"!(application.ini|browser|defaults|precomplete|removed-files|updater.ini|update-settings.ini|webapprt*|*.icns|*.lproj) "$CONTENTSDIR/Resources"
+	cp -r "$MAC_RUNTIME_PATH/Contents/MacOS/"!(firefox|firefox-bin|crashhelper|crashreporter.app|minidump-analyzer|nmhproxy|pingsender|updater.app) "$CONTENTSDIR/MacOS"
+	cp -r "$MAC_RUNTIME_PATH/Contents/Resources/"!(application.ini|Assets.car|browser|defaults|precomplete|removed-files|updater.ini|update-settings.ini|webapprt*|*.icns|*.lproj) "$CONTENTSDIR/Resources"
 	
 	# Add our custom ChannelPrefs.framework and change channel if not a source build
 	mkdir "$CONTENTSDIR/Frameworks"
@@ -721,7 +739,7 @@ if [ $BUILD_MAC == 1 ]; then
 	echo
 	
 	# Copy app files
-	rsync -a "$base_dir/" "$CONTENTSDIR/Resources/"
+	copy_dir "$base_dir" "$CONTENTSDIR/Resources"
 	
 	# Add word processor plug-ins
 	mkdir "$CONTENTSDIR/Resources/integration"
@@ -732,12 +750,66 @@ if [ $BUILD_MAC == 1 ]; then
 	find "$CONTENTSDIR" -depth -type d -name .git -exec rm -rf {} \;
 	find "$CONTENTSDIR" \( -name .DS_Store -or -name update.rdf \) -exec rm -f {} \;
 	
-	# Add Safari App Extension -- this depends on signing but needs to be done before generating
+	# Add Safari extensions -- this depends on signing but needs to be done before generating
 	# the precomplete file
+	#
+	# $SAFARI_APPEX is a stub appex built from the safari-web-extension wrapper project. The web
+	# extension itself comes from $SAFARI_EXT_RESOURCES (a zotero-connectors build/safari
+	# directory), which replaces the stub's placeholder resources here before signing.
+	#
+	# $SAFARI_APP_EXTENSION is an optional prebuilt legacy Safari App Extension, embedded
+	# alongside the web extension for Safari versions that can't load Developer ID web
+	# extensions (supported in Safari 18.4 and later). On Safari versions that can load the
+	# web extension, the SFSafariAppExtensionBundleIdentifiersToReplace key causes it to
+	# replace the App Extension.
 	if [[ $SIGN == 1 ]] && [[ -n "$SAFARI_APPEX" ]] && [[ -d "$SAFARI_APPEX" ]]; then
+		if [[ -z "${SAFARI_EXT_RESOURCES:-}" ]] || [[ ! -f "$SAFARI_EXT_RESOURCES/manifest.json" ]]; then
+			echo "SAFARI_EXT_RESOURCES doesn't contain a web extension -- aborting" 2>&1
+			exit 1
+		fi
+		bundle_identifier=$(/usr/libexec/PlistBuddy -c "Print CFBundleIdentifier" "$APPDIR/Contents/Info.plist")
 		mkdir "$APPDIR/Contents/PlugIns"
-		cp -R $SAFARI_APPEX "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex"
-		rm -rf "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/test/"
+		
+		webext_appex="$APPDIR/Contents/PlugIns/ZoteroSafariWebExtension.appex"
+		cp -R "$SAFARI_APPEX" "$webext_appex"
+		appex_resources="$webext_appex/Contents/Resources"
+		rm -rf "$appex_resources"
+		mkdir "$appex_resources"
+		cp -R "$SAFARI_EXT_RESOURCES/." "$appex_resources/"
+		
+		# Show the connector version in Safari
+		connector_version=$(python3 -c "import json, sys; print(json.load(open(sys.argv[1]))['version'])" "$appex_resources/manifest.json")
+		if [[ $connector_version == *999* ]] && [ "$UPDATE_CHANNEL" != "test" ]; then
+			echo "Placeholder connector version $connector_version not allowed for '$UPDATE_CHANNEL' channel -- aborting" 2>&1
+			exit 1
+		fi
+		/usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString $connector_version" \
+			"$webext_appex/Contents/Info.plist"
+		/usr/libexec/PlistBuddy -c "Set CFBundleVersion $connector_version" \
+			"$webext_appex/Contents/Info.plist"
+		
+		# Give the appex the same bundle identifier prefix as the parent app
+		/usr/libexec/PlistBuddy -c "Set CFBundleIdentifier $bundle_identifier.SafariWebExtension" \
+			"$webext_appex/Contents/Info.plist"
+		
+		# Replace the legacy App Extension on Safari versions that can load the web extension
+		/usr/libexec/PlistBuddy -c "Add :NSExtension:SFSafariAppExtensionBundleIdentifiersToReplace array" \
+			"$webext_appex/Contents/Info.plist"
+		/usr/libexec/PlistBuddy -c "Add :NSExtension:SFSafariAppExtensionBundleIdentifiersToReplace:0 string $bundle_identifier.SafariExtension" \
+			"$webext_appex/Contents/Info.plist"
+		
+		# Add legacy Safari App Extension
+		if [[ -n "${SAFARI_APP_EXTENSION:-}" ]]; then
+			if [[ ! -d "$SAFARI_APP_EXTENSION" ]]; then
+				echo "SAFARI_APP_EXTENSION not found at $SAFARI_APP_EXTENSION -- aborting" 2>&1
+				exit 1
+			fi
+			appext_appex="$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex"
+			cp -R "$SAFARI_APP_EXTENSION" "$appext_appex"
+			rm -rf "$appext_appex/Contents/Resources/safari/test"
+			/usr/libexec/PlistBuddy -c "Set CFBundleIdentifier $bundle_identifier.SafariExtension" \
+				"$appext_appex/Contents/Info.plist"
+		fi
 	fi
 	
 	# Copy over removed-files and make a precomplete file
@@ -773,34 +845,36 @@ if [ $BUILD_MAC == 1 ]; then
 		
 		# Sign .jnilib (Java native shared library) within LibreOffice extension, since notarization
 		# started failing without this. The .jnilib is within a .jar within the .oxt, so we have to
-		# extract both, sign the library, and then update each ZIP.
+		# extract both, sign the libraries, and then update each ZIP.
+		#
+		# TODO: Remove this block once the plugin ships a jna.jar without the macOS native
+		# libraries, which are never loaded (JNA is used only on Windows)
 		pushd "$BUILD_DIR"
 		mkdir libreoffice-repack
 		cd libreoffice-repack
 		unzip -q "$APPDIR/Contents/Resources/integration/libreoffice/Zotero_LibreOffice_Integration.oxt" external_jars/jna.jar
-		unzip -q external_jars/jna.jar com/sun/jna/darwin/libjnidispatch.jnilib
-		/usr/bin/codesign --force --options runtime --sign "$DEVELOPER_ID" com/sun/jna/darwin/libjnidispatch.jnilib
-		zip -u external_jars/jna.jar com/sun/jna/darwin/libjnidispatch.jnilib
+		unzip -q external_jars/jna.jar 'com/sun/jna/darwin*/libjnidispatch.jnilib'
+		/usr/bin/codesign --force --options runtime --sign "$DEVELOPER_ID" com/sun/jna/darwin*/libjnidispatch.jnilib
+		zip -u external_jars/jna.jar com/sun/jna/darwin*/libjnidispatch.jnilib
 		zip -u "$APPDIR/Contents/Resources/integration/libreoffice/Zotero_LibreOffice_Integration.oxt" external_jars/jna.jar
 		cd ..
 		rm -rf libreoffice-repack
 		popd
 		
-		# Sign Safari App Extension
+		# Sign Safari extensions
 		#
-		# Even though it's signed by Xcode, we sign it again to make sure it matches the parent app signature
-		if [ -d "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex" ]; then
+		# Even though they're signed by Xcode, we sign them again to make sure they match the parent app signature
+		for appex in "$APPDIR"/Contents/PlugIns/*.appex; do
+			if [ ! -d "$appex" ]; then
+				continue
+			fi
 			echo
 			# Extract entitlements, which differ from parent app
-			/usr/bin/codesign -d --entitlements "$BUILD_DIR/safari-entitlements.plist" --xml "$SAFARI_APPEX"
+			/usr/bin/codesign -d --entitlements "$BUILD_DIR/safari-entitlements.plist" --xml "$appex"
 			
-			# Change appex bundle identifier to have same prefix as parent app
-			bundle_identifier=$(/usr/libexec/PlistBuddy -c "Print CFBundleIdentifier" "$APPDIR/Contents/Info.plist")
-			perl -pi -e "s/org\.zotero\.SafariExtensionApp\.SafariExtension/$bundle_identifier.SafariExtension/" "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Info.plist"
-
-			find "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex/Contents" -name '*.dylib' -exec /usr/bin/codesign --force --options runtime --entitlements "$entitlements_file" --sign "$DEVELOPER_ID" {} \;
-			/usr/bin/codesign --force --options runtime --entitlements "$BUILD_DIR/safari-entitlements.plist" --sign "$DEVELOPER_ID" "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex"
-		fi
+			find "$appex/Contents" -name '*.dylib' -exec /usr/bin/codesign --force --options runtime --entitlements "$entitlements_file" --sign "$DEVELOPER_ID" {} \;
+			/usr/bin/codesign --force --options runtime --entitlements "$BUILD_DIR/safari-entitlements.plist" --sign "$DEVELOPER_ID" "$appex"
+		done
 		
 		# Sign final app package
 		echo
@@ -808,11 +882,14 @@ if [ $BUILD_MAC == 1 ]; then
 		
 		# Verify app
 		/usr/bin/codesign --verify -vvvv "$APPDIR"
-		# Verify Safari App Extension
-		if [[ -n "$SAFARI_APPEX" ]] && [[ -d "$SAFARI_APPEX" ]]; then
+		# Verify Safari extensions
+		for appex in "$APPDIR"/Contents/PlugIns/*.appex; do
+			if [ ! -d "$appex" ]; then
+				continue
+			fi
 			echo
-			/usr/bin/codesign --verify -vvvv "$APPDIR/Contents/PlugIns/ZoteroSafariExtension.appex"
-		fi
+			/usr/bin/codesign --verify -vvvv "$appex"
+		done
 	fi
 	
 	# Build and notarize disk image
@@ -885,7 +962,7 @@ if [ $BUILD_WIN == 1 ]; then
 		#
 		# 'i686' is a huge directory containing x86 versions of xul.dll and other files in
 		# Firefox ARM64 builds for use with the EME DRM plugins
-		cp -R "$runtime_path"/!(application.ini|browser|crashreporter*|default-browser-agent.exe|defaultagent*|defaults|devtools-files|firefox*|i686|maintenanceservice*|minidump-analyzer.exe|pingsender.exe|private_browsing*|precomplete|removed-files|uninstall|update*) "$APPDIR"
+		cp -R "$runtime_path"/!(application.ini|browser|crashhelper.exe|crashreporter*|default-browser-agent.exe|defaultagent*|defaults|desktop-launcher|devtools-files|firefox*|i686|maintenanceservice*|minidump-analyzer.exe|nmhproxy.exe|pingsender.exe|private_browsing*|precomplete|removed-files|uninstall|update*) "$APPDIR"
 
 		# Copy zotero.exe, which is built directly from Firefox source and then modified by
 		# ResourceHacker to add icons
@@ -910,11 +987,11 @@ if [ $BUILD_WIN == 1 ]; then
 		fi
 		
 		# Copy app files
-		rsync -a "$base_dir/" "$APPDIR/"
+		copy_dir "$base_dir" "$APPDIR"
 		#mv "$APPDIR/app/application.ini" "$APPDIR/"
 		
 		# Copy in common files
-		rsync -a "$COMMON_APPDIR/" "$APPDIR/"
+		copy_dir "$COMMON_APPDIR" "$APPDIR"
 		
 		cat "$CALLDIR/win/installer/updater_append.ini" >> "$APPDIR/updater.ini"
 		
@@ -1056,7 +1133,7 @@ if [ $BUILD_LINUX == 1 ]; then
 	if [[ -n $arch ]]; then
 		archs=("$(get_canonical_arch l $arch)")
 	else
-		archs=(x64 arm64 i686)
+		archs=(x64 arm64)
 	fi
 	for arch in "${archs[@]}"; do
 		[[ $arch == x64 ]] && arch="x86_64"
@@ -1070,7 +1147,7 @@ if [ $BUILD_LINUX == 1 ]; then
 		mkdir "$APPDIR"
 		
 		# Merge relevant assets from Firefox
-		cp -r "$runtime_path/"!(application.ini|browser|defaults|devtools-files|crashreporter|crashreporter.ini|firefox|pingsender|precomplete|removed-files|run-mozilla.sh|update-settings.ini|updater|updater.ini) "$APPDIR"
+		cp -r "$runtime_path/"!(application.ini|browser|crashhelper|crashreporter|crashreporter.ini|defaults|devtools-files|firefox|pingsender|precomplete|removed-files|run-mozilla.sh|update-settings.ini|updater|updater.ini) "$APPDIR"
 		
 		# Use our own launcher that calls the original Firefox executable with -app
 		mv "$APPDIR"/firefox-bin "$APPDIR"/zotero-bin
@@ -1086,7 +1163,7 @@ if [ $BUILD_LINUX == 1 ]; then
 		chmod 755 "$APPDIR/updater"
 
 		# Copy app files
-		rsync -a "$base_dir/" "$APPDIR/"
+		copy_dir "$base_dir" "$APPDIR"
 		
 		# Add word processor plug-ins
 		mkdir "$APPDIR/integration"
diff --git a/app/config.sh b/app/config.sh
index 072e075242..fd2b0e5a35 100644
--- a/app/config.sh
+++ b/app/config.sh
@@ -1,17 +1,17 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # Version of Gecko to build with
-GECKO_VERSION_MAC="140.11.0esr"
-GECKO_VERSION_LINUX="140.11.0esr"
-GECKO_VERSION_WIN="140.10.0esr"
-RUST_VERSION=1.86.0
+GECKO_VERSION_MAC="153.1.0esr"
+GECKO_VERSION_LINUX="153.1.0esr"
+GECKO_VERSION_WIN="153.1.0esr"
+RUST_VERSION=1.94.0
 
 # URL prefix for custom builds of Firefox components
 custom_components_url="https://download.zotero.org/dev/firefox-components/"
 custom_components_hash_mac=""
-custom_components_hash_win_x64="d4f13db655004401c114fb937b1535a74919b6516fae637e35847734bde4d602"
-custom_components_hash_win_arm64="69390facb8502fc40127f1ad80012858a3717935d5806331f1b17f54b05c2ca8"
-custom_components_hash_win32="163e98eecf2c17579f47e1c2cfa1eb44e204cc26bcb220bb7c31168ab866e2ef"
+custom_components_hash_win_x64="ac2cd5e2d4190c07af1649ca0372ff07dae70afd880d309441dafb575ccdc61a"
+custom_components_hash_win_arm64="2369eb75912fb91633fb16d0f756c78d41f533522a3415bb4746c2a911547083"
+custom_components_hash_win32="8eea54a3754b5f5331fc9147a6e7741976d70ddb48c8759f3b1a77e8729d8019"
 
 APP_NAME="Zotero"
 APP_ID="zotero\@zotero.org"
diff --git a/app/linux/build b/app/linux/build
index ee14b1dd36..2d4f74f883 100755
--- a/app/linux/build
+++ b/app/linux/build
@@ -6,7 +6,7 @@ APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
 . "$APP_ROOT_DIR/config.sh"
 
 if [ -z "${1:-}" ]; then
-	echo "Usage: $0 x64|arm64|i686" >&2
+	echo "Usage: $0 x64|arm64" >&2
 	exit 1
 fi
 
@@ -24,8 +24,6 @@ if [ $arch = "x64" ]; then
 	rust_target=x86_64
 elif [ $arch = "arm64" ]; then
 	rust_target=aarch64
-elif [ $arch = "i686" ]; then
-	rust_target=i686
 else
 	echo "Unknown architecture $arch" >&2
 	exit 1
@@ -37,8 +35,6 @@ touch "$gecko_path/mozconfig"
 
 if [ $arch == "arm64" ]; then
 	echo "ac_add_options --target=aarch64-linux-gnu" >> "$gecko_path/mozconfig"
-elif [ $arch == "i686" ]; then
-	echo "ac_add_options --target=i686" >> "$gecko_path/mozconfig"
 fi
 
 cat "$SCRIPT_DIR/mozconfig" >> "$gecko_path/mozconfig"
diff --git a/app/linux/update_updater b/app/linux/update_updater
index cf8f6aa342..e68bdd872d 100755
--- a/app/linux/update_updater
+++ b/app/linux/update_updater
@@ -11,7 +11,7 @@ fi
 
 version="$1"
 
-for arch in x86_64 aarch64 i686; do
+for arch in x86_64 aarch64; do
 	package="firefox-${version}.en-US.linux-${arch}.tar.xz"
 	if [ $arch = 'aarch64' ]; then
 		arch="arm64"
@@ -36,8 +36,8 @@ if [ `uname` = "Darwin" ]; then
 else
 	tar=tar
 fi
-$tar --owner=0 --group=0 --numeric-owner --no-xattrs --mode=0755 -cJvf updater.tar.xz updater-x86_64 updater-arm64 updater-i686
+$tar --owner=0 --group=0 --numeric-owner --no-xattrs --mode=0755 -cJvf updater.tar.xz updater-x86_64 updater-arm64
 
-rm updater-x86_64 updater-arm64 updater-i686
+rm updater-x86_64 updater-arm64
 
 echo "Done: updater.tar.xz created"
diff --git a/app/mac/pkg-dmg b/app/mac/pkg-dmg
index f84ba962ca..6d5581861c 100755
--- a/app/mac/pkg-dmg
+++ b/app/mac/pkg-dmg
@@ -303,6 +303,7 @@ my(@gCleanup, %gConfig, $gDarwinMajor, $gDryRun, $gVerbosity);
             'cmd_chmod'          => 'chmod',
             'cmd_diskutil'       => 'diskutil',
             'cmd_du'             => 'du',
+            'cmd_find'           => 'find',
             'cmd_hdid'           => 'hdid',
             'cmd_hdiutil'        => 'hdiutil',
             'cmd_mkdir'          => 'mkdir',
@@ -311,6 +312,7 @@ my(@gCleanup, %gConfig, $gDarwinMajor, $gDryRun, $gVerbosity);
             'cmd_rm'             => 'rm',
             'cmd_rsync'          => 'rsync',
             'cmd_SetFile'        => '/Developer/Tools/SetFile',
+            'cmd_xattr'          => 'xattr',
 
             # create_directly indicates whether hdiutil create supports
             # -srcfolder and -srcdevice.  It does on >= 10.3 (Panther).
@@ -996,6 +998,65 @@ sub diskImageMaker($$$$$$$$) {
           cleanupDie('unlink hybridImage failed: '.$!);
         }
       }
+
+      # hdiutil makehybrid gives every file on the image non-empty
+      # Finder info (it sets an icon location), which appears as a
+      # com.apple.FinderInfo extended attribute that "codesign
+      # --verify --strict" rejects as detritus and that can cause
+      # Safari to silently ignore a bundled web extension (observed
+      # with Safari 17.6 on macOS 12; the exact trigger conditions
+      # are unknown). Mount a read-write copy of the image and strip
+      # the attributes before compressing. Note that Finder flags set
+      # with --attribute are stored in the same Finder info, so if
+      # --attribute is ever used, the affected files would need to be
+      # excluded from the strip.
+      if($uncompressedImage eq $hybridImage) {
+        my($udrwImage);
+        $udrwImage = giveExtension($tempDir.'/udrw', '.dmg');
+
+        if(command($gConfig{'cmd_hdiutil'}, 'convert', '-format', 'UDRW',
+         '-ov', $hybridImage, '-o', $udrwImage) != 0) {
+          cleanupDie('hdiutil convert to UDRW failed');
+        }
+
+        push(@gCleanup,
+         sub {commandInternalVerbosity(0, 'unlink', $udrwImage);});
+
+        $uncompressedImage = $udrwImage;
+
+        # $hybridImage is no longer needed.  Remove it and its cleanup
+        # entry, which is below the entry for $udrwImage.
+        my(@tempCleanup) = splice(@gCleanup, -2);
+        push(@gCleanup, $tempCleanup[1]);
+
+        if(commandInternal('unlink', $hybridImage) != 1) {
+          cleanupDie('unlink hybridImage failed: '.$!);
+        }
+      }
+
+      my($rootDevice, $partitionDevice, $partitionMountPoint);
+      if(!(($rootDevice, $partitionDevice, $partitionMountPoint) =
+       hdidMountImage($tempMount, $uncompressedImage))) {
+        cleanupDie('hdid mount failed');
+      }
+
+      push(@gCleanup, sub {commandVerbosity(0,
+       $gConfig{'cmd_diskutil'}, 'eject', $rootDevice);});
+
+      if(command($gConfig{'cmd_find'}, $partitionMountPoint,
+       '-mindepth', '1', '-not', '-type', 'l',
+       '-xattrname', 'com.apple.FinderInfo',
+       '-exec', $gConfig{'cmd_xattr'}, '-d', 'com.apple.FinderInfo',
+       '{}', '+') != 0) {
+        cleanupDie('stripping com.apple.FinderInfo failed');
+      }
+
+      # Pop diskutil eject
+      pop(@gCleanup);
+
+      if(command($gConfig{'cmd_diskutil'}, 'eject', $rootDevice) != 0) {
+        cleanupDie('diskutil eject failed');
+      }
     }
     else {
       # makehybrid is not available, fall back to making a UDRW and
diff --git a/app/mac/set-channel-prefs-channel b/app/mac/set-channel-prefs-channel
index 2431837584..fc1ccc1335 100755
--- a/app/mac/set-channel-prefs-channel
+++ b/app/mac/set-channel-prefs-channel
@@ -19,7 +19,8 @@ binary=$1
 from_channel=$2
 to_channel=$3
 # `strings` has a 4-character minimum by default, but we need 3 for 'dev'
-strings_cmd="strings -n 3"
+# `-arch all` scans all slices of the universal binary rather than just the host architecture
+strings_cmd="strings -n 3 -arch all"
 
 if [ ${#to_channel} -gt 7 ]; then
 	echo "Channel length cannot exceed 7 characters -- aborting" >&2
diff --git a/app/modules/zotero-libreoffice-integration b/app/modules/zotero-libreoffice-integration
index c216d787c4..227551c164 160000
--- a/app/modules/zotero-libreoffice-integration
+++ b/app/modules/zotero-libreoffice-integration
@@ -1 +1 @@
-Subproject commit c216d787c4a3dfbb440b5db620fb14f2f185ad74
+Subproject commit 227551c1644c6cb1156226d4db5d1b293fdb271d
diff --git a/app/modules/zotero-word-for-mac-integration b/app/modules/zotero-word-for-mac-integration
index 084f16d78b..300886d198 160000
--- a/app/modules/zotero-word-for-mac-integration
+++ b/app/modules/zotero-word-for-mac-integration
@@ -1 +1 @@
-Subproject commit 084f16d78b4924b15ad24c83dd5d8aaaeb9998d8
+Subproject commit 300886d1984de7a0006d7a48310baa0c8c99bea0
diff --git a/app/modules/zotero-word-for-windows-integration b/app/modules/zotero-word-for-windows-integration
index 72e8364775..c0aa6e4bef 160000
--- a/app/modules/zotero-word-for-windows-integration
+++ b/app/modules/zotero-word-for-windows-integration
@@ -1 +1 @@
-Subproject commit 72e83647756b759ec80923922218fff8bf8b0343
+Subproject commit c0aa6e4bef039d94e17e81cb28b1fe9170c45b96
diff --git a/app/scripts/8.0_release_build_and_deploy b/app/scripts/8.0_release_build_and_deploy
deleted file mode 100755
index 3f18495ce0..0000000000
--- a/app/scripts/8.0_release_build_and_deploy
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
-ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
-. "$APP_ROOT_DIR/config.sh"
-
-CHANNEL="release"
-BRANCH="8.0"
-BUILD_ONLY=0
-if [ "`uname`" = "Darwin" ]; then
-	export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/release/ZoteroSafariExtension.appex"
-fi
-
-while getopts "b" opt; do
-	case $opt in
-		b)
-			BUILD_ONLY=1
-			;;
-	esac
-	shift $((OPTIND-1)); OPTIND=1
-done
-
-cd "$SCRIPT_DIR"
-./check_requirements
-
-hash=`./get_repo_branch_hash $BRANCH`
-source_dir=`./get_commit_files $hash`
-build_dir=`mktemp -d`
-
-function cleanup {
-	rm -rf "$source_dir"
-	rm -rf "$build_dir"
-}
-trap cleanup EXIT
-
-./prepare_build -s "$source_dir" -o "$build_dir" -c $CHANNEL -m $hash
-VERSION="`cat \"$build_dir/version\"`"
-./build_for_deploy -d "$build_dir" -p $BUILD_PLATFORMS -c $CHANNEL
-
-if [ $BUILD_ONLY -eq 1 ]; then
-	echo
-	echo "Build only -- skipping deploy."
-	echo "To deploy, run on the deploy server:"
-	echo "  $DEPLOY_PATH/deploy $CHANNEL $VERSION $BUILD_PLATFORMS"
-else
-	ssh $DEPLOY_HOST "$DEPLOY_PATH/deploy" $CHANNEL "$VERSION" $BUILD_PLATFORMS
-fi
diff --git a/app/scripts/9.0_release_build_and_deploy b/app/scripts/9.0_release_build_and_deploy
index 72c7b0db09..79d325b770 100755
--- a/app/scripts/9.0_release_build_and_deploy
+++ b/app/scripts/9.0_release_build_and_deploy
@@ -10,7 +10,16 @@ CHANNEL="release"
 BRANCH="9.0"
 BUILD_ONLY=0
 if [ "`uname`" = "Darwin" ]; then
-	export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/release/ZoteroSafariExtension.appex"
+	export SAFARI_APPEX="$ROOT_DIR/../safari-web-extension-builds/ZoteroSafariExtension.appex"
+	export SAFARI_EXT_RESOURCES="$ROOT_DIR/../safari-web-extension-builds/release/safari"
+	if [ ! -d "$SAFARI_APPEX" ]; then
+		echo "Safari extension stub not found at $SAFARI_APPEX -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -f "$SAFARI_EXT_RESOURCES/manifest.json" ]; then
+		echo "Safari web extension not found in $SAFARI_EXT_RESOURCES -- aborting" >&2
+		exit 1
+	fi
 fi
 
 while getopts "b" opt; do
@@ -26,6 +35,7 @@ cd "$SCRIPT_DIR"
 ./check_requirements
 
 hash=`./get_repo_branch_hash $BRANCH`
+./check_app_matches_commit $hash
 source_dir=`./get_commit_files $hash`
 build_dir=`mktemp -d`
 
diff --git a/app/scripts/add_omni_file b/app/scripts/add_omni_file
index cc309e14da..8b3006e04a 100755
--- a/app/scripts/add_omni_file
+++ b/app/scripts/add_omni_file
@@ -37,11 +37,14 @@ win_path="$STAGE_DIR/Zotero_win-x64"
 linux_path="$STAGE_DIR/Zotero_linux-x86_64"
 
 added=0
+build_id=$(date +%Y%m%d%H%M%S)
 for path in "$mac_path" "$win_path" "$linux_path"; do
 	if [ -d "$path" ]; then
 		echo "$path/app/omni.ja"
 		echo "Updating $(basename $(dirname $(dirname $path)))"
 		zip "$path/app/omni.ja" $files
+		# Bump BuildID so that startup caches are invalidated
+		perl -pi -e "s/^BuildID=.*/BuildID=$build_id/" "$path/app/application.ini"
 		added=1
 	fi
 done
diff --git a/app/scripts/add_version_info b/app/scripts/add_version_info
index 68320b108f..1d5690aa15 100755
--- a/app/scripts/add_version_info
+++ b/app/scripts/add_version_info
@@ -4,6 +4,7 @@ Update a builds manifest with info on a given build
 """
 import argparse
 import os
+import re
 import sys
 import shutil
 import json
@@ -25,7 +26,7 @@ def main():
     try:
         file = args.file
         version = args.version
-        short_version = version[0:3]
+        short_version = re.match(r'\d+\.\d+', version).group(0)
         
         # Back up JSON file
         shutil.copy2(file, file + '.bak')
diff --git a/app/scripts/beta_build_and_deploy b/app/scripts/beta_build_and_deploy
index 92676beeee..f2087968d0 100755
--- a/app/scripts/beta_build_and_deploy
+++ b/app/scripts/beta_build_and_deploy
@@ -8,15 +8,39 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 
 CHANNEL="beta"
 BRANCH="main"
-export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/beta/ZoteroSafariExtension.appex"
+BUILD_ONLY=0
+if [ "`uname`" = "Darwin" ]; then
+	export SAFARI_APPEX="$ROOT_DIR/../safari-web-extension-builds/ZoteroSafariExtension.appex"
+	export SAFARI_EXT_RESOURCES="$ROOT_DIR/../safari-web-extension-builds/beta/safari"
+	export SAFARI_APP_EXTENSION="$ROOT_DIR/../safari-app-extension-builds/beta/ZoteroSafariExtension.appex"
+	if [ ! -d "$SAFARI_APPEX" ]; then
+		echo "Safari extension stub not found at $SAFARI_APPEX -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -f "$SAFARI_EXT_RESOURCES/manifest.json" ]; then
+		echo "Safari web extension not found in $SAFARI_EXT_RESOURCES -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -d "$SAFARI_APP_EXTENSION" ]; then
+		echo "Safari App Extension not found at $SAFARI_APP_EXTENSION -- aborting" >&2
+		exit 1
+	fi
+fi
 
-# Set Safari extension LSMinimumSystemVersion to Mojave for betas
-perl -pi -e 's/<string>11\.0<\/string>/<string>10.14<\/string>/' "$SAFARI_APPEX"/Contents/Info.plist
+while getopts "b" opt; do
+	case $opt in
+		b)
+			BUILD_ONLY=1
+			;;
+	esac
+	shift $((OPTIND-1)); OPTIND=1
+done
 
 cd "$SCRIPT_DIR"
 ./check_requirements
 
 hash=`./get_repo_branch_hash $BRANCH`
+./check_app_matches_commit $hash
 source_dir=`./get_commit_files $hash`
 build_dir=`mktemp -d`
 
@@ -29,4 +53,12 @@ trap cleanup EXIT
 ./prepare_build -s "$source_dir" -o "$build_dir" -c $CHANNEL -m $hash
 VERSION="`cat \"$build_dir/version\"`"
 ./build_for_deploy -d "$build_dir" -p $BUILD_PLATFORMS -c $CHANNEL
-ssh $DEPLOY_HOST "$DEPLOY_PATH/deploy" $CHANNEL "$VERSION" $BUILD_PLATFORMS
+
+if [ $BUILD_ONLY -eq 1 ]; then
+	echo
+	echo "Build only -- skipping deploy."
+	echo "To deploy, run on the deploy server:"
+	echo "  $DEPLOY_PATH/deploy $CHANNEL $VERSION $BUILD_PLATFORMS"
+else
+	ssh $DEPLOY_HOST "$DEPLOY_PATH/deploy" $CHANNEL "$VERSION" $BUILD_PLATFORMS
+fi
diff --git a/app/scripts/build_and_run b/app/scripts/build_and_run
index 154ad95670..2cffaa24da 100755
--- a/app/scripts/build_and_run
+++ b/app/scripts/build_and_run
@@ -10,13 +10,23 @@ if [ -n "${ZOTERO_PROFILE:-}" ]; then
 	profile_args=(-p "$ZOTERO_PROFILE")
 fi
 
-REBUILD=0
+FORCE_FULL=0
+NO_REBUILD=0
 SKIP_BUNDLED_FILES=0
 DEBUGGER=0
-while getopts "rbd" opt; do
+while getopts "rfnbd" opt; do
 	case $opt in
 		r)
-			REBUILD=1
+			# Deprecated -- rebuilding is now the default
+			echo "-r is deprecated -- rebuilding is now the default (use -n to skip)" >&2
+			;;
+		
+		f)
+			FORCE_FULL=1
+			;;
+		
+		n)
+			NO_REBUILD=1
 			;;
 		
 		b)
@@ -28,7 +38,6 @@ while getopts "rbd" opt; do
 			;;
 		
 		\?)
-			echo "Invalid option: -$OPTARG" >&2
 			exit 1
 			;;
 	esac
@@ -37,12 +46,15 @@ done
 # Remove options from $@
 shift $((OPTIND-1))
 
-if [ $REBUILD -eq 1 ]; then
+if [ $NO_REBUILD -eq 0 ]; then
 	PARAMS=""
 	if [ $DEBUGGER -eq 1 ]; then
 		PARAMS="-t"
 	fi
-	
+	if [ $FORCE_FULL -eq 1 ]; then
+		PARAMS="$PARAMS -f"
+	fi
+
 	# Check if build watch is running
 	# If not, run now
 	if ! ps u | grep js-build/build.js | grep -v grep > /dev/null; then
@@ -50,16 +62,11 @@ if [ $REBUILD -eq 1 ]; then
 		echo
 		cd $ROOT_DIR
 		# TEMP: --openssl-legacy-provider avoids a build error in pdf.js
-		NODE_OPTIONS=--openssl-legacy-provider npm run build
+		NODE_OPTIONS=--openssl-legacy-provider node js-build/build.js
 		echo
 	fi
-	
-	"$SCRIPT_DIR/dir_build" -q $PARAMS
-	
-	if [ "`uname`" = "Darwin" ]; then
-		# Sign the Word dylib so it works on Apple Silicon
-		"$SCRIPT_DIR/codesign_local" "$APP_ROOT_DIR/staging/Zotero.app"
-	fi
+
+	"$SCRIPT_DIR/dir_build" $PARAMS
 fi
 
 PARAMS=""
@@ -87,4 +94,5 @@ else
 	exit 1
 fi
 
-"$APP_ROOT_DIR/staging/$command" "${profile_args[@]}" -ZoteroDebugText -purgecaches $PARAMS "$@"
+echo
+"$APP_ROOT_DIR/staging/$command" "${profile_args[@]}" -ZoteroDebugText $PARAMS "$@"
diff --git a/app/scripts/build_for_deploy b/app/scripts/build_for_deploy
index f61591f0cc..1f9db44ade 100755
--- a/app/scripts/build_for_deploy
+++ b/app/scripts/build_for_deploy
@@ -121,7 +121,7 @@ do
 	fi
 
 	# Combine and deduplicate
-	INCREMENTALS="`echo -e "$INCREMENTALS\n$PINNED" | sort -u | grep -v '^$'`"
+	INCREMENTALS="`echo -e "$INCREMENTALS\n$PINNED" | sort -u | grep -v '^$' || true`"
 	echo "$INCREMENTALS"
 	echo
 
@@ -144,7 +144,7 @@ chmod g+ws "$TEMP_DIR/version_info"
 cp "$DIST_DIR"/files-* "$TEMP_DIR/version_info"
 chmod g+w "$TEMP_DIR"/version_info/files-*
 # Generate build-{os}.json for each platform
-SHORT_VERSION="${VERSION:0:3}"
+SHORT_VERSION=$(echo "$VERSION" | grep -oE '^[0-9]+\.[0-9]+')
 DETAILS_URL="https://www.zotero.org/support/${SHORT_VERSION}_changelog"
 for i in `seq 0 1 $((${#PLATFORMS}-1))`
 do
diff --git a/app/scripts/check_app_matches_commit b/app/scripts/check_app_matches_commit
new file mode 100755
index 0000000000..236ca7744c
--- /dev/null
+++ b/app/scripts/check_app_matches_commit
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euo pipefail
+
+# Check that app/ in this checkout matches app/ in the commit being built.
+#
+# The build-and-deploy scripts run the build scripts and config from the local
+# checkout but build source files from the tip of the remote branch, so a stale
+# checkout can silently build with the wrong Gecko version or omni patches.
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
+
+if [ -z "${1:-}" ]; then
+	echo "Usage: $0 commit-hash" >&2
+	exit 1
+fi
+hash=$1
+
+cd "$ROOT_DIR"
+
+if ! git cat-file -e "$hash^{commit}" 2>/dev/null; then
+	git fetch -q origin
+fi
+if ! git cat-file -e "$hash^{commit}" 2>/dev/null; then
+	echo "Commit $hash not found locally after fetching -- aborting" >&2
+	exit 1
+fi
+
+if ! git diff --quiet HEAD "$hash" -- app/; then
+	echo >&2
+	echo "app/ files in this checkout differ from app/ in $hash:" >&2
+	echo >&2
+	git --no-pager diff --stat HEAD "$hash" -- app/ >&2
+	echo >&2
+	echo "Update this checkout (e.g., 'git pull') and try again" >&2
+	exit 1
+fi
diff --git a/app/scripts/dev_build_and_deploy b/app/scripts/dev_build_and_deploy
index 0bc3cc01cd..98923fe1d6 100755
--- a/app/scripts/dev_build_and_deploy
+++ b/app/scripts/dev_build_and_deploy
@@ -8,12 +8,24 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 
 CHANNEL="dev"
 BRANCH="main"
-export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/dev/ZoteroSafariExtension.appex"
+if [ "`uname`" = "Darwin" ]; then
+	export SAFARI_APPEX="$ROOT_DIR/../safari-web-extension-builds/ZoteroSafariExtension.appex"
+	export SAFARI_EXT_RESOURCES="$ROOT_DIR/../safari-web-extension-builds/dev/safari"
+	if [ ! -d "$SAFARI_APPEX" ]; then
+		echo "Safari extension stub not found at $SAFARI_APPEX -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -f "$SAFARI_EXT_RESOURCES/manifest.json" ]; then
+		echo "Safari web extension not found in $SAFARI_EXT_RESOURCES -- aborting" >&2
+		exit 1
+	fi
+fi
 
 cd "$SCRIPT_DIR"
 ./check_requirements
 
 hash=`./get_repo_branch_hash $BRANCH`
+./check_app_matches_commit $hash
 source_dir=`./get_commit_files $hash`
 build_dir=`mktemp -d`
 
diff --git a/app/scripts/dir_build b/app/scripts/dir_build
index 493288ad47..20f5ef0590 100755
--- a/app/scripts/dir_build
+++ b/app/scripts/dir_build
@@ -5,6 +5,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
 ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 . "$APP_ROOT_DIR/config.sh"
+. "$SCRIPT_DIR/utils.sh"
 
 function usage {
 	cat >&2 <<DONE
@@ -15,9 +16,9 @@ Architecture is ignored for Mac builds, which are always shipped as universal bi
 
 Options
  -p PLATFORM        Platform to build (m=Mac, w=Windows, l=Linux)
- -a ARCH            Target architecture (arm64, x64, i686, win32) — **Windows/Linux only**
+ -a ARCH            Target architecture (arm64, x64, win32) — **Windows/Linux only**
  -t                 add devtools
- -q                 quick build (skip compression and other optional steps for faster restarts during development)
+ -f                 force a full rebuild instead of updating the staged build in place
 DONE
 	exit 1
 }
@@ -25,8 +26,8 @@ DONE
 platform=""
 arch=""
 devtools=0
-quick_build=0
-while getopts "tp:a:q" opt; do
+force_full=0
+while getopts "tp:a:f" opt; do
 	case $opt in
 		t)
 			devtools=1
@@ -47,12 +48,11 @@ while getopts "tp:a:q" opt; do
 		a)
 			arch="$OPTARG"
 			;;
-		q)
-			quick_build=1
+		f)
+			force_full=1
 			;;
 		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
+			usage
 			;;
 	esac
 done
@@ -76,29 +76,100 @@ if [[ $platform = "m" ]]; then
 else
 	# Windows / Linux: derive arch if not supplied
 	if [[ -z $arch ]]; then
-		case "$(uname -m)" in
-			arm64|aarch64) arch="arm64" ;;
-			x86_64)         arch="x64"   ;;
-			i?86)           arch="i686"  ;;
-		esac
+		# An x64 build of Git for Windows runs emulated on Windows on ARM, where it
+		# reports x86_64 from `uname -m`, while `uname -s` reports the native
+		# architecture
+		if [[ $platform = "w" && "$(uname -s)" == *ARM64* ]]; then
+			arch="arm64"
+		else
+			case "$(uname -m)" in
+				arm64|aarch64) arch="arm64" ;;
+				x86_64)         arch="x64"   ;;
+			esac
+		fi
 	fi
 fi
 
 CHANNEL="source"
 
+# Remove stale symlinks left behind in build/ when source files are deleted,
+# which would otherwise break the build
+if [ -d "$ROOT_DIR/build" ]; then
+	# With -L, -type l matches only broken symlinks
+	stale_links=$(find -L "$ROOT_DIR/build" -type l -print)
+	if [ -n "$stale_links" ]; then
+		echo "Removing stale symlinks from build/:" >&2
+		echo "$stale_links" >&2
+		while IFS= read -r link; do
+			rm "$link"
+		done <<< "$stale_links"
+	fi
+fi
+
+# Try to update the staged build in place instead of doing a full rebuild
+if [[ $force_full -eq 0 ]]; then
+	incr_cmd=("$SCRIPT_DIR/incremental_update" -p "$platform")
+	[[ -n $arch ]] && incr_cmd+=( -a "$arch" )
+	[[ $devtools -eq 1 ]] && incr_cmd+=( -t )
+	set +e
+	"${incr_cmd[@]}"
+	incr_status=$?
+	set -e
+	if [ $incr_status -ne 2 ]; then
+		exit $incr_status
+	fi
+fi
+
 hash=$(git -C "$ROOT_DIR" rev-parse --short HEAD)
 
 build_dir=$(mktemp -d)
-cleanup() { rm -rf "$build_dir"; }
+manifest_tmp=""
+cleanup() {
+	rm -rf "$build_dir"
+	if [ -n "$manifest_tmp" ]; then
+		rm -f "$manifest_tmp"
+	fi
+}
 trap cleanup EXIT
 
+# Snapshot the state of build/ and app/ before the build for later incremental
+# updates
+app_hash=""
+if [ -d "$ROOT_DIR/build" ]; then
+	manifest_tmp=$(mktemp)
+	generate_build_manifest "$ROOT_DIR/build" > "$manifest_tmp"
+	app_hash=$(generate_app_hash "$APP_ROOT_DIR")
+fi
+
 "$SCRIPT_DIR/prepare_build" -s "$ROOT_DIR/build" -o "$build_dir" -c "$CHANNEL" -m "$hash"
 
-build_cmd=("$APP_ROOT_DIR/build.sh" -d "$build_dir" -p "$platform" -c "$CHANNEL" -s)
+build_cmd=("$APP_ROOT_DIR/build.sh" -d "$build_dir" -p "$platform" -c "$CHANNEL" -s -q)
 [[ -n $arch ]] && build_cmd+=( -a "$arch" )
 [[ $devtools -eq 1 ]] && build_cmd+=( -t )
-[[ $quick_build -eq 1 ]] && build_cmd+=( -q )
 
 "${build_cmd[@]}"
 
+# Save manifest for future incremental updates
+if [ -n "$manifest_tmp" ]; then
+	if [[ -z "${ZOTERO_TEST:-}" ]] || [[ "${ZOTERO_TEST:-}" == "0" ]]; then
+		include_tests=0
+	else
+		include_tests=1
+	fi
+	{
+		echo "#format=2"
+		echo "#include_tests=$include_tests"
+		echo "#devtools=$devtools"
+		echo "#app_hash=$app_hash"
+		cat "$manifest_tmp"
+	} > "$STAGE_DIR/.build-manifest"
+fi
+
+# Ad-hoc-sign the Word dylib so it works on Apple Silicon. This only needs to
+# happen when the staged build is fully rebuilt -- incremental updates don't
+# touch the dylib.
+if [[ $platform = "m" ]] && [[ "$(uname -s)" = "Darwin" ]]; then
+	"$SCRIPT_DIR/codesign_local" "$STAGE_DIR/Zotero.app"
+fi
+
 echo Done
diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner
index 7ec257f506..065970ab22 100755
--- a/app/scripts/fetch_xulrunner
+++ b/app/scripts/fetch_xulrunner
@@ -35,7 +35,7 @@ Required
 Optional / Conditional
  -a ARCH       - Mac:      disallowed (builds are universal)
                - Windows:  x64 | arm64 | win32
-               - Linux:    x64 (or x86_64) | arm64 | i686
+               - Linux:    x64 (or x86_64) | arm64
                If omitted on Windows/Linux, all standard archs are fetched.
 DONE
 	exit 1
@@ -87,7 +87,7 @@ if [[ $BUILD_WIN == 1 || $BUILD_LINUX == 1 ]]; then
 		fi
 		if [[ $BUILD_LINUX == 1 ]]; then
 			[[ $arch == x64 ]] && arch="x86_64"
-			case $arch in x86_64|i686|arm64) ;; *) echo "Invalid Linux arch: $arch" >&2; echo; usage;; esac
+			case $arch in x86_64|arm64) ;; *) echo "Invalid Linux arch: $arch" >&2; echo; usage;; esac
 		fi
 	fi
 fi
@@ -133,6 +133,12 @@ function modify_omni {
 	rm actors/AudioPlayback{Parent,Child}.sys.mjs
 	
 	replace_line 'BROWSER_CHROME_URL:.+' 'BROWSER_CHROME_URL: "chrome:\/\/zotero\/content\/zoteroPane.xhtml",' modules/AppConstants.sys.mjs
+	# Used by OSKeyStore as the master-key label, visible in macOS Keychain Access.
+	# Verify that OSKeyStore still derives the label from MOZ_APP_BASENAME, so a
+	# future Mozilla change to a hardcoded string doesn't silently rebrand the
+	# keychain entry back to "Firefox Encrypted Storage".
+	replace_line 'MOZ_APP_BASENAME: "Firefox"' 'MOZ_APP_BASENAME: "Zotero"' modules/AppConstants.sys.mjs
+	check_line 'STORE_LABEL: AppConstants\.MOZ_APP_BASENAME \+ " Encrypted Storage"' modules/OSKeyStore.sys.mjs
 	
 	# https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/internals/preferences.html
 	#
@@ -195,15 +201,17 @@ function modify_omni {
 	
 	file="modules/ActorManagerParent.sys.mjs"
 	# Remove deleted actors
-	remove_between 'AboutTranslations: \{' '^  },' $file
-	remove_between 'CookieBanner: \{' '^  },' $file
-	remove_between 'PictureInPictureLauncher: \{' '^  },' $file
-	remove_between 'PictureInPictureToggle: \{' '^  },' $file
-	remove_between 'PictureInPicture: \{' '^  },' $file
-	remove_between 'Thumbnails: \{' '^  },' $file
-	remove_between 'Translations: \{' '^  },' $file
-	remove_between 'TranslationsEngine: \{' '^  },' $file
-	remove_between 'AudioPlayback: \{' '^  },' $file
+	# Entries in the JSWINDOWACTORS/JSPROCESSACTORS literals:
+	remove_between '^  AudioPlayback: \{' '^  },' $file
+	remove_between '^  CookieBanner: \{' '^  },' $file
+	remove_between '^  Thumbnails: \{' '^  },' $file
+	remove_between '^  Translations: \{' '^  },' $file
+	remove_between '^  TranslationsEngine: \{' '^  },' $file
+	# Entries added conditionally after the literals:
+	remove_between '^  JSWINDOWACTORS\.AboutTranslations = \{' '^  \};' $file
+	remove_between '^  JSWINDOWACTORS\.PictureInPictureLauncher = \{' '^  \};' $file
+	remove_between '^  JSWINDOWACTORS\.PictureInPictureToggle = \{' '^  \};' $file
+	remove_between '^  JSWINDOWACTORS\.PictureInPicture = \{' '^  \};' $file
 	# Do not trigger LoginManager event that logs an error on autocomplete submission
 	remove_line 'DOMInputPasswordAdded: \{\},' $file
 	
@@ -387,8 +395,12 @@ function modify_omni {
 	
 	file="chrome/toolkit/content/mozapps/extensions/aboutaddons.css"
 	echo >> $file
-	# Hide search bar, Themes and Plugins tabs, and sidebar footer
-	echo '.main-search, button[name="theme"], button[name="plugin"], sidebar-footer { display: none; }' >> $file
+	# Hide the search bar and the whole sidebar, since we only ever show plugins and the main pane
+	# is already headed "Manage Your Plugins"
+	echo '.main-search, #sidebar { display: none; }' >> $file
+	# Center the content in the window now that it isn't offset by the sidebar
+	echo '#full { grid-template-columns: 1fr; }' >> $file
+	echo '#content { max-width: calc(var(--page-main-content-width) + var(--main-margin-start)); margin-inline: auto; }' >> $file
 	echo '.main-heading { margin-top: 2em; }' >> $file
 	# Hide Details/Permissions tabs in addon details so we only show details
 	echo 'addon-details > button-group { display: none !important; }' >> $file
@@ -404,46 +416,46 @@ function modify_omni {
 	echo '.addon-detail-row-homepage .text-link { cursor: pointer; color: LinkText; }' >> $file
 	echo '.addon-detail-row-homepage .text-link:hover { text-decoration: underline; }' >> $file
 	
-	file="chrome/toolkit/content/mozapps/extensions/aboutaddons.js"
+	file="chrome/toolkit/content/mozapps/extensions/aboutaddons-utils.mjs"
 	# Hide unsigned-addon warning
-	replace_line 'if \(!isCorrectlySigned\(addon\)\) \{' 'if (!isCorrectlySigned(addon)) {return {};' $file
+	replace_line 'export function isUnsignedWarningMessageDisabled\(\) \{' \
+		'export function isUnsignedWarningMessageDisabled() {if (true) return true;' $file
+	# Use our own localized string for blocked plugin notification
+	replace_line 'details-notification-hard-blocked-\$\{typeSuffix\}' 'plugins-blocked-plugin' $file
+	# Hide Recommendations tab in sidebar and recommendations in main pane
+	replace_line 'function isDiscoverEnabled\(\) \{' 'function isDiscoverEnabled() {return false;' $file
+
+	file="chrome/toolkit/content/mozapps/extensions/components/addon-details.mjs"
 	# Hide Private Browsing setting in addon details
 	replace_line 'pbRow\.' '\/\/pbRow.' $file
 	replace_line 'let isAllowed = await isAllowedInPrivateBrowsing' '\/\/let isAllowed = await isAllowedInPrivateBrowsing' $file
-	# Use our own strings for the removal prompt
-	replace_line 'let \{ BrowserAddonUI \} = windowRoot.ownerGlobal;' '' $file
-	replace_line 'await BrowserAddonUI.promptRemoveExtension' 'promptRemoveExtension' $file
-	
-	# Customize empty-list message
-	replace_line 'createEmptyListMessage\(\) {' 'createEmptyListMessage() {
-        var p = document.createElement("p");
-        p.id = "empty-list-message";
-        return p;' $file
-	# Swap in include.js, which we need for Zotero.getString(), for abuse-reports.js, which we don't need
-	
 	# Open plugin links in external browser
 	replace_line 'let homepageURL = homepageRow.querySelector\(\"a\"\);' 'let homepageURL = homepageRow.querySelector(\"\.text-link\");' $file
 	replace_line 'homepageURL.href = addon.homepageURL;' 'homepageURL.setAttribute("href", addon.homepageURL);' $file
 	replace_line '<a target="_blank" dir="ltr"><\/a>' \
-		'<label target="_blank" class="text-link" dir="ltr"><\/label>' \
-		chrome/toolkit/content/mozapps/extensions/aboutaddons.html
-	
+		'<label target="_blank" class="text-link" dir="ltr"><\/label>' $file
+
+	file="chrome/toolkit/content/mozapps/extensions/components/addon-card.mjs"
+	# Use our own strings for the removal prompt
+	replace_line 'let \{ BrowserAddonUI \} = windowRoot.window;' '' $file
+	replace_line 'await BrowserAddonUI.promptRemoveExtension' 'promptRemoveExtension' $file
+
+	# Customize empty-list message
+	replace_line 'createEmptyListMessage\(\) {' 'createEmptyListMessage() {
+        var p = document.createElement("p");
+        p.id = "empty-list-message";
+        return p;' chrome/toolkit/content/mozapps/extensions/components/addon-list.mjs
+
 	# Add zotero.ftl to the addons page for our own localized strings
 	replace_line 'href="toolkit\/about\/aboutAddons.ftl"' 'href="toolkit\/about\/aboutAddons.ftl" \/>\n    <link rel="localization" href="zotero.ftl"' \
 		chrome/toolkit/content/mozapps/extensions/aboutaddons.html
-	# Use our own localized string for blocked plugin notification
-	file="chrome/toolkit/content/mozapps/extensions/aboutaddons.js"
-	replace_line 'details-notification-hard-blocked-\$\{typeSuffix\}' 'plugins-blocked-plugin' $file
 
 	# TODO: Use our own strings, but for now fix the bundled English ones
 	replace_line 'Manage Your Extensions' 'Manage Your Plugins' localization/en-US/toolkit/about/aboutAddons.ftl
-	replace_line '= Extensions' '= Plugins' localization/en-US/toolkit/about/aboutAddons.ftl
 	replace_line 'Add-on' 'Plugin' localization/en-US/toolkit/about/aboutAddons.ftl
 	replace_line 'add-ons' 'plugins' localization/en-US/toolkit/about/aboutAddons.ftl
 	replace_line 'Select add-on to install' 'Select plugin to install' localization/en-US/toolkit/about/aboutAddons.ftl
 	
-	# Hide Recommendations tab in sidebar and recommendations in main pane
-	replace_line 'function isDiscoverEnabled\(\) \{' 'function isDiscoverEnabled() {return false;' chrome/toolkit/content/mozapps/extensions/aboutaddonsCommon.js
 	replace_line 'pref\("extensions.htmlaboutaddons.recommendations.enabled".+' 'pref("extensions.htmlaboutaddons.recommendations.enabled", false);' greprefs.js
 	
 	# Hide Report option
@@ -460,7 +472,7 @@ function modify_omni {
 		chrome/toolkit/content/global/commonDialog.xhtml
 	# commonDialog.css link is split across multiple lines, so we have to do a weird substitution,
 	# so check the one-line global.css to make sure the format hasn't changed
-	check_line '<html:link rel="stylesheet" href="chrome:\/\/global\/skin\/global.css" \/>'
+	check_line '<html:link rel="stylesheet" href="chrome:\/\/global\/skin\/global.css" \/>' chrome/toolkit/content/global/commonDialog.xhtml
 	replace_line 'chrome:\/\/global\/skin\/commonDialog.css"' \
 		'chrome:\/\/global\/skin\/commonDialog.css"\/>
 		<html:link rel="stylesheet" href="chrome:\/\/zotero-platform\/content\/zotero.css"' \
@@ -490,8 +502,19 @@ function modify_omni {
        }
        popupset.appendChild(this._autoScrollPopup);' chrome/toolkit/content/global/elements/browser-custom-element.mjs
 	
-	# Remove aria-autocomplete unnecessarily added to search-textbox to not confuse screen readers
-	remove_line 'this.inputField.setAttribute\("aria-autocomplete' chrome/toolkit/content/global/elements/search-textbox.js
+	# Add the dropmarker for toolbarbuttons with wantdropmarker, which Firefox no longer creates
+	replace_line 'this.appendChild\(this.constructor.fragment.cloneNode\(true\)\);' \
+		'this.appendChild(this.constructor.fragment.cloneNode(true));
+
+        if (this.hasAttribute("wantdropmarker")) {
+          let dropmarker = document.createXULElement("dropmarker");
+          dropmarker.setAttribute("type", "menu");
+          dropmarker.className = "toolbarbutton-menu-dropmarker";
+          this.appendChild(dropmarker);
+        }' chrome/toolkit/content/global/elements/toolbarbutton.js
+	# Let clicks on the dropmarker pass through to the toolbarbutton, which only opens its menu
+	# when it's the original event target, as xul.css did when Firefox created the dropmarker
+	echo '.toolbarbutton-menu-dropmarker { pointer-events: none; }' >> chrome/toolkit/content/global/xul.css
 
 	# Remove non-native text input styles
 	remove_between 'html\|input\:where\(' '^}' chrome/toolkit/skin/classic/global/global-shared.css
@@ -505,10 +528,12 @@ function modify_omni {
 		overflow: var(--moz-text-control-overflow);
 	}' >> chrome/toolkit/res/forms.css
 	
-	# By default, an autocomplete popup's width is calculated based on the input that opened it.
-	# Allow an ancestor to designate itself as the width container instead. (For creator inputs.)
-	replace_line 'aElement.getBoundingClientRect\(\).width' \
-		'(aElement.closest(".autocomplete-popup-width-container") || aElement).getBoundingClientRect().width' \
+	# Size an autocomplete popup to the input that opened it, or to an ancestor that designates
+	# itself as the width container. Firefox sizes the popup to its content. (For creator inputs.)
+	replace_line '\/\/ invalidate\(\) depends on the width attribute' \
+		'let widthElement = aElement.closest(".autocomplete-popup-width-container") || aElement;
+        this.style.setProperty("--panel-width", Math.max(widthElement.getBoundingClientRect().width, 100) + "px");
+        \/\/ invalidate() depends on the width attribute' \
 		chrome/toolkit/content/global/elements/autocomplete-popup.js
 	
 	zip -qr9XD omni.ja *
@@ -556,7 +581,7 @@ if [ $BUILD_MAC == 1 ]; then
 		echo "Using Firefox $GECKO_VERSION.app.zip"
 		unzip "Firefox $GECKO_VERSION.app.zip"
 	else
-		curl -o Firefox.dmg "$DOWNLOAD_URL/mac/en-US/Firefox%20$GECKO_VERSION.dmg"
+		curl -fo Firefox.dmg "$DOWNLOAD_URL/mac/en-US/Firefox%20$GECKO_VERSION.dmg"
 		set +e
 		hdiutil detach -quiet /Volumes/Firefox 2>/dev/null
 		set -e
@@ -642,7 +667,7 @@ if [ $BUILD_WIN == 1 ]; then
 			else
 				moz_arch=$arch
 			fi
-			curl -O "$DOWNLOAD_URL/$moz_arch/en-US/Firefox%20Setup%20$GECKO_VERSION.exe"
+			curl -fO "$DOWNLOAD_URL/$moz_arch/en-US/Firefox%20Setup%20$GECKO_VERSION.exe"
 			# Store local copy of unmodified app
 			cp "Firefox%20Setup%20$GECKO_VERSION.exe" "$archived_file"
 		fi
@@ -758,7 +783,7 @@ if [ $BUILD_LINUX == 1 ]; then
 	if [[ -n $arch ]]; then
 		arch_list=("$arch")
 	else
-		arch_list=(x86_64 arm64 i686)
+		arch_list=(x86_64 arm64)
 	fi
 	for arch in "${arch_list[@]}"; do
 		xdir="firefox-linux-$arch"
@@ -774,7 +799,7 @@ if [ $BUILD_LINUX == 1 ]; then
 			else
 				moz_arch=$arch
 			fi
-			curl -O "$DOWNLOAD_URL/linux-$moz_arch/en-US/firefox-$GECKO_VERSION.tar.xz"
+			curl -fO "$DOWNLOAD_URL/linux-$moz_arch/en-US/firefox-$GECKO_VERSION.tar.xz"
 			# Store local copy of unmodified app
 			cp "firefox-$GECKO_VERSION.tar.xz" "$archived_file"
 		fi
diff --git a/app/scripts/incremental_update b/app/scripts/incremental_update
new file mode 100755
index 0000000000..386d8fb510
--- /dev/null
+++ b/app/scripts/incremental_update
@@ -0,0 +1,322 @@
+#!/bin/bash
+set -euo pipefail
+
+#
+# Incrementally update a staged build in staging/ by zipping changed files from
+# the client build/ directory directly into app/omni.ja, based on a manifest
+# saved by dir_build after the last full build.
+#
+# Only files that are copied into omni.ja unmodified by build.sh can be updated
+# this way. If any other file changed (or a file was removed), a full rebuild
+# is required.
+#
+# Exit codes:
+#   0 -- staged build was updated (or nothing changed)
+#   2 -- a full rebuild is required
+#
+# This is normally run automatically by dir_build, not directly.
+#
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
+ROOT_DIR="$(dirname "$APP_ROOT_DIR")"
+. "$APP_ROOT_DIR/config.sh"
+. "$SCRIPT_DIR/utils.sh"
+
+function usage {
+	cat >&2 <<DONE
+Usage: $0 -p PLATFORM [-a ARCH] [-t]
+
+Options
+ -p PLATFORM        platform of the staged build to update (m=Mac, w=Windows, l=Linux)
+ -a ARCH            target architecture (Windows/Linux only)
+ -t                 devtools requested
+DONE
+	exit 1
+}
+
+platform=""
+arch=""
+devtools=0
+while getopts "p:a:t" opt; do
+	case $opt in
+		p)
+			platform="$OPTARG"
+			;;
+		a)
+			arch="$OPTARG"
+			;;
+		t)
+			devtools=1
+			;;
+		*)
+			usage
+			;;
+	esac
+done
+
+if [ -z "$platform" ]; then
+	usage
+fi
+
+BUILD_SRC_DIR="$ROOT_DIR/build"
+MANIFEST_FILE="$STAGE_DIR/.build-manifest"
+
+function fall_back {
+	echo "$1 -- performing full build" >&2
+	exit 2
+}
+
+if [ ! -d "$BUILD_SRC_DIR" ]; then
+	fall_back "No build/ directory"
+fi
+if [ ! -f "$MANIFEST_FILE" ]; then
+	fall_back "No manifest from previous build"
+fi
+if [[ "$(sed -n 's/^#format=//p' "$MANIFEST_FILE")" != "2" ]]; then
+	fall_back "Unsupported manifest format"
+fi
+
+# Make sure a staged build exists for the requested platform
+case $platform in
+	m)
+		app_dir="$STAGE_DIR/Zotero.app/Contents/Resources"
+		;;
+	w)
+		app_dir="$STAGE_DIR/Zotero_$(get_canonical_arch w "$arch")"
+		;;
+	l)
+		app_dir="$STAGE_DIR/Zotero_linux-$(get_canonical_arch l "$arch")"
+		;;
+	*)
+		fall_back "Unknown platform '$platform'"
+		;;
+esac
+if [ ! -f "$app_dir/app/omni.ja" ]; then
+	fall_back "No staged build for requested platform"
+fi
+
+# If the previous build didn't include tests or devtools and they're requested
+# now, files are missing from the staged build
+manifest_tests=$(sed -n 's/^#include_tests=//p' "$MANIFEST_FILE")
+manifest_tests=${manifest_tests:-0}
+manifest_devtools=$(sed -n 's/^#devtools=//p' "$MANIFEST_FILE")
+manifest_devtools=${manifest_devtools:-0}
+if [[ -z "${ZOTERO_TEST:-}" ]] || [[ "${ZOTERO_TEST:-}" == "0" ]]; then
+	want_tests=0
+else
+	want_tests=1
+fi
+if [[ $want_tests -eq 1 ]] && [[ $manifest_tests != "1" ]]; then
+	fall_back "Tests requested but not included in staged build"
+fi
+if [[ $devtools -eq 1 ]] && [[ $manifest_devtools != "1" ]]; then
+	fall_back "Devtools requested but not included in staged build"
+fi
+
+# If anything changed in app/ (build scripts, assets, bundled modules, Firefox
+# runtime), a full rebuild is required
+manifest_app_hash=$(sed -n 's/^#app_hash=//p' "$MANIFEST_FILE")
+app_hash=$(generate_app_hash "$APP_ROOT_DIR")
+if [[ -z "$manifest_app_hash" ]] || [[ "$app_hash" != "$manifest_app_hash" ]]; then
+	fall_back "Files in app/ changed"
+fi
+
+file_list=$(mktemp)
+new_stats=$(mktemp)
+carried=$(mktemp)
+candidates=$(mktemp)
+removed=$(mktemp)
+cand_entries=$(mktemp)
+trap 'rm -f "$file_list" "$new_stats" "$carried" "$candidates" "$removed" "$cand_entries"' EXIT
+
+cd "$BUILD_SRC_DIR"
+
+# Quickly find files that may have changed based on size/mtime, so that only
+# those have to be hashed. Unmodified manifest entries are carried over,
+# new/modified files become candidates, and files no longer present are
+# considered removed.
+build_manifest_file_list > "$file_list"
+stat_file_list < "$file_list" > "$new_stats"
+awk -F'\t' -v carried="$carried" -v candidates="$candidates" -v removed="$removed" '
+	NR==FNR {
+		if (/^#/) next
+		hash[$3] = $1
+		stat[$3] = $2
+		next
+	}
+	{
+		if (!($2 in stat)) {
+			print > candidates
+		}
+		else {
+			if ($1 == stat[$2]) {
+				print hash[$2] "\t" $0 > carried
+			}
+			else {
+				print > candidates
+			}
+			delete stat[$2]
+		}
+	}
+	END {
+		for (path in stat) print path > removed
+	}
+' "$MANIFEST_FILE" "$new_stats"
+
+# Hash the candidates and compare to the previous hashes to find real changes
+# -- A = added, C = changed, R = removed
+if [ -s "$candidates" ]; then
+	paste \
+		<(cut -f2 "$candidates" | sed 's,^,./,' | tr '\n' '\0' | hash_file_list | cut -f1) \
+		"$candidates" \
+		> "$cand_entries"
+fi
+changes=$(
+	if [ -s "$cand_entries" ]; then
+		awk -F'\t' '
+			NR==FNR {
+				if (/^#/) next
+				old[$3] = $1
+				next
+			}
+			{
+				if (!($3 in old)) print "A\t" $3
+				else if (old[$3] != $1) print "C\t" $3
+			}
+		' "$MANIFEST_FILE" "$cand_entries"
+	fi
+	if [ -s "$removed" ]; then
+		awk '{print "R\t" $0}' "$removed"
+	fi
+)
+
+# Make sure all changed files can be zipped directly into omni.ja, and skip
+# ones that aren't included in the staged build
+zip_files=()
+ftl_files=()
+test_copy_files=()
+while IFS=$'\t' read -r status path; do
+	if [ -z "$status" ]; then
+		continue
+	fi
+	if [ "$status" == "R" ]; then
+		case "$path" in
+			test/*)
+				# Ignore removed test files if tests weren't included
+				if [[ $manifest_tests != "1" ]]; then
+					continue
+				fi
+				;;
+		esac
+		fall_back "$path was removed"
+	fi
+	case "$path" in
+		# Copied into localization/ subdirectories by build.sh
+		chrome/locale/*/zotero/mozilla/*)
+			fall_back "Can't update $path in place"
+			;;
+		# Pruned by prepare_build
+		chrome/content/zotero/locale/csl/*)
+			fall_back "Can't update $path in place"
+			;;
+		# Copied to localization/<locale>/ in addition to the chrome path
+		chrome/locale/*/zotero/*.ftl)
+			zip_files+=("$path")
+			ftl_files+=("$path")
+			;;
+		chrome/*|components/*|resource/*)
+			zip_files+=("$path")
+			;;
+		# Appended to the main chrome.manifest by build.sh
+		test/chrome.manifest)
+			fall_back "Can't update $path in place"
+			;;
+		test/*)
+			# If tests weren't included in the staged build, ignore changes
+			# to test files
+			if [[ $manifest_tests == "1" ]]; then
+				zip_files+=("$path")
+				case "$path" in
+					# Also copied to tests/ at the top level of the app
+					test/tests/*)
+						test_copy_files+=("$path")
+						;;
+				esac
+			fi
+			;;
+		*)
+			fall_back "Can't update $path in place"
+			;;
+	esac
+done <<< "$changes"
+
+# Find all staged omni.ja files to update (multiple can exist -- e.g., all
+# Windows architectures)
+omni_files=()
+while IFS= read -r file; do
+	omni_files+=("$file")
+done < <(find "$STAGE_DIR" -path '*/app/omni.ja')
+
+if [ ${#zip_files[@]} -gt 0 ]; then
+	echo "Changed files:"
+	for path in "${zip_files[@]}"; do
+		echo "  $path"
+	done
+	
+	cd "$BUILD_SRC_DIR"
+	for omni_file in "${omni_files[@]}"; do
+		echo "Updating ${omni_file#"$STAGE_DIR"/}"
+		zip -qX "$omni_file" "${zip_files[@]}"
+	done
+	
+	# Copy .ftl files to their localization/ paths
+	if [ ${#ftl_files[@]} -gt 0 ]; then
+		l10n_dir=$(mktemp -d)
+		for path in "${ftl_files[@]}"; do
+			locale=${path#chrome/locale/}
+			locale=${locale%%/*}
+			mkdir -p "$l10n_dir/localization/$locale"
+			cp -L "$path" "$l10n_dir/localization/$locale/$(basename "$path")"
+		done
+		pushd "$l10n_dir" > /dev/null
+		for omni_file in "${omni_files[@]}"; do
+			zip -qrX "$omni_file" localization
+		done
+		popd > /dev/null
+		rm -rf "$l10n_dir"
+	fi
+	
+	# Copy test files to tests/ directories
+	if [ ${#test_copy_files[@]} -gt 0 ]; then
+		for path in "${test_copy_files[@]}"; do
+			for omni_file in "${omni_files[@]}"; do
+				dest="${omni_file%/app/omni.ja}/tests/${path#test/tests/}"
+				mkdir -p "$(dirname "$dest")"
+				cp -L "$path" "$dest"
+			done
+		done
+	fi
+	
+	# Bump BuildID so that startup caches are invalidated even without
+	# -purgecaches
+	build_id=$(date +%Y%m%d%H%M%S)
+	for omni_file in "${omni_files[@]}"; do
+		perl -pi -e "s/^BuildID=.*/BuildID=$build_id/" "$(dirname "$omni_file")/application.ini"
+	done
+	
+	echo "Updated staged build with ${#zip_files[@]} changed file(s)"
+elif [ -n "$changes" ]; then
+	echo "No staged files changed"
+else
+	echo "No changes since last build"
+fi
+
+{
+	echo "#format=2"
+	echo "#include_tests=$manifest_tests"
+	echo "#devtools=$manifest_devtools"
+	echo "#app_hash=$app_hash"
+	LC_ALL=C sort -t$'\t' -k3 "$carried" "$cand_entries"
+} > "$MANIFEST_FILE.tmp"
+mv "$MANIFEST_FILE.tmp" "$MANIFEST_FILE"
diff --git a/app/scripts/prepare_build b/app/scripts/prepare_build
index ad96024249..4b94e548ef 100755
--- a/app/scripts/prepare_build
+++ b/app/scripts/prepare_build
@@ -71,34 +71,42 @@ def main():
         
         tmp_src_dir = os.path.join(tmp_dir, 'zotero')
         
-        # Export a clean copy of the source tree
-        subprocess.check_call([
-            'rsync',
-            '-aL',
-            # Exclude hidden files
-            '--exclude', '.*',
-            '--exclude', '#*',
-            '--exclude', 'package.json',
-            '--exclude', 'package-lock.json',
-            '.' + os.sep,
-            tmp_src_dir + os.sep
-        ])
+        # Export a clean copy of the source tree -- with Python on Windows, where rsync,
+        # if present at all, doesn't handle Windows-style paths
+        if os.name == 'nt' or not shutil.which('rsync'):
+            shutil.copytree(
+                '.',
+                tmp_src_dir,
+                ignore=shutil.ignore_patterns('.*', '#*', 'package.json', 'package-lock.json')
+            )
+        else:
+            subprocess.check_call([
+                'rsync',
+                '-aL',
+                # Exclude hidden files
+                '--exclude', '.*',
+                '--exclude', '#*',
+                '--exclude', 'package.json',
+                '--exclude', 'package-lock.json',
+                '.' + os.sep,
+                tmp_src_dir + os.sep
+            ])
         
-        # Make sure rsync worked
+        # Make sure the copy worked
         d = os.path.join(tmp_src_dir, 'chrome')
         if not os.path.isdir(d):
             raise FileNotFoundError(d + " not found")
         
         # Delete CSL locale support files
-        subprocess.check_call([
-            'find',
-            os.path.normpath(tmp_src_dir + '/chrome/content/zotero/locale/csl/'),
-            '-mindepth', '1',
-            '!', '-name', '*.xml',
-            '!', '-name', 'locales.json',
-            #'-print',
-            '-delete'
-        ])
+        csl_dir = os.path.normpath(tmp_src_dir + '/chrome/content/zotero/locale/csl/')
+        for root, dirs, files in os.walk(csl_dir, topdown=False):
+            for name in files:
+                if not name.endswith('.xml') and name != 'locales.json':
+                    os.remove(os.path.join(root, name))
+            for name in dirs:
+                d = os.path.join(root, name)
+                if not os.listdir(d):
+                    os.rmdir(d)
         
         # Delete styles build script
         os.remove(os.path.join(tmp_src_dir, 'styles', 'update'))
diff --git a/app/scripts/test_build_and_deploy b/app/scripts/test_build_and_deploy
index e2d8b2df11..dba4d253bd 100755
--- a/app/scripts/test_build_and_deploy
+++ b/app/scripts/test_build_and_deploy
@@ -8,12 +8,29 @@ ROOT_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 
 CHANNEL="test"
 BRANCH="main"
-export SAFARI_APPEX="$ROOT_DIR/../safari-app-extension-builds/test/ZoteroSafariExtension.appex"
+if [ "`uname`" = "Darwin" ]; then
+	export SAFARI_APPEX="$ROOT_DIR/../safari-web-extension-builds/ZoteroSafariExtension.appex"
+	export SAFARI_EXT_RESOURCES="$ROOT_DIR/../safari-web-extension-builds/test/safari"
+	export SAFARI_APP_EXTENSION="$ROOT_DIR/../safari-app-extension-builds/test/ZoteroSafariExtension.appex"
+	if [ ! -d "$SAFARI_APPEX" ]; then
+		echo "Safari extension stub not found at $SAFARI_APPEX -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -f "$SAFARI_EXT_RESOURCES/manifest.json" ]; then
+		echo "Safari web extension not found in $SAFARI_EXT_RESOURCES -- aborting" >&2
+		exit 1
+	fi
+	if [ ! -d "$SAFARI_APP_EXTENSION" ]; then
+		echo "Safari App Extension not found at $SAFARI_APP_EXTENSION -- aborting" >&2
+		exit 1
+	fi
+fi
 
 cd "$SCRIPT_DIR"
 ./check_requirements
 
 hash=`./get_repo_branch_hash $BRANCH`
+./check_app_matches_commit $hash
 source_dir=`./get_commit_files $hash`
 build_dir=`mktemp -d`
 
diff --git a/app/scripts/utils.sh b/app/scripts/utils.sh
index ede0d72f7e..021cb2ddf5 100644
--- a/app/scripts/utils.sh
+++ b/app/scripts/utils.sh
@@ -39,8 +39,87 @@ get_canonical_arch() {
 	esac
 }
 
+# Print a sorted NUL-separated list of the files in the current directory to
+# include in the build manifest. Follows symlinks, like the rsync calls in
+# prepare_build and build.sh.
+function build_manifest_file_list {
+	# Exclusions match the rsync call in prepare_build
+	find -L . -mindepth 1 \( -name '.*' -o -name '#*' \) -prune \
+			-o -type f ! -name 'package.json' ! -name 'package-lock.json' -print0 \
+		| LC_ALL=C sort -z
+}
+
+# Read a NUL-separated file list on stdin and print "size|mtime<TAB>path" for
+# each file
+function stat_file_list {
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+		xargs -0 stat -L -f '%z|%Fm|%N'
+	else
+		xargs -0 stat -L -c '%s|%y|%n'
+	fi | sed -E 's,^([0-9]+[|][^|]+)[|](\./)?,\1'$'\t'','
+}
+
+# Read a NUL-separated file list on stdin and print "hash<TAB>path" for each
+# file
+function hash_file_list {
+	local md5_cmd
+	if command -v md5sum > /dev/null 2>&1; then
+		md5_cmd="md5sum"
+	else
+		md5_cmd="md5 -r"
+	fi
+	xargs -0 $md5_cmd | sed -E 's,^([0-9a-f]{32})  ?(\./)?,\1'$'\t'','
+}
+
+# Generate a manifest of a build directory for incremental updates, with one
+# "hash<TAB>size|mtime<TAB>path" line per file, sorted by path
+function generate_build_manifest {
+	local dir=$1
+	(
+		cd "$dir"
+		local file_list
+		file_list=$(mktemp)
+		build_manifest_file_list > "$file_list"
+		paste \
+			<(hash_file_list < "$file_list" | cut -f1) \
+			<(stat_file_list < "$file_list")
+		rm -f "$file_list"
+	)
+}
+
+# Generate a hash of the files in app/ that affect build output, for detecting
+# when a staged build can't be updated incrementally. Since some of the files
+# are large binaries, use file sizes and modification times rather than
+# contents. The xulrunner runtimes are covered by the hash-* files written by
+# fetch_xulrunner.
+function generate_app_hash {
+	local app_dir=$1
+	local md5_cmd
+	if command -v md5sum > /dev/null 2>&1; then
+		md5_cmd="md5sum"
+	else
+		md5_cmd="md5 -r"
+	fi
+	(
+		cd "$app_dir"
+		local paths=(assets build.sh config.sh scripts mac win linux modules update-packaging)
+		if [ -f config-custom.sh ]; then
+			paths+=(config-custom.sh)
+		fi
+		{
+			if [[ "$OSTYPE" == "darwin"* ]]; then
+				find -L "${paths[@]}" -name '.*' -prune -o -type f -print0 | xargs -0 stat -L -f '%N|%z|%m'
+			else
+				find -L "${paths[@]}" -name '.*' -prune -o -type f -print0 | xargs -0 stat -L -c '%n|%s|%Y'
+			fi
+			cat xulrunner/hash-* 2> /dev/null || true
+		} | LC_ALL=C sort | $md5_cmd | awk '{print $1}'
+	)
+}
+
 function check_line {
 	pattern=$1
+	file=$2
 	if ! grep -E -q "$pattern" "$file"; then
 		echo "$pattern" not found in "$file" -- aborting 2>&1
 		exit 1
diff --git a/app/scripts/xulrunner_hash b/app/scripts/xulrunner_hash
index 9daf3ce2b8..aec7662205 100755
--- a/app/scripts/xulrunner_hash
+++ b/app/scripts/xulrunner_hash
@@ -8,7 +8,7 @@
 #   * **Windows (w)** ‑a is **required**. Accepted values:
 #         win32 | x64 | arm64
 #   * **Linux (l)**   ‑a is **required**. Accepted values:
-#         x86_64 | i686 | arm64 (alias x64 → x86_64)
+#         x86_64 | arm64 (alias x64 → x86_64)
 
 set -euo pipefail
 
@@ -26,7 +26,7 @@ Usage: xulrunner_hash.sh -p <m|w|l> [-a ARCH]
  -p PLATFORM   m (mac), w (windows), l (linux)        [required]
  -a ARCH       *required* for Windows & Linux builds
                Windows:  x64 | arm64 | win32
-               Linux:    x64 (or x86_64) | arm64 | i686
+               Linux:    x64 (or x86_64) | arm64
                Mac:      disallowed – always universal
 DONE
 	exit 1
@@ -65,7 +65,7 @@ case $platform in
 		[[ -z $arch ]] && { echo "-a is required for Linux builds" >&2; echo; usage; }
 		[[ $arch == x64 ]] && arch="x86_64"
 		case $arch in
-			x86_64|i686|arm64) ;;
+			x86_64|arm64) ;;
 			*) echo "Invalid Linux arch: $arch" >&2; echo; usage;;
 		esac
 		GECKO_VERSION="$GECKO_VERSION_LINUX"
@@ -91,4 +91,5 @@ fi
 
 input_string="${platform}-${arch}-${components_hash}|${GECKO_VERSION}|${xulrunner_content}"
 
-printf "%s" "$input_string" | openssl dgst -sha256 | awk '{print $2}'
+
+printf "%s" "$input_string" | openssl dgst -sha256 | awk '{print $NF}'
diff --git a/app/update-packaging/build_autoupdate.sh b/app/update-packaging/build_autoupdate.sh
index 39d1d22d3d..e7931ec3ea 100755
--- a/app/update-packaging/build_autoupdate.sh
+++ b/app/update-packaging/build_autoupdate.sh
@@ -97,6 +97,8 @@ if [[ $BUILD_MAC == 0 ]] && [[ $BUILD_WIN == 0 ]] && [[ $BUILD_LINUX == 0 ]]; th
 	usage
 fi
 
+TO_MAJOR_VERSION="${TO%%.*}"
+
 rm -rf "$UPDATE_STAGE_DIR"
 mkdir "$UPDATE_STAGE_DIR"
 
@@ -157,15 +159,17 @@ for version in "$FROM" "$TO"; do
 		mkdir "$CACHE_DIR"
 	fi
 	
-	# Build archive list (no Linux arm64 for Zotero 7)
+	# Build archive list (no Linux arm64 before Zotero 8, no Linux i686 from Zotero 11)
 	ARCHIVES=(
 		"$MAC_ARCHIVE"
 		"$WIN32_ARCHIVE"
 		"$WIN_X64_ARCHIVE"
 		"$WIN_ARM64_ARCHIVE"
-		"$LINUX_X86_ARCHIVE"
 		"$LINUX_X86_64_ARCHIVE"
 	)
+	if [ "$TO_MAJOR_VERSION" -lt 11 ]; then
+		ARCHIVES+=("$LINUX_X86_ARCHIVE")
+	fi
 	if [ "$MAJOR_VERSION" -ge 8 ]; then
 		ARCHIVES+=("$LINUX_ARM64_ARCHIVE")
 	fi
@@ -235,8 +239,13 @@ for version in "$FROM" "$TO"; do
 		set -e
 	done
 	
-	# Delete cached files older than 14 days
-	find "$CACHE_DIR" -ctime +14 -delete
+	# Delete cached archives older than 14 days
+	find "$CACHE_DIR" -maxdepth 1 -type f -ctime +14 -delete
+	# Delete cached diffs and compressed files not created or used in 60 days
+	# (cache hits touch the entries)
+	if [ -d "$CACHE_DIR/update-packaging" ]; then
+		find "$CACHE_DIR/update-packaging" -type f -ctime +60 -delete
+	fi
 	
 	# Unpack Zotero.app
 	if [ $BUILD_MAC == 1 ]; then
@@ -257,9 +266,14 @@ for version in "$FROM" "$TO"; do
 	# Unpack Windows zips
 	if [ $BUILD_WIN == 1 ]; then
 		if [[ -f "$WIN32_ARCHIVE" ]] && [[ -f "$WIN_X64_ARCHIVE" ]] && [[ -f "$WIN_ARM64_ARCHIVE" ]]; then
+			# Unpack architectures in parallel
+			UNPACK_PIDS=""
 			for build in "$WIN32_ARCHIVE" "$WIN_X64_ARCHIVE" "$WIN_ARM64_ARCHIVE"; do
-				unzip -q "$build"
-				rm "$build"
+				(unzip -q "$build" && rm "$build") &
+				UNPACK_PIDS="$UNPACK_PIDS $!"
+			done
+			for pid in $UNPACK_PIDS; do
+				wait $pid
 			done
 			INCREMENTALS_FOUND=1
 		else
@@ -269,8 +283,11 @@ for version in "$FROM" "$TO"; do
 	
 	# Unpack Linux tarballs
 	if [ $BUILD_LINUX == 1 ]; then
-		# Zotero 7 has no Linux arm64 build
-		LINUX_BUILDS_TO_UNPACK=("$LINUX_X86_ARCHIVE" "$LINUX_X86_64_ARCHIVE")
+		# Zotero 7 has no Linux arm64 build; Zotero 11 has no Linux i686 build
+		LINUX_BUILDS_TO_UNPACK=("$LINUX_X86_64_ARCHIVE")
+		if [ "$TO_MAJOR_VERSION" -lt 11 ]; then
+			LINUX_BUILDS_TO_UNPACK+=("$LINUX_X86_ARCHIVE")
+		fi
 		if [ "$MAJOR_VERSION" -ge 8 ]; then
 			LINUX_BUILDS_TO_UNPACK+=("$LINUX_ARM64_ARCHIVE")
 		fi
@@ -284,9 +301,14 @@ for version in "$FROM" "$TO"; do
 		done
 		
 		if [ "$MISSING" -eq 0 ]; then
+			# Unpack architectures in parallel
+			UNPACK_PIDS=""
 			for build in "${LINUX_BUILDS_TO_UNPACK[@]}"; do
-				tar -xf "$build"
-				rm "$build"
+				(tar -xf "$build" && rm "$build") &
+				UNPACK_PIDS="$UNPACK_PIDS $!"
+			done
+			for pid in $UNPACK_PIDS; do
+				wait $pid
 			done
 			INCREMENTALS_FOUND=1
 		else
@@ -301,12 +323,21 @@ done
 export MOZ_PRODUCT_VERSION="$TO"
 export MAR_CHANNEL_ID="$CHANNEL"
 
+# Reuse diffs and compressed files across incremental builds, since FROM
+# versions often share files with each other and with the TO version. Entries
+# that haven't been used recently are cleaned up above.
+export UPDATE_CACHE_DIR="$ROOT_DIR/cache/update-packaging"
+
 CHANGES_MADE=0
 for build in "mac" "win32" "win-x64" "win-arm64" "linux-i686" "linux-x86_64" "linux-arm64"; do
 	# Zotero 7 has no Linux arm64 builds
 	if [[ $build == "linux-arm64" ]] && [[ $FROM == 7.* ]]; then
 		continue
 	fi
+	# Zotero 11 has no Linux i686 builds, so there's nothing to update to
+	if [[ $build == "linux-i686" ]] && [[ $TO_MAJOR_VERSION -ge 11 ]]; then
+		continue
+	fi
 	if [[ $build == "mac" ]]; then
 		if [[ $BUILD_MAC == 0 ]]; then
 			continue
diff --git a/app/update-packaging/common.sh b/app/update-packaging/common.sh
index 38b3919e06..5ca6435d06 100644
--- a/app/update-packaging/common.sh
+++ b/app/update-packaging/common.sh
@@ -9,7 +9,9 @@
 #
 
 # -----------------------------------------------------------------------------
-QUIET=0
+# Preserve a value set by the parent so it survives in the child processes
+# spawned by run_parallel_tasks()
+QUIET=${QUIET:-0}
 
 # By default just assume that these tools exist on our path
 MAR=${MAR:-mar}
@@ -33,7 +35,11 @@ if [ $? -ne 0 ]; then
     fi
   fi
 fi
-# Ensure that we're always using the right compression settings
+# Ensure that we're always using the right compression settings.
+# -T1 (single-threaded) is required: multi-threaded xz produces non-deterministic
+# output, which would break both the reproducibility of MARs and the content-hash
+# cache in process_update_task(). See get_cache_tag() for how changes here are
+# accounted for in the cache.
 export XZ_OPT="-T1 -7e"
 
 # -----------------------------------------------------------------------------
@@ -156,10 +162,10 @@ append_remove_instructions() {
       if [ -n "$f" ]; then
         # Exclude comments
         if [ ! $(echo "$f" | grep -c '^#') = 1 ]; then
-          if [ $(echo "$f" | grep -c '\/$') = 1 ]; then
+          if [ $(echo "$f" | grep -c '/$') = 1 ]; then
             verbose_notice "      rmdir \"$f\""
             echo "rmdir \"$f\"" >> "$filev3"
-          elif [ $(echo "$f" | grep -c '\/\*$') = 1 ]; then
+          elif [ $(echo "$f" | grep -c '/\*$') = 1 ]; then
             # Remove the *
             f=$(echo "$f" | sed -e 's:\*$::')
             verbose_notice "    rmrfdir \"$f\""
@@ -175,6 +181,236 @@ append_remove_instructions() {
   fi
 }
 
+# Return the number of parallel jobs to use for diffing/compression, from
+# UPDATE_PACKAGING_JOBS or the number of cores
+get_parallel_jobs() {
+  if [ -n "${UPDATE_PACKAGING_JOBS:-}" ]; then
+    echo "$UPDATE_PACKAGING_JOBS"
+    return 0
+  fi
+  nproc 2>/dev/null && return 0
+  sysctl -n hw.ncpu 2>/dev/null && return 0
+  echo 1
+}
+
+# Run per-file tasks from a task file in parallel by re-invoking the calling
+# script with --run-task for each line. Tasks are ordered largest-file-first so
+# that long-running jobs (e.g., diffing xul) start as early as possible.
+#
+#   $1 - task file, with one "<type><TAB><relative path>" task per line
+#   $2 - directory to measure file sizes against for job ordering
+#   $3 - script to re-invoke (callers pass "$0" and handle --run-task before
+#        option parsing by calling process_update_task)
+#
+# Callers must export the variables needed by process_update_task().
+run_parallel_tasks() {
+  local taskfile="$1"
+  local basedir="$2"
+  local script="$3"
+  local jobs
+
+  if [ ! -s "$taskfile" ]; then
+    return 0
+  fi
+
+  # xargs requires a resolvable command path
+  script="$(cd "$(dirname "$script")" && pwd)/$(basename "$script")"
+
+  # Compute the cache tag once here and export it so the per-file child
+  # processes inherit it rather than recomputing it for every file
+  if [ -n "${UPDATE_CACHE_DIR:-}" ] && [ -z "${UPDATE_CACHE_TAG:-}" ]; then
+    UPDATE_CACHE_TAG="$(get_cache_tag)"
+    export UPDATE_CACHE_TAG
+  fi
+
+  jobs=$(get_parallel_jobs)
+  notice "Processing $(wc -l < "$taskfile" | tr -d ' ') files with $jobs parallel jobs"
+
+  (cd "$basedir" && du -ak .) > "$taskfile.sizes"
+  awk -F'\t' 'NR==FNR { sizes[substr($2, 3)] = $1; next } { print sizes[$2] "\t" $0 }' \
+      "$taskfile.sizes" "$taskfile" \
+    | sort -rn \
+    | cut -f 2- \
+    | tr '\n' '\000' \
+    | xargs -0 -n 1 -P "$jobs" "$script" --run-task
+}
+
+# -----------------------------------------------------------------------------
+# Diff and compression cache
+#
+# Building updates repeats the same expensive work: the same file contents get
+# xz-compressed once per architecture, per FROM version, and per release, and
+# the same before/after file pair gets binary-diffed again and again. When
+# UPDATE_CACHE_DIR is set, we cache the results by content hash and reuse them
+# across builds. Two kinds of entry are stored:
+#
+#   full-<tag>-<hash>.xz               A single file compressed with xz, keyed
+#                                      on the file's contents. Reused whenever
+#                                      the same content shows up again, in any
+#                                      architecture, version, or release.
+#
+#   patch-<tag>-<oldhash>-<newhash>.xz The compressed binary diff between a
+#                                      file's old and new contents, keyed on
+#                                      both. Reused whenever the same
+#                                      before/after pair recurs (e.g., a file
+#                                      unchanged across several FROM versions
+#                                      being patched to the same TO).
+#
+# Both entries are written even when only one is ultimately packaged, so a file
+# that loses the patch-vs-full size comparison in one build still seeds the
+# cache for the next. <tag> is get_cache_tag(), so a toolchain/settings change
+# starts a fresh namespace rather than reusing stale output. Entries are touched
+# on use and expire via the time-based cleanup in build_autoupdate.sh.
+# -----------------------------------------------------------------------------
+
+# Print a SHA-256 content hash to use as a cache key
+hash_file() {
+  if command -v sha256sum > /dev/null 2>&1; then
+    sha256sum "$1" | awk '{print $1}'
+  else
+    shasum -a 256 "$1" | awk '{print $1}'
+  fi
+}
+
+# Print a SHA-256 hash of stdin
+hash_stdin() {
+  if command -v sha256sum > /dev/null 2>&1; then
+    sha256sum | awk '{print $1}'
+  else
+    shasum -a 256 | awk '{print $1}'
+  fi
+}
+
+# Print a short tag identifying the toolchain and options that produce cached
+# files, so that entries are invalidated when any of them change. The cache
+# keys files by input content only, on the assumption that the same inputs
+# always compress/diff to the same output; this tag makes that assumption hold
+# across xz/mbsdiff upgrades and XZ_OPT/BCJ_OPTIONS changes. (A change to any
+# input invalidates both the full and patch caches, which is more than strictly
+# necessary but keeps this simple; a stale build is just a cold rebuild.)
+# Stale-tag entries are removed by the time-based cleanup in build_autoupdate.sh.
+get_cache_tag() {
+  local mbsdiff_bin
+  mbsdiff_bin="$(command -v "$MBSDIFF" 2>/dev/null)"
+  {
+    $XZ --version 2>/dev/null | head -1
+    echo "XZ_OPT=$XZ_OPT"
+    echo "BCJ_OPTIONS=${BCJ_OPTIONS:-}"
+    # mbsdiff has no --version, so identify it by its binary contents
+    if [ -n "$mbsdiff_bin" ]; then
+      hash_file "$mbsdiff_bin"
+    else
+      echo "MBSDIFF=$MBSDIFF"
+    fi
+  } | hash_stdin | cut -c 1-16
+}
+
+# Atomically store file $2 in the cache as $1
+cache_store() {
+  mkdir -p "$(dirname "$1")"
+  cp "$2" "$1.tmp.$$" && mv -f "$1.tmp.$$" "$1"
+}
+
+# xz-compress $1 to $2, reusing a cached result when one exists (see the cache
+# overview above)
+compress_full_file() {
+  local src="$1"
+  local dest="$2"
+  local key=""
+
+  if [ -n "${UPDATE_CACHE_DIR:-}" ]; then
+    key="$UPDATE_CACHE_DIR/full-${UPDATE_CACHE_TAG:-}-$(hash_file "$src").xz"
+    if [ -f "$key" ]; then
+      # Keep entries that are still in use from expiring
+      touch -c "$key" 2>/dev/null || true
+      cp "$key" "$dest"
+      return 0
+    fi
+  fi
+
+  $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$src" > "$dest"
+
+  if [ -n "$key" ]; then
+    cache_store "$key" "$dest"
+  fi
+}
+
+# Process a single task line from run_parallel_tasks():
+#
+#   full - compress the new file into the work directory
+#   diff - if the file changed, generate a binary diff and keep the smaller of
+#          the compressed patch ($f.patch) and the compressed file ($f)
+#
+# Expects newdir and workdir in the environment, plus olddir for diff tasks.
+# The results are assembled into the manifest serially by the caller based on
+# which files exist in the work directory. Diffs and compressed files are
+# cached when enabled -- see the cache overview above.
+process_update_task() {
+  local task="$1"
+  local tab=$(printf '\t')
+  local type="${task%%"$tab"*}"
+  local f="${task#*"$tab"}"
+  local oldfile_path newfile_path patch_path patchsize fullsize full_pid patchkey
+
+  if [ "$type" = "diff" ]; then
+    if diff "$olddir/$f" "$newdir/$f" > /dev/null; then
+      # Unchanged
+      return 0
+    fi
+
+    mkdir -p "$(dirname "$workdir/$f")"
+    verbose_notice "diffing \"$f\""
+
+    # Compress the full new file in the background while diffing, since both
+    # are needed to decide which to package
+    compress_full_file "$newdir/$f" "$workdir/$f" &
+    full_pid=$!
+
+    patchkey=""
+    if [ -n "${UPDATE_CACHE_DIR:-}" ]; then
+      patchkey="$UPDATE_CACHE_DIR/patch-${UPDATE_CACHE_TAG:-}-$(hash_file "$olddir/$f")-$(hash_file "$newdir/$f").xz"
+    fi
+    if [ -n "$patchkey" ] && [ -f "$patchkey" ]; then
+      # Keep entries that are still in use from expiring
+      touch -c "$patchkey" 2>/dev/null || true
+      cp "$patchkey" "$workdir/$f.patch.xz"
+    else
+      # mbsdiff doesn't like POSIX paths on Windows
+      if [ ${WIN_NATIVE:-0} -eq 1 ]; then
+        oldfile_path=$(cygpath -m "$olddir/$f")
+        newfile_path=$(cygpath -m "$newdir/$f")
+        patch_path=$(cygpath -m "$workdir/$f.patch")
+      else
+        oldfile_path="$olddir/$f"
+        newfile_path="$newdir/$f"
+        patch_path="$workdir/$f.patch"
+      fi
+      $MBSDIFF "$oldfile_path" "$newfile_path" "$patch_path"
+      $XZ $XZ_OPT --compress --lzma2 --format=xz --check=crc64 --force "$workdir/$f.patch"
+      if [ -n "$patchkey" ]; then
+        cache_store "$patchkey" "$workdir/$f.patch.xz"
+      fi
+    fi
+
+    wait $full_pid
+    copy_perm "$newdir/$f" "$workdir/$f"
+
+    patchsize=$(get_file_size "$workdir/$f.patch.xz")
+    fullsize=$(get_file_size "$workdir/$f")
+
+    if [ $patchsize -lt $fullsize ]; then
+      mv -f "$workdir/$f.patch.xz" "$workdir/$f.patch"
+      rm -f "$workdir/$f"
+    else
+      rm -f "$workdir/$f.patch.xz"
+    fi
+  else
+    mkdir -p "$(dirname "$workdir/$f")"
+    compress_full_file "$newdir/$f" "$workdir/$f"
+    copy_perm "$newdir/$f" "$workdir/$f"
+  fi
+}
+
 # List all files in the current directory, stripping leading "./"
 # Pass a variable name and it will be filled as an array.
 list_files() {
diff --git a/app/update-packaging/make_full_update.sh b/app/update-packaging/make_full_update.sh
index 3510ebee33..a6c8558d31 100755
--- a/app/update-packaging/make_full_update.sh
+++ b/app/update-packaging/make_full_update.sh
@@ -13,6 +13,12 @@ set -eo pipefail
 
 . $(dirname "$0")/common.sh
 
+# Process a single file task when invoked from run_parallel_tasks()
+if [ "${1:-}" = "--run-task" ]; then
+  process_update_task "$2"
+  exit 0
+fi
+
 # -----------------------------------------------------------------------------
 
 print_usage() {
@@ -50,7 +56,7 @@ archive="$1"
 targetdir="$2"
 # Prevent the workdir from being inside the targetdir so it isn't included in
 # the update mar.
-if [ $(echo "$targetdir" | grep -c '\/$') = 1 ]; then
+if [ $(echo "$targetdir" | grep -c '/$') = 1 ]; then
   # Remove the /
   targetdir=$(echo "$targetdir" | sed -e 's:\/$::')
 fi
@@ -88,6 +94,23 @@ notice ""
 notice "Adding file add instructions to update manifests"
 num_files=${#files[*]}
 
+# Compress the files in parallel via run_parallel_tasks() in
+# common.sh, and then assemble the manifest and archive list serially in the
+# original order
+tmpdir="$(mktemp -d)"
+taskfile="$tmpdir/tasks"
+TAB="$(printf '\t')"
+> "$taskfile"
+
+for ((i=0; $i<$num_files; i=$i+1)); do
+  echo "full$TAB${files[$i]}" >> "$taskfile"
+done
+
+newdir="$targetdir"
+export newdir workdir BCJ_OPTIONS QUIET
+run_parallel_tasks "$taskfile" "$targetdir" "$0"
+rm -rf "$tmpdir"
+
 for ((i=0; $i<$num_files; i=$i+1)); do
   f="${files[$i]}"
 
@@ -97,11 +120,6 @@ for ((i=0; $i<$num_files; i=$i+1)); do
     make_add_instruction "$f" "$updatemanifestv3"
   fi
 
-  dir=$(dirname "$f")
-  mkdir -p "$workdir/$dir"
-  $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$targetdir/$f" > "$workdir/$f"
-  copy_perm "$targetdir/$f" "$workdir/$f"
-
   targetfiles="$targetfiles \"$f\""
 done
 
diff --git a/app/update-packaging/make_incremental_update.sh b/app/update-packaging/make_incremental_update.sh
index 35945c993e..43c0ba426b 100755
--- a/app/update-packaging/make_incremental_update.sh
+++ b/app/update-packaging/make_incremental_update.sh
@@ -13,6 +13,12 @@ set -eo pipefail
 
 . $(dirname "$0")/common.sh
 
+# Process a single file task when invoked from run_parallel_tasks()
+if [ "${1:-}" = "--run-task" ]; then
+  process_update_task "$2"
+  exit 0
+fi
+
 # -----------------------------------------------------------------------------
 
 print_usage() {
@@ -112,7 +118,7 @@ olddir="$2"
 newdir="$3"
 # Prevent the workdir from being inside the targetdir so it isn't included in
 # the update mar.
-if [ $(echo "$newdir" | grep -c '\/$') = 1 ]; then
+if [ $(echo "$newdir" | grep -c '/$') = 1 ]; then
   # Remove the /
   newdir=$(echo "$newdir" | sed -e 's:\/$::')
 fi
@@ -164,93 +170,67 @@ num_oldfiles=${#oldfiles[*]}
 remove_array=
 num_removes=0
 
+# The main file loop is split into three passes so that the
+# CPU-heavy work can run in parallel: classify each file into a task list, run
+# the diffing/compression tasks in parallel via run_parallel_tasks() in
+# common.sh, and then assemble the manifest and archive list serially in the
+# original order based on the files the tasks left in the work directory.
+#
+# (This also drops the unused MBSDIFF_HOOK/funsize path from the upstream
+# script -- the diff behavior itself is unchanged and now lives in
+# process_update_task() in common.sh.)
+tmpdir="$(mktemp -d)"
+taskfile="$tmpdir/tasks"
+TAB="$(printf '\t')"
+> "$taskfile"
+
 for ((i=0; $i<$num_oldfiles; i=$i+1)); do
   f="${oldfiles[$i]}"
 
   # If this file exists in the new directory as well, then check if it differs.
   if [ -f "$newdir/$f" ]; then
-
     if check_for_add_if_not_update "$f"; then
-      # The full workdir may not exist yet, so create it if necessary.
-      mkdir -p "$(dirname "$workdir/$f")"
-      $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
-      copy_perm "$newdir/$f" "$workdir/$f"
+      echo "full$TAB$f" >> "$taskfile"
+    elif check_for_forced_update "$requested_forced_updates" "$f"; then
+      echo "full$TAB$f" >> "$taskfile"
+    else
+      echo "diff$TAB$f" >> "$taskfile"
+    fi
+  fi
+done
+
+# Newly added files -- in the new directory but not the old one. (This replaces
+# the O(n^2) nested skip loop from the upstream script.)
+printf '%s\n' "${oldfiles[@]}" | sort > "$tmpdir/oldlist"
+printf '%s\n' "${newfiles[@]}" | sort > "$tmpdir/newlist"
+comm -13 "$tmpdir/oldlist" "$tmpdir/newlist" | sed '/^$/d' | sort -r > "$tmpdir/newonly"
+
+while IFS= read -r f; do
+  echo "full$TAB$f" >> "$taskfile"
+done < "$tmpdir/newonly"
+
+export olddir newdir workdir MBSDIFF BCJ_OPTIONS QUIET
+run_parallel_tasks "$taskfile" "$newdir" "$0"
+
+# Assemble the manifest and archive list in the original order. A diffed file
+# left $f.patch in the work directory if the patch was smaller, $f if the
+# compressed file was smaller, and neither if the file was unchanged.
+for ((i=0; $i<$num_oldfiles; i=$i+1)); do
+  f="${oldfiles[$i]}"
+
+  if [ -f "$newdir/$f" ]; then
+    if check_for_add_if_not_update "$f"; then
       make_add_if_not_instruction "$f" "$updatemanifestv3"
       archivefiles="$archivefiles \"$f\""
-      continue 1
-    fi
-
-    if check_for_forced_update "$requested_forced_updates" "$f"; then
-      # The full workdir may not exist yet, so create it if necessary.
-      mkdir -p "$(dirname "$workdir/$f")"
-      $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
-      copy_perm "$newdir/$f" "$workdir/$f"
+    elif check_for_forced_update "$requested_forced_updates" "$f"; then
       make_add_instruction "$f" "$updatemanifestv3" 1
       archivefiles="$archivefiles \"$f\""
-      continue 1
-    fi
-
-    if ! diff "$olddir/$f" "$newdir/$f" > /dev/null; then
-      # Compute both the compressed binary diff and the compressed file, and
-      # compare the sizes.  Then choose the smaller of the two to package.
-      dir=$(dirname "$workdir/$f")
-      mkdir -p "$dir"
-      verbose_notice "diffing \"$f\""
-      # MBSDIFF_HOOK represents the communication interface with funsize and,
-      # if enabled, caches the intermediate patches for future use and
-      # compute avoidance
-      #
-      # An example of MBSDIFF_HOOK env variable could look like this:
-      # export MBSDIFF_HOOK="myscript.sh -A https://funsize/api -c /home/user"
-      # where myscript.sh has the following usage:
-      # myscript.sh -A SERVER-URL [-c LOCAL-CACHE-DIR-PATH] [-g] [-u] \
-      #   PATH-FROM-URL PATH-TO-URL PATH-PATCH SERVER-URL
-      #
-      # Note: patches are bzipped or xz stashed in funsize to gain more speed
-
-      # if service is not enabled then default to old behavior
-      # Disabled for Zotero
-      #if [ -z "$MBSDIFF_HOOK" ]; then
-      if true; then
-        # mbsdiff doesn't like POSIX paths on Windows
-        if [ $WIN_NATIVE -eq 1 ]; then
-          oldfile_path=$(cygpath -m "$olddir/$f")
-          newfile_path=$(cygpath -m "$newdir/$f")
-          patch_path=$(cygpath -m "$workdir/$f.patch")
-        else
-          oldfile_path="$olddir/$f"
-          newfile_path="$newdir/$f"
-          patch_path="$workdir/$f.patch"
-        fi
-        $MBSDIFF "$oldfile_path" "$newfile_path" "$patch_path"
-        $XZ $XZ_OPT --compress --lzma2 --format=xz --check=crc64 --force "$workdir/$f.patch"
-      else
-        # if service enabled then check patch existence for retrieval
-        if $MBSDIFF_HOOK -g "$olddir/$f" "$newdir/$f" "$workdir/$f.patch.xz"; then
-          verbose_notice "file \"$f\" found in funsize, diffing skipped"
-        else
-          # if not found already - compute it and cache it for future use
-          $MBSDIFF "$olddir/$f" "$newdir/$f" "$workdir/$f.patch"
-          $XZ $XZ_OPT --compress --lzma2 --format=xz --check=crc64 --force "$workdir/$f.patch"
-          $MBSDIFF_HOOK -u "$olddir/$f" "$newdir/$f" "$workdir/$f.patch.xz"
-        fi
-      fi
-      $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
-      copy_perm "$newdir/$f" "$workdir/$f"
-      patchfile="$workdir/$f.patch.xz"
-      patchsize=$(get_file_size "$patchfile")
-      fullsize=$(get_file_size "$workdir/$f")
-
-      if [ $patchsize -lt $fullsize ]; then
-        make_patch_instruction "$f" "$updatemanifestv3"
-        mv -f "$patchfile" "$workdir/$f.patch"
-        rm -f "$workdir/$f"
-        archivefiles="$archivefiles \"$f.patch\""
-      else
-        make_add_instruction "$f" "$updatemanifestv3"
-        rm -f "$patchfile"
-        archivefiles="$archivefiles \"$f\""
-      fi
+    elif [ -f "$workdir/$f.patch" ]; then
+      make_patch_instruction "$f" "$updatemanifestv3"
+      archivefiles="$archivefiles \"$f.patch\""
+    elif [ -f "$workdir/$f" ]; then
+      make_add_instruction "$f" "$updatemanifestv3"
+      archivefiles="$archivefiles \"$f\""
     fi
   else
     # remove instructions are added after add / patch instructions for
@@ -265,33 +245,18 @@ done
 # Newly added files
 notice ""
 notice "Adding file add instructions to update manifests"
-num_newfiles=${#newfiles[*]}
-
-for ((i=0; $i<$num_newfiles; i=$i+1)); do
-  f="${newfiles[$i]}"
-
-  # If we've already tested this file, then skip it
-  for ((j=0; $j<$num_oldfiles; j=$j+1)); do
-    if [ "$f" = "${oldfiles[j]}" ]; then
-      continue 2
-    fi
-  done
-
-  dir=$(dirname "$workdir/$f")
-  mkdir -p "$dir"
-
-  $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f"
-  copy_perm "$newdir/$f" "$workdir/$f"
 
+while IFS= read -r f; do
   if check_for_add_if_not_update "$f"; then
     make_add_if_not_instruction "$f" "$updatemanifestv3"
   else
     make_add_instruction "$f" "$updatemanifestv3"
   fi
 
-
   archivefiles="$archivefiles \"$f\""
-done
+done < "$tmpdir/newonly"
+
+rm -rf "$tmpdir"
 
 notice ""
 notice "Adding file remove instructions to update manifests"
diff --git a/app/update-packaging/removed-files_linux-i686 b/app/update-packaging/removed-files_linux-i686
deleted file mode 100644
index 76fa0719aa..0000000000
--- a/app/update-packaging/removed-files_linux-i686
+++ /dev/null
@@ -1,24 +0,0 @@
-application.ini
-chrome.manifest
-chrome/*
-components/*
-defaults/*
-deleted.txt
-dictionaries/*
-extensions/*
-fonts/EmojiOneMozilla.ttf
-gtk2/*
-icudt58l.dat
-install.rdf
-libnssdbm3.chk
-libnssdbm3.so
-libsoftokn3.chk
-pingsender
-resource/*
-run-zotero.sh
-styles.zip
-test/*
-translators.index
-translators.zip
-xulrunner/*
-zotero.jar
diff --git a/app/update-packaging/removed-files_mac b/app/update-packaging/removed-files_mac
index 03d6796004..6094c0e94d 100644
--- a/app/update-packaging/removed-files_mac
+++ b/app/update-packaging/removed-files_mac
@@ -38,12 +38,6 @@ Contents/MacOS/updater.app/Contents/MacOS/updater-bin
 Contents/MacOS/updates.xml
 Contents/MacOS/updates/*
 Contents/MacOS/zotero-bin
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/inject/translate_inject.js
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/node_modules.js
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/test/*
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/translate/cachedTypes.js
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/translate/resource/README.md
-Contents/PlugIns/ZoteroSafariExtension.appex/Contents/Resources/safari/translate/resource/zoteroTypeSchemaData.js
 Contents/Resources/CONTRIBUTING.md
 Contents/Resources/COPYING
 Contents/Resources/README.md
diff --git a/app/win/build b/app/win/build
index c89850a70a..deaddf5e05 100644
--- a/app/win/build
+++ b/app/win/build
@@ -30,8 +30,8 @@ else
 	echo "Unknown architecture $arch" >&2
 	exit 1
 fi
-rustup target add $rust_target-pc-windows-msvc
 rustup default $RUST_VERSION
+rustup target add $rust_target-pc-windows-msvc
 
 cp "$SCRIPT_DIR/mozconfig" "$gecko_path"
 
diff --git a/app/win/mozconfig b/app/win/mozconfig
index 430ff70e9d..2375e8b65d 100644
--- a/app/win/mozconfig
+++ b/app/win/mozconfig
@@ -29,6 +29,11 @@ ac_add_options --disable-update-agent
 
 export MOZILLA_OFFICIAL=1
 export RELEASE_OR_BETA=1
+
+# We don't need source-repo info embedded, and generating it would require a
+# source-repo.h that Firefox only auto-populates for Mercurial, not our git
+# checkout, which breaks packaging. Turn it off.
+ac_add_options MOZ_INCLUDE_SOURCE_INFO=
 MOZ_REQUIRE_SIGNING=
 
 # Build updater without MAR signature verification
diff --git a/app/win/mozilla-140.patch b/app/win/mozilla-153.patch
similarity index 78%
rename from app/win/mozilla-140.patch
rename to app/win/mozilla-153.patch
index 4346cb4c8f..14988af56e 100644
--- a/app/win/mozilla-140.patch
+++ b/app/win/mozilla-153.patch
@@ -1,14 +1,9 @@
 diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
-index a85fdbfebe0f..819475717ffb 100644
+index 4c5982c056fd..1ad4c9dfd597 100644
 --- a/browser/app/nsBrowserApp.cpp
 +++ b/browser/app/nsBrowserApp.cpp
-@@ -156,19 +156,30 @@ static bool IsArg(const char* arg, const char* s) {
- #endif
- 
-   return false;
- }
- 
- MOZ_RUNINIT Bootstrap::UniquePtr gBootstrap;
+@@ -198,9 +198,20 @@ static bool HasFlag(int argc, char* argv[], const char* s) {
+ constinit Bootstrap::UniquePtr gBootstrap;
  
  static int do_main(int argc, char* argv[], char* envp[]) {
 +  // Allow profile downgrade for Zotero
@@ -26,24 +21,14 @@ index a85fdbfebe0f..819475717ffb 100644
 +
 +  }
 +  char *appDataFile = iniPath.get();
-   if ((!appDataFile || !*appDataFile) && (argc > 1 && IsArg(argv[1], "app"))) {
+   if ((!appDataFile || !*appDataFile) && (argc > 1 && IsFlag(argv[1], "app"))) {
      if (argc == 2) {
        Output("Incorrect number of arguments passed to -app");
-       return 255;
-     }
-     appDataFile = argv[2];
- 
-     char appEnv[MAXPATHLEN];
 diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
-index 8167d2b81c91..a1ef657232bf 100644
+index 8337336dc894..c55677631c88 100644
 --- a/browser/app/winlauncher/LauncherProcessWin.cpp
 +++ b/browser/app/winlauncher/LauncherProcessWin.cpp
-@@ -156,17 +156,31 @@ static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) {
-                         mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND ||
-       mozilla::CheckArg(aArgc, aArgv, "remote-debugging-port", nullptr,
-                         mozilla::CheckArgFlag::None) == mozilla::ARG_FOUND ||
-       mozilla::EnvHasValue("MOZ_AUTOMATION") ||
-       mozilla::EnvHasValue("MOZ_HEADLESS")) {
+@@ -250,7 +250,21 @@ static mozilla::LauncherFlags ProcessCmdLine(int& aArgc, wchar_t* aArgv[]) {
      result |= mozilla::LauncherFlags::eWaitForBrowser;
    }
  
@@ -66,21 +51,86 @@ index 8167d2b81c91..a1ef657232bf 100644
      result |= mozilla::LauncherFlags::eNoDeelevate;
    }
  
-   if (mozilla::CheckArg(aArgc, aArgv, ATTEMPTING_DEELEVATION_FLAG) ==
-       mozilla::ARG_FOUND) {
-     result |= mozilla::LauncherFlags::eDeelevating;
-   }
+diff --git a/toolkit/components/remote/WinRemoteMessage.cpp b/toolkit/components/remote/WinRemoteMessage.cpp
+index 16a59fa7beda..4aa85c4a7632 100644
+--- a/toolkit/components/remote/WinRemoteMessage.cpp
++++ b/toolkit/components/remote/WinRemoteMessage.cpp
+@@ -32,6 +32,31 @@ WinRemoteMessageSender::WinRemoteMessageSender(int32_t aArgc,
+ 
+ COPYDATASTRUCT* WinRemoteMessageSender::CopyData() { return &mData; }
+ 
++nsresult WinRemoteMessageReceiver::ParseV0(const nsACString& aBuffer) {
++  CommandLineParserWin<char> parser;
++  parser.HandleCommandLine(aBuffer);
++
++  mCommandLine = new nsCommandLine();
++  return mCommandLine->Init(parser.Argc(), parser.Argv(), nullptr,
++                            nsICommandLine::STATE_REMOTE_AUTO);
++}
++
++nsresult WinRemoteMessageReceiver::ParseV1(const nsACString& aBuffer) {
++  CommandLineParserWin<char> parser;
++  size_t cch = parser.HandleCommandLine(aBuffer);
++  ++cch;  // skip a null char
++
++  nsCOMPtr<nsIFile> workingDir;
++  if (cch < aBuffer.Length()) {
++    (void)NS_NewLocalFile(NS_ConvertUTF8toUTF16(Substring(aBuffer, cch)),
++                          getter_AddRefs(workingDir));
++  }
++
++  mCommandLine = new nsCommandLine();
++  return mCommandLine->Init(parser.Argc(), parser.Argv(), workingDir,
++                            nsICommandLine::STATE_REMOTE_AUTO);
++}
++
+ nsresult WinRemoteMessageReceiver::ParseV2(const nsAString& aBuffer) {
+   CommandLineParserWin<char16_t> parser;
+   size_t cch = parser.HandleCommandLine(aBuffer);
+@@ -110,6 +135,12 @@ nsresult WinRemoteMessageReceiver::ParseV3(const nsACString& aBuffer) {
+ 
+ nsresult WinRemoteMessageReceiver::Parse(const COPYDATASTRUCT* aMessageData) {
+   switch (static_cast<WinRemoteMessageVersion>(aMessageData->dwData)) {
++    case WinRemoteMessageVersion::CommandLineOnly:
++      return ParseV0(nsDependentCSubstring(
++          reinterpret_cast<char*>(aMessageData->lpData), aMessageData->cbData));
++    case WinRemoteMessageVersion::CommandLineAndWorkingDir:
++      return ParseV1(nsDependentCSubstring(
++          reinterpret_cast<char*>(aMessageData->lpData), aMessageData->cbData));
+     case WinRemoteMessageVersion::CommandLineAndWorkingDirInUtf16:
+       return ParseV2(
+           nsDependentSubstring(reinterpret_cast<wchar_t*>(aMessageData->lpData),
+diff --git a/toolkit/components/remote/WinRemoteMessage.h b/toolkit/components/remote/WinRemoteMessage.h
+index b62fb73fa13d..ee6612f55f4b 100644
+--- a/toolkit/components/remote/WinRemoteMessage.h
++++ b/toolkit/components/remote/WinRemoteMessage.h
+@@ -28,10 +28,10 @@
+ // some sort, as v3 does, to reduce the chances of variants of bug 1847458.
+ enum class WinRemoteMessageVersion : uint32_t {
+   // "<CommandLine>\0" in utf8
+-  /* CommandLineOnly = 0, */
++  CommandLineOnly = 0,
+ 
+   // "<CommandLine>\0<WorkingDir>\0" in utf8
+-  /* CommandLineAndWorkingDir = 1, */
++  CommandLineAndWorkingDir = 1,
+ 
+   // L"<CommandLine>\0<WorkingDir>\0" in utf16, used by ESR 128
+   CommandLineAndWorkingDirInUtf16 = 2,
+@@ -61,6 +61,8 @@ class WinRemoteMessageSender final {
+ class WinRemoteMessageReceiver final {
+   nsCOMPtr<nsICommandLineRunner> mCommandLine;
+ 
++  nsresult ParseV0(const nsACString& aBuffer);
++  nsresult ParseV1(const nsACString& aBuffer);
+   nsresult ParseV2(const nsAString& aBuffer);
+   nsresult ParseV3(const nsACString& aBuffer);
  
 diff --git a/toolkit/mozapps/update/common/commonupdatedir.cpp b/toolkit/mozapps/update/common/commonupdatedir.cpp
 index 0ba9fcef9417..ed286476fec3 100644
 --- a/toolkit/mozapps/update/common/commonupdatedir.cpp
 +++ b/toolkit/mozapps/update/common/commonupdatedir.cpp
-@@ -38,17 +38,17 @@
- // (i.e. C:\ProgramData\<ROOT_UPDATE_DIR_NAME>)
- // It is really important that we properly set the permissions on this
- // directory at creation time. Thus, it is really important that this code be
- // the creator of this directory. We had many problems with the old update
- // directory having been previously created by old versions of Firefox. To avoid
+@@ -43,7 +43,7 @@
  // this problem in the future, we are including a UUID in the root update
  // directory name to attempt to ensure that it will be created by this code and
  // won't already exist with the wrong permissions.
@@ -89,21 +139,11 @@ index 0ba9fcef9417..ed286476fec3 100644
  // This describes the directory between the "Mozilla" directory and the install
  // path hash (i.e. C:\ProgramData\Mozilla\<UPDATE_PATH_MID_DIR_NAME>\<hash>)
  #  define UPDATE_PATH_MID_DIR_NAME "updates"
- 
- enum class WhichUpdateDir {
-   CurrentUpdateDir,
-   UnmigratedUpdateDir,
- };
 diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
-index 1718caa3c66d..10fa59c0cd80 100644
+index 2c8d78f02440..f55d3db32469 100644
 --- a/xpcom/build/BinaryPath.h
 +++ b/xpcom/build/BinaryPath.h
-@@ -283,16 +283,43 @@ class BinaryPath {
-     if (NS_FAILED(Get(path))) {
-       return nullptr;
-     }
-     UniqueFreePtr<char> result;
-     result.reset(strdup(path));
+@@ -286,6 +286,33 @@ class BinaryPath {
      return result;
    }
  
@@ -137,81 +177,3 @@ index 1718caa3c66d..10fa59c0cd80 100644
  #ifdef MOZILLA_INTERNAL_API
    static nsresult GetFile(nsIFile** aResult) {
      nsCOMPtr<nsIFile> lf;
- #  ifdef XP_WIN
-     wchar_t exePath[MAXPATHLEN];
-     nsresult rv = GetW(exePath);
- #  else
-     char exePath[MAXPATHLEN];
-diff --git a/toolkit/components/remote/WinRemoteMessage.cpp b/toolkit/components/remote/WinRemoteMessage.cpp
---- a/toolkit/components/remote/WinRemoteMessage.cpp
-+++ b/toolkit/components/remote/WinRemoteMessage.cpp
-@@ -33,6 +33,31 @@
- 
- COPYDATASTRUCT* WinRemoteMessageSender::CopyData() { return &mData; }
- 
-+nsresult WinRemoteMessageReceiver::ParseV0(const nsACString& aBuffer) {
-+  CommandLineParserWin<char> parser;
-+  parser.HandleCommandLine(aBuffer);
-+
-+  mCommandLine = new nsCommandLine();
-+  return mCommandLine->Init(parser.Argc(), parser.Argv(), nullptr,
-+                            nsICommandLine::STATE_REMOTE_AUTO);
-+}
-+
-+nsresult WinRemoteMessageReceiver::ParseV1(const nsACString& aBuffer) {
-+  CommandLineParserWin<char> parser;
-+  size_t cch = parser.HandleCommandLine(aBuffer);
-+  ++cch;  // skip a null char
-+
-+  nsCOMPtr<nsIFile> workingDir;
-+  if (cch < aBuffer.Length()) {
-+    (void)NS_NewLocalFile(NS_ConvertUTF8toUTF16(Substring(aBuffer, cch)),
-+                          getter_AddRefs(workingDir));
-+  }
-+
-+  mCommandLine = new nsCommandLine();
-+  return mCommandLine->Init(parser.Argc(), parser.Argv(), workingDir,
-+                            nsICommandLine::STATE_REMOTE_AUTO);
-+}
-+
- nsresult WinRemoteMessageReceiver::ParseV2(const nsAString& aBuffer) {
-   CommandLineParserWin<char16_t> parser;
-   size_t cch = parser.HandleCommandLine(aBuffer);
-@@ -111,6 +136,12 @@
- 
- nsresult WinRemoteMessageReceiver::Parse(const COPYDATASTRUCT* aMessageData) {
-   switch (static_cast<WinRemoteMessageVersion>(aMessageData->dwData)) {
-+    case WinRemoteMessageVersion::CommandLineOnly:
-+      return ParseV0(nsDependentCSubstring(
-+          reinterpret_cast<char*>(aMessageData->lpData), aMessageData->cbData));
-+    case WinRemoteMessageVersion::CommandLineAndWorkingDir:
-+      return ParseV1(nsDependentCSubstring(
-+          reinterpret_cast<char*>(aMessageData->lpData), aMessageData->cbData));
-     case WinRemoteMessageVersion::CommandLineAndWorkingDirInUtf16:
-       return ParseV2(
-           nsDependentSubstring(reinterpret_cast<wchar_t*>(aMessageData->lpData),
-diff --git a/toolkit/components/remote/WinRemoteMessage.h b/toolkit/components/remote/WinRemoteMessage.h
---- a/toolkit/components/remote/WinRemoteMessage.h
-+++ b/toolkit/components/remote/WinRemoteMessage.h
-@@ -29,10 +29,10 @@
- // some sort, as v3 does, to reduce the chances of variants of bug 1847458.
- enum class WinRemoteMessageVersion : uint32_t {
-   // "<CommandLine>\0" in utf8
--  /* CommandLineOnly = 0, */
-+  CommandLineOnly = 0,
- 
-   // "<CommandLine>\0<WorkingDir>\0" in utf8
--  /* CommandLineAndWorkingDir = 1, */
-+  CommandLineAndWorkingDir = 1,
- 
-   // L"<CommandLine>\0<WorkingDir>\0" in utf16, used by ESR 128
-   CommandLineAndWorkingDirInUtf16 = 2,
-@@ -62,6 +62,8 @@
- class WinRemoteMessageReceiver final {
-   nsCOMPtr<nsICommandLineRunner> mCommandLine;
- 
-+  nsresult ParseV0(const nsACString& aBuffer);
-+  nsresult ParseV1(const nsACString& aBuffer);
-   nsresult ParseV2(const nsAString& aBuffer);
-   nsresult ParseV3(const nsACString& aBuffer);
-
diff --git a/app/win/updater.exe.tar.xz b/app/win/updater.exe.tar.xz
index 9e3cf1eeb8..25f0718997 100644
--- a/app/win/updater.exe.tar.xz
+++ b/app/win/updater.exe.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e66cbd095e4b714ef5f2494240190f67da78af77053368b65f380c7c7ef95f41
-size 393284
+oid sha256:13a76afa9dac4bfbb5f1a9b2c69ecc82f300a6f52a673c562da8f30a11b62438
+size 876372
diff --git a/app/win/zotero.exe.tar.xz b/app/win/zotero.exe.tar.xz
index afd682e663..2bcb60735a 100644
--- a/app/win/zotero.exe.tar.xz
+++ b/app/win/zotero.exe.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:070a38196290224fcb0db22bbf0aa739d60188cf3df6137ced3b26819b7e98b6
-size 524100
+oid sha256:5ab890f9893d17d1b492f6762adc9d60d29e405eb089ca1311e522cb987cbca9
+size 559376
diff --git a/chrome/content/scaffold/scaffold.xhtml b/chrome/content/scaffold/scaffold.xhtml
index b625db7497..10a567b814 100644
--- a/chrome/content/scaffold/scaffold.xhtml
+++ b/chrome/content/scaffold/scaffold.xhtml
@@ -293,11 +293,16 @@
 					</keyset>
 		
 					<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
+					<!-- macOS 13 changed "Preferences" to "Settings" so one of these gets picked -->
 					<menupopup id="menu_FilePopup">
 						<menuitem id="menu_preferences"
 								label="&preferencesCmdMac.label;"
 								key="key_preferencesCmdMac"
 								oncommand="Zotero.Utilities.Internal.openPreferences()"/>
+						<menuitem id="menu_settings"
+								data-l10n-id="menu-application-settings"
+								key="key_preferencesCmdMac"
+								oncommand="Zotero.Utilities.Internal.openPreferences()"/>
 						<menuitem id="menu_mac_services"
 								label="&servicesMenuMac.label;"/>
 						<menuitem id="menu_mac_hide_app"
diff --git a/chrome/content/zotero/HiddenBrowser.mjs b/chrome/content/zotero/HiddenBrowser.mjs
index 814d565cd9..8e9a54d8f3 100644
--- a/chrome/content/zotero/HiddenBrowser.mjs
+++ b/chrome/content/zotero/HiddenBrowser.mjs
@@ -37,6 +37,10 @@ ChromeUtils.defineESModuleGetters(globalThis, {
 
 const progressListeners = new Set();
 
+// From nsSandboxFlags.h
+const SANDBOXED_ORIGIN = 0x10;
+const SANDBOXED_SCRIPTS = 0x80;
+
 /**
  * Functions for creating and destroying hidden browser objects
  **/
@@ -54,6 +58,7 @@ export class HiddenBrowser {
 	 */
 	constructor(options = {}) {
 		this._destroyed = false;
+		this._allowJavaScript = options.allowJavaScript !== false;
 		this._createdPromise = (async () => {
 			let doc;
 			if (options.useHiddenFrame !== false) {
@@ -61,7 +66,6 @@ export class HiddenBrowser {
 				this._frame = frame;
 
 				var windowlessBrowser = await frame.get();
-				windowlessBrowser.browsingContext.allowJavascript = options.allowJavaScript !== false;
 				windowlessBrowser.docShell.allowImages = false;
 				if (options.docShell) {
 					Object.assign(windowlessBrowser.docShell, options.docShell);
@@ -100,7 +104,14 @@ export class HiddenBrowser {
 			if (options.customUserAgent) {
 				browser.browsingContext.customUserAgent = options.customUserAgent;
 			}
-			
+
+			if (!this._allowJavaScript) {
+				// A system-principal document (e.g., a blob: URL created by chrome code) can run
+				// scripts even when scripting is otherwise disabled, so sandbox it with a null
+				// principal and no scripts.
+				browser.browsingContext.sandboxFlags |= SANDBOXED_ORIGIN | SANDBOXED_SCRIPTS;
+			}
+
 			this._browser = browser;
 		})();
 
@@ -144,18 +155,12 @@ export class HiddenBrowser {
 		Zotero.debug(`Loading ${uri} in hidden browser`);
 		// Next bit adapted from Mozilla's HeadlessShell.jsm
 		try {
-			// Figure out whether the browser should be remote. We actually
-			// perform the load in PageDataChild, but remoteness changes
-			// need to happen here.
-			let oa = E10SUtils.predictOriginAttributes({ browser: this });
-			let remoteType = E10SUtils.getRemoteTypeForURI(
-				uri,
-				true,
-				false,
-				E10SUtils.DEFAULT_REMOTE_TYPE,
-				null,
-				oa
-			);
+			// Figure out whether the browser should be remote
+			let remoteType = ChromeUtils.predictRemoteTypeForURI(uri, {
+				preferredRemoteType: E10SUtils.DEFAULT_REMOTE_TYPE,
+				useRemoteTabs: true,
+				useRemoteSubframes: false
+			});
 			if (this.remoteType !== remoteType) {
 				// The following functions need to be called on the <browser> directly,
 				// not through our proxy (aka 'this')
@@ -210,12 +215,18 @@ export class HiddenBrowser {
 				);
 			});
 
-			let loadURISuccess = await this.browsingContext.currentWindowGlobal.getActor("PageData")
-				.sendQuery("loadURI", { uri });
-			if (!loadURISuccess) {
+			let prepared = await this.browsingContext.currentWindowGlobal.getActor("PageData")
+				.sendQuery("prepareLoad");
+			if (!prepared) {
 				Zotero.logError(new Error("Load failed"));
 				return false;
 			}
+			// Start the load from the parent process. A load started by the content process
+			// is restricted to URLs that process could load itself, which excludes blob: URLs
+			// created by chrome code.
+			this._browser.loadURI(Services.io.newURI(uri), {
+				triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()
+			});
 			await loadCompletePromise;
 		}
 		catch (e) {
@@ -255,12 +266,22 @@ export class HiddenBrowser {
 	
 	/**
 	 * @param {String[]} props - 'characterSet', 'title', 'bodyText', 'documentHTML', 'cookie', 'channelInfo'
+	 * @param {Object} [options]
+	 * @param {Number} [options.timeout=30000] - Time to wait for each property in milliseconds.
+	 *     The queries wait for the document to be ready, so a page that never finishes loading
+	 *     would otherwise hang the query forever.
 	 */
-	async getPageData(props) {
+	async getPageData(props, { timeout = 30000 } = {}) {
 		var actor = this.browsingContext.currentWindowGlobal.getActor("PageData");
 		var data = {};
 		for (let prop of props) {
-			data[prop] = await actor.sendQuery(prop);
+			let timeoutPromise = new Promise((_, reject) => {
+				setTimeout(
+					() => reject(new Error(`Timed out getting '${prop}' from hidden browser`)),
+					timeout
+				);
+			});
+			data[prop] = await Promise.race([actor.sendQuery(prop), timeoutPromise]);
 		}
 		return data;
 	}
diff --git a/chrome/content/zotero/actors/PageDataChild.mjs b/chrome/content/zotero/actors/PageDataChild.mjs
index 87093301c1..4b1d8f27b4 100644
--- a/chrome/content/zotero/actors/PageDataChild.mjs
+++ b/chrome/content/zotero/actors/PageDataChild.mjs
@@ -2,10 +2,10 @@ import { documentIsReady } from "chrome://zotero/content/actors/actorUtils.mjs";
 
 export class PageDataChild extends JSWindowActorChild {
 	async receiveMessage(message) {
-		// Special case for loadURI: don't wait for document to be ready,
+		// Special case for prepareLoad: don't wait for document to be ready,
 		// since we haven't loaded anything yet
-		if (message.name === "loadURI") {
-			return this.loadURI(message.data.uri);
+		if (message.name === "prepareLoad") {
+			return this.prepareLoad();
 		}
 		
 		let document = this.document;
@@ -50,31 +50,13 @@ export class PageDataChild extends JSWindowActorChild {
 		}
 	}
 	
-	loadURI(uri) {
+	prepareLoad() {
 		// https://searchfox.org/mozilla-central/rev/e69f323af80c357d287fb6314745e75c62eab92a/toolkit/actors/BackgroundThumbnailsChild.sys.mjs#44-85
-		let docShell = this.docShell.QueryInterface(Ci.nsIWebNavigation);
 		// Don't allow downloads/external apps
-		docShell.allowContentRetargeting = false;
+		this.docShell.allowContentRetargeting = false;
 
 		// Get the document to force a content viewer to be created, otherwise
 		// the first load can fail.
-		if (!this.document) {
-			return false;
-		}
-		
-		let loadURIOptions = {
-			triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-		};
-		
-		try {
-			docShell.loadURI(
-				Services.io.newURI(uri),
-				loadURIOptions
-			);
-			return true;
-		}
-		catch (e) {
-			return false;
-		}
+		return !!this.document;
 	}
 }
diff --git a/chrome/content/zotero/actors/TranslationChild.mjs b/chrome/content/zotero/actors/TranslationChild.mjs
index ad84043ed8..7f9fb3d8f6 100644
--- a/chrome/content/zotero/actors/TranslationChild.mjs
+++ b/chrome/content/zotero/actors/TranslationChild.mjs
@@ -209,6 +209,9 @@ export class TranslationChild extends JSWindowActorChild {
 			sameZoneAs: this.contentWindow,
 			wantXrays: true,
 			wantGlobalProperties: ["XMLHttpRequest", "fetch", "WebSocket"],
+			// The translation framework adds Bluebird methods to Promise, which system-principal
+			// sandboxes freeze by default
+			freezeBuiltins: false,
 		});
 		
 		let scriptURIs = [
diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js
deleted file mode 100644
index b28c441147..0000000000
--- a/chrome/content/zotero/advancedSearch.js
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
-*/
-
-
-import CollectionViewItemTree from 'zotero/collectionViewItemTree';
-import { COLUMNS } from 'zotero/itemTreeColumns';
-
-
-var ZoteroAdvancedSearch = new function () {
-	this.onLoad = onLoad;
-	this.search = search;
-	this.clear = clear;
-	this.onItemActivate = onItemActivate;
-	
-	this.itemsView = false;
-	this._loadedDeferred = Zotero.Promise.defer();
-
-	var _searchBox;
-	var _libraryID;
-	var _searchCounter = 0;
-	
-	async function onLoad() {
-		_searchBox = document.getElementById('zotero-search-box');
-		
-		// Set font size from pref
-		var sbc = document.getElementById('zotero-search-box-container');
-		Zotero.UIProperties.registerRoot(sbc);
-		
-		_searchBox.onLibraryChange = this.onLibraryChange;
-		var io = window.arguments[0];
-		
-		io.dataIn.search.loadPrimaryData()
-		.then(function () {
-			_searchBox.search = io.dataIn.search;
-		});
-		
-		var elem = document.getElementById('zotero-items-tree');
-		const columns = COLUMNS.map((column) => {
-			column = Object.assign({}, column);
-			column.hidden = !['title', 'firstCreator', 'year', 'hasAttachment'].includes(column.dataKey);
-			return column;
-		});
-		this.itemsView = await CollectionViewItemTree.init(elem, {
-			id: "advanced-search",
-			dragAndDrop: true,
-			columnPicker: true,
-			onActivate: this.onItemActivate.bind(this),
-			columns,
-		});
-
-		await this.itemsView.changeCollectionTreeRow({
-			id: 'advanced-search-' + _searchCounter++,
-			ref: _searchBox.search,
-			visibilityGroup: 'default',
-			isSearchMode: () => true,
-			getItems: async () => [],
-			isLibrary: () => false,
-			isCollection: () => false,
-			isSearch: () => true,
-			isPublications: () => false,
-			isDuplicates: () => false,
-			isFeed: () => false,
-			isFeeds: () => false,
-			isFeedsOrFeed: () => false,
-			isRecentlyRead: () => false,
-			isSortable: () => true,
-			isShare: () => false,
-			isTrash: () => false,
-			isSearch: () => true
-		});
-
-		// Focus the first field in the window
-		Services.focus.moveFocus(window, null, Services.focus.MOVEFOCUS_FORWARD, 0);
-		this._loadedDeferred.resolve();
-	}
-	
-	this.onUnload = function () {
-		this.itemsView.unregister();
-	}
-	
-	function search() {
-		_searchBox.updateSearch();
-		_searchBox.active = true;
-		
-		return this.itemsView.changeCollectionTreeRow({
-			id: 'advanced-search-' + _searchCounter++,
-			ref: _searchBox.search,
-			visibilityGroup: 'default',
-			isSearchMode: () => true,
-			isSearch: () => true,
-			getItems: async function () {
-				await Zotero.Libraries.get(_libraryID).waitForDataLoad('item');
-
-				var search = _searchBox.search.clone();
-				search.libraryID = _libraryID;
-				var ids = await search.search();
-				return Zotero.Items.get(ids);
-			}
-		});
-	}
-	
-	
-	function clear() {
-		this.itemsView.changeCollectionTreeRow(null);
-		
-		var s = new Zotero.Search();
-		// Don't clear the selected library
-		s.libraryID = _searchBox.search.libraryID;
-		s.addCondition('title', 'contains', '');
-		_searchBox.search = s;
-		_searchBox.active = false;
-	}
-	
-	
-	this.save = async function () {
-		_searchBox.updateSearch();
-		
-		var promptService = Services.prompt;
-		
-		var libraryID = _searchBox.search.libraryID;
-		
-		var searches = await Zotero.Searches.getAll(libraryID);
-		var prefix = Zotero.getString('pane.collections.untitled');
-		var name = Zotero.Utilities.Internal.getNextName(
-			prefix,
-			searches.map(s => s.name).filter(n => n.startsWith(prefix))
-		);
-		
-		name = { value: name };
-		var result = promptService.prompt(window,
-			Zotero.getString('pane.collections.newSavedSeach'),
-			Zotero.getString('pane.collections.savedSearchName'), name, "", {});
-		
-		if (!result) {
-			return;
-		}
-		
-		if (!name.value) {
-			name.value = 'untitled';
-		}
-		
-		var s = _searchBox.search.clone();
-		s.name = name.value;
-		await s.saveTx();
-		
-		window.close();
-	};
-	
-	
-	this.onLibraryChange = function (libraryID) {
-		_libraryID = libraryID;
-		var library = Zotero.Libraries.get(libraryID);
-		var isEditable = library.editable && library.libraryType != 'publications';
-		document.getElementById('zotero-search-save').disabled = !isEditable;
-	}
-	
-	
-	function onItemActivate(event, items)
-	{
-		var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-					   .getService(Components.interfaces.nsIWindowMediator);
-		
-		var lastWin = wm.getMostRecentWindow("navigator:browser");
-		
-		if (!lastWin) {
-			return;
-		}
-		
-		lastWin.ZoteroPane.selectItems(items.map(item => item.id));
-		lastWin.focus();
-	}
-}
diff --git a/chrome/content/zotero/advancedSearch.xhtml b/chrome/content/zotero/advancedSearch.xhtml
deleted file mode 100644
index ac90733b78..0000000000
--- a/chrome/content/zotero/advancedSearch.xhtml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero-platform/content/overlay.css"?>
-<?xml-stylesheet href="chrome://zotero-platform/content/zotero.css"?>
-
-<!DOCTYPE window [
-	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd">
-	%zoteroDTD;
-	<!ENTITY % searchboxDTD SYSTEM "chrome://zotero/locale/searchbox.dtd">
-	%searchboxDTD;
-]>
-
-<window
-	id="zotero-advanced-search-dialog"
-	title="&zotero.toolbar.advancedSearch;"
-	orient="vertical"
-	persist="screenX screenY width height"
-	onload="ZoteroAdvancedSearch.onLoad()"
-	onunload="ZoteroAdvancedSearch.onUnload();"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:html="http://www.w3.org/1999/xhtml"
-	windowtype="zotero:search"
-	style="display: flex;">
-
-	<script src="include.js"/>
-	<script>
-	</script>
-	<script src="customElements.js"/>
-	<script src="advancedSearch.js"/>
-
-	<popupset>
-		<panel is="autocomplete-richlistbox-popup"
-			id="search-autocomplete-popup"
-			type="autocomplete-richlistbox"
-			noautofocus="true"/>
-	</popupset>
-	
-	<vbox id="zotero-search-box-container" flex="1">
-		<vbox id="zotero-search-box-controls">
-			<zoterosearch id="zotero-search-box" oncommand="if (this.active) { ZoteroAdvancedSearch.search(); }" flex="1"/>
-			
-			<hbox id="zotero-search-buttons">
-				<button label="&zotero.search.search;" default="true" oncommand="ZoteroAdvancedSearch.search()"/>
-				<button label="&zotero.search.clear;" oncommand="ZoteroAdvancedSearch.clear()"/>
-				<button id="zotero-search-save" label="&zotero.search.saveSearch;" oncommand="ZoteroAdvancedSearch.save()"/>
-			</hbox>
-		</vbox>
-		<hbox class="virtualized-table-container" flex="1">
-			<html:div id="zotero-items-tree"/>
-		</hbox>
-	</vbox>
-	
-	<keyset>
-		<key id="key_close" key="W" modifiers="accel" oncommand="window.close()"/>
-	</keyset>
-</window>
diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx
index 90e2f1cad6..c2e34ba69c 100644
--- a/chrome/content/zotero/collectionTree.jsx
+++ b/chrome/content/zotero/collectionTree.jsx
@@ -50,6 +50,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		dragAndDrop: false,
 		filterLibraryIDs: false,
 		hideSources: [],
+		multiSelect: false,
 		onContextMenu: noop,
 	};
 
@@ -59,13 +60,13 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		dragAndDrop: PropTypes.bool,
 		filterLibraryIDs: PropTypes.array,
 		hideSources: PropTypes.array,
+		multiSelect: PropTypes.bool,
 		onContextMenu: PropTypes.func,
 	};
 
 	constructor(props) {
 		super(props);
 		this.itemTreeView = null;
-		this.itemToSelect = null;
 
 		this.type = 'collection';
 		this.name = "CollectionTree";
@@ -140,6 +141,8 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 	}
 
 	componentDidMount() {
+		super.componentDidMount();
+		
 		this.selection.select(0);
 		this.makeVisible();
 		if (this.props.dragAndDrop) {
@@ -163,10 +166,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			return false; // In-line editing active
 		}
 		
-		var libraryID = this.getSelectedLibraryID();
-		if (!libraryID) return true;
 		let treeRow = this.getRow(this.selection.focused);
-		
+		var libraryID = treeRow?.ref?.libraryID;
+		if (!libraryID) return true;
+
 		if (event.key == '+' && !(event.ctrlKey || event.altKey || event.metaKey)) {
 			this.expandLibrary(libraryID, true);
 		}
@@ -182,6 +185,16 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		else if (event.key == "F2" && !Zotero.isMac && treeRow.isCollection()) {
 			this.handleActivate(event, [this.selection.focused]);
 		}
+		else if (event.key == 'a' && !event.shiftKey
+				&& (Zotero.isMac ? (event.metaKey && !event.ctrlKey) : event.ctrlKey)) {
+			if (this.props.multiSelect) {
+				this._handleSelectAll();
+			}
+			// Own Cmd/Ctrl-A here so that neither the table's unscoped Select All nor
+			// the cmd_selectAll key command runs
+			event.preventDefault();
+			return false;
+		}
 		else if (["ArrowDown", "ArrowUp"].includes(event.key)) {
 			// Specific logic for keypress navigation during collection filtering
 			// that skips context-rows
@@ -242,6 +255,11 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 	}
 	
 	handleActivate = (event, indices) => {
+		// Activation (rename collection, edit saved search/feed, open library) acts on
+		// a single row, so ignore it when multiple rows are selected
+		if (this.selection.count > 1) {
+			return;
+		}
 		let index = indices[0];
 		let treeRow = this.getRow(index);
 		if (treeRow.isCollection() && this.editable && this.selection.focused == index) {
@@ -275,7 +293,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		if (!treeRow.editingName) return;
 		treeRow.ref.name = treeRow.editingName;
 		delete treeRow.editingName;
-		await treeRow.ref.saveTx();
+		await treeRow.ref.saveTx({ undoAction: 'undo-action-rename-collection' });
 		window.Zotero_Tabs.rename("zotero-pane", treeRow.ref.name);
 	}
 	
@@ -306,6 +324,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		// Classes
 		div.className = "row";
 		div.classList.toggle('selected', selection.isSelected(index));
+		div.classList.toggle('first-selected', selection.isFirstRowOfSelectionBlock(index));
+		div.classList.toggle('last-selected', selection.isLastRowOfSelectionBlock(index));
+		// Focus ring on the focused-but-unselected row (e.g., macOS Cmd-arrow navigation)
+		div.classList.toggle('focused', selection.focused == index);
 		div.classList.toggle('highlighted', this._highlightedRows.has(treeRow.id));
 		div.classList.toggle('drop', this._dropRow == index);
 		div.classList.toggle('flashing', this._flashingRow == index);
@@ -476,6 +498,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 				onToggleOpenState: this.toggleOpenState,
 				getRowString: this.getRowString.bind(this),
 				
+				multiSelect: this.props.multiSelect,
+				// The collection tree must always have a selection
+				requireSelection: true,
+
 				onItemContextMenu: (...args) => this.props.onContextMenu && this.props.onContextMenu(...args),
 
 				onKeyDown: this.handleKeyDown,
@@ -726,10 +752,9 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			return 0;
 		}
 		
-		var currentLibraryID = this.getSelectedLibraryID();
 		var libraryID = items[0].libraryID;
-		// If in a different library
-		if (libraryID != currentLibraryID) {
+		// If not in one of the selected libraries
+		if (!this.getSelectedLibraryIDs().includes(libraryID)) {
 			Zotero.debug("Library ID differs; switching library");
 			await this.selectLibrary(libraryID);
 		}
@@ -1241,9 +1266,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		if (treeRow.isLibrary(true) || treeRow.isCollection() || treeRow.isFeeds()) {
 			count = await this._expandRow(this._rows, index, true);
 		}
-		if (this.selection.focused > index) {
-			this.selection.select(this.selection.focused + count);
-		}
+		this.selection.adjustForRowInsertion(index, count);
 		this.selection.selectEventsSuppressed = false;
 		
 		this._rows[index].isOpen = true;
@@ -1305,22 +1328,46 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 	 * @returns {Promise<void>}
 	 */
 	async deleteSelection(deleteItems) {
-		var treeRow = this.getRow(this.selection.focused);
-		if (treeRow.isFeed()) {
-			await treeRow.ref.eraseTx();
-			return;
+		let treeRows = this.getSelectedRows();
+		// Feeds must be erased outside a transaction since Feed.erase()
+		// starts its own transaction internally
+		let feeds = treeRows.filter(r => r.isFeed());
+		let others = treeRows.filter(r => !r.isFeed());
+		for (let row of feeds) {
+			await row.ref.eraseTx();
 		}
-		treeRow.ref.deleted = true;
-		if (treeRow.isCollection()) {
-			await treeRow.ref.saveTx({ deleteItems });
-			return;
+		if (others.length) {
+			let collectionCount = others.filter(r => r.isCollection()).length;
+			let searchCount = others.length - collectionCount;
+			// Use the search label only when nothing but searches is selected;
+			// otherwise describe the action in terms of collections
+			let undoAction, undoActionArgs;
+			if (searchCount && !collectionCount) {
+				undoAction = 'undo-action-trash-search';
+				undoActionArgs = { count: searchCount };
+			}
+			else {
+				undoAction = 'undo-action-trash-collection';
+				undoActionArgs = { count: collectionCount + searchCount };
+			}
+			await Zotero.DB.executeTransaction(async () => {
+				for (let row of others) {
+					row.ref.deleted = true;
+					if (row.isCollection()) {
+						await row.ref.save({ deleteItems, undoAction, undoActionArgs });
+					}
+					else {
+						await row.ref.save({ undoAction, undoActionArgs });
+					}
+				}
+			});
 		}
-		await treeRow.ref.saveTx();
 	}
 	
 	unregister() {
 		this._uninitialized = true;
 		Zotero.Notifier.unregisterObserver(this._unregisterID);
+		this.clearEventListeners();
 	}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1362,37 +1409,91 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 	}
 	
 	/**
-	 * Return libraryID of selected row (which could be a collection, etc.)
+	 * Throw for a plugin calling one of the removed single-selection methods while multiple
+	 * rows are selected, where the items list can span collections or libraries and acting
+	 * on one row's value isn't safe
+	 *
+	 * Pre-release builds throw regardless of the selection, so that plugin developers see
+	 * the failure.
+	 *
+	 * Also used by the ZoteroPane methods that wrap these, which pass their own names.
+	 *
+	 * @param {String} name
+	 * @param {String} replacement
 	 */
-	getSelectedLibraryID() {
-		var treeRow = this.getRow(this.selection.focused);
-		return treeRow && treeRow.ref && treeRow.ref.libraryID !== undefined
-			&& treeRow.ref.libraryID;
-	}
-	
-	getSelectedCollection(asID) {
-		var collection = this.getRow(this.selection.focused);
-		if (collection && collection.isCollection()) {
-			return asID ? collection.ref.id : collection.ref;
+	_requireSingleSelection(name, replacement) {
+		if (this.selection.count > 1
+				|| Zotero.isBetaBuild || Zotero.isDevBuild || Zotero.isSourceBuild) {
+			throw new Error(`${name} was removed -- use ${replacement}`);
 		}
+		Zotero.Plugins.warnRemovedAPICall(name, replacement);
+	}
+
+	getSelectedLibraryID() {
+		this._requireSingleSelection("CollectionTree#getSelectedLibraryID()",
+			"getSelectedLibraryIDs()");
+		var libraryIDs = this.getSelectedLibraryIDs();
+		return libraryIDs.length ? libraryIDs[0] : false;
+	}
+
+	/**
+	 * Return the libraryID of every selected row, in tree order
+	 *
+	 * @return {Integer[]}
+	 */
+	getSelectedLibraryIDs() {
+		var libraryIDs = [];
+		for (let index of [...this.selection.selected].sort((a, b) => a - b)) {
+			let row = this.getRow(index);
+			if (row && row.ref && row.ref.libraryID !== undefined
+					&& !libraryIDs.includes(row.ref.libraryID)) {
+				libraryIDs.push(row.ref.libraryID);
+			}
+		}
+		return libraryIDs;
+	}
+
+	getSelectedCollection(asID) {
+		this._requireSingleSelection("CollectionTree#getSelectedCollection()",
+			"getSelectedCollections()");
+		return this.getSelectedCollections(asID)[0];
+	}
+
+	getSelectedCollections(asID) {
+		var collections = [];
+		for (let index of this.selection.selected) {
+			let row = this.getRow(index);
+			if (row && row.isCollection()) {
+				collections.push(asID ? row.ref.id : row.ref);
+			}
+		}
+		return collections;
 	}
 	
 	getSelectedSearch(asID) {
-		if (this.getRow(this.selection.focused)) {
-			var search = this.getRow(this.selection.focused);
-			if (search && search.isSearch()) {
-				return asID ? search.ref.id : search.ref;
+		this._requireSingleSelection("CollectionTree#getSelectedSearch()",
+			"getSelectedSearches()");
+		var searches = this.getSelectedSearches(asID);
+		return searches.length ? searches[0] : false;
+	}
+
+	getSelectedSearches(asID) {
+		var searches = [];
+		for (let index of this.selection.selected) {
+			let row = this.getRow(index);
+			if (row && row.isSearch()) {
+				searches.push(asID ? row.ref.id : row.ref);
 			}
 		}
-		return false;
+		return searches;
 	}
 	
 	getSelectedGroup(asID) {
-		if (this.getRow(this.selection.focused)) {
-			var group = this.getRow(this.selection.focused);
-			if (group && group.isGroup()) {
-				return asID ? group.ref.id : group.ref;
-			}
+		this._requireSingleSelection("CollectionTree#getSelectedGroup()",
+			"getSelectedRows() filtered by isGroup()");
+		var group = this.getSelectedRows().find(row => row.isGroup());
+		if (group) {
+			return asID ? group.ref.id : group.ref;
 		}
 		return false;
 	}
@@ -1448,18 +1549,27 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 ////////////////////////////////////////////////////////////////////////////////
 
 	onDragStart(event, index) {
-		const treeRow = this.getRow(index);
+		super.onDragStart(event, index);
+		
 		// See note in #setDropEffect()
 		if (Zotero.isWin || Zotero.isLinux) {
 			event.dataTransfer.effectAllowed = 'copyMove';
 		}
 		
-		if (!treeRow.isCollection() && !treeRow.isSearch()) {
+		let rows = this.getSelectedRows();
+		// Ignore drag if all selected rows aren't the same type
+		if (!rows.every(o => o.type == rows[0].type)) {
 			return;
 		}
-		let type = treeRow.isCollection() ? "zotero/collection" : "zotero/search";
-		event.dataTransfer.setData(type, treeRow.ref.id);
-		Zotero.debug(`Dragging ${type} ` + treeRow.id);
+		// Ignore if not all collections or searches
+		if (!rows.every(o => o.isCollection() || o.isSearch())) {
+			return;
+		}
+		let type = rows[0].isCollection() ? "zotero/collection" : "zotero/search";
+		let ids = rows.map(o => o.ref.id);
+		event.dataTransfer.setDragImage(this._dragImageContainer, 0, 0);
+		event.dataTransfer.setData(type, ids);
+		Zotero.debug(`Dragging ${type} ` + (ids.length > 1 ? '[' + ids.join(', ') + ']' : ids[0]));
 	}
 
 	onDragOver(event, index) {
@@ -1470,6 +1580,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		try {
 			// Prevent modifier keys from doing their normal things
 			event.preventDefault();
+			Zotero.DragDrop.currentDropEffect = null;
 			var previousOrientation = Zotero.DragDrop.currentOrientation;
 			Zotero.DragDrop.currentOrientation = getDragTargetOrient(event);
 
@@ -1533,7 +1644,19 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 					}
 				}
 				
-				if ((Zotero.isMac && event.metaKey) || (!Zotero.isMac && event.shiftKey)) {
+				let move = (Zotero.isMac && event.metaKey) || (!Zotero.isMac && event.shiftKey);
+
+				// A selection from a multiple-collection view can span libraries. Those items can
+				// only be copied, never moved (a move can't coherently move some items and copy
+				// others), so disallow a move rather than silently substituting a copy.
+				let ids = Zotero.DragDrop.getDataFromDataTransfer(event.dataTransfer).data;
+				let items = Zotero.Items.get(ids);
+				if (new Set(items.map(item => item.libraryID)).size > 1) {
+					this.setDropEffect(event, move ? "none" : "copy");
+					return false;
+				}
+
+				if (move) {
 					this.setDropEffect(event, "move");
 				}
 				else {
@@ -1603,7 +1726,9 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		}
 	}
 	
-	onDragEnd = () => {
+	onDragEnd = (event, index) => {
+		super.onDragEnd(event, index);
+		
 		let dropRow = this._dropRow;
 		this._dropRow = null;
 		this.tree.invalidateRow(dropRow);
@@ -1732,11 +1857,14 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 					}
 					
 					// Intra-library drag
-					
-					// Don't allow drag onto root of same library
+
+					// An item can't be added to the root of its own library, but skip it rather
+					// than rejecting the whole drag, so a mixed-library selection can still copy
+					// its out-of-library items here. (If every item is already in this library,
+					// `skip` stays true and the drag is refused below.)
 					if (treeRow.isLibrary(true)) {
-						Zotero.debug("Can't drag into same library root");
-						return false;
+						Zotero.debug("Item " + item.id + " already in library " + treeRow.ref.libraryID);
+						continue;
 					}
 					
 					// Make sure there's at least one item that's not already in this destination
@@ -1775,19 +1903,20 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 					return false;
 				}
 				
-				let draggedCollectionID = data[0];
-				let draggedCollection = Zotero.Collections.get(draggedCollectionID);
+				for (let id of data) {
+					let draggedCollection = Zotero.Collections.get(id);
 				
-				// Dragging within same library
-				if (treeRow.ref.libraryID == draggedCollection.libraryID) {
-					// Collections cannot be dropped on themselves
-					if (draggedCollectionID == treeRow.ref.id) {
-						return false;
-					}
+					// Dragging within same library
+					if (treeRow.ref.libraryID == draggedCollection.libraryID) {
+						// Collections cannot be dropped on themselves
+						if (id == treeRow.ref.id) {
+							return false;
+						}
 					
-					// Nor in their children
-					if (draggedCollection.hasDescendent('collection', treeRow.ref.id)) {
-						return false;
+						// Nor in their children
+						if (draggedCollection.hasDescendent('collection', treeRow.ref.id)) {
+							return false;
+						}
 					}
 				}
 				
@@ -2166,7 +2295,11 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		this._flashingRow = null;
 		this.tree.invalidateRow(oldFlashing);
 
-		if (!dataTransfer.dropEffect || dataTransfer.dropEffect == "none"
+		// Use the effect set in onDragOver(), which the drop event's dropEffect may not reflect
+		// (see LibraryTreeView::setDropEffect())
+		var dropEffect = Zotero.DragDrop.currentDropEffect || dataTransfer.dropEffect;
+		Zotero.DragDrop.currentDropEffect = null;
+		if (!dropEffect || dropEffect == "none"
 				|| !(await this.canDropCheckAsync(row, orient, dataTransfer))) {
 			return false;
 		}
@@ -2175,7 +2308,6 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			Zotero.debug("No drag data");
 			return false;
 		}
-		var dropEffect = dragData.dropEffect;
 		var dataType = dragData.dataType;
 		var data = dragData.data;
 		var sourceTreeRow = Zotero.DragDrop.getDragSource(dataTransfer);
@@ -2192,16 +2324,21 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		// Dropping items, collections, or searches into trash
 		if (targetTreeRow.isTrash()) {
 			let objects = [];
+			let undoAction;
 			if (dataType == 'zotero/collection') {
 				objects = await Zotero.Collections.getAsync(data);
+				undoAction = 'undo-action-trash-collection';
 			}
 			else if (dataType == 'zotero/search') {
 				objects = await Zotero.Searches.getAsync(data);
+				undoAction = 'undo-action-trash-search';
 			}
 			else if (dataType == 'zotero/item') {
 				objects = await Zotero.Items.getAsync(data);
+				undoAction = 'undo-action-trash';
 			}
 			await Zotero.DB.executeTransaction(async function () {
+				Zotero.UndoHistory.stageAction(undoAction, { count: objects.length });
 				for (let obj of objects) {
 					obj.deleted = true;
 					await obj.save();
@@ -2213,22 +2350,36 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		var targetLibraryID = targetTreeRow.ref.libraryID;
 		var targetCollectionID = targetTreeRow.isCollection() ? targetTreeRow.ref.id : false;
 		
+		if (targetCollectionID) {
+			Zotero.Collections.addToRecent(targetTreeRow.ref);
+		}
+		
 		if (dataType == 'zotero/collection') {
-			var droppedCollection = await Zotero.Collections.getAsync(data[0]);
+			let droppedCollections = await Zotero.Collections.getAsync(data);
+			if (droppedCollections.some(c => c.id == targetCollectionID)) {
+				throw new Error("Can't drop onto source row");
+			}
+			
 			// Collection drag between libraries
-			if (targetLibraryID != droppedCollection.libraryID) {
-				await this.executeCollectionCopy({
-					collection: droppedCollection,
-					targetCollectionID,
-					targetLibraryID,
-					targetTreeRow,
-					copyOptions
-				});
+			if (targetLibraryID != droppedCollections[0].libraryID) {
+				for (let droppedCollection of droppedCollections) {
+					await this.executeCollectionCopy({
+						collection: droppedCollection,
+						targetCollectionID,
+						targetLibraryID,
+						targetTreeRow,
+						copyOptions
+					});
+				}
 			}
 			// Collection drag within a library
 			else {
-				droppedCollection.parentID = targetCollectionID;
-				await droppedCollection.saveTx();
+				await Zotero.DB.executeTransaction(async () => {
+					for (let droppedCollection of droppedCollections) {
+						droppedCollection.parentID = targetCollectionID;
+						await droppedCollection.save({ undoAction: 'undo-action-move-collection' });
+					}
+				});
 			}
 		}
 		else if (dataType == 'zotero/item') {
@@ -2275,42 +2426,61 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 				});
 			}
 			
-			let newItems = [];
-			let newIDs = [];
+			// Route each item by its own library: items already in the target library are added
+			// directly, while items from other libraries are copied into the target library. A
+			// selection can span multiple libraries when dragging from a multiple-collection view.
+			let sameLibraryItems = [];
+			let otherLibraryItems = [];
 			let toMove = [];
-			// TODO: support items coming from different sources?
-			let sameLibrary = items[0].libraryID == targetLibraryID
-			
 			for (let item of items) {
 				if (!item.isTopLevelItem()) {
 					continue;
 				}
 				
-				newItems.push(item);
-				
-				if (sameLibrary) {
-					newIDs.push(item.id);
+				if (item.libraryID == targetLibraryID) {
+					sameLibraryItems.push(item);
 					toMove.push(item.id);
 				}
+				else {
+					otherLibraryItems.push(item);
+				}
 			}
-			if (sameLibrary) {
-				// Add items to target container in the same library.
+			
+			// Add same-library items to the target container
+			if (sameLibraryItems.length) {
 				if (targetCollectionID) {
-					let ids = newIDs.filter(itemID => Zotero.Items.get(itemID).isTopLevelItem());
+					let ids = sameLibraryItems.map(item => item.id);
 					await Zotero.DB.executeTransaction(async function () {
 						let collection = await Zotero.Collections.getAsync(targetCollectionID);
 						await collection.addItems(ids);
+						// If moving, remove from source in the same
+						// transaction so it's a single undo step
+						if (dropEffect == 'move' && toMove.length
+								&& sourceTreeRow && sourceTreeRow.isCollection()) {
+							await sourceTreeRow.ref.removeItems(toMove);
+							toMove = [];
+							Zotero.UndoHistory.stageAction(
+								'undo-action-move-to-collection', { count: ids.length }
+							);
+						}
+						else {
+							Zotero.UndoHistory.stageAction(
+								'undo-action-add-to-collection', { count: ids.length }
+							);
+						}
 					}.bind(this));
 				}
 				else if (targetTreeRow.isPublications()) {
-					await Zotero.Items.addToPublications(newItems, copyOptions);
+					await Zotero.Items.addToPublications(sameLibraryItems, copyOptions);
 				}
 			}
-			else {
+			
+			// Copy items from other libraries into the target library
+			if (otherLibraryItems.length) {
 				let toReconcile = [];
 				
 				await Zotero.Utilities.Internal.forEachChunkAsync(
-					newItems,
+					otherLibraryItems,
 					100,
 					function (chunk) {
 						return Zotero.DB.executeTransaction(async () => {
@@ -2379,11 +2549,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			}
 			
 			
-			// If moving, remove items from source collection
-			if (dropEffect == 'move' && toMove.length) {
-				if (!sameLibrary) {
-					throw new Error("Cannot move items between libraries");
-				}
+			// If moving, remove items from source collection. A move of a mixed-library selection
+			// is disallowed in onDragOver(), so it shouldn't reach here; guard against a partial
+			// move just in case, since only the same-library items would be moved.
+			if (dropEffect == 'move' && toMove.length && !otherLibraryItems.length) {
 				if (!sourceTreeRow || !sourceTreeRow.isCollection()) {
 					throw new Error("Drag source must be a collection for move action");
 				}
@@ -2519,9 +2688,72 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		return true;
 	}
 	
-	isSelectable = index => {
+	// Cmd/Ctrl-A on the collection tree. Expand the current selection to all rows of
+	// the same kind within their natural scope: all library roots in the same
+	// visibility group (so feeds and regular libraries don't mix), all collections
+	// sharing a parent with a selected collection (so a multi-level or multi-parent
+	// selection expands each branch it touches), or Recently Read in every library.
+	// Anything else (saved searches, Unfiled, Trash, etc.) has no useful "select
+	// all", so the selection is left untouched rather than cleared.
+	async _handleSelectAll() {
+		let selectedIndexes = Array.from(this.selection.selected);
+		if (!selectedIndexes.length) {
+			return;
+		}
+		let selectedRows = selectedIndexes.map(index => this.getRow(index));
+		let scope;
+		if (selectedRows.every(row => row.isLibrary(true))) {
+			// Stay within one visibility group so feeds aren't pulled into an
+			// all-libraries selection, which couldn't be shown together
+			let visibilityGroup = selectedRows[0].visibilityGroup;
+			scope = row => row.isLibrary(true) && row.visibilityGroup === visibilityGroup;
+		}
+		else if (selectedRows.every(row => row.isCollection())) {
+			let parentIndexes = new Set(
+				selectedIndexes.map(index => this.getParentIndex(index))
+			);
+			scope = (row, index) => row.isCollection()
+				&& parentIndexes.has(this.getParentIndex(index));
+		}
+		else if (selectedRows.every(row => row.isRecentlyRead())) {
+			// Recently Read can appear under any library, so open any collapsed
+			// libraries that show it -- otherwise its row isn't in the tree to select
+			let libraryIDs = [];
+			for (let i = 0; i < this._rows.length; i++) {
+				let row = this.getRow(i);
+				if (row.isLibrary(true)
+						&& this._virtualCollectionLibraries.recentlyRead?.[row.ref.libraryID] !== false) {
+					libraryIDs.push(row.ref.libraryID);
+				}
+			}
+			for (let libraryID of libraryIDs) {
+				await this.expandLibrary(libraryID);
+			}
+			scope = row => row.isRecentlyRead();
+		}
+		else {
+			return;
+		}
+		this._selectAllScope = scope;
+		try {
+			this.selection.selectAll();
+		}
+		finally {
+			this._selectAllScope = null;
+		}
+	}
+
+	isSelectable = (index) => {
 		let treeRow = this.getRow(index);
-		return treeRow && !(treeRow.isSeparator() || treeRow.isHeader());
+		if (!treeRow || treeRow.isSeparator() || treeRow.isHeader()) {
+			return false;
+		}
+		// While a scoped Select All (Cmd/Ctrl-A) is running, restrict the new
+		// selection to the rows in the scope computed in _handleSelectAll()
+		if (this._selectAllScope) {
+			return this._selectAllScope(treeRow, index);
+		}
+		return true;
 	}
 
 	_closeContainer(row, skipMap) {
@@ -2532,9 +2764,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		var level = this.getLevel(row);
 		var nextRow = row + 1;
 		
-		// Remove child rows
+		// Remove child rows, remapping any selected ones to the collapsed container
 		while ((nextRow < this._rows.length) && (this.getLevel(nextRow) > level)) {
-			this._removeRow(nextRow, true);
+			this.selection.adjustForRowRemoval(nextRow, true);
+			this._removeRow(nextRow, true, true);
 		}
 		this.selection.selectEventsSuppressed = false;
 		
@@ -2645,7 +2878,7 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		let collectionTable = document.getElementById("collection-tree").firstElementChild;
 		let isEmpty = this._isFilterEmpty();
 		let willBeEmpty = filterText.length == 0;
-		this._filter = filterText.toLowerCase();
+		this._filter = Zotero.Utilities.Internal.normalizeForSearch(filterText);
 		let currentRow = this.getRow(this.selection.focused) || this._hiddenFocusedRow;
 		let currentRowDisplayed = currentRow && this._includedInTree(currentRow.ref);
 		let shouldRestoreScrollPosition = willBeEmpty && !isEmpty && !this._treeWasFocused;
@@ -2660,6 +2893,10 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 			this.selection.clearSelection();
 		}
 		await this.reload();
+		// reload() rebuilds the rows, so any selected indices from before now point at
+		// different (or out-of-range) rows. Clear them and re-select just the current
+		// row below, collapsing a multi-selection to the focused row while filtering.
+		this.selection.clearSelection();
 		if (currentRow) {
 			// Special treatment for when there are no filter matches
 			// Otherwise, selection.focused does not get updated by selectByID, which breaks ZoteroPane.
@@ -2892,14 +3129,15 @@ var CollectionTree = class CollectionTree extends LibraryTree {
 		if (this._filterResultsCache[objectID] && !resetCache) {
 			return this._filterResultsCache[objectID];
 		}
-		// Filtering is case insensitive
-		let objectName = (object.name || "").toLowerCase();
+		// Filtering is case- and accent-insensitive
+		let normalize = Zotero.Utilities.Internal.normalizeForSearch;
+		let objectName = normalize(object.name || "");
 		// Special treatment to fetch the name for My Library or Feeds
 		if (objectID[0] == 'L' && object._ObjectType !== "Group") {
-			objectName = Zotero.getString('pane.collections.library').toLowerCase();
+			objectName = normalize(Zotero.getString('pane.collections.library'));
 		}
 		else if (objectID == 'feeds') {
-			objectName = Zotero.getString('pane.collections.feedLibraries').toLowerCase();
+			objectName = normalize(Zotero.getString('pane.collections.feedLibraries'));
 		}
 		let filterValue = this._filter;
 
diff --git a/chrome/content/zotero/collectionViewItemTree.jsx b/chrome/content/zotero/collectionViewItemTree.jsx
index 7ed1ed2031..30ad42f7c8 100644
--- a/chrome/content/zotero/collectionViewItemTree.jsx
+++ b/chrome/content/zotero/collectionViewItemTree.jsx
@@ -43,12 +43,32 @@ const React = require('react');
 const ReactDOM = require('react-dom');
 const ItemTree = require('zotero/itemTree');
 const { ItemTreeRowProvider } = ItemTree;
+const { LibraryHeaderItemTreeRow, SpacerItemTreeRow } = require('zotero/itemTreeRow');
 
 const { OS } = ChromeUtils.importESModule("chrome://zotero/content/osfile.mjs");
 const { ZOTERO_CONFIG } = ChromeUtils.importESModule('resource://zotero/config.mjs');
 
 const COLORED_TAGS_RE = new RegExp("^(?:Numpad|Digit)([0-" + Zotero.Tags.MAX_COLORED_TAGS + "]{1})$");
 
+/**
+ * Message for a failed items list load, naming the plugin responsible if the error came
+ * from plugin code
+ *
+ * @param {Error} e
+ * @return {Promise<String>}
+ */
+async function getLoadErrorMessage(e) {
+	let plugin = await Zotero.Plugins.getPluginFromError(e);
+	if (!plugin) {
+		return Zotero.getString('pane.items.loadError');
+	}
+	Zotero.warn(`Items list failed to load in a call from plugin ${plugin.name} (${plugin.id})`);
+	return Zotero.ftl.formatValueSync('items-list-load-error-plugin', {
+		// The message is rendered as HTML
+		plugin: Zotero.Utilities.htmlSpecialChars(plugin.name)
+	});
+}
+
 // Minimal CollectionTreeRow-like object for callers that pass plain objects to
 // changeCollectionTreeRow()/setCollectionTreeRow() (e.g. advanced search).
 const STUB_COLLECTION_TREE_ROW = {
@@ -90,46 +110,227 @@ const STUB_COLLECTION_TREE_ROW = {
 class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 	constructor(itemTree) {
 		super(itemTree);
-		this.collectionTreeRow = null;
+		this.collectionTreeRows = [];
 	}
 
 	/**
-	 * Check if the quick search box has a search term.
+	 * The kind of view the selected rows add up to, for the behaviors that
+	 * belong to the view rather than to any one row (trash restoring,
+	 * duplicate sets, feed dates). Set in setCollectionTreeRows().
+	 *
+	 * Anything that varies between rows -- ref, libraryID, collection vs.
+	 * saved search -- has to be read from collectionTreeRows instead.
+	 *
+	 * @return {String}
+	 */
+	get viewMode() {
+		return this._viewMode ?? 'default';
+	}
+
+	/**
+	 * The view mode a set of rows adds up to, or throw if they don't agree.
+	 * ZoteroPane.onCollectionSelected() keeps incompatible rows from being
+	 * selected together; this is the backstop for anything setting rows
+	 * directly.
+	 *
+	 * @param {CollectionTreeRow[]} rows
+	 * @return {String} - 'default', 'trash', 'duplicates', 'unfiled', 'retracted',
+	 *     'recentlyRead', 'publications', 'bucket', 'feed', or 'feeds'
+	 */
+	_computeViewMode(rows) {
+		let modes = new Set(rows.map((row) => {
+			// Library roots, collections, and saved searches are ordinary item
+			// lists -- they differ in what they contain, not in how the view behaves
+			if (row.isLibrary(true) && !row.isFeed()) return 'default';
+			if (row.isCollection() || row.isSearch()) return 'default';
+			return row.type;
+		}));
+		if (modes.size > 1) {
+			throw new Error("Selected collection tree rows don't form a single view: "
+				+ [...modes].join(', '));
+		}
+		return [...modes][0] ?? 'default';
+	}
+
+	/**
+	 * Check if the quick search box has a search term. Filters are set on every
+	 * selected row, so any row's search text describes the view.
 	 * @returns {boolean}
 	 */
 	hasQuickSearch() {
-		return this.collectionTreeRow?.searchText.length > 0;
+		return this.collectionTreeRows[0]?.searchText.length > 0;
 	}
 
 	/**
-	 * Set a new collectionTreeRow and refresh items.
+	 * When showing multiple libraries, group rows by library in collections-list
+	 * order -- independent of the active sort direction
+	 */
+	_compareRows(a, b) {
+		if (this._groupedByLibrary) {
+			let rankA = this._libraryOrder.get(a.ref.libraryID) ?? Infinity;
+			let rankB = this._libraryOrder.get(b.ref.libraryID) ?? Infinity;
+			if (rankA != rankB) {
+				return rankA - rankB;
+			}
+		}
+		return super._compareRows(a, b);
+	}
+
+	/**
+	 * Sorting compares rows as items, so remove the header and spacer rows first
+	 * and rebuild them afterward, keeping each header attached to the top of its
+	 * library's block
+	 */
+	_sort(itemIDs) {
+		if (this._showSectionHeaders) {
+			this._rows = this._rows.filter(row => row.isObjectRow);
+			this.refreshRowMap();
+		}
+		super._sort(itemIDs);
+		if (this._showSectionHeaders) {
+			this._insertLibraryHeaders();
+			this.refreshRowMap();
+		}
+	}
+
+	/**
+	 * Insert a library header row above each library's group of items.
+	 * Rows must already be sorted with library as the primary grouping.
+	 */
+	_insertLibraryHeaders() {
+		let newRows = [];
+		let lastLibraryID = null;
+		let seenFirstHeader = false;
+		for (let row of this._rows) {
+			if (!row.isObjectRow) {
+				continue;
+			}
+			if (row.level == 0 && row.ref.libraryID !== lastLibraryID) {
+				lastLibraryID = row.ref.libraryID;
+				let library = Zotero.Libraries.get(lastLibraryID);
+				// Every header except the first gets a blank spacer row above it, for one
+				// row of whitespace separating its section from the previous library's
+				if (seenFirstHeader) {
+					newRows.push(new SpacerItemTreeRow(library));
+				}
+				seenFirstHeader = true;
+				let { label, iconName } = this._sectionHeaders.get(lastLibraryID) || {};
+				newRows.push(new LibraryHeaderItemTreeRow(library, label, iconName));
+			}
+			newRows.push(row);
+		}
+		this._rows = newRows;
+	}
+
+	/**
+	 * Compute the section header label (and, for single-library selections, icon) for
+	 * each library in the selection. Returns a Map of libraryID -> { label, iconName }.
+	 *
+	 * Across libraries, each header is the library name plus what's selected in it
+	 * ("My Library (2 collections selected)"); within a single library, one header
+	 * summarizes the selection ("2 collections selected"). Labels are resolved with
+	 * Zotero.ftl (the synchronous Fluent API) rather than awaiting document.l10n, so this
+	 * stays synchronous: that lets the sticky header render immediately and keeps
+	 * setCollectionTreeRows from adding an await that can race with rapid selection changes.
+	 */
+	_computeSectionHeaders(collectionTreeRows) {
+		let grouped = this._groupedByLibrary;
+		// Group the selected rows by library, preserving selection order
+		let byLibrary = new Map();
+		for (let row of collectionTreeRows) {
+			let libraryID = row.ref.libraryID;
+			if (!byLibrary.has(libraryID)) {
+				byLibrary.set(libraryID, []);
+			}
+			byLibrary.get(libraryID).push(row);
+		}
+		let map = new Map();
+		for (let [libraryID, rows] of byLibrary) {
+			let count = rows.length;
+			let library = Zotero.Libraries.getName(libraryID);
+			let id;
+			if (rows.every(row => row.isRecentlyRead())) {
+				id = grouped ? 'items-section-library-recently-read' : null;
+			}
+			else if (rows.every(row => row.isLibrary(true))) {
+				id = grouped ? 'items-section-library' : null;
+			}
+			else if (rows.every(row => row.isCollection())) {
+				id = grouped ? 'items-section-library-collections' : 'items-section-collections-selected';
+			}
+			else if (rows.every(row => row.isSearch())) {
+				id = grouped ? 'items-section-library-searches' : 'items-section-searches-selected';
+			}
+			else {
+				id = grouped ? 'items-section-library-sources' : 'items-section-sources-selected';
+			}
+			let label = Zotero.ftl.formatValueSync(id || 'items-section-library', { library, count });
+			// Cross-library headers use the library icon; the single-library summary
+			// header has no icon, to set it apart from a sticky library header
+			map.set(libraryID, { label, iconName: grouped ? undefined : null });
+		}
+		return map;
+	}
+
+	/**
+	 * Set new collectionTreeRows and refresh items.
 	 * This handles the data/model logic; UI orchestration stays in ItemTree.
-	 * @param {Object} collectionTreeRow - The collection tree row to set
+	 * @param {Object[]} collectionTreeRows - The collection tree rows to set
 	 * @returns {Promise<void>}
 	 */
-	async setCollectionTreeRow(collectionTreeRow) {
+	async setCollectionTreeRows(collectionTreeRows) {
 		// Normalize stub objects to include default CollectionTreeRow methods
-		if (collectionTreeRow.constructor.name == "Object") {
-			collectionTreeRow = Object.assign({}, STUB_COLLECTION_TREE_ROW, collectionTreeRow);
-		}
-		// No-op if same collection
-		if (this.collectionTreeRow && this.collectionTreeRow.id === collectionTreeRow.id) {
+		collectionTreeRows = collectionTreeRows.map((row) => {
+			if (row.constructor.name == "Object") {
+				row = Object.assign({}, STUB_COLLECTION_TREE_ROW, row);
+			}
+			return row;
+		});
+		// No-op if same set of collections
+		if (this.collectionTreeRows.length
+				&& Zotero.Utilities.arrayEquals(
+					this.collectionTreeRows.map(row => row.id).sort(),
+					collectionTreeRows.map(row => row.id).sort()
+				)) {
 			return;
 		}
-		let resetColumns = false;
-		if (this.collectionTreeRow?.type != collectionTreeRow.type) {
-			resetColumns = true;
+		if (!collectionTreeRows.slice(1).every(row => row.visibilityGroup == collectionTreeRows[0].visibilityGroup)) {
+			throw new Error("Selected collection tree rows belong to different visibility groups");
 		}
-		this.collectionTreeRow = collectionTreeRow;
+		let viewMode = this._computeViewMode(collectionTreeRows);
+		let resetColumns = viewMode != this._viewMode;
+		this._viewMode = viewMode;
+		this.collectionTreeRows = collectionTreeRows;
+
+		// When the selection spans multiple libraries, group items by library in
+		// collections-list order (the order of the selected rows), with a header
+		// row above each library's items
+		this._libraryOrder = new Map();
+		for (let row of collectionTreeRows) {
+			let libraryID = row.ref.libraryID;
+			if (libraryID !== undefined && !this._libraryOrder.has(libraryID)) {
+				this._libraryOrder.set(libraryID, this._libraryOrder.size);
+			}
+		}
+		this._groupedByLibrary = !collectionTreeRows[0].isFeedsOrFeed()
+			&& this._libraryOrder.size > 1;
+		// A section header is shown above each library's items whenever more than one row
+		// is selected (a single header for a single-library selection; one per library
+		// across libraries). Feeds are never grouped or headed.
+		this._showSectionHeaders = !collectionTreeRows[0].isFeedsOrFeed()
+			&& collectionTreeRows.length > 1;
+		this._sectionHeaders = this._showSectionHeaders
+			? this._computeSectionHeaders(collectionTreeRows)
+			: new Map();
 
 		// Set ID based on visibilityGroup
-		const visibilityGroup = collectionTreeRow.visibilityGroup || 'default';
+		const visibilityGroup = collectionTreeRows[0].visibilityGroup || 'default';
 		let treeID = "item-tree-" + this.itemTree.props.id + "-" + visibilityGroup;
-		// Needs to be called after this.collectionTreeRow is set so that this.itemTree.visibilityGroup is correct
+		// Needs to be called after this.collectionTreeRows is set so that this.itemTree.visibilityGroup is correct
 		let idChanged = await this.itemTree.setId(treeID);
 		
-		this._includeTrashed = collectionTreeRow.isTrash();
-		// Emit loading state - only setCollectionTreeRow shows loading UI
+		this._includeTrashed = collectionTreeRows[0].isTrash();
+		// Emit loading state - only setCollectionTreeRows shows loading UI
 		await this.runListeners('update', null, { loading: true });
 		await this.itemTree._ensureSortContextReady();
 		resetColumns && await this.itemTree._resetColumns();
@@ -144,23 +345,34 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 	 * @returns {Promise<void>}
 	 */
 	async setFilter(type, data) {
-		let changed;
-		switch (type) {
-			case 'search':
-				changed = this.collectionTreeRow.setSearch(data);
-				break;
-			case 'citation-search':
-				changed = this.collectionTreeRow.setSearch(data, 'fields');
-				break;
-			case 'tags':
-				changed = this.collectionTreeRow.setTags(data);
-				break;
-			default:
-				throw ('Invalid filter type in setFilter');
+		let changed = false;
+		for (let collectionTreeRow of this.collectionTreeRows) {
+			let rowChanged;
+			switch (type) {
+				case 'search':
+					rowChanged = collectionTreeRow.setSearch(data, Zotero.Prefs.get('search.quicksearch-mode'));
+					break;
+				case 'citation-search':
+					rowChanged = collectionTreeRow.setSearch(data, 'fields');
+					break;
+				case 'advanced-search':
+					rowChanged = collectionTreeRow.setAdvancedSearch(data);
+					break;
+				case 'tags':
+					rowChanged = collectionTreeRow.setTags(data);
+					break;
+				default:
+					throw ('Invalid filter type in setFilter');
+			}
+			changed = changed || rowChanged;
 		}
 		if (changed) {
-			await this.refresh({ restoreSelection: true });
+			this._filterRefreshPromise = this.refresh({ restoreSelection: true });
 		}
+		// An unchanged filter can arrive while a previous filter's refresh is still in
+		// flight (e.g., closing and immediately reopening the Advanced Search), so wait
+		// for that refresh either way
+		await this._filterRefreshPromise;
 	}
 
 	/**
@@ -177,15 +389,42 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 		this.itemTree._refreshPromise = deferred.promise;
 		
 		try {
-			this.collectionTreeRow.clearCache();
-			// Get the full set of items we want to show
-			let newSearchItems = await this.collectionTreeRow.getItems();
-			if (this.collectionTreeRow.isTrash()) {
-				// When in trash, also fetch trashed collections and searched
-				// So that they are displayed among deleted items
+			this.collectionTreeRows.forEach(row => row.clearCache());
+			// Get the full set of items we want to show, merged across all selected rows
+			let newSearchItemSet = new Set();
+			for (let arr of await Promise.all(this.collectionTreeRows.map(row => row.getItems()))) {
+				for (let item of arr) {
+					newSearchItemSet.add(item);
+				}
+			}
+			let newSearchItems = [...newSearchItemSet];
+			// Embedded-image attachments (images pasted into notes) are never shown in the
+			// tree, so don't let one match a search and pull in its parents
+			newSearchItems = newSearchItems.filter(item => !item.isEmbeddedImageAttachment());
+			if (this.viewMode == 'trash') {
+				// When in trash, also fetch trashed collections and searches
+				// so that they're displayed among the deleted items
+				let trashedCollections = await this.collectionTreeRows[0].getTrashedCollections();
+				let trashedSearches = await Zotero.Searches.getDeleted(
+					this.collectionTreeRows[0].ref.libraryID
+				);
+				// Collections and searches can't match item-level conditions or tags, so when
+				// an advanced search or tag filter is active, don't show them. With a quick
+				// search, match against their names.
+				let { searchText, advancedSearch, tags } = this.collectionTreeRows[0];
+				if (advancedSearch || (tags && tags.size)) {
+					trashedCollections = [];
+					trashedSearches = [];
+				}
+				else if (searchText) {
+					let words = searchText.toLowerCase().split(/\s+/).filter(Boolean);
+					let matches = obj => words.every(word => obj.name.toLowerCase().includes(word));
+					trashedCollections = trashedCollections.filter(matches);
+					trashedSearches = trashedSearches.filter(matches);
+				}
 				newSearchItems = newSearchItems
-					.concat(await this.collectionTreeRow.getTrashedCollections())
-					.concat(await Zotero.Searches.getDeleted(this.collectionTreeRow.ref.libraryID));
+					.concat(trashedCollections)
+					.concat(trashedSearches);
 			}
 			// Remove notes and attachments if necessary
 			if (this.itemTree.props.regularOnly) {
@@ -196,6 +435,19 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 				});
 			}
 			let newSearchItemIDs = new Set(newSearchItems.map(item => item.treeViewID));
+			// In Recently Read, the search matches parent items, but the items that were
+			// actually read are their child attachments. Mark those as matched too, so they
+			// display as full results rather than grayed-out context rows.
+			// Keep them out of newSearchParentIDs below so we don't auto-expand the parents.
+			for (let row of this.collectionTreeRows) {
+				if (!row.isRecentlyRead()) {
+					continue;
+				}
+				let lastReadAttachmentIDs = await Zotero.Items.getLastReadAttachmentIDs(row.ref.libraryID);
+				for (let id of lastReadAttachmentIDs) {
+					newSearchItemIDs.add(id);
+				}
+			}
 			// Find the items that aren't yet in the tree
 			let itemsToAdd = newSearchItems.filter(item => this._rowMap[item.treeViewID] === undefined);
 			// Find the parents of search matches
@@ -206,8 +458,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			);
 			this._searchParentIDs = newSearchParentIDs;
 			
-			var newCellTextCache = {};
-			var newSearchMode = this.collectionTreeRow.isSearchMode();
+			var newSearchMode = this.collectionTreeRows.some(row => row.isSearchMode());
 			var newRows = [];
 			var allItemIDs = new Set();
 			var addedItemIDs = new Set();
@@ -219,6 +470,10 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			var skipChildren;
 			for (let i = 0; i < this._rows.length; i++) {
 				let row = this._rows[i];
+				// Don't copy library header or spacer rows -- they're reinserted after sorting
+				if (!row.isObjectRow) {
+					continue;
+				}
 				// Top-level items
 				if (row.level == 0) {
 					// A top-level attachment moved into a parent. Don't copy, it will be added
@@ -296,7 +551,10 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			this._rows = newRows;
 			this.refreshRowMap();
 			await this.itemTree._ensureSortContextReady();
-			this._sort(options.forceSortAll ? null : [...addedItemIDs]);
+			// In grouped mode, always sort everything: a partial sort doesn't compare
+			// pre-existing rows against each other, so library grouping wouldn't be
+			// applied to rows carried over from the previous view
+			this._sort(options.forceSortAll || this._groupedByLibrary ? null : [...addedItemIDs]);
 			
 			// Toggle all open containers closed and open to refresh child items
 			var t = new Date();
@@ -307,12 +565,17 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			}
 			this.refreshRowMap();
 			Zotero.debug(`Refreshed open parents in ${new Date() - t} ms`);
-			
+
+			if (this._showSectionHeaders) {
+				this._insertLibraryHeaders();
+				this.refreshRowMap();
+			}
+
 			this._searchMode = newSearchMode;
 			this._searchItemIDs = newSearchItemIDs; // items matching the search
 			this.itemTree.invalidateRowCache(true);
 				
-			if (!this.collectionTreeRow.isPublications()) {
+			if (this.viewMode != 'publications') {
 				this._expandMatchParents(newSearchParentIDs);
 			}
 			
@@ -384,7 +647,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			}
 			await Zotero.Promise.delay();
 			this.runListeners('update', true, {
-				message: Zotero.getString('pane.items.loadError')
+				message: await getLoadErrorMessage(e)
 			});
 			throw e;
 		}
@@ -399,8 +662,9 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 		await this.itemTree._refreshPromise;
 
 		const cachedSelection = this.itemTree._cachedSelection;
-		const collectionTreeRow = this.collectionTreeRow;
+				const collectionTreeRows = this.collectionTreeRows;
 
+		var initialRowCount = this.getRowCount();
 		var madeChanges = false;
 		var refresh = false;
 		var sort = false;
@@ -420,20 +684,23 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 
 		// 'collection-item' ids are in the form collectionID-itemID
 		if (type == 'collection-item') {
-			if (!collectionTreeRow.isCollection()) {
+			// Collections can be selected alongside saved searches, which have no
+			// subcollections of their own
+			let selectedCollections = collectionTreeRows.filter(row => row.isCollection());
+			if (!selectedCollections.length) {
 				return;
 			}
 
 			var visibleSubcollections = Zotero.Prefs.get('recursiveCollections')
-				? collectionTreeRow.ref.getDescendents(false, 'collection')
+				? selectedCollections.map(row => row.ref.getDescendents(false, 'collection')).flat()
 				: [];
 			var splitIDs = [];
 			for (let id of ids) {
-				var split = id.split('-');
-				// Include if an item in this collection or a visible subcollection
-				if (split[0] == collectionTreeRow.ref.id
-						|| visibleSubcollections.some(c => split[0] == c.id)) {
-					splitIDs.push(split[1]);
+				let [collectionID, itemID] = id.split('-');
+				// Include if an item in one of the selected collections or a visible subcollection
+				if (selectedCollections.some(row => row.ref.id == collectionID)
+						|| visibleSubcollections.some(c => collectionID == c.id)) {
+					splitIDs.push(itemID);
 				}
 			}
 			ids = splitIDs;
@@ -460,7 +727,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			}
 
 			// For a refresh on an item in the trash, check if the item hadn't been restored
-			if (type == 'item' && collectionTreeRow.isTrash()) {
+			if (type == 'item' && this.viewMode == 'trash') {
 				let rows = [];
 				for (let id of ids) {
 					let row = this.getRowIndexByID(id);
@@ -485,6 +752,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 					this._removeRows(rows);
 					rowsToInvalidate = true; // all rows
 					this.runListeners('update', true);
+					this.itemTree.runListeners('rowCountChange');
 				}
 			}
 
@@ -495,16 +763,24 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 			return;
 		}
 
-		if ((action == 'remove' && !collectionTreeRow.isLibrary(true))
+		// In grouped (multi-library) mode, handle removals with a full refresh, since
+		// incremental row removal would leave the header row of an emptied library group
+		if (this._groupedByLibrary && ['remove', 'delete', 'trash'].includes(action)) {
+			this.itemTree.invalidateRowCache(ids);
+			refresh = true;
+			madeChanges = true;
+		}
+		else if ((action == 'remove' && !collectionTreeRows.some(row => row.isLibrary(true)))
 			|| action == 'delete' || action == 'trash'
-			|| (action == 'removeDuplicatesMaster' && collectionTreeRow.isDuplicates())) {
+			|| (action == 'removeDuplicatesMaster' && this.viewMode == 'duplicates')) {
 			// Since a remove involves shifting of rows, we have to do it in order,
 			// so sort the ids by row
 			var rows = [];
 			let push = action == 'delete' || action == 'trash' || action == 'removeDuplicatesMaster';
 			for (var i = 0, len = ids.length; i < len; i++) {
 				if (!push) {
-					push = !collectionTreeRow.ref.hasItem(ids[i]);
+					let id = ids[i];
+					push = !collectionTreeRows.some(row => row.ref.hasItem(id));
 				}
 				// Row might already be gone (e.g. if this is a child and
 				// 'modify' was sent to parent)
@@ -530,7 +806,8 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 				madeChanges = true;
 			}
 		}
-		else if (collectionTreeRow.isSearchMode() && ['item', 'collection', 'search'].includes(type) && ['add', 'modify'].includes(action)) {
+		else if ((collectionTreeRows.length > 1 || collectionTreeRows.some(row => row.isSearchMode()))
+				&& ['item', 'collection', 'search'].includes(type) && ['add', 'modify'].includes(action)) {
 			// If search mode, just re-run search
 			if (action == 'add' && this.hasQuickSearch()) {
 				// For item adds, clear the quick search, unless all the new items have
@@ -548,7 +825,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 					if (search) {
 						search.searchTextbox.value = '';
 					}
-					this.collectionTreeRow.setSearch('');
+					this.collectionTreeRows.forEach(row => row.setSearch(''));
 				}
 			}
 			this.itemTree.invalidateRowCache(ids);
@@ -603,7 +880,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 						}
 					}
 					// If Unfiled Items and item was added to a collection, remove from view
-					else if (this.itemTree.isContainer(row) && collectionTreeRow.isUnfiled() && item.getCollections().length) {
+					else if (this.itemTree.isContainer(row) && this.viewMode == 'unfiled' && item.getCollections().length) {
 						this._closeContainer(row);
 						this._removeRow(row);
 					}
@@ -618,11 +895,14 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 				// containing the item, the item has to be added
 				else if (item.isTopLevelItem()) {
 					// Root view
-					let add = collectionTreeRow.isLibrary(true)
-						&& collectionTreeRow.ref.libraryID == item.libraryID;
+					let add = collectionTreeRows.some(
+						row => row.isLibrary(true) && row.ref.libraryID == item.libraryID
+					);
 					// Collection containing item
-					if (!add && collectionTreeRow.isCollection()) {
-						add = item.inCollection(collectionTreeRow.ref.id);
+					if (!add) {
+						add = collectionTreeRows.some(
+							row => row.isCollection() && item.inCollection(row.ref.id)
+						);
 					}
 					if (add) {
 						// Most likely, the note or attachment's parent was removed.
@@ -652,10 +932,9 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 		else if (type == 'item' && action == 'add') {
 			if (!items) items = Zotero.Items.get(ids);
 			for (let item of items) {
-				// if the item belongs in this collection
-				if (((collectionTreeRow.isLibrary(true)
-					&& collectionTreeRow.ref.libraryID == item.libraryID)
-					|| (collectionTreeRow.isCollection() && item.inCollection(collectionTreeRow.ref.id)))
+				// if the item belongs in one of the selected views
+				if ((collectionTreeRows.some(row => row.isLibrary(true) && row.ref.libraryID == item.libraryID)
+					|| collectionTreeRows.some(row => row.isCollection() && item.inCollection(row.ref.id)))
 					// if we haven't already added it to our hash map
 					&& !this._rowMap[item.id]
 					// Regular item or standalone note/attachment
@@ -687,7 +966,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 				}
 				// In Recently Read, remove parent items that no longer have any lastRead attachments
 				// But only if a refresh isn't scheduled already anyway
-				if (!refresh && collectionTreeRow.isRecentlyRead()) {
+				if (!refresh && this.viewMode == 'recentlyRead') {
 					let rowsToRemove = [];
 					for (let parentID of parentItemIDs) {
 						let parentRow = this._rowMap[parentID];
@@ -718,7 +997,7 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 
 			// If we refreshed, we have to clear the cache
 			if (!refresh) {
-				this.collectionTreeRow.clearCache();
+				this.collectionTreeRows.forEach(row => row.clearCache());
 			}
 
 			var singleSelect = false;
@@ -784,10 +1063,10 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 						|| action == 'removeDuplicatesMaster')
 					&& cachedSelection.some(o => this.getRowIndexByID(o.id) === false)) {
 					// In duplicates view, select the next set on delete
-					if (collectionTreeRow.isDuplicates()) {
+					if (this.viewMode == 'duplicates') {
 						if (this._rows[firstAffectedRowIdx]) {
 							var itemID = this._rows[firstAffectedRowIdx].ref.id;
-							var setItemIDs = collectionTreeRow.ref.getSetItemsByItemID(itemID);
+							var setItemIDs = this.collectionTreeRows[0].ref.getSetItemsByItemID(itemID);
 							rowsToSelect = setItemIDs;
 							restoreSelection = false;
 						}
@@ -826,6 +1105,10 @@ class CollectionViewItemTreeRowProvider extends ItemTreeRowProvider {
 				selection: rowsToSelect
 			});
 		}
+
+		if (this.getRowCount() != initialRowCount) {
+			this.itemTree.runListeners('rowCountChange');
+		}
 	}
 }
 
@@ -844,18 +1127,24 @@ class CollectionViewItemTree extends ItemTree {
 		// Triggered when the item tree is refreshed:
 		// - Collection/view changed (changeCollectionTreeRow)
 		// - Search/filter updated (setFilter)
-		// - Items added/removed/modified (notify -> refresh)
 		this.onRefresh = this.createEventBinding('refresh');
+		// Triggered when notifier events change the number of rows in the view
+		// (e.g., items added during a sync)
+		this.onRowCountChange = this.createEventBinding('rowCountChange');
 	}
 
-	get collectionTreeRow() { return this.rowProvider.collectionTreeRow; }
+	get viewMode() { return this.rowProvider.viewMode; }
+
+	isFeedsOrFeed() { return ['feed', 'feeds'].includes(this.viewMode); }
+
+	get collectionTreeRows() { return this.rowProvider.collectionTreeRows; }
 
 	get visibilityGroup() {
-		return this.collectionTreeRow?.visibilityGroup ?? 'default';
+		return this.collectionTreeRows[0]?.visibilityGroup ?? 'default';
 	}
 
 	get viewType() {
-		let ctr = this.collectionTreeRow;
+		let ctr = this.collectionTreeRows[0];
 		if (!ctr) return 'default';
 		let type = ctr.type;
 		if (ctr.isWithinGroup?.()) return type + '-group';
@@ -863,11 +1152,11 @@ class CollectionViewItemTree extends ItemTree {
 	}
 
 	get isSortable() {
-		return this.collectionTreeRow.isSortable();
+		return this.collectionTreeRows.every(row => row.isSortable());
 	}
 
 	_getColumns() {
-		if (!this.collectionTreeRow) {
+		if (!this.collectionTreeRows.length) {
 			this._columns = [];
 			return this._columns;
 		}
@@ -875,18 +1164,24 @@ class CollectionViewItemTree extends ItemTree {
 	}
 
 	async changeCollectionTreeRow(collectionTreeRow) {
+		return this.changeCollectionTreeRows(collectionTreeRow ? [collectionTreeRow] : []);
+	}
+
+	async changeCollectionTreeRows(collectionTreeRows) {
 		if (this._locked) return;
-		if (!collectionTreeRow) {
+		if (!collectionTreeRows || !collectionTreeRows.length) {
 			this.tree = null;
 			this._treebox = null;
 			return this.clearItemsPaneMessage();
 		}
-		Zotero.debug(`CollectionViewItemTree.changeCollectionTreeRow(): ${collectionTreeRow.id}`);
+		Zotero.debug(`CollectionViewItemTree.changeCollectionTreeRows(): [${collectionTreeRows.map(row => row.id).join(', ')}]`);
 
-		if (collectionTreeRow.view) {
-			collectionTreeRow.view.itemTreeView = this;
+		for (let collectionTreeRow of collectionTreeRows) {
+			if (collectionTreeRow.view) {
+				collectionTreeRow.view.itemTreeView = this;
+			}
 		}
-		await this.rowProvider.setCollectionTreeRow(collectionTreeRow);
+		await this.rowProvider.setCollectionTreeRows(collectionTreeRows);
 		return this.waitForLoad();
 	}
 
@@ -896,11 +1191,11 @@ class CollectionViewItemTree extends ItemTree {
 	}
 
 	render() {
-		const showMessage = !this.collectionTreeRow || this._itemsPaneMessage;
+		const showMessage = !this.collectionTreeRows.length || this._itemsPaneMessage;
 
-		// If no collectionTreeRow yet, render stub div instead of VirtualizedTable.
+		// If no rows are selected yet, render stub div instead of VirtualizedTable.
 		// This prevents VirtualizedTable from trying to use undefined ID.
-		if (!this.collectionTreeRow) {
+		if (!this.collectionTreeRows.length) {
 			return [
 				this._renderItemsPaneMessage(showMessage),
 				<div
@@ -950,14 +1245,14 @@ class CollectionViewItemTree extends ItemTree {
 	async selectItems(ids, noRecurse, noScroll) {
 		if (!ids.length) return 0;
 		// If no row map, we're probably in the process of switching collections,
-		// so store the items to select on the collectionTreeRow for later
-		if (!this._rowMap && this.collectionTreeRow) {
-			this.collectionTreeRow.itemsToSelect = ids;
+		// so store the items to select on the first selected row for later
+		if (!this._rowMap && this.collectionTreeRows.length) {
+			this.collectionTreeRows[0].itemsToSelect = ids;
 			Zotero.debug("_rowMap not yet set; not selecting items");
 			return 0;
 		}
 		// Filter out deleted items if not in trash
-		if (!this.collectionTreeRow.isTrash()) {
+		if (this.viewMode != 'trash') {
 			ids = ids.filter(id => !Zotero.Items.get(id).deleted);
 		}
 		return super.selectItems(ids, noRecurse, noScroll);
@@ -969,19 +1264,23 @@ class CollectionViewItemTree extends ItemTree {
 	 * @returns {Boolean}
 	 */
 	isSelectable(index, selectAll=false) {
+		// Library header and spacer rows are never selectable
+		let row = this.getRow(index);
+		if (row && !row.isObjectRow) {
+			return false;
+		}
 		// Every listed item is selectable individually. There are exceptions
 		// for select-all selections.
 		if (!selectAll) return true;
 
 		// Every item is selectable in publications (even when not in a search)
 		// or when the tree is not in search mode
-		if (!this._searchMode || this.collectionTreeRow.isPublications()) return true;
+		if (!this._searchMode || this.viewMode == 'publications') return true;
 		
-		let row = this.getRow(index);
 		if (!row) return false;
 
 		// Only deleted items are selectable in trash
-		if (this.collectionTreeRow.isTrash()) {
+		if (this.viewMode == 'trash') {
 			return row.ref.deleted;
 		}
 		else {
@@ -1003,7 +1302,7 @@ class CollectionViewItemTree extends ItemTree {
 		
 		let row = super._getRowData(index);
 		// Don't change the format of date in feeds
-		if (this.collectionTreeRow.isFeedsOrFeed() && row.date) {
+		if (this.isFeedsOrFeed() && row.date) {
 			let val;
 			let customRowValue = this.props.getExtraField(treeRow.ref, 'date');
 			if (customRowValue !== undefined) {
@@ -1035,7 +1334,12 @@ class CollectionViewItemTree extends ItemTree {
 	 * Start a drag using HTML 5 Drag and Drop
 	 */
 	onDragStart(event, index) {
-		Zotero.DragDrop.currentDragSource = this.collectionTreeRow;
+		let row = this.getRow(index);
+		if (row && !row.isObjectRow) {
+			event.preventDefault();
+			return false;
+		}
+		Zotero.DragDrop.currentDragSource = this.collectionTreeRows[0];
 		return super.onDragStart(event, index);
 	};
 
@@ -1047,6 +1351,7 @@ class CollectionViewItemTree extends ItemTree {
 		try {
 			event.preventDefault();
 			event.stopPropagation();
+			Zotero.DragDrop.currentDropEffect = null;
 			var previousOrientation = Zotero.DragDrop.currentOrientation;
 			Zotero.DragDrop.currentOrientation = getDragTargetOrient(event);
 			Zotero.debug(`Dragging over item ${row} with ${Zotero.DragDrop.currentOrientation}, drop row: ${this._dropRow}`);
@@ -1073,7 +1378,7 @@ class CollectionViewItemTree extends ItemTree {
 			if (event.dataTransfer.getData("zotero/item")) {
 				var sourceCollectionTreeRow = Zotero.DragDrop.getDragSource();
 				if (sourceCollectionTreeRow) {
-					var targetCollectionTreeRow = this.collectionTreeRow;
+					var targetCollectionTreeRow = this.collectionTreeRows[0];
 
 					if (!targetCollectionTreeRow) {
 						this.setDropEffect(event, "none");
@@ -1162,16 +1467,24 @@ class CollectionViewItemTree extends ItemTree {
 		var dataType = dragData.dataType;
 		var data = dragData.data;
 
-		var collectionTreeRow = this.collectionTreeRow;
+		var collectionTreeRow = this.collectionTreeRows[0];
 
+		var rowItem = null;
 		if (row != -1 && orient == 0) {
-			var rowItem = this.getRow(row).ref; // the item we are dragging over
+			rowItem = this.getRow(row).ref; // the item we are dragging over
 			// Cannot drop anything on attachments/notes
 			if (!rowItem.isRegularItem()) {
 				return false;
 			}
 		}
 
+		// When the selection spans multiple libraries, only allow drops directly onto a
+		// specific item, which identifies the target library. Drops into blank space or
+		// between rows are ambiguous across libraries, so disallow them.
+		if (!rowItem && new Set(this.collectionTreeRows.map(r => r.ref.libraryID)).size > 1) {
+			return false;
+		}
+
 		if (dataType == 'zotero/item') {
 			let items = Zotero.Items.get(data);
 
@@ -1190,8 +1503,9 @@ class CollectionViewItemTree extends ItemTree {
 						return false;
 					}
 
-					// Disallow cross-library child drag
-					if (item.libraryID != collectionTreeRow.ref.libraryID) {
+					// Disallow cross-library child drag (the target item's library, which
+					// may differ from the focused row's in a cross-library selection)
+					if (item.libraryID != rowItem.libraryID) {
 						return false;
 					}
 
@@ -1205,7 +1519,7 @@ class CollectionViewItemTree extends ItemTree {
 			}
 
 			// In library, allow children to be dragged out of parent
-			else if (collectionTreeRow.isLibrary(true) || collectionTreeRow.isCollection()) {
+			else if (this.collectionTreeRows.some(r => r.isLibrary(true) || r.isCollection())) {
 				let targetRow = row != -1 ? this.getRow(row) : null;
 				for (let item of items) {
 					// Don't allow drag if any top-level items
@@ -1264,8 +1578,11 @@ class CollectionViewItemTree extends ItemTree {
 					return false;
 				}
 			}
-			// Don't allow drop into searches or publications
-			else if (collectionTreeRow.isSearch() || collectionTreeRow.isPublications()) {
+			// Into blank space, require a row that can receive items -- a collection or a
+			// library root. A saved search or My Publications can't, and checking all
+			// selected rows keeps this order-independent for a mixed collection + search
+			// selection.
+			else if (!this.collectionTreeRows.some(r => r.isCollection() || r.isLibrary(true))) {
 				return false;
 			}
 
@@ -1287,7 +1604,11 @@ class CollectionViewItemTree extends ItemTree {
 		}
 		this._dropRow = null;
 		Zotero.DragDrop.currentDragSource = null;
-		if (!dataTransfer.dropEffect || dataTransfer.dropEffect == "none") {
+		// Use the effect set in onDragOver(), which the drop event's dropEffect may not reflect
+		// (see LibraryTreeView::setDropEffect())
+		var dropEffect = Zotero.DragDrop.currentDropEffect || dataTransfer.dropEffect;
+		Zotero.DragDrop.currentDropEffect = null;
+		if (!dropEffect || dropEffect == "none") {
 			return false;
 		}
 
@@ -1296,11 +1617,10 @@ class CollectionViewItemTree extends ItemTree {
 			Zotero.debug("No drag data");
 			return false;
 		}
-		var dropEffect = dragData.dropEffect;
 		var dataType = dragData.dataType;
 		var data = dragData.data;
 		var sourceCollectionTreeRow = Zotero.DragDrop.getDragSource(dataTransfer);
-		var collectionTreeRow = this.collectionTreeRow;
+		var collectionTreeRow = this.collectionTreeRows[0];
 		var targetLibraryID = collectionTreeRow.ref.libraryID;
 
 		if (dataType == 'zotero/item') {
@@ -1330,6 +1650,11 @@ class CollectionViewItemTree extends ItemTree {
 				// canDrop() limits this to child items
 				var rowItem = this.getRow(row).ref; // the item we are dragging over
 				await Zotero.DB.executeTransaction(async function () {
+					Zotero.UndoHistory.stageAction(
+						'undo-action-change-parent-item',
+						{ count: items.length }
+					);
+
 					for (let i = 0; i < items.length; i++) {
 						let item = items[i];
 						item.parentID = rowItem.id;
@@ -1340,43 +1665,52 @@ class CollectionViewItemTree extends ItemTree {
 
 			// Dropped outside of a row
 			else {
-				// Remove from parent and make top-level
-				if (collectionTreeRow.isLibrary(true)) {
-					await Zotero.DB.executeTransaction(async function () {
-						for (let i = 0; i < items.length; i++) {
-							let item = items[i];
-							if (!item.isRegularItem()) {
-								item.parentID = false;
-								await item.save();
-							}
-						}
-					});
-				}
-				// Add to collection
-				else {
+				let collectionRows = this.collectionTreeRows.filter(r => r.isCollection());
+				// Add to all selected collections
+				if (collectionRows.length) {
 					await Zotero.DB.executeTransaction(async function () {
+						Zotero.UndoHistory.stageAction(
+							'undo-action-add-to-collection',
+							{ count: items.length }
+						);
+
 						for (let i = 0; i < items.length; i++) {
 							let item = items[i];
 							var source = item.isRegularItem() ? false : item.parentItemID;
-							// Top-level item
+							// Child item -- make top-level
 							if (source) {
 								item.parentID = false;
-								item.addToCollection(collectionTreeRow.ref.id);
-								await item.save();
 							}
-							else {
-								item.addToCollection(collectionTreeRow.ref.id);
-								await item.save();
+							for (let collectionRow of collectionRows) {
+								item.addToCollection(collectionRow.ref.id);
 							}
+							await item.save();
 							toMove.push(item.id);
 						}
 					});
 				}
+				// Only library roots selected -- remove from parent and make top-level
+				else if (collectionTreeRow.isLibrary(true)) {
+					await Zotero.DB.executeTransaction(async function () {
+						Zotero.UndoHistory.stageAction(
+							'undo-action-convert-to-standalone',
+							{ count: items.length }
+						);
+
+						for (let i = 0; i < items.length; i++) {
+							let item = items[i];
+							item.parentID = false;
+							await item.save();
+						}
+					});
+				}
 			}
 		}
 		else if (dataType == 'application/x-moz-file') {
-			// Disallow drop into read-only libraries
-			if (!collectionTreeRow.editable) {
+			// Disallow drop into read-only libraries. For a drop directly on an item,
+			// that's the item's library (which can differ in a cross-library selection).
+			let dropLibraryID = orient == 0 ? this.getRow(row).ref.libraryID : collectionTreeRow.ref.libraryID;
+			if (!Zotero.Libraries.get(dropLibraryID).editable) {
 				window.ZoteroPane.displayCannotEditLibraryMessage();
 				return;
 			}
@@ -1399,14 +1733,23 @@ class CollectionViewItemTree extends ItemTree {
 			var targetLibraryID = collectionTreeRow.ref.libraryID;
 
 			var parentItemID = false;
-			var parentCollectionID = false;
+			var parentCollectionIDs = false;
 
 			if (orient == 0) {
+				// Dropped directly on an item: attach to it, in its library (which can
+				// differ from the focused row's in a cross-library selection)
 				let treerow = this.getRow(row);
 				parentItemID = treerow.ref.id;
+				targetLibraryID = treerow.ref.libraryID;
 			}
-			else if (collectionTreeRow.isCollection()) {
-				var parentCollectionID = collectionTreeRow.ref.id;
+			else {
+				// Add to all selected collections. Adding to a collection already implies
+				// the item is in that collection's library, so when a library root is also
+				// selected the collection(s) are the right (and sufficient) target.
+				let collectionRows = this.collectionTreeRows.filter(r => r.isCollection());
+				if (collectionRows.length) {
+					parentCollectionIDs = collectionRows.map(r => r.ref.id);
+				}
 			}
 
 			let addedItems = [];
@@ -1467,7 +1810,7 @@ class CollectionViewItemTree extends ItemTree {
 							file,
 							title: delaySetAutoAttachmentTitle ? '' : undefined,
 							parentItemID,
-							collections: parentCollectionID ? [parentCollectionID] : undefined,
+							collections: parentCollectionIDs || undefined,
 							saveOptions: {
 								notifierQueue
 							}
@@ -1485,7 +1828,7 @@ class CollectionViewItemTree extends ItemTree {
 							fileBaseName,
 							libraryID: targetLibraryID,
 							parentItemID,
-							collections: parentCollectionID ? [parentCollectionID] : undefined,
+							collections: parentCollectionIDs || undefined,
 							saveOptions: {
 								notifierQueue
 							}
@@ -1536,7 +1879,7 @@ class CollectionViewItemTree extends ItemTree {
 	handleActivate(event, indices) {
 		let items = indices.map(index => this.getRow(index).ref);
 		// Ignore double-clicks in duplicates view on everything except attachments
-		if (event.button == 0 && this.collectionTreeRow?.isDuplicates()) {
+		if (event.button == 0 && this.viewMode == 'duplicates') {
 			if (items.length != 1 || !items[0].isAttachment()) {
 				return false;
 			}
@@ -1546,15 +1889,15 @@ class CollectionViewItemTree extends ItemTree {
 
 	_handleRowMouseUpDown(event) {
 		const modifierIsPressed = ['ctrlKey', 'metaKey', 'shiftKey', 'altKey'].some(key => event[key]);
-		if (this.collectionTreeRow?.isDuplicates() && !modifierIsPressed) {
+		if (this.viewMode == 'duplicates' && !modifierIsPressed) {
 			this.duplicateMouseSelection = true;
 		}
 	};
 
 	_handleSelectionChange = (selection, shouldDebounce) => {
-		if (this.collectionTreeRow?.isDuplicates() && selection.count == 1 && this.duplicateMouseSelection) {
+		if (this.viewMode == 'duplicates' && selection.count == 1 && this.duplicateMouseSelection) {
 			var itemID = this.getRow(selection.focused).ref.id;
-			var setItemIDs = this.collectionTreeRow.ref.getSetItemsByItemID(itemID);
+			var setItemIDs = this.collectionTreeRows[0].ref.getSetItemsByItemID(itemID);
 			
 			// We are modifying the selection object directly here
 			// which won't trigger item updates
@@ -1574,20 +1917,20 @@ class CollectionViewItemTree extends ItemTree {
 	// ///////////////////////////////////////////////////////////////////////////
 
 	getSortDirection(sortFields) {
-		if (this.collectionTreeRow?.isFeedsOrFeed()) {
+		if (this.isFeedsOrFeed()) {
 			return Zotero.Prefs.get('feeds.sortAscending') ? 1 : -1;
 		}
-		if (this.collectionTreeRow.isRecentlyRead()) {
+		if (this.viewMode == 'recentlyRead') {
 			return -1;
 		}
 		return super.getSortDirection(sortFields);
 	}
 
 	getSortField() {
-		if (this.collectionTreeRow?.isFeedsOrFeed()) {
+		if (this.isFeedsOrFeed()) {
 			return 'id';
 		}
-		if (this.collectionTreeRow.isRecentlyRead()) {
+		if (this.viewMode == 'recentlyRead') {
 			return 'lastRead';
 		}
 		return super.getSortField();
@@ -1611,14 +1954,20 @@ class CollectionViewItemTree extends ItemTree {
 				&& !event.altKey
 				&& !event.shiftKey
 				&& (Zotero.isMac ? (event.metaKey && !event.ctrlKey) : event.ctrlKey)
-				&& !this.collectionTreeRow.isPublications()) {
+				&& this.viewMode != 'publications') {
 			this.rowProvider.expandMatchParents();
 			return true;
 		}
 
 		// Colored tag handling (ZoteroPane-specific)
 		if (!event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey && COLORED_TAGS_RE.test(event.code)) {
-			let libraryID = this.collectionTreeRow?.ref?.libraryID;
+			// Colored-tag number shortcuts map positions to a single library's colored
+			// tags, which aren't shown in the tag selector across a multi-library
+			// selection, so disable them there
+			if (new Set(this.collectionTreeRows.map(r => r.ref?.libraryID)).size > 1) {
+				return true;
+			}
+			let libraryID = this.collectionTreeRows[0]?.ref?.libraryID;
 			if (!libraryID) {
 				return true;
 			}
@@ -1646,15 +1995,21 @@ class CollectionViewItemTree extends ItemTree {
 
 			// Async but no need to wait
 			(async () => {
-				for (let item of items) {
-					if (tagRemove) {
-						item.removeTag(colorData.name);
+				await Zotero.DB.executeTransaction(async () => {
+					Zotero.UndoHistory.stageAction(
+						tagRemove ? 'undo-action-remove-tag' : 'undo-action-add-tag',
+						{ count: items.length }
+					);
+					for (let item of items) {
+						if (tagRemove) {
+							item.removeTag(colorData.name);
+						}
+						else {
+							item.addTag(colorData.name);
+						}
+						await item.save();
 					}
-					else {
-						item.addTag(colorData.name);
-					}
-					await item.saveTx();
-				}
+				});
 			})();
 
 			// We handled this
@@ -1662,13 +2017,13 @@ class CollectionViewItemTree extends ItemTree {
 		}
 
 		// Duplicates view arrow key handling
-		if (this.collectionTreeRow?.isDuplicates() && ["ArrowUp", "ArrowDown"].includes(event.key)
+		if (this.viewMode == 'duplicates' && ["ArrowUp", "ArrowDown"].includes(event.key)
 				&& !event.ctrlKey && !event.metaKey && !event.shiftKey
 				&& this.selection.count > 1) {
 			let focused = this.selection.focused;
 			let nextItem = this.getRow(focused + (event.key == "ArrowUp" ? -1 : 1));
 			if (nextItem) {
-				var setItemIDs = this.collectionTreeRow.ref.getSetItemsByItemID(nextItem.id);
+				var setItemIDs = this.collectionTreeRows[0].ref.getSetItemsByItemID(nextItem.id);
 				// If next item is part of the set, we skip the whole set
 				if (this.selection.isSelected(this._rowMap[nextItem.id])) {
 					let newIndex;
@@ -1716,16 +2071,16 @@ class CollectionViewItemTree extends ItemTree {
 			let selectedItems = selectedObjects.filter(o => o instanceof Zotero.Item);
 			let selectedItemIDs = selectedItems.map(o => o.id);
 
-			let collectionTreeRow = this.collectionTreeRow;
+			let collectionTreeRows = this.collectionTreeRows;
 
 			// If all selected items are annotations, for now erase them skipping trash
 			if (selectedItems.length && selectedItems.every(item => item.isAnnotation())) {
 				await Zotero.Items.erase(selectedItemIDs);
 			}
-			else if (collectionTreeRow.isBucket()) {
-				collectionTreeRow.ref.deleteItems(ids);
+			else if (this.viewMode == 'bucket') {
+				collectionTreeRows[0].ref.deleteItems(ids);
 			}
-			else if (collectionTreeRow.isTrash()) {
+			else if (this.viewMode == 'trash') {
 				let [trashedCollectionIDs, trashedSearches] = [[], []];
 				for (let obj of selectedObjects) {
 					if (obj instanceof Zotero.Collection) {
@@ -1745,7 +2100,7 @@ class CollectionViewItemTree extends ItemTree {
 					await Zotero.Items.erase(selectedItemIDs);
 				}
 			}
-			else if (collectionTreeRow.isRecentlyRead() && !force) {
+			else if (this.viewMode == 'recentlyRead' && !force) {
 				await Zotero.DB.executeTransaction(async () => {
 					for (let item of selectedItems) {
 						let attachments;
@@ -1771,22 +2126,25 @@ class CollectionViewItemTree extends ItemTree {
 					}
 				});
 			}	
-			else if (collectionTreeRow.isLibrary(true)
-					|| collectionTreeRow.isSearch()
-					|| collectionTreeRow.isUnfiled()
-					|| collectionTreeRow.isRecentlyRead()
-					|| collectionTreeRow.isRetracted()
-					|| collectionTreeRow.isDuplicates()
+			else if (collectionTreeRows.some(row => row.isLibrary(true))
+					|| collectionTreeRows.some(row => row.isSearch())
+					|| ['unfiled', 'recentlyRead', 'retracted', 'duplicates'].includes(this.viewMode)
 					|| force) {
 				await Zotero.Items.trashTx(selectedItemIDs);
 			}
-			else if (collectionTreeRow.isCollection()) {
-				let collectionIDs = [collectionTreeRow.ref.id];
+			else if (collectionTreeRows.every(row => row.isCollection())) {
+				let collectionIDs = collectionTreeRows.map(row => row.ref.id);
 				if (Zotero.Prefs.get('recursiveCollections')) {
-					collectionIDs.push(...collectionTreeRow.ref.getDescendents(false, 'collection').map(c => c.id));
+					for (let row of collectionTreeRows) {
+						collectionIDs.push(...row.ref.getDescendents(false, 'collection').map(c => c.id));
+					}
 				}
 
 				await Zotero.DB.executeTransaction(async () => {
+					Zotero.UndoHistory.stageAction(
+						'undo-action-remove-from-collection',
+						{ count: selectedItems.length }
+					);
 					for (let item of selectedItems) {
 						for (let collectionID of collectionIDs) {
 							item.removeFromCollection(collectionID);
@@ -1797,7 +2155,7 @@ class CollectionViewItemTree extends ItemTree {
 					}
 				});
 			}
-			else if (collectionTreeRow.isPublications()) {
+			else if (this.viewMode == 'publications') {
 				await Zotero.Items.removeFromPublications(selectedItems);
 			}
 		}
@@ -1813,12 +2171,14 @@ class CollectionViewItemTree extends ItemTree {
 	// ///////////////////////////////////////////////////////////////////////////
 
 	async _updateIntroText() {
-		if (this.collectionTreeRow && !this.rowCount) {
+		if (this.collectionTreeRows.length && !this.rowCount) {
 			let doc = this._ownerDocument;
 			let div;
 
-			// My Library and no groups
-			if (this.collectionTreeRow.isLibrary() && !Zotero.Groups.getAll().length) {
+			// My Library with no groups and no items
+			if (this.collectionTreeRows.every(row => row.isLibrary())
+					&& !Zotero.Groups.getAll().length
+					&& !await this.collectionTreeRows[0].ref.hasItems()) {
 				div = doc.createElement('div');
 				let p = doc.createElement('p');
 				let html = Zotero.getString(
@@ -1885,7 +2245,7 @@ class CollectionViewItemTree extends ItemTree {
 				div.dataset.allowdrop = true;
 			}
 			// My Publications
-			else if (this.collectionTreeRow.isPublications()) {
+			else if (this.viewMode == 'publications') {
 				div = doc.createElement('div');
 				div.className = 'publications';
 				let p = doc.createElement('p');
diff --git a/chrome/content/zotero/components/progressQueueTable.jsx b/chrome/content/zotero/components/progressQueueTable.jsx
index 2553212768..713d13104d 100644
--- a/chrome/content/zotero/components/progressQueueTable.jsx
+++ b/chrome/content/zotero/components/progressQueueTable.jsx
@@ -75,10 +75,10 @@ const ProgressQueueTable = ({ onActivate = noop, progressQueue }) => {
 		for (let column of columns) {
 			if (column.dataKey === 'success') {
 				let span = document.createElement('span');
-				if (!span.ownerGlobal) {
+				if (!span.documentGlobal) {
 					// If this script was imported from a non-window context, we'll have a global object that looks like
 					// a Window and document.createElement() will succeed, but the returned Element object won't have
-					// an ownerGlobal. Trying to append a child or set its innerHTML will segfault Zotero. For now,
+					// an documentGlobal. Trying to append a child or set its innerHTML will segfault Zotero. For now,
 					// let's just abort if we get an invalid Element.
 					// TODO: Remove once we're using ES modules
 					return div;
diff --git a/chrome/content/zotero/components/virtualized-table.jsx b/chrome/content/zotero/components/virtualized-table.jsx
index 0ad5b64af6..99facfbeda 100644
--- a/chrome/content/zotero/components/virtualized-table.jsx
+++ b/chrome/content/zotero/components/virtualized-table.jsx
@@ -258,6 +258,63 @@ class TreeSelection {
 		this._updateTree(shouldDebounce);
 	}
 
+	/**
+	 * Adjusts selection indexes after a row is removed. A removed selected row is
+	 * dropped from the selection, or remapped to the previous row when remapToPrevious
+	 * is true (e.g., when collapsing a container remaps removed descendants to the
+	 * container row, which precedes them). If the removal leaves nothing selected, the
+	 * previous row is selected. If the focused or pivot row is removed, it moves to
+	 * the previous row.
+	 *
+	 * @param {Number} index Removed row index
+	 * @param {Boolean} [remapToPrevious=false] Select the previous row in place of a
+	 * 		removed selected row instead of dropping it from the selection
+	 */
+	adjustForRowRemoval(index, remapToPrevious = false) {
+		let previousIndex = Math.max(index - 1, 0);
+		let selected = new Set();
+		for (let selectedIndex of this.selected) {
+			if (selectedIndex == index) {
+				if (remapToPrevious) {
+					selected.add(previousIndex);
+				}
+			}
+			else {
+				selected.add(selectedIndex > index ? selectedIndex - 1 : selectedIndex);
+			}
+		}
+		if (this.selected.size && !selected.size) {
+			selected.add(previousIndex);
+		}
+		this.selected = selected;
+		this.focused = this.focused == index
+			? previousIndex
+			: this.focused > index ? this.focused - 1 : this.focused;
+		this.pivot = this.pivot == index
+			? previousIndex
+			: this.pivot > index ? this.pivot - 1 : this.pivot;
+	}
+
+	/**
+	 * Adjusts selection indexes after rows are inserted after a given row.
+	 *
+	 * @param {Number} index Row after which rows were inserted
+	 * @param {Number} count Number of inserted rows
+	 */
+	adjustForRowInsertion(index, count) {
+		let selected = new Set();
+		for (let selectedIndex of this.selected) {
+			selected.add(selectedIndex > index ? selectedIndex + count : selectedIndex);
+		}
+		this.selected = selected;
+		if (this.focused > index) {
+			this.focused += count;
+		}
+		if (this.pivot > index) {
+			this.pivot += count;
+		}
+	}
+
 	/**
 	 * Calls the onSelectionChange prop on the tree
 	 * @param shouldDebounce {Boolean} Whether the update to the tree should be debounced
@@ -379,6 +436,17 @@ class VirtualizedTable extends React.Component {
 
 		multiSelect: false,
 
+		// When true, the last selected row can't be toggled off, so the selection
+		// never becomes empty through user action
+		requireSelection: false,
+
+		// When true, the header row of the section currently at the top of the view is
+		// pinned to the top while scrolling (see isSectionHeader)
+		stickySectionHeaders: false,
+		// Returns whether the row at the given index begins a section, i.e., should be
+		// pinned to the top while its section is scrolled through
+		isSectionHeader: () => false,
+
 		onSelectionChange: noop,
 
 		// The below are for arrow-key navigation
@@ -443,6 +511,11 @@ class VirtualizedTable extends React.Component {
 
 		multiSelect: PropTypes.bool,
 
+		requireSelection: PropTypes.bool,
+
+		stickySectionHeaders: PropTypes.bool,
+		isSectionHeader: PropTypes.func,
+
 		onSelectionChange: PropTypes.func,
 
 		// The below are for arrow-key navigation
@@ -553,7 +626,7 @@ class VirtualizedTable extends React.Component {
 	 *
 	 * @param {Event} e
 	 */
-	_onKeyDown = (e) => {
+	_onKeyDown = async (e) => {
 		if (this.props.onKeyDown && this.props.onKeyDown(e) === false) return;
 
 		this._preventKeyboardScrolling(e);
@@ -647,6 +720,25 @@ class VirtualizedTable extends React.Component {
 		}
 		
 		if (shiftSelect || moveFocused) return;
+
+		// If selection count is greater than 1 and the focused row wasn't
+		// moved out of the selection - toggle open/closed all rows in that selection
+		// Otherwise if the focused row has moved out of the selection, toggle state
+		// of the focused row (handled below)
+		if (this.selection.count > 1
+				&& this.selection.isSelected(this.selection.focused)
+				&& [Zotero.arrowPreviousKey, Zotero.arrowNextKey].includes(e.key)) {
+			let open = e.key == Zotero.arrowNextKey;
+			let rows = Array.from(this.selection.selected)
+				.filter(index => this.props.isContainer(index)
+					&& !this.props.isContainerEmpty(index)
+					&& (open ? !this.props.isContainerOpen(index) : this.props.isContainerOpen(index)))
+				.sort((a, b) => b - a);
+			for (let index of rows) {
+				await this.toggleOpenState(index);
+			}
+			return;
+		}
 		
 		switch (e.key) {
 		case Zotero.arrowPreviousKey:
@@ -797,7 +889,16 @@ class VirtualizedTable extends React.Component {
 	 * @param index {Number}
 	 */
 	scrollToRow(index) {
-		this._jsWindow && this._jsWindow.scrollToRow(index);
+		if (!this._jsWindow) return;
+		// When a sticky section header is pinned at the top of the view, it overlays the rows
+		// below it. Reserve a row's worth of space so a row scrolled up into view lands below the
+		// pinned header rather than behind it.
+		let topOffset = 0;
+		if (this.props.stickySectionHeaders && !this.props.isSectionHeader(index)
+				&& this._getSectionHeaderIndices().some(i => i < index)) {
+			topOffset = this._rowHeight;
+		}
+		this._jsWindow.scrollToRow(index, false, topOffset);
 	}
 
 	/**
@@ -823,6 +924,11 @@ class VirtualizedTable extends React.Component {
 			this.selection.shiftSelect(index, toggleSelection, shouldDebounce);
 		}
 		else if (toggleSelection) {
+			// Don't allow toggling off the last selected row when a selection is required
+			if (this.props.requireSelection
+					&& this.selection.count === 1 && this.selection.isSelected(index)) {
+				return;
+			}
 			this.selection.toggleSelect(index, shouldDebounce);
 		}
 		else if (moveFocused) {
@@ -835,7 +941,9 @@ class VirtualizedTable extends React.Component {
 		}
 		// Normal selection
 		else if (!toggleSelection) {
-			if (index > 0 && !this.props.isSelectable(index)) {
+			// Non-selectable rows (e.g. a sticky library header) are a no-op, including no
+			// scroll-to-row below -- otherwise clicking the header at index 0 jumps to the top
+			if (!this.props.isSelectable(index)) {
 				return;
 			}
 			this.selection.select(index, shouldDebounce);
@@ -1070,12 +1178,24 @@ class VirtualizedTable extends React.Component {
 		this._setXulTooltip();
 
 		this._topDiv.style.setProperty("--first-column-extra-width", `${this.firstColumnExtraWidth}px`);
-		window.addEventListener("resize", () => {
-			this._debouncedRerender();
-		});
+		this._resizeObserver = new ResizeObserver(() => this.rerender());
+		this._resizeObserver.observe(this._jsWindow.targetElement);
+
+		if (this.props.stickySectionHeaders) {
+			this._jsWindow.targetElement.addEventListener('scroll', this._updateStickySectionHeader, { passive: true });
+			// The pinned header overlays the rows, so reject drops on it rather than letting
+			// them reach the body's drop handler (which would treat them as a list drop)
+			this._stickyHeader.addEventListener('dragover', this._rejectStickyHeaderDrop);
+			this._stickyHeader.addEventListener('drop', this._rejectStickyHeaderDrop);
+			this._updateStickySectionHeader();
+		}
 	}
-	
+
 	componentWillUnmount() {
+		this._resizeObserver?.disconnect();
+		if (this.props.stickySectionHeaders && this._jsWindow) {
+			this._jsWindow.targetElement.removeEventListener('scroll', this._updateStickySectionHeader);
+		}
 		this._jsWindow.destroy();
 	}
 	
@@ -1148,8 +1268,12 @@ class VirtualizedTable extends React.Component {
 		}
 		node.style.height = (index in this._customRowHeightMap ? this._customRowHeightMap[index] : this._rowHeight) + 'px';
 		node.id = this.props.id + "-row-" + index;
-		node.classList.toggle('odd', index % 2 == 1);
-		node.classList.toggle('even', index % 2 == 0);
+		// Row striping restarts at each section header, so every section's first row is
+		// the same shade (see _sectionRelativeIndex); without section headers this is just
+		// the row index
+		let stripeIndex = this._sectionRelativeIndex(index);
+		node.classList.toggle('odd', stripeIndex % 2 == 1);
+		node.classList.toggle('even', stripeIndex % 2 == 0);
 		if (!node.hasAttribute('role')) {
 			node.setAttribute('role', 'row');
 		}
@@ -1279,7 +1403,12 @@ class VirtualizedTable extends React.Component {
 		}
 		let jsWindowProps = {
 			id: this._jsWindowID,
-			className: "virtualized-table-body",
+			// Reserve a scrollbar gutter when there are sticky section headers (see CSS), so the
+			// scrollbar doesn't float over the content. Without it a macOS overlay scrollbar
+			// overlaps the rows, and the opaque pinned header -- which must paint above the rows
+			// to occlude them, and so above the scrollbar -- covers the scrollbar's edge.
+			className: "virtualized-table-body"
+				+ (this.props.stickySectionHeaders ? " has-sticky-section-headers" : ""),
 			onFocus: (e) => {
 				if (e.target.id == this._jsWindowID) {
 					// Focus should always remain on the list itself.
@@ -1292,7 +1421,23 @@ class VirtualizedTable extends React.Component {
 			<div {...props}>
 				{columnDragMarker}
 				{header}
-				<div {...jsWindowProps} />
+				<div {...jsWindowProps}>
+					{/* Pinned copy of the current section's header. Lives inside the scrolling
+					    body (as its first child, before the windowed-list) and pins with
+					    position: sticky, so its width tracks the body's content box automatically
+					    and it lines up with the rows without any JS geometry. */}
+					{this.props.stickySectionHeaders
+						&& <div
+							className="virtualized-table-sticky-section-header"
+							ref={ref => this._stickyHeader = ref}
+							aria-hidden="true"
+						>
+							<div
+								className="virtualized-table-sticky-section-header-content"
+								ref={ref => this._stickyHeaderContent = ref}
+							/>
+						</div>}
+				</div>
 			</div>
 		);
 	}
@@ -1304,6 +1449,7 @@ class VirtualizedTable extends React.Component {
 		if (!this._jsWindow) return;
 		this._jsWindow.invalidate();
 		this._updateWidth();
+		this._refreshStickySectionHeader();
 	}
 
 	/**
@@ -1314,6 +1460,149 @@ class VirtualizedTable extends React.Component {
 		if (!this._jsWindow) return;
 		this._jsWindow.render();
 		this._updateWidth();
+		this._refreshStickySectionHeader();
+	}
+
+	// ------------------------ Sticky Section Headers ------------------------ //
+
+	/**
+	 * Make a drop on the pinned header a no-op. Not preventing the default on dragover leaves
+	 * it an invalid drop target (so no drop fires), and stopping propagation keeps the event
+	 * from the body's handlers, which would otherwise allow the drop and treat it as a drop on
+	 * the list. The header occludes a row, but dropping on it shouldn't act on that row.
+	 */
+	_rejectStickyHeaderDrop = (e) => {
+		e.stopPropagation();
+		if (e.type == 'dragover' && e.dataTransfer) {
+			e.dataTransfer.dropEffect = 'none';
+		}
+	}
+
+	/**
+	 * The set of section-header rows can change whenever the row model changes, so drop
+	 * the cached indices and repin. Called after the list is invalidated/rerendered.
+	 */
+	_refreshStickySectionHeader() {
+		if (!this.props.stickySectionHeaders) return;
+		this._sectionHeaderIndices = null;
+		this._stickyHeaderIndex = null;
+		this._updateStickySectionHeader();
+	}
+
+	/**
+	 * The stripe index of a row, so striping restarts at each section header. The header
+	 * counts as the section's first (unstriped) row, so the data row right below it is
+	 * striped; subsequent rows alternate. Without section headers this is just the row
+	 * index, preserving the normal whole-list striping (first row unstriped).
+	 */
+	_sectionRelativeIndex(index) {
+		let base = -1;
+		for (let headerIndex of this._getSectionHeaderIndices()) {
+			if (headerIndex <= index) {
+				base = headerIndex;
+			}
+			else {
+				break;
+			}
+		}
+		// No header above: stripe from the top (first row unstriped). With a header above,
+		// the header is the unstriped row 0, so the row below it (index - base == 1) is striped.
+		return base === -1 ? index : index - base;
+	}
+
+	/**
+	 * Indices of all section-header rows, ascending. Cached until the row model changes.
+	 */
+	_getSectionHeaderIndices() {
+		// Only trees that opt into section headers have them
+		if (!this.props.stickySectionHeaders) {
+			return [];
+		}
+		if (this._sectionHeaderIndices) {
+			return this._sectionHeaderIndices;
+		}
+		let indices = [];
+		let count = this.props.getRowCount();
+		for (let i = 0; i < count; i++) {
+			if (this.props.isSectionHeader(i)) {
+				indices.push(i);
+			}
+		}
+		this._sectionHeaderIndices = indices;
+		return indices;
+	}
+
+	/**
+	 * Pin the header of the section currently at the top of the view, pushing it up as
+	 * the next section's header scrolls into it, and reuse the consumer's renderItem so the
+	 * pinned copy matches the real header row's appearance.
+	 *
+	 * The pinned header is the first child of the scrolling body and stays put via position:
+	 * sticky, taking its width from the body's content box so it lines up with the rows. The
+	 * outer element has zero height (so it adds no space to the flow); the inner (opaque)
+	 * element holds the rendered header, overflows downward over the rows, and is the part that
+	 * translates, so a header pushed up by the next section is clipped at the top of the body
+	 * (by the body's own overflow) rather than spilling over the column header.
+	 */
+	_updateStickySectionHeader = () => {
+		if (!this.props.stickySectionHeaders || !this._stickyHeader || !this._jsWindow) {
+			return;
+		}
+		let clip = this._stickyHeader;
+		let content = this._stickyHeaderContent;
+		let headerIndices = this._getSectionHeaderIndices();
+		let scrollTop = this._jsWindow.targetElement.scrollTop;
+		// The section in view is the last header at or above the top of the view; the
+		// next header (if any) is what pushes it up
+		let currentIndex = -1;
+		let nextIndex = -1;
+		for (let index of headerIndices) {
+			if (this._jsWindow._getItemPosition(index) <= scrollTop) {
+				currentIndex = index;
+			}
+			else {
+				nextIndex = index;
+				break;
+			}
+		}
+		// Show the pinned copy only once the header row has scrolled up past the top edge of
+		// the view
+		let stuck = currentIndex != -1
+			&& scrollTop > this._jsWindow._getItemPosition(currentIndex);
+		if (!stuck) {
+			clip.style.display = 'none';
+			this._stickyHeaderIndex = null;
+			return;
+		}
+		clip.style.display = '';
+		clip.classList.add('stuck');
+		// Re-render only when the pinned section changes. Use _renderItem (not the raw
+		// renderItem prop) so the pinned copy gets the same post-processing as a real row
+		// (e.g. the tree's indent/twisty spacer), then drop its id to avoid duplicating the
+		// real row's.
+		if (this._stickyHeaderIndex !== currentIndex) {
+			this._stickyHeaderIndex = currentIndex;
+			let node = this._renderItem(currentIndex);
+			node.removeAttribute('id');
+			// Strip the focus ring: focus defaults to row 0, which can be a header, but a
+			// pinned header shouldn't show focus
+			node.classList.remove('focused');
+			content.textContent = '';
+			content.appendChild(node);
+		}
+		// Geometry is all CSS now: the clip is the first child of the scrolling body, has zero
+		// height (so it takes no space in the flow and the rows below aren't shifted down), and
+		// pins itself with position: sticky. Its content overflows downward over the rows and
+		// gets its width from the body's content box, so it lines up with the real rows.
+		// Push the pinned header up as the next section's header approaches the top
+		let translateY = 0;
+		if (nextIndex != -1) {
+			let nextTop = this._jsWindow._getItemPosition(nextIndex) - scrollTop;
+			if (nextTop < this._rowHeight) {
+				translateY = nextTop - this._rowHeight;
+			}
+		}
+		content.style.transform = `translateY(${translateY}px)`;
 	}
 	
 	updateFontSize = () => {
@@ -1376,8 +1665,6 @@ class VirtualizedTable extends React.Component {
 		return parseFloat(height.split('px')[0]);
 	}
 	
-	_debouncedRerender = Zotero.Utilities.debounce(this.rerender, 200);
-	
 	_updateWidth() {
 		if (!this.props.showHeader) return;
 		const jsWindow = document.querySelector(`#${this._jsWindowID} .windowed-list`);
@@ -2000,12 +2287,10 @@ function makeRowRenderer(getRowData) {
 				else {
 					div.appendChild(renderCell(index, rowData[column.dataKey], column));
 				}
-				let columnName = column.label;
-				if (column.label in Zotero.Intl.strings) {
-					columnName = Zotero.getString(column.label);
-				}
-				if (typeof rowData[column.dataKey] === "string") {
-					ariaLabel += `${columnName}: ${rowData[column.dataKey]} `;
+				let columnName = formatColumnName(column);
+				let value = rowData[column.dataKey];
+				if (typeof value === "string" || typeof value === "number") {
+					ariaLabel += `${columnName}: ${value} `;
 				}
 				else {
 					ariaLabel += `${columnName} `;
diff --git a/chrome/content/zotero/components/windowed-list.js b/chrome/content/zotero/components/windowed-list.js
index e99b971916..cd264e6851 100644
--- a/chrome/content/zotero/components/windowed-list.js
+++ b/chrome/content/zotero/components/windowed-list.js
@@ -205,8 +205,11 @@ module.exports = class {
 	 * @param {Integer} index
 	 * @param {Boolean} forceScrollToTop  If true, the row will be scrolled to the top of the scrollbox
 	 * even if it is below the current scroll window.
+	 * @param {Integer} topOffset  Amount of space reserved at the top of the scrollbox (e.g. for a
+	 * sticky section header that overlays the rows). When scrolling a row into view from above, the
+	 * row is positioned below this offset rather than flush with the top edge.
 	 */
-	scrollToRow(index, forceScrollToTop = false) {
+	scrollToRow(index, forceScrollToTop = false, topOffset = 0) {
 		const { scrollOffset } = this;
 		const itemCount = this._getItemCount();
 		const height = this.getWindowHeight();
@@ -221,8 +224,8 @@ module.exports = class {
 			this.scrollTo(startPosition);
 			return;
 		}
-		if (startPosition < scrollOffset) {
-			this.scrollTo(startPosition);
+		if (startPosition - topOffset < scrollOffset) {
+			this.scrollTo(startPosition - topOffset);
 		}
 		else if (endPosition > scrollOffset + height) {
 			this.scrollTo(endPosition - height - 1);
diff --git a/chrome/content/zotero/containers/tagSelectorContainer.jsx b/chrome/content/zotero/containers/tagSelectorContainer.jsx
index 45afdc0736..833bb56af2 100644
--- a/chrome/content/zotero/containers/tagSelectorContainer.jsx
+++ b/chrome/content/zotero/containers/tagSelectorContainer.jsx
@@ -52,15 +52,21 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 			['collection-item', 'item', 'item-tag', 'tag', 'setting'],
 			'tagSelector'
 		);
-		this._prefObserverID = Zotero.Prefs.registerObserver('fontSize', this.handleUIPropertiesChange.bind(this));
-		this._prefObserverID = Zotero.Prefs.registerObserver('uiDensity', this.handleUIPropertiesChange.bind(this));
+		this._prefObserverIDs = [
+			Zotero.Prefs.registerObserver('fontSize', this.handleUIPropertiesChange.bind(this)),
+			Zotero.Prefs.registerObserver('uiDensity', this.handleUIPropertiesChange.bind(this))
+		];
 		this._mediaQueryList = window.matchMedia("(min-resolution: 1.5dppx)");
-		this._mediaQueryList.addEventListener("change", this.handleUIPropertiesChange.bind(this));
+		this._boundHandleUIPropertiesChange = this.handleUIPropertiesChange.bind(this);
+		this._mediaQueryList.addEventListener("change", this._boundHandleUIPropertiesChange);
 		
 		this.tagListRef = React.createRef();
 		this.searchBoxRef = React.createRef();
 		
 		this.displayAllTags = Zotero.Prefs.get('tagSelector.displayAllTags');
+		// Library IDs of the selected collection tree rows, in collections-list order.
+		// Usually one, but a cross-library selection scopes the tag selector to several.
+		this.libraryIDs = [];
 		// Not stored in state to avoid an unnecessary refresh. Instead, when a tag is selected, we
 		// trigger the selection handler, which updates the visible items, which triggers
 		// onItemViewChanged(), which triggers a refresh with the new tags.
@@ -101,10 +107,13 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 	componentDidUpdate(_prevProps, _prevState) {
 		Zotero.debug("Tag selector updated");
 		
-		// If we changed collections, scroll to top
-		if (this.collectionTreeRow && this.collectionTreeRow.id != this.prevTreeViewID) {
-			this.tagListRef.current.scrollToTop();
-			this.prevTreeViewID = this.collectionTreeRow.id;
+		// If we changed the set of collections, scroll to top
+		if (this.collectionTreeRows) {
+			let treeViewIDs = this.collectionTreeRows.map(row => row.id).sort();
+			if (!Zotero.Utilities.arrayEquals(treeViewIDs, this.prevTreeViewIDs)) {
+				this.tagListRef.current.scrollToTop();
+				this.prevTreeViewIDs = treeViewIDs;
+			}
 		}
 	}
 
@@ -115,7 +124,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 	}
 	
 	/**
-	 * Safely fetch tags from the current collection tree row, returning [] on search error.
+	 * Safely fetch tags from the selected collection tree rows, returning [] on search error.
 	 * CollectionTreeRow.getTags() calls getSearchResults() under the hood, which throws
 	 * Zotero.CollectionTreeRow.SearchError if the underlying search query fails (e.g., a
 	 * saved search with invalid conditions). The tag selector should degrade gracefully in
@@ -124,7 +133,15 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 	 */
 	async _safeGetTags(...args) {
 		try {
-			return await this.collectionTreeRow.getTags(...args);
+			let rows = this.collectionTreeRows || [];
+			// A single row uses its own cached temp table directly; multiple rows are
+			// combined into one temp table and query to avoid a per-row query
+			let tags = rows.length == 1
+				? await rows[0].getTags(...args)
+				: await Zotero.CollectionTreeRow.getTagsAcrossRows(rows, ...args);
+			// Multiple rows (collections, or collections across libraries) can return
+			// the same tag, so dedupe by name
+			return this._dedupeTags(tags);
 		}
 		catch (e) {
 			if (e instanceof Zotero.CollectionTreeRow.SearchError) {
@@ -135,24 +152,78 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		}
 	}
 
+	/**
+	 * Whether more than one library is currently in scope (cross-library selection)
+	 */
+	get multiLibrary() {
+		return this.libraryIDs.length > 1;
+	}
+
+	_dedupeTags(tags) {
+		let seen = new Set();
+		let result = [];
+		for (let tag of tags) {
+			if (!seen.has(tag.tag)) {
+				seen.add(tag.tag);
+				result.push(tag);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Get all tags across the selected libraries (for "Display All Tags"), deduped by name
+	 *
+	 * @param {Number[]} [tagIDs] - Limit to the given tag IDs
+	 */
+	async _getAllTagsInLibraries(tagIDs) {
+		let results = await Promise.all(
+			this.libraryIDs.map(libraryID => Zotero.Tags.getAllWithin({ libraryID, tagIDs }))
+		);
+		return this._dedupeTags(results.flat());
+	}
+
+	_getSelectedLibraryIDs(collectionTreeRows, fallbackLibraryID) {
+		let ids = [];
+		for (let row of collectionTreeRows || []) {
+			let id = row.ref && row.ref.libraryID;
+			if (id !== undefined && id !== null && !ids.includes(id)) {
+				ids.push(id);
+			}
+		}
+		if (!ids.length && fallbackLibraryID) {
+			ids.push(fallbackLibraryID);
+		}
+		return ids;
+	}
+
+	/**
+	 * Colored tags are a per-library synced setting, so a unified cross-library list
+	 * can't coherently show them (the same color can mean different tags in different
+	 * libraries). Only show colored tags when a single library is in scope. The items
+	 * list still shows each item's own library's swatches via Item.getItemsListTags().
+	 */
+	_getScopeColors() {
+		if (this.libraryIDs.length !== 1) {
+			return new Map();
+		}
+		return Zotero.Tags.getColors(this.libraryIDs[0]);
+	}
+
 	// Update trigger #1 (triggered by ZoteroPane)
-	async onItemViewChanged({ collectionTreeRow, libraryID }) {
+	async onItemViewChanged({ collectionTreeRows, libraryID }) {
 		Zotero.debug('Updating tag selector from current view');
-		
-		var prevLibraryID = this.libraryID;
-		this.collectionTreeRow = collectionTreeRow;
-		this.libraryID = libraryID;
-		
+
+		var prevLibraryIDs = this.libraryIDs;
+		this.collectionTreeRows = collectionTreeRows;
+		this.libraryIDs = this._getSelectedLibraryIDs(collectionTreeRows, libraryID);
+		this.libraryID = this.libraryIDs[0];
+
 		var newState = {
 			loaded: true
 		};
-		if (prevLibraryID != libraryID) {
-			if (libraryID) {
-				newState.tagColors = Zotero.Tags.getColors(libraryID);
-			}
-			else {
-				newState.tagColors = new Map();
-			}
+		if (!Zotero.Utilities.arrayEquals(prevLibraryIDs, this.libraryIDs)) {
+			newState.tagColors = this._getScopeColors();
 		}
 		var { tags, scope } = await this.getTagsAndScope();
 		newState.tags = tags;
@@ -166,14 +237,14 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 			if (ids.some(val => val.split('/')[1] == 'tagColors')) {
 				Zotero.debug("Updating tag selector after tag color change");
 				this.setState({
-					tagColors: Zotero.Tags.getColors(this.libraryID)
+					tagColors: this._getScopeColors()
 				});
 			}
 			return;
 		}
 		
 		// Ignore anything other than deletes in duplicates view
-		if (this.collectionTreeRow && this.collectionTreeRow.isDuplicates()) {
+		if (this.collectionTreeRows?.[0]?.isDuplicates()) {
 			switch (event) {
 				case 'delete':
 				case 'trash':
@@ -215,9 +286,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 			for (let [type, tagIDs] of tagsByType) {
 				changedTagsInScope.push(...await this._safeGetTags([type], tagIDs));
 				if (this.displayAllTags) {
-					changedTagsInView.push(
-						...await Zotero.Tags.getAllWithin({ libraryID: this.libraryID, tagIDs })
-					);
+					changedTagsInView.push(...await this._getAllTagsInLibraries(tagIDs));
 				}
 			}
 			if (!this.displayAllTags) {
@@ -340,7 +409,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		// The scope is all visible tags, not all tags in the library
 		var scope = new Set(tags.map(t => t.tag));
 		if (this.displayAllTags) {
-			tags = await Zotero.Tags.getAll(this.libraryID);
+			tags = await this._getAllTagsInLibraries();
 		}
 		
 		// If tags haven't changed, return previous array without sorting again
@@ -518,10 +587,10 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		});
 		tags = coloredTags.concat(tags);
 		
-		// Filter
+		// Filter (case- and accent-insensitive, matching search conditions)
 		if (this.state.searchString) {
-			let lcStr = this.state.searchString.toLowerCase();
-			tags = tags.filter(tag => tag.tag.toLowerCase().includes(lcStr));
+			let normalizedStr = Zotero.Utilities.Internal.normalizeForSearch(this.state.searchString);
+			tags = tags.filter(tag => Zotero.Utilities.Internal.normalizeForSearch(tag.tag).includes(normalizedStr));
 		}
 		
 		// Prepare tag objects for list component
@@ -584,6 +653,14 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		for (let i = 0; i < tagContextMenu.childNodes.length; i++) {
 			tagContextMenu.childNodes[i].disabled = this.state.viewOnly;
 		}
+		// In a cross-library selection, disable per-library actions that would only
+		// affect one of the selected libraries. Deleting still works -- it removes the
+		// tag from all selected libraries (see openDeletePrompt())
+		if (this.multiLibrary) {
+			for (let id of ['assign-color-tag', 'rename-tag', 'split-tag']) {
+				document.getElementById(id).disabled = true;
+			}
+		}
 		ev.preventDefault();
 		
 		tagContextMenu.openPopupAtScreen(
@@ -665,7 +742,11 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 				ids = ids.split(',');
 				var items = Zotero.Items.get(ids);
 				var value = elem.textContent;
-				
+
+				Zotero.UndoHistory.stageAction(
+					remove ? 'undo-action-remove-tag' : 'undo-action-add-tag',
+					{ count: items.length }
+				);
 				for (let i=0; i<items.length; i++) {
 					let item = items[i];
 					if (remove) {
@@ -741,6 +822,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		if (dataOut.result.op === 'split') {
 			const itemIDs = await Zotero.Tags.getTagItems(this.libraryID, oldTagID);
 			await Zotero.DB.executeTransaction(async () => {
+				Zotero.UndoHistory.stageAction('undo-action-split-tag');
 				for (const itemID of itemIDs) {
 					const item = await Zotero.Items.getAsync(itemID);
 					const tagType = item.getTagType(oldTagName);
@@ -804,12 +886,16 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 			
 		var tagID = Zotero.Tags.getID(this.contextTag.name);
 
-		if (tagID) {
-			await Zotero.Tags.removeFromLibrary(this.libraryID, tagID);
-		}
-		// If only a tag color setting, remove that
-		else {
-			await Zotero.Tags.setColor(this.libraryID, this.contextTag.name, false);
+		// Delete from every selected library. removeFromLibrary() only clears the color
+		// for tags that have items in the library, so also clear any remaining color-only
+		// setting (e.g. a tag that's a real tag in one library but only colored in another)
+		for (let libraryID of this.libraryIDs) {
+			if (tagID) {
+				await Zotero.Tags.removeFromLibrary(libraryID, tagID);
+			}
+			if (Zotero.Tags.getColors(libraryID).has(this.contextTag.name)) {
+				await Zotero.Tags.setColor(libraryID, this.contextTag.name, false);
+			}
 		}
 	}
 
@@ -897,7 +983,10 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 		this._uninitialized = true;
 		this.props.root.unmount();
 		Zotero.Notifier.unregisterObserver(this._notifierID);
-		Zotero.Prefs.unregisterObserver(this._prefObserverID);
+		for (let id of this._prefObserverIDs) {
+			Zotero.Prefs.unregisterObserver(id);
+		}
+		this._mediaQueryList.removeEventListener("change", this._boundHandleUIPropertiesChange);
 	}
 	
 	static propTypes = {
diff --git a/chrome/content/zotero/contextMenuUtils.sys.mjs b/chrome/content/zotero/contextMenuUtils.sys.mjs
index 0c88112aa2..457915cda1 100644
--- a/chrome/content/zotero/contextMenuUtils.sys.mjs
+++ b/chrome/content/zotero/contextMenuUtils.sys.mjs
@@ -124,7 +124,7 @@ function getContextMenuPosition(targetElement) {
  */
 export function createContextMenuEvent(targetElement) {
 	let { clientX, clientY } = getContextMenuPosition(targetElement);
-	let win = targetElement.ownerGlobal;
+	let win = targetElement.documentGlobal;
 	let screenX = win.mozInnerScreenX + clientX;
 	let screenY = win.mozInnerScreenY + clientY;
 	// Need to use initNSMouseEvent() to set inputSource, so just construct a
diff --git a/chrome/content/zotero/contextPane.js b/chrome/content/zotero/contextPane.js
index d9ac85ba3f..9256671b25 100644
--- a/chrome/content/zotero/contextPane.js
+++ b/chrome/content/zotero/contextPane.js
@@ -53,8 +53,8 @@ var ZoteroContextPane = new function () {
 			return this.splitter.getAttribute('state') === 'collapsed';
 		},
 		set: (collapsed) => {
-			_contextPane.setAttribute('collapsed', !!collapsed);
-			_contextPaneInner.setAttribute('collapsed', !!collapsed);
+			_contextPane.toggleAttribute('collapsed', !!collapsed);
+			_contextPaneInner.toggleAttribute('collapsed', !!collapsed);
 			_contextPaneSplitter.setAttribute('state', collapsed ? 'collapsed' : 'open');
 			_contextPaneSplitterStacked.setAttribute('state', collapsed ? 'collapsed' : 'open');
 			this.update();
@@ -141,7 +141,7 @@ var ZoteroContextPane = new function () {
 			return;
 		}
 		if (_isStacked()) {
-			_contextPaneSplitterStacked.setAttribute('hidden', false);
+			_contextPaneSplitterStacked.removeAttribute('hidden');
 			_contextPaneSplitter.setAttribute('hidden', true);
 			_contextPane.classList.add('stacked');
 			_contextPane.classList.remove('standard');
@@ -159,7 +159,7 @@ var ZoteroContextPane = new function () {
 			_contextPaneSplitter.setAttribute('state', this.collapsed ? 'collapsed' : 'open');
 		}
 		else {
-			_contextPaneSplitter.setAttribute('hidden', false);
+			_contextPaneSplitter.removeAttribute('hidden');
 			_contextPaneSplitterStacked.setAttribute('hidden', true);
 			_contextPane.classList.add('standard');
 			_contextPane.classList.remove('stacked');
@@ -180,12 +180,12 @@ var ZoteroContextPane = new function () {
 		var height = null;
 		if (_isStacked()) {
 			height = 0;
-			if (_contextPane.getAttribute('collapsed') != 'true') {
+			if (!_contextPane.hasAttribute('collapsed')) {
 				height = _contextPaneInner.getBoundingClientRect().height;
 			}
 		}
 
-		_contextPaneInner.setAttribute('collapsed', this.collapsed ? 'true' : 'false');
+		_contextPaneInner.toggleAttribute('collapsed', this.collapsed);
 
 		let tabContent = _getTabContent();
 		if (tabContent) {
diff --git a/chrome/content/zotero/customElements.js b/chrome/content/zotero/customElements.js
index 9e9f0e0b64..29fd6a0432 100644
--- a/chrome/content/zotero/customElements.js
+++ b/chrome/content/zotero/customElements.js
@@ -33,6 +33,8 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/itemTreeMe
 {
 	// https://searchfox.org/mozilla-central/rev/8e885f04a0a4ff6d64ea59741c10d9b8e45d9ff8/toolkit/content/customElements.js#826-832
 	for (let [tag, script] of [
+		['advanced-search-deck', 'chrome://zotero/content/elements/advancedSearchDeck.js'],
+		['advanced-search-pane', 'chrome://zotero/content/elements/advancedSearchPane.js'],
 		['attachment-box', 'chrome://zotero/content/elements/attachmentBox.js'],
 		['attachment-preview', 'chrome://zotero/content/elements/attachmentPreview.js'],
 		['attachment-preview-box', 'chrome://zotero/content/elements/attachmentPreviewBox.js'],
@@ -49,8 +51,10 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/itemTreeMe
 		['note-box', 'chrome://zotero/content/elements/noteBox.js'],
 		['note-editor', 'chrome://zotero/content/elements/noteEditor.js'],
 		['notes-box', 'chrome://zotero/content/elements/notesBox.js'],
+		['query-textbox', 'chrome://zotero/content/elements/queryTextbox.js'],
 		['quick-search-textbox', 'chrome://zotero/content/elements/quickSearchTextbox.js'],
 		['related-box', 'chrome://zotero/content/elements/relatedBox.js'],
+		['search-textbox', 'chrome://zotero/content/elements/searchTextbox.js'],
 		['shadow-autocomplete-input', 'chrome://zotero/content/elements/shadowAutocompleteInput.js'],
 		['split-menu-button', 'chrome://zotero/content/elements/splitMenuButton.js'],
 		['tabs-menu-panel', 'chrome://zotero/content/elements/tabsMenuPanel.js'],
@@ -344,6 +348,8 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/itemTreeMe
 		if (target.tagName !== "menulist") return;
 		if (event.metaKey || event.ctrlKey || event.altKey || event.shiftKey) return;
 		if (event.key !== " ") return;
+		// A find-as-you-type search in progress is typing a name with a space in it
+		if (Zotero.Utilities.Internal.isMenuFindAsYouTypeActive(target)) return;
 
 		if (target.open) {
 			// Simulate blinking of the selected menuitem on macOS (same as on Return keypress)
@@ -438,7 +444,6 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/itemTreeMe
 			}
 		],
 		mac: [
-			"wizard",
 			{
 				element: "dialog",
 				// The `attachShadow` are cleared in <dialog>, we need to monkey-patch after `connectedCallback`.
diff --git a/chrome/content/zotero/elements/abstractBox.js b/chrome/content/zotero/elements/abstractBox.js
index ca8632dd3b..fb2cd73370 100644
--- a/chrome/content/zotero/elements/abstractBox.js
+++ b/chrome/content/zotero/elements/abstractBox.js
@@ -138,7 +138,13 @@
 					throw new Error('Item has not been added to library');
 				}
 				this._item.setField('abstractNote', this._abstractField.value);
-				await this._item.saveTx();
+				await this._item.saveTx({
+					undoAction: 'undo-action-edit-field',
+					undoActionArgs: {
+						field: Zotero.ItemFields.getLocalizedString('abstractNote'),
+						count: 1
+					}
+				});
 			}
 			this._forceRenderAll();
 		}
diff --git a/chrome/content/zotero/elements/advancedSearchDeck.js b/chrome/content/zotero/elements/advancedSearchDeck.js
new file mode 100644
index 0000000000..56faf28012
--- /dev/null
+++ b/chrome/content/zotero/elements/advancedSearchDeck.js
@@ -0,0 +1,83 @@
+/*
+	***** BEGIN LICENSE BLOCK *****
+
+	Copyright © 2025 Corporation for Digital Scholarship
+					 Vienna, Virginia, USA
+					 https://www.zotero.org
+
+	This file is part of Zotero.
+
+	Zotero is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	Zotero is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+	***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+{
+	class AdvancedSearchDeck extends XULElementBase {
+		content = MozXULElement.parseXULToFragment(`
+			<deck>
+				<advanced-search-pane id="zotero-temporary-advanced-search-pane" type="temporary"/>
+				<advanced-search-pane id="zotero-saved-advanced-search-pane" type="saved"/>
+			</deck>
+		`);
+
+		init() {
+			this.hidden = true;
+			this._state = 'closed';
+			
+			this.deck = this.firstChild;
+		}
+
+		get state() {
+			return this._state;
+		}
+
+		set state(state) {
+			switch (state) {
+				case 'open':
+					this.hidden = false;
+					break;
+				case 'collapsed':
+				case 'closed':
+					this.hidden = true;
+					break;
+				default:
+					throw new Error('Invalid state: ' + state);
+			}
+			this._state = state;
+		}
+		
+		get selectedSearchType() {
+			return this.deck.selectedIndex === 0 ? 'temporary' : 'saved';
+		}
+		
+		set selectedSearchType(selectedSearchType) {
+			switch (selectedSearchType) {
+				case 'temporary':
+					this.deck.selectedIndex = 0;
+					break;
+				case 'saved':
+					this.deck.selectedIndex = 1;
+					break;
+			}
+		}
+		
+		get pane() {
+			return this.deck.selectedPanel;
+		}
+	}
+	customElements.define("advanced-search-deck", AdvancedSearchDeck);
+}
diff --git a/chrome/content/zotero/elements/advancedSearchPane.js b/chrome/content/zotero/elements/advancedSearchPane.js
new file mode 100644
index 0000000000..c3be83b149
--- /dev/null
+++ b/chrome/content/zotero/elements/advancedSearchPane.js
@@ -0,0 +1,407 @@
+/*
+	***** BEGIN LICENSE BLOCK *****
+
+	Copyright © 2025 Corporation for Digital Scholarship
+					 Vienna, Virginia, USA
+					 https://www.zotero.org
+
+	This file is part of Zotero.
+
+	Zotero is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	Zotero is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+	***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+{
+	class AdvancedSearchPane extends XULElementBase {
+		content = MozXULElement.parseXULToFragment(`
+			<hbox class="saved-search-name-row">
+				<label control="saved-search-name" data-l10n-id="new-collection-name"/>
+				<html:input type="text" id="saved-search-name"/>
+			</hbox>
+			<zoterosearch/>
+			<hbox class="advanced-search-buttons">
+				<button class="cancel-button" data-l10n-id="cancel-button"/>
+				<button class="search-button" data-l10n-id="search-button" default="true"/>
+				<button class="clear-button" data-l10n-id="clear-button"/>
+				<button class="save-button" data-l10n-id="save-search-new-button"/>
+			</hbox>
+		`);
+
+		_active = false;
+
+		init() {
+			this._nameField = this.querySelector('#saved-search-name');
+			this._searchElem = this.querySelector('zoterosearch');
+			this._cancelButton = this.querySelector('.cancel-button');
+			this._searchButton = this.querySelector('.search-button');
+			this._clearButton = this.querySelector('.clear-button');
+			this._saveButton = this.querySelector('.save-button');
+
+			this._searchElem.addEventListener('input', () => this._searchElem.updateSearch());
+			this._searchElem.addEventListener('command', () => this._searchElem.updateSearch());
+			
+			this._cancelButton.addEventListener('command', () => this.cancel());
+			this._searchButton.addEventListener('command', () => this.submit());
+			this._clearButton.addEventListener('command', () => this.clear());
+			this._saveButton.addEventListener('command', () => this.save());
+			
+			if (!['temporary', 'saved'].includes(this.type)) {
+				throw new Error(`Invalid type: ${this.type}`);
+			}
+			
+			if (this.type === 'saved') {
+				this._saveButton.setAttribute('default', 'true');
+				// Editing an existing search saves changes directly, so just "Save"
+				// (vs. "Save Search…" for creating a new one, which prompts for a name)
+				this._saveButton.setAttribute('data-l10n-id', 'save-search-edit-button');
+			}
+
+			this.addEventListener('keydown', this._handleKeyDown);
+		}
+
+		_handleKeyDown = async (event) => {
+			this._searchElem.updateSearch();
+			// Shift-Enter adds a new condition (handled by the search element), so
+			// don't run/save the search for it
+			if (event.key === 'Enter' && !event.shiftKey) {
+				// Enter on a focused button runs that button (which the platform only does
+				// for Space), not the pane's default action
+				let button = event.target.closest && event.target.closest('button, toolbarbutton');
+				if (button) {
+					button.click();
+					return;
+				}
+				if (this.type === 'temporary') {
+					await this.submit();
+				}
+				else {
+					await this.save();
+				}
+			}
+		};
+
+		/**
+		 * @returns {'temporary' | 'saved'}
+		 */
+		get type() {
+			return this.getAttribute('type');
+		}
+		
+		get search() {
+			return this._search;
+		}
+
+		/**
+		 * The ID of the saved search being edited, for type "saved"
+		 */
+		get editedSearchID() {
+			return this._searchID;
+		}
+		
+		/**
+		 * Whether the search has been submitted and should filter the items list
+		 */
+		get active() {
+			return this._active;
+		}
+		
+		set search(search) {
+			this._active = false;
+			if (this.type === 'saved') {
+				if (!search?.id) {
+					throw new Error('Cannot edit unsaved search');
+				}
+				this._searchID = search.id;
+				this._search = search.clone();
+				this._nameField.value = search.name;
+			}
+			else if (search) {
+				this._search = search.clone();
+			}
+			else {
+				this._search = new Zotero.Search();
+				// Default a fresh search to top-level items, so a condition on a child
+				// (e.g. attachment content) maps up to its item without any grouping
+				this._search.addCondition('resultLevel', 'item');
+				this._search.addCondition('title', 'contains', '');
+			}
+			this._searchElem.search = this._search;
+			this._loadedState = this.type === 'saved' ? this._getState() : null;
+		}
+		
+		/**
+		 * The editor's current name and conditions, for comparison against the state the
+		 * search was loaded with
+		 *
+		 * The search is serialized through the editor, since rendering an existing search
+		 * can normalize it (e.g., folding a legacy 'noChildren' condition into the result
+		 * level), and the normalized form is what a save would write.
+		 */
+		_getState() {
+			this._searchElem.updateSearch();
+			return {
+				name: this._nameField.value,
+				conditions: this._search.toJSON().conditions
+			};
+		}
+		
+		/**
+		 * Whether the name or conditions have been edited since the search was loaded,
+		 * for type "saved"
+		 */
+		get hasChanges() {
+			if (this.type !== 'saved') {
+				throw new Error('hasChanges is unsupported for temporary search');
+			}
+			if (!this._loadedState) {
+				return false;
+			}
+			let state = this._getState();
+			return state.name !== this._loadedState.name
+				|| state.conditions.length !== this._loadedState.conditions.length
+				|| state.conditions.some((condition, i) => !Zotero.Searches.conditionEquals(
+					condition, this._loadedState.conditions[i]
+				));
+		}
+		
+		_ensureSearch() {
+			if (!this._search && this.type === 'temporary') {
+				this.search = null;
+			}
+		}
+
+		// Allow saving at an editable library or group root (but not a feed) or with
+		// collections and/or saved searches selected within a single editable library,
+		// in which case the selection is added to the saved search as scope conditions
+		// (see _addScopeConditions())
+		_canSaveInSelection() {
+			let collectionTreeRows = ZoteroPane.getCollectionTreeRows();
+			if (!collectionTreeRows.length) {
+				return false;
+			}
+			let libraryID = collectionTreeRows[0].ref?.libraryID;
+			return collectionTreeRows.every((row) => {
+				if (row.ref?.libraryID !== libraryID || !row.editable) {
+					return false;
+				}
+				return (row.isLibrary(true) && !row.isFeed())
+					|| row.isCollection()
+					|| row.isSearch();
+			});
+		}
+
+		refresh() {
+			this._ensureSearch();
+			let libraryID = ZoteroPane.getSelectedLibraryIDs()[0];
+			// Keep the previous library when the selected row doesn't have one (e.g., Feeds)
+			if (libraryID) {
+				this._search.libraryID = libraryID;
+			}
+			// Set the libraries the search applies to: a temporary search spans all
+			// selected libraries, a saved search just its own. Used to scope value
+			// autocomplete and, when more than one library is involved, to drop the
+			// Collection/Saved Search condition, which can only resolve within one library.
+			if (this.type === 'temporary') {
+				let libraryIDs = [];
+				for (let row of ZoteroPane.getCollectionTreeRows()) {
+					let id = row.ref && row.ref.libraryID;
+					if (id !== undefined && id !== null && !libraryIDs.includes(id)) {
+						libraryIDs.push(id);
+					}
+				}
+				this._searchElem.scopeLibraryIDs = libraryIDs;
+			}
+			else {
+				this._searchElem.scopeLibraryIDs = [this._search.libraryID];
+			}
+			this._searchElem.search = this._search;
+			this._saveButton.disabled = this.type === 'temporary' && !this._canSaveInSelection();
+		}
+
+		async cancel() {
+			await ZoteroPane.setSavedSearchEditorState('closed');
+		}
+
+		async submit() {
+			if (this.type === 'saved') {
+				throw new Error('submit() is unsupported for saved search');
+			}
+
+			this._searchElem.updateSearch();
+			this._active = true;
+			await ZoteroPane.itemsView.setFilter('advanced-search', this._search);
+		}
+		
+		async clear() {
+			if (this.type === 'saved') {
+				throw new Error('clear() is unsupported for saved search');
+			}
+
+			this.search = null;
+			await ZoteroPane.itemsView.setFilter('advanced-search', null);
+		}
+
+		async save() {
+			this._searchElem.updateSearch();
+			
+			if (this.type === 'saved') {
+				let search = Zotero.Searches.get(this._searchID);
+				if (!search) {
+					throw new Error('Missing search');
+				}
+				search.fromJSON(this._search.toJSON());
+				search.name = this._nameField.value;
+				await search.saveTx();
+				await ZoteroPane.setSavedSearchEditorState('closed');
+				Zotero_Tabs.rename('zotero-pane', search.name);
+				return;
+			}
+
+			let collectionTreeRows = ZoteroPane.getCollectionTreeRows();
+			if (!this._canSaveInSelection()) {
+				throw new Error('Can only save in an editable library, collection, or saved search');
+			}
+			this._ensureSearch();
+
+			let libraryID = collectionTreeRows[0].ref.libraryID;
+			let searches = await Zotero.Searches.getAll(libraryID);
+			let prefix = Zotero.getString('pane.collections.untitled');
+			let defaultName = Zotero.Utilities.Internal.getNextName(
+				prefix,
+				searches.map(s => s.name).filter(n => n.startsWith(prefix))
+			);
+
+			// Prompt for a name, defaulting to the next "Untitled" name
+			let [title, message] = await document.l10n.formatValues([
+				'save-search-name-title',
+				'save-search-name-message'
+			]);
+			let nameObj = { value: defaultName };
+			if (!Services.prompt.prompt(window, title, message, nameObj, null, {})) {
+				return;
+			}
+			let name = nameObj.value.trim() || defaultName;
+
+			let search = this._search.clone(libraryID);
+			search.name = name;
+			// If saving within collections or saved searches rather than at the library
+			// root, scope the search to the selection
+			if (!collectionTreeRows.some(row => row.isLibrary(true))) {
+				this._addScopeConditions(search, collectionTreeRows);
+			}
+			await search.saveTx();
+
+			await ZoteroPane.setAdvancedSearchState('closed');
+		}
+		
+		// Scope a search to the given collection/saved search rows by adding a top-level
+		// collection/savedSearch condition for each -- an 'any' group of them when more
+		// than one row is selected. If the search's own join mode is 'any', its existing
+		// conditions move into an 'any' group of their own so the scope conditions apply
+		// to every result.
+		_addScopeConditions(search, collectionTreeRows) {
+			let conditions = Object.values(search.getConditions());
+			
+			// Split the existing conditions into top-level markers/flags, which are
+			// position-independent and stay at the top level, and the rest, which may get
+			// wrapped in a group below. The search always comes from updateSearch(), so
+			// these are the only markers/flags that can appear at the top level.
+			const FLAGS = ['resultLevel', 'recursive', 'includeParentsAndChildren'];
+			let joinMode = 'all';
+			let flags = [];
+			let rest = [];
+			let depth = 0;
+			// Number of top-level conditions and groups -- a single one doesn't need wrapping
+			let units = 0;
+			for (let condition of conditions) {
+				if (condition.condition == 'groupStart') {
+					if (!depth) {
+						units++;
+					}
+					depth++;
+					rest.push(condition);
+				}
+				else if (condition.condition == 'groupEnd') {
+					depth--;
+					rest.push(condition);
+				}
+				else if (!depth && condition.condition == 'joinMode') {
+					joinMode = condition.operator;
+				}
+				else if (!depth && FLAGS.includes(condition.condition)) {
+					flags.push(condition);
+				}
+				else {
+					if (!depth) {
+						units++;
+					}
+					rest.push(condition);
+				}
+			}
+			
+			let scope = collectionTreeRows.map(row => ({
+				condition: row.isCollection() ? 'collection' : 'savedSearch',
+				operator: 'is',
+				value: row.ref.key
+			}));
+			// Search subcollections when the collections view does
+			if (Zotero.Prefs.get('recursiveCollections')
+					&& scope.some(c => c.condition == 'collection')
+					&& !flags.some(c => c.condition == 'recursive')) {
+				flags.push({ condition: 'recursive', operator: 'true', value: null });
+			}
+			if (scope.length > 1) {
+				scope = [
+					{ condition: 'groupStart', operator: 'true', value: '' },
+					{ condition: 'joinMode', operator: 'any', value: null },
+					...scope,
+					{ condition: 'groupEnd', operator: 'true', value: '' }
+				];
+			}
+			if (joinMode == 'any' && units > 1) {
+				rest = [
+					{ condition: 'groupStart', operator: 'true', value: '' },
+					{ condition: 'joinMode', operator: 'any', value: null },
+					...rest,
+					{ condition: 'groupEnd', operator: 'true', value: '' }
+				];
+			}
+			
+			// Rebuild the search's conditions in the new order. removeCondition()
+			// renumbers the remaining conditions, so 0 is always the next one to remove.
+			let count = conditions.length;
+			for (let i = 0; i < count; i++) {
+				search.removeCondition(0);
+			}
+			for (let condition of [...scope, ...rest, ...flags]) {
+				search.addCondition(
+					condition.condition + (condition.mode ? '/' + condition.mode : ''),
+					condition.operator,
+					condition.value
+				);
+			}
+		}
+		
+		focus(options) {
+			let menu = this._searchElem.querySelector('#conditionsmenu');
+			// focusVisible so the focus ring shows even though we're focusing
+			// programmatically (in response to a click)
+			menu.focus({ focusVisible: true, ...options });
+		}
+	}
+	customElements.define("advanced-search-pane", AdvancedSearchPane);
+}
diff --git a/chrome/content/zotero/elements/attachmentBox.js b/chrome/content/zotero/elements/attachmentBox.js
index 160b90328e..19433434d6 100644
--- a/chrome/content/zotero/elements/attachmentBox.js
+++ b/chrome/content/zotero/elements/attachmentBox.js
@@ -593,7 +593,7 @@
 				}
 				
 				if (show) {
-					reindexButton.setAttribute('hidden', false);
+					reindexButton.removeAttribute('hidden');
 				}
 				else {
 					reindexButton.setAttribute('hidden', true);
@@ -765,7 +765,13 @@
 
 		_handleTitleBlur = () => {
 			this.item.setField('title', this._id('title').value);
-			this.item.saveTx();
+			this.item.saveTx({
+				undoAction: 'undo-action-edit-field',
+				undoActionArgs: {
+					field: Zotero.ItemFields.getLocalizedString('title'),
+					count: 1
+				}
+			});
 		};
 
 		_handleFileNameFocus = () => {
diff --git a/chrome/content/zotero/elements/attachmentRow.js b/chrome/content/zotero/elements/attachmentRow.js
index 72fc1f705b..3f282a134a 100644
--- a/chrome/content/zotero/elements/attachmentRow.js
+++ b/chrome/content/zotero/elements/attachmentRow.js
@@ -39,7 +39,7 @@ import { getCSSItemTypeIcon } from 'components/icons';
 					<html:span class="icon"/>
 					<html:span class="label"/>
 				</html:div>
-				<toolbarbutton class="zotero-clicky zotero-clicky-minus" tabindex="0" data-l10n-id="section-button-remove" disabled="false">
+				<toolbarbutton class="zotero-clicky zotero-clicky-minus" tabindex="0" data-l10n-id="section-button-remove">
 					<image class="toolbarbutton-icon"/>
 					<label class="toolbarbutton-text" />
 				</toolbarbutton>
diff --git a/chrome/content/zotero/elements/bubbleInput.js b/chrome/content/zotero/elements/bubbleInput.js
index 6f93259659..5cac125669 100644
--- a/chrome/content/zotero/elements/bubbleInput.js
+++ b/chrome/content/zotero/elements/bubbleInput.js
@@ -36,6 +36,7 @@
 			this._body = this.querySelector('.bubble-input.body');
 			this._body.addEventListener('click', this._onBodyClick.bind(this));
 			this._lastFocusedInput = null;
+			this.showJustAddedPlaceholder = false;
 
 			Utils.init(this);
 			DragDropHandler.init(this);
@@ -123,11 +124,10 @@
 			if (isOnlyInput) {
 				document.l10n.setAttributes(this._body.firstChild, `integration-citationDialog-single-input-${dialogType}`);
 			}
-			// otherwise, add a regular aria descriptions and placeholders to all inputs
+			// otherwise, set default placeholders for all inputs, with special handling
+			// of the last input after a bubble is added with visible placeholder
 			else {
-				for (let input of [...this.querySelectorAll(".input")]) {
-					document.l10n.setAttributes(input, `integration-citationDialog-input-${dialogType}`);
-				}
+				Utils.setupInputPlaceholders(this.showJustAddedPlaceholder, dialogType);
 			}
 			// If any two inputs end up next to each other (e.g. after bubble is deleted),
 			// have them merged
@@ -339,10 +339,20 @@
 				Utils.notifyDialog("handle-input", { query: input.value, eventType: "focus" });
 			});
 			input.addEventListener("blur", async (event) => {
+				// When the window itself loses focus (e.g., Cmd/Alt-Tab to another app),
+				// the input remains focused, so keep its state unchanged
+				if (!document.hasFocus()) return;
 				// record this input as last focused if it's not empty OR if the focus left bubbleInput altogether
 				if (!Utils.isInputEmpty(input) || !this.contains(event.relatedTarget)) {
 					this._lastFocusedInput = input;
 				}
+				// Collapse a placeholder input back to regular size once focus leaves.
+				// The placeholder attributes are reset on the next refresh()
+				if (input.classList.contains("just-added-placeholder")) {
+					input.classList.remove("just-added-placeholder");
+					input.removeAttribute("title");
+					input.style.minWidth = "";
+				}
 			});
 			return input;
 		}
@@ -604,6 +614,87 @@
 			return spanWidth;
 		},
 
+		getTextWidth(text) {
+			let span = document.createElement("span");
+			span.classList = "input";
+			span.innerText = text;
+			this.bubbleInput._body.appendChild(span);
+			let spanWidth = span.getBoundingClientRect().width;
+			span.remove();
+			return spanWidth;
+		},
+
+		// Return the longest prefix of `text` such that prefix + "…" fits within maxWidth,
+		// or the original text if it already fits. Used for placeholder truncation, since
+		// text-overflow:ellipsis doesn't work on <input> in Firefox chrome.
+		truncateToWidth(text, maxWidth) {
+			if (this.getTextWidth(text) <= maxWidth) return text;
+			let ellipsis = "…";
+			for (let i = text.length - 1; i > 0; i--) {
+				let candidate = text.slice(0, i) + ellipsis;
+				if (this.getTextWidth(candidate) <= maxWidth) {
+					return candidate;
+				}
+			}
+			return ellipsis;
+		},
+
+		// Set aria-descriptions and placeholders on every input in the bubble-input.
+		// For the just-added input (the last one, when showJustAddedPlaceholder is set), the
+		// placeholder is truncated to the space remaining on its line and passed to Fluent as
+		// a variable.
+		setupInputPlaceholders(showJustAddedPlaceholder, dialogType) {
+			let allInputs = [...this.bubbleInput.querySelectorAll(".input")];
+			let lastInput = allInputs[allInputs.length - 1];
+			let bodyRight = this.bubbleInput._body.getBoundingClientRect().right;
+			for (let input of allInputs) {
+				let isJustAdded = showJustAddedPlaceholder && input === lastInput;
+				if (!isJustAdded) {
+					// If the just-added placeholder was dismissed (e.g. by right-arrow at the
+					// end of the input) while the input is still focused and empty, keep the
+					// visible placeholder but fall back to the default search prompt, since
+					// searching still works. It collapses when the input loses focus (see the
+					// blur handler in _createInputElem())
+					if (input.classList.contains("just-added-placeholder")
+							&& document.activeElement == input && !input.value) {
+						let placeholder = this.truncateToWidth(
+							" " + Zotero.getString("integration-citationDialog-search-for-items"),
+							parseFloat(input.style.minWidth) || Infinity);
+						document.l10n.setAttributes(input, "integration-citationDialog-just-added-input-citation", { placeholder, title: "" });
+						continue;
+					}
+					input.classList.remove("just-added-placeholder");
+					document.l10n.setAttributes(input, `integration-citationDialog-input-${dialogType}`);
+					// Clear any stale title and min-width left over from a previous just-added state
+					input.removeAttribute("title");
+					input.style.minWidth = "";
+				}
+				if (isJustAdded && !input.classList.contains("just-added-placeholder")) {
+					input.classList.add("just-added-placeholder");
+					// Leading NBSP gives a small visual gap between the cursor and the placeholder
+					// text (CSS padding/text-indent on input or ::placeholder both move the cursor too)
+					let fullPlaceholder = " " + Zotero.getString("integration-citationDialog-just-added-input-placeholder");
+					let availableWidth = bodyRight - input.getBoundingClientRect().left - 20;
+					let placeholderWidth = this.getTextWidth(fullPlaceholder);
+					let placeholder, title, minWidth;
+					if (availableWidth >= placeholderWidth) {
+						placeholder = fullPlaceholder;
+						title = "";
+						minWidth = placeholderWidth;
+					}
+					else {
+						placeholder = this.truncateToWidth(fullPlaceholder, availableWidth);
+						title = fullPlaceholder;
+						minWidth = availableWidth;
+					}
+					// min-width keeps the placeholder visible when the input is empty, but
+					// lets the input grow to fit content the user types beyond the placeholder.
+					input.style.minWidth = minWidth + 'px';
+					document.l10n.setAttributes(input, "integration-citationDialog-just-added-input-citation", { placeholder, title });
+				}
+			}
+		},
+
 		// If a bubble is removed between two inputs we need to combine them
 		combineNeighboringInputs(startingNode) {
 			let node = startingNode;
diff --git a/chrome/content/zotero/elements/collapsibleSection.js b/chrome/content/zotero/elements/collapsibleSection.js
index a5335b9497..c509da76db 100644
--- a/chrome/content/zotero/elements/collapsibleSection.js
+++ b/chrome/content/zotero/elements/collapsibleSection.js
@@ -43,7 +43,8 @@
 		set open(newOpen) {
 			newOpen = !!newOpen;
 			let oldOpen = this.open;
-			if (oldOpen === newOpen || this.empty || !this.collapsible) return;
+			if (oldOpen === newOpen || this.empty) return;
+			if (!newOpen && !this.collapsible) return;
 			this.render();
 			
 			// Force open before getting scrollHeight, so we get the right value
@@ -118,9 +119,22 @@
 				this.setAttribute('no-collapse', val);
 			}
 		}
-		
+
+		get showContextMenu() {
+			return !this.getAttribute("no-context-menu");
+		}
+
+		set showContextMenu(val) {
+			if (val) {
+				this.removeAttribute('no-context-menu');
+			}
+			else {
+				this.setAttribute('no-context-menu', val);
+			}
+		}
+
 		static get observedAttributes() {
-			return ['open', 'empty', 'label', 'summary', 'extra-buttons'];
+			return ['open', 'empty', 'label', 'summary', 'extra-buttons', 'no-collapse'];
 		}
 		
 		attributeChangedCallback(name) {
@@ -348,7 +362,7 @@
 		}
 		
 		_saveOpenState() {
-			if (this._disableSavingOpenState) return;
+			if (this._disableSavingOpenState || this._skipSaveOpenState) return;
 			Zotero.Prefs.set(`panes.${this.dataset.pane}.open`, this.open);
 		}
 		
@@ -383,11 +397,11 @@
 		}
 
 		get _disableContextMenu() {
-			return !this._getSidenav() || !!this.closest('annotation-items-pane');
+			return !this._getSidenav() || !this.showContextMenu || !!this.closest('annotation-items-pane');
 		}
 
 		_handleClick = (event) => {
-			if (this._disableCollapsing) return;
+			if (this._disableCollapsing || !this.collapsible) return;
 			if (event.target.closest('.section-custom-button, menupopup')) return;
 			this.open = !this.open;
 		};
@@ -417,7 +431,7 @@
 			}
 			// Space/Enter toggle section open/closed.
 			// ArrowLeft/ArrowRight on actual header will close/open (depending on locale direction)
-			if (["ArrowLeft", "ArrowRight", " ", "Enter"].includes(event.key) && !this._disableCollapsing) {
+			if (["ArrowLeft", "ArrowRight", " ", "Enter"].includes(event.key) && !this._disableCollapsing && this.collapsible) {
 				stopEvent();
 				this.open = ([" ", "Enter"].includes(event.key)) ? !this.open : (event.key == Zotero.arrowNextKey);
 				event.target.focus();
@@ -480,7 +494,7 @@
 			this._title.textContent = this.label;
 			this._summary.textContent = this.summary;
 			let twisty = this._head.querySelector('.twisty');
-			twisty.hidden = this._disableCollapsing;
+			twisty.hidden = this._disableCollapsing || !this.collapsible;
 			document.l10n.setAttributes(twisty, `section-button-${this.open ? "collapse" : "expand"}`, { section: this._paneName || "" });
 		}
 	}
diff --git a/chrome/content/zotero/elements/contextPane.js b/chrome/content/zotero/elements/contextPane.js
index 2728d55c8f..130bb6f13e 100644
--- a/chrome/content/zotero/elements/contextPane.js
+++ b/chrome/content/zotero/elements/contextPane.js
@@ -224,9 +224,9 @@
 				else {
 					this._disableNotesContext();
 				}
-				_contextPaneSplitter.setAttribute('hidden', false);
+				_contextPaneSplitter.removeAttribute('hidden');
 
-				_contextPane.setAttribute('collapsed', !(_contextPaneSplitter.getAttribute('state') != 'collapsed'));
+				_contextPane.toggleAttribute('collapsed', _contextPaneSplitter.getAttribute('state') == 'collapsed');
 				
 				this._sidenav.hidden = false;
 
diff --git a/chrome/content/zotero/elements/editableText.js b/chrome/content/zotero/elements/editableText.js
index 22bf14ade1..c0d3a54a32 100644
--- a/chrome/content/zotero/elements/editableText.js
+++ b/chrome/content/zotero/elements/editableText.js
@@ -38,9 +38,7 @@
 
 	class EditableText extends XULElementBase {
 		_input;
-		
-		_resizeObserver;
-		
+
 		_ignoredWindowInactiveBlur = false;
 		
 		_focusMousedownEvent = false;
@@ -76,7 +74,30 @@
 			});
 			return span;
 		}
-		
+
+		/**
+		 * A single ResizeObserver shared by every EditableText in the document.
+		 * When inputs resize, recompute the 'overflowing' state for all affected
+		 * fields at once, batching layout reads before writes:
+		 * toggling 'overflowing' makes the layout dirty, and measuring the width
+		 * requires a clean layout, so interleaving the two would force a reflow
+		 * per measurement, which adds up to multiple seconds of layout
+		 * calculations on outlier items with thousands of creators.
+		 *
+		 * See {@link #batchSizeToContent()}.
+		 */
+		static _resizeObserver = new ResizeObserver((entries) => {
+			let editableTexts = entries
+				.map(entry => entry.target.closest('editable-text'))
+				.filter(editableText => editableText?._input);
+			// Read phase: measure everything first
+			let overflowing = editableTexts.map(editableText => editableText._isOverflowing());
+			// Write phase: apply the class changes in one batch
+			for (let i = 0; i < editableTexts.length; i++) {
+				editableTexts[i].classList.toggle('overflowing', overflowing[i]);
+			}
+		});
+
 		get noWrap() {
 			return this.hasAttribute('nowrap');
 		}
@@ -137,6 +158,14 @@
 			this.setAttribute('value', value || '');
 		}
 		
+		get values() {
+			return this._values ? this._values : [this.value];
+		}
+		
+		set values(values) {
+			this._values = values;
+		}
+		
 		get initialValue() {
 			return this._input?.dataset.initialValue ?? '';
 		}
@@ -180,6 +209,23 @@
 			return this._input;
 		}
 
+		get multipleValues() {
+			return this.hasAttribute('multiple-values');
+		}
+		
+		set multipleValues(multipleValues) {
+			this.toggleAttribute('multiple-values', !!multipleValues);
+		}
+		
+		// true if the value is unchanged since the last blur event. Relevant for batch editing.
+		get cancelled() {
+			return this.hasAttribute('cancelled');
+		}
+
+		set cancelled(cancelled) {
+			this.toggleAttribute('cancelled', !!cancelled);
+		}
+
 		_resetTextDirection() {
 			this._input?.removeAttribute('dir');
 		}
@@ -199,6 +245,27 @@
 		sizeToContent = () => {
 			this.style.maxWidth = this._getContentWidth() + 'px';
 		};
+
+		/**
+		 * Size multiple elements to their content in a single batch.
+		 *
+		 * sizeToContent() reads layout and then updates layout styles.
+		 * Calling it once per element interleaves those reads and writes,
+		 * forcing a full synchronous reflow on every call. That's extremely
+		 * slow, especially if it occurs in a loop that also adds new elements
+		 * to the DOM on each iteration, as in the InfoBox.
+		 * Measuring everything first and only then applying the widths collapses
+		 * that to a single reflow regardless of how many elements are sized.
+		 *
+		 * @param {EditableText[]} elements
+		 */
+		static batchSizeToContent(elements) {
+			elements = [...elements];
+			let widths = elements.map(el => el._getContentWidth());
+			for (let i = 0; i < elements.length; i++) {
+				elements[i].style.maxWidth = widths[i] + 'px';
+			}
+		}
 		
 		attributeChangedCallback(name) {
 			if (name === 'value' || name === 'dir') {
@@ -211,6 +278,13 @@
 			this.render();
 		}
 
+		destroy() {
+			// Stop the shared observer from holding a reference to our input
+			if (this._input) {
+				EditableText._resizeObserver.unobserve(this._input);
+			}
+		}
+
 		render() {
 			let autocompleteParams = this.autocomplete;
 			let autocompleteEnabled = !this.multiline && !!autocompleteParams;
@@ -245,6 +319,7 @@
 					this.removeEventListener('keydown', this._captureAutocompleteKeydown, true);
 				}
 				
+				let oldInput = this._input;
 				let focused = this.focused;
 				let selectionStart = this._input?.selectionStart;
 				let selectionEnd = this._input?.selectionEnd;
@@ -268,14 +343,22 @@
 					this._input.setSelectionRange(selectionStart, selectionEnd, selectionDirection);
 				}
 				
-				this._resizeObserver?.disconnect();
+				if (oldInput) {
+					EditableText._resizeObserver.unobserve(oldInput);
+				}
+				// Only nowrap fields can overflow horizontally; textareas wrap
 				if (this.noWrap) {
-					this._resizeObserver = new ResizeObserver(this._handleInputResize);
-					this._resizeObserver.observe(this._input);
+					EditableText._resizeObserver.observe(this._input);
 				}
 			}
 			this._input.readOnly = this.readOnly;
-			this._input.placeholder = this.placeholder;
+			this._input.removeAttribute('tabindex');
+			// Read-only multiple-values fields are focusable (for keyboard access) but
+			// can't be edited, so keep their "Multiple" placeholder visible while focused.
+			// Editable fields clear it on focus (see _handleFocus), so don't reset it here.
+			if (!(this.multipleValues && this.focused && !this.readOnly)) {
+				this._input.placeholder = this.placeholder;
+			}
 
 			if (this._input.tagName == "textarea") {
 				// Reset to initial state
@@ -381,6 +464,9 @@
 				this._ignoredWindowInactiveBlur = false;
 				return;
 			}
+			
+			this.cancelled = false;
+			this._clearValue = false;
 
 			let valueBeforeFocus = this.value;
 			this.dispatchEvent(new CustomEvent('focus'));
@@ -400,7 +486,17 @@
 			}
 
 			if (!('initialValue' in this._input.dataset)) {
-				this._input.dataset.initialValue = this._input.value;
+				this._input.dataset.initialValue = this.value;
+			}
+			
+			if (this.multipleValues) {
+				if (!this.readOnly) {
+					this._input.placeholder = '';
+				}
+				this._input.value = '';
+				if (this._input.mController) {
+					this._input.mController.startSearch("");
+				}
 			}
 		};
 		
@@ -410,12 +506,22 @@
 				this._ignoredWindowInactiveBlur = true;
 				return;
 			}
+
+			if (this.multipleValues) {
+				if (this.cancelled || (this._input.value === '' && !this._clearValue)) {
+					this.value = '';
+					this.placeholder = Zotero.getString('item-pane-batch-editing-multiple-values-placeholder');
+					this.cancelled = true;
+				}
+			}
+			
 			this.dispatchEvent(new Event('blur'));
 			this._resetStateAfterBlur();
 		};
 		
 		_resetStateAfterBlur() {
 			this._ignoredWindowInactiveBlur = false;
+			this._clearValue = false;
 			this._focusMousedownEvent = null;
 			this.classList.remove('focused');
 			this._input.scrollLeft = 0;
@@ -436,9 +542,14 @@
 				}
 			}
 			else if (event.key === 'Escape') {
-				let initialValue = this._input.dataset.initialValue ?? '';
-				this.setAttribute('value', initialValue);
-				this._input.value = initialValue;
+				if (this.multipleValues) {
+					this.cancelled = true;
+				}
+				else {
+					let initialValue = this._input.dataset.initialValue ?? '';
+					this.setAttribute('value', initialValue);
+					this._input.value = initialValue;
+				}
 				this._input.blur();
 			}
 		};
@@ -497,10 +608,10 @@
 			}
 		};
 		
-		_handleInputResize = () => {
+		_isOverflowing() {
 			// Very small floating-point-error allowance
 			const EPSILON = 0.001;
-			this.classList.toggle('overflowing',
+			return (
 				// We're overflowing if the field can scroll at least a pixel
 				this._input.scrollLeftMax > 0
 				// But sometimes it can scroll a *sub*pixel, and every single
@@ -513,7 +624,7 @@
 					&& this._getContentWidth() > this._input.getBoundingClientRect().width + EPSILON
 				)
 			);
-		};
+		}
 
 		focus(options) {
 			// If the window isn't active, the focus event won't fire yet,
diff --git a/chrome/content/zotero/elements/fileRenamingSettings.js b/chrome/content/zotero/elements/fileRenamingSettings.js
index 649aa09923..1b070d88b3 100644
--- a/chrome/content/zotero/elements/fileRenamingSettings.js
+++ b/chrome/content/zotero/elements/fileRenamingSettings.js
@@ -25,6 +25,7 @@
 
 {
 	const { DEFAULT_ATTACHMENT_RENAME_TEMPLATE } = ChromeUtils.importESModule("chrome://zotero/content/renameFiles.mjs");
+	const { isTemplateValid } = ChromeUtils.importESModule("chrome://zotero/content/modules/templates.mjs");
 	const DEFAULT_EXT = 'pdf';
 	class FileRenameSettings extends XULElementBase {
 		content = MozXULElement.parseXULToFragment(`
@@ -102,14 +103,21 @@
 						id="file-renaming-format-template"
 						rows="8"
 					/>
-					<html:label id="file-renaming-format-preview-label">
-						<html:h2
-							data-l10n-id="file-renaming-format-preview"
+					<html:div id="file-renaming-format-preview-section">
+						<html:label id="file-renaming-format-preview-label">
+							<html:h2
+								data-l10n-id="file-renaming-format-preview"
+							/>
+						</html:label>
+						<html:label
+							aria-labelledby="file-renaming-format-preview-label"
+							id="file-renaming-format-preview"
 						/>
-					</html:label>
-					<html:label
-						aria-labelledby="file-renaming-format-preview-label"
-						id="file-renaming-format-preview"
+					</html:div>
+					<label
+						id="file-renaming-template-invalid"
+						class="is-hidden"
+						data-l10n-id="file-renaming-template-invalid"
 					/>
 				</groupbox>
 			</vbox>
@@ -176,6 +184,27 @@
 			this.formatTemplateTextarea.value = val;
 		}
 
+		get templateValid() {
+			return this._isTemplateValid(this.formatTemplate);
+		}
+
+		// Validate `template`, memoizing the last result. Normalize first so the dialog judges the
+		// same string the rename engine validates and renders (see Zotero.Attachments.normalizeRenameTemplate)
+		_isTemplateValid(template) {
+			let normalized = Zotero.Attachments.normalizeRenameTemplate(template);
+			if (normalized !== this._validatedTemplate) {
+				this._validatedTemplate = normalized;
+				this._validatedResult = this._validateTemplate(normalized);
+			}
+			return this._validatedResult;
+		}
+
+		// Engine parse behind an instance method, so tests can count parses (a frozen ESM
+		// namespace export cannot be spied directly)
+		_validateTemplate(normalized) {
+			return isTemplateValid(normalized);
+		}
+
 		handleChange = () => {
 			let autoRenameEnabled = this.autoRenameEnabled;
 			let enabledFileTypes = this.enabledFileTypes;
@@ -195,11 +224,17 @@
 
 		handleTemplateInput = () => {
 			let formatString = this.formatTemplateTextarea.value;
-			// Ignore the empty value, which we'll reset in handleInputBlur() if necessary
+			// A whitespace-only value will be reset to the default on blur; preview the default
+			// (so any stale syntax-error message clears) but don't propagate the change yet
 			if (formatString.replace(/\s/g, '') === '') {
+				this._renderPreview(DEFAULT_ATTACHMENT_RENAME_TEMPLATE);
 				return;
 			}
-			this.updatePreview();
+			// Keep showing the previous preview while the user types through an invalid state.
+			// If the template is still invalid on blur, handleTemplateBlur() will show the error.
+			if (this.templateValid) {
+				this.updatePreview();
+			}
 			this.handleChange();
 		};
 
@@ -210,6 +245,9 @@
 				this.updatePreview();
 				this.handleChange();
 			}
+			else {
+				this.updatePreview();
+			}
 		};
 
 		handleRenameToggle = () => {
@@ -227,9 +265,20 @@
 			this.formatTemplateTextarea.readOnly = readonly;
 		};
 
+		// Note: also used as an onSelect listener, so it must take no positional arguments
 		updatePreview = () => {
+			this._renderPreview(this.formatTemplate);
+		};
+
+		_renderPreview = (formatString) => {
+			let valid = this._isTemplateValid(formatString);
+			this.previewSection.classList.toggle('is-hidden', !valid);
+			this.invalidMessage.classList.toggle('is-hidden', valid);
+			if (!valid) {
+				return;
+			}
+
 			let [item, ext, attachmentTitle] = this.getActiveItem() ?? [this.mockItem ?? this.makeMockItem(), DEFAULT_EXT, ''];
-			let formatString = this.formatTemplate;
 			let preview = Zotero.Attachments.getFileBaseNameFromItem(item, { formatString, attachmentTitle });
 			this.querySelector('#file-renaming-format-preview').innerText = `${preview}.${ext}`;
 		};
@@ -242,6 +291,8 @@
 			this.fileTypesCheckboxes = this.querySelector('#file-renaming-file-types-box');
 			this.renameLinkedCheckbox = this.querySelector('#rename-linked-files');
 			this.formatTemplateTextarea = this.querySelector('#file-renaming-format-template');
+			this.previewSection = this.querySelector('#file-renaming-format-preview-section');
+			this.invalidMessage = this.querySelector('#file-renaming-template-invalid');
 			this.enabledFileTypes = this.getAttribute('file-types') ?? '';
 			this.autoRenameEnabled = this.getAttribute('auto-rename-enabled') === 'true';
 			this.renameLinkedCheckbox.checked = this.getAttribute('rename-linked-enabled') === 'true';
diff --git a/chrome/content/zotero/elements/guidancePanel.js b/chrome/content/zotero/elements/guidancePanel.js
index e65482be14..dfd56e3552 100644
--- a/chrome/content/zotero/elements/guidancePanel.js
+++ b/chrome/content/zotero/elements/guidancePanel.js
@@ -161,7 +161,7 @@ const getAnchorOffset = (anchorEl, popoverEl, padding = 5) => {
 				// If the anchor element is inside another frame, create a proxy
 				// element in the parent document at the anchor's visual location
 				if (forEl.ownerDocument !== document) {
-					let iframe = forEl.ownerGlobal.frameElement;
+					let iframe = forEl.documentGlobal.frameElement;
 					if (iframe) {
 						let iframeRect = iframe.getBoundingClientRect();
 						let forElRect = forEl.getBoundingClientRect();
diff --git a/chrome/content/zotero/elements/itemBox.js b/chrome/content/zotero/elements/itemBox.js
index e87a96916e..b87f7c392e 100644
--- a/chrome/content/zotero/elements/itemBox.js
+++ b/chrome/content/zotero/elements/itemBox.js
@@ -54,6 +54,8 @@
 			this.eventHandlers = [];
 			this.itemTypeMenu = null;
 			
+			this._extraItems = [];
+			this._unionFieldDescriptors = null;
 			this._mode = 'view';
 			this._visibleFields = [];
 			this._hiddenFields = [];
@@ -67,6 +69,9 @@
 			this._selectFieldValue = null;
 			this._selectFieldSelection = null;
 			this._addCreatorRow = false;
+			this._addingCreatorRowsInBulk = false;
+			this._needsUnsavedCreatorRemoval = false;
+			this._pendingCreatorSizing = [];
 			this._switchedModeOfCreator = null;
 			this._popupNode = null;
 
@@ -126,7 +131,7 @@
 		}
 		
 		get _renderDependencies() {
-			return [...super._renderDependencies, this.collectionTreeRow?.id];
+			return [...super._renderDependencies, this.collectionTreeRows?.map(o => o.id).join(',')];
 		}
 		
 		init() {
@@ -279,6 +284,19 @@
 				this.updateCustomRowProperty(rowElem);
 			}
 		}
+
+		get extraItems() {
+			return this._extraItems;
+		}
+
+		set extraItems(val) {
+			if (!Array.isArray(val)) {
+				return;
+			}
+			this._extraItems = val.filter(item => item instanceof Zotero.Item && item.isRegularItem());
+			this._unionFieldDescriptors = null;
+			this._resetRenderedFlags();
+		}
 		
 		// .ref is an alias for .item
 		get ref() {
@@ -404,7 +422,8 @@
 				this.renderCustomRows(ids);
 				return;
 			}
-			if (event == 'modify' && this.item?.id && ids.includes(this.item.id)) {
+			if (event == 'modify' && this.item?.id
+					&& (ids.includes(this.item.id) || this._extraItems?.some(item => ids.includes(item.id)))) {
 				this._forceRenderAll();
 			}
 			if (event === 'select' && type === 'tab' && ids.length > 0) {
@@ -442,8 +461,60 @@
 			}
 		}
 
+		/**
+		 * Compute the union of fields across all selected item types for cross-type
+		 * batch editing. Returns null if all items share the same type (caller should
+		 * fall back to the normal single-type field list).
+		 *
+		 * Each descriptor in the returned array has:
+		 *   canonicalName -- base field name if base-mapped, else the original field name
+		 *   label -- localized label per the labeling rules
+		 */
+		_computeUnionFieldList() {
+			let allItems = [this.item, ...this._extraItems];
+			let allTypeIDs = [...new Set(allItems.map(i => i.itemTypeID))];
+
+			// Same-type batch -- use normal single-type logic
+			if (allTypeIDs.length === 1) return null;
+
+			let fieldMap = new Map(); // canonicalName -> descriptor
+			let orderCounter = 0;
+
+			for (let typeID of allTypeIDs) {
+				let typeFieldIDs = Zotero.ItemFields.getItemTypeFields(typeID);
+				for (let fieldID of typeFieldIDs) {
+					let fieldName = Zotero.ItemFields.getName(fieldID);
+
+					// Resolve to base field name if a mapping exists
+					let baseID = Zotero.ItemFields.getBaseIDFromTypeAndField(typeID, fieldID);
+					let canonicalName = baseID
+						? Zotero.ItemFields.getName(baseID)
+						: fieldName;
+
+					if (fieldMap.has(canonicalName)) {
+						// Shared by multiple types -- use base field label
+						fieldMap.get(canonicalName).label
+							= Zotero.ItemFields.getLocalizedString(canonicalName);
+					}
+					else {
+						fieldMap.set(canonicalName, {
+							canonicalName,
+							firstOrder: orderCounter++,
+							// Use type-specific label until another type shares this field
+							label: Zotero.ItemFields.getLocalizedString(fieldName),
+						});
+					}
+				}
+			}
+
+			let result = [...fieldMap.values()];
+			result.sort((a, b) => a.firstOrder - b.firstOrder);
+			return result;
+		}
+
 		_renderInternal() {
 			this._saveFieldFocus();
+			this._unionFieldDescriptors = null;
 
 			delete this._linkMenu.dataset.link;
 
@@ -466,7 +537,9 @@
 			}
 
 			// Item type menu
-			this.addItemTypeMenu();
+			if (!this._extraItems?.length) {
+				this.addItemTypeMenu();
+			}
 			this.updateItemTypeMenuSelection();
 			var fieldNames = [];
 			
@@ -477,15 +550,35 @@
 				}
 			}
 			// Get field order from database
+			else if (this._extraItems.length) {
+				// Batch editing -- compute field list
+				let unionFields = this._computeUnionFieldList();
+				if (unionFields) {
+					// Cross-type batch: use union of fields from all item types
+					this._unionFieldDescriptors = new Map();
+					for (let desc of unionFields) {
+						fieldNames.push(desc.canonicalName);
+						this._unionFieldDescriptors.set(desc.canonicalName, desc);
+					}
+				}
+				else {
+					// Same-type batch: use the shared item type's fields
+					let fields = Zotero.ItemFields.getItemTypeFields(this.item.getField("itemTypeID"));
+					for (let i = 0; i < fields.length; i++) {
+						fieldNames.push(Zotero.ItemFields.getName(fields[i]));
+					}
+				}
+				fieldNames.push("dateAdded", "dateModified");
+			}
 			else {
 				var fields = Zotero.ItemFields.getItemTypeFields(this.item.getField("itemTypeID"));
-				
+
 				for (let i = 0; i < fields.length; i++) {
 					fieldNames.push(Zotero.ItemFields.getName(fields[i]));
 				}
 
 				if (this.item instanceof Zotero.FeedItem) {
-					let row = ZoteroPane.getCollectionTreeRow();
+					let row = ZoteroPane.getCollectionTreeRows()[0];
 					if (row && row.isFeeds()) {
 						fieldNames.unshift("feed");
 					}
@@ -500,10 +593,14 @@
 					continue;
 				}
 				let val = '';
+				let extraFieldValues = [];
 				
 				if (fieldName) {
 					var fieldID = Zotero.ItemFields.getID(fieldName);
-					if (fieldID && !Zotero.ItemFields.isValidForType(fieldID, this.item.itemTypeID)) {
+					// In cross-type batch mode, union fields are pre-validated
+					if (!this._unionFieldDescriptors
+							&& fieldID
+							&& !Zotero.ItemFields.isValidForType(fieldID, this.item.itemTypeID)) {
 						fieldName = null;
 					}
 				}
@@ -523,11 +620,20 @@
 					else if (fieldName == 'feed') {
 						val = Zotero.Feeds.get(this.item.libraryID)?.name;
 					}
+					else if (this._unionFieldDescriptors) {
+						val = this.item.getField(fieldName, false, true);
+						extraFieldValues = this._extraItems.map(item => item.getField(fieldName, false, true));
+					}
 					else {
 						val = this.item.getField(fieldName);
+
+						if (this._extraItems.length) {
+							extraFieldValues = this._extraItems.map(item => item.getField(fieldName));
+						}
 					}
 					
-					if (!val && this.hideEmptyFields
+					if (!val && !extraFieldValues.some(v => v)
+							&& this.hideEmptyFields
 							&& this._visibleFields.indexOf(fieldName) == -1
 							&& (this.mode != 'fieldmerge' || typeof this._fieldAlternatives[fieldName] == 'undefined')) {
 						continue;
@@ -540,7 +646,10 @@
 							&& Zotero.ItemFields.isDate(fieldName)
 							// TEMP - NSF
 							&& fieldName != 'dateSent') {
-						this.addDateRow(fieldName, this.item.getField(fieldName, true));
+						let dateVal = this._unionFieldDescriptors
+							? this.item.getField(fieldName, true, true)
+							: this.item.getField(fieldName, true);
+						this.addDateRow(fieldName, dateVal, extraFieldValues);
 						continue;
 					}
 				}
@@ -548,14 +657,21 @@
 				let rowLabel = document.createElement("div");
 				rowLabel.className = "meta-label";
 				rowLabel.setAttribute('fieldname', fieldName);
+				// Augment the fieldname attribute with a class so querySelectors for
+				// label elements use fast indexed class lookups
+				if (fieldName) {
+					rowLabel.classList.add(`meta-label-${fieldName}`);
+				}
 				
 				let valueElement = this.createFieldValueElement(
-					val, fieldName
+					val, fieldName, extraFieldValues
 				);
 				
 				if (fieldName) {
+					let labelText = this._unionFieldDescriptors?.get(fieldName)?.label
+						?? Zotero.ItemFields.getLocalizedString(fieldName);
 					let label = this.createLabelElement({
-						text: Zotero.ItemFields.getLocalizedString(fieldName),
+						text: labelText,
 						id: `itembox-field-${fieldName}-label`,
 					});
 					rowLabel.appendChild(label);
@@ -564,8 +680,12 @@
 				let openLinkButton;
 				let link = val;
 				let addLinkContextMenu = false;
+				// Don't show View Online button in batch edit mode
+				if (this._extraItems.length) {
+					// No open-link button in batch edit mode
+				}
 				// TEMP - NSF (homepage)
-				if ((fieldName == 'url' || fieldName == 'homepage')
+				else if ((fieldName == 'url' || fieldName == 'homepage')
 						// Only make plausible HTTP URLs clickable
 						&& Zotero.Utilities.isHTTPURL(val, true)) {
 					openLinkButton = this.createOpenLinkIcon(val, fieldName);
@@ -640,8 +760,8 @@
 					onContextMenu = this.createContextMenuHandler(fieldName, () => {
 						let menupopup = ZoteroPane.buildFieldTransformMenu({
 							target: valueElement,
-							onTransform: (newValue) => {
-								this._setFieldTransformedValue(valueElement, newValue);
+							onTransform: (newValues) => {
+								this._setFieldTransformedValue(valueElement, newValues);
 							}
 						});
 						this.querySelector('#info-box > popupset').append(menupopup);
@@ -654,7 +774,7 @@
 					optionsButton.addEventListener("click", onContextMenu);
 					rowData.appendChild(optionsButton);
 					// Options button is always created for focus management but if the field is empty, it is hidden
-					if (!val) optionsButton.hidden = true;
+					if (!val && !extraFieldValues.some(v => v)) optionsButton.hidden = true;
 				}
 
 				rowData.oncontextmenu = onContextMenu;
@@ -715,6 +835,11 @@
 						labelKey = 'items-column-modified-by';
 					}
 					if (userID) {
+						let hasMultipleUsers = fieldName === 'dateAdded'
+							? this._extraItems.some(item => item.createdByUserID !== userID)
+							: this._extraItems.some(
+								item => (item.lastModifiedByUserID || item.createdByUserID) !== userID
+							);
 						let userLabel = document.createElement("div");
 						userLabel.className = "meta-label";
 						userLabel.setAttribute("fieldname", userFieldName);
@@ -724,9 +849,22 @@
 						}));
 						let userData = document.createElement("div");
 						userData.className = "meta-data";
-						userData.appendChild(this.createValueElement({
-							text: Zotero.Users.getName(userID),
-						}));
+						let valueElem = this.createValueElement({
+							text: hasMultipleUsers ? '' : Zotero.Users.getName(userID),
+							id: `itembox-field-value-${userFieldName}`,
+							attributes: { fieldname: userFieldName },
+						});
+						// Only treat the field as having multiple values -- which shows the
+						// "Multiple" placeholder and makes it non-focusable -- when the users
+						// actually differ. With a single shared value, leave it as a normal
+						// read-only field so keyboard users can still focus it.
+						if (this._extraItems.length && hasMultipleUsers) {
+							valueElem.multipleValues = true;
+							valueElem.placeholder = Zotero.getString(
+								'item-pane-batch-editing-multiple-values-placeholder'
+							);
+						}
+						userData.appendChild(valueElem);
 						this.addDynamicRow(userLabel, userData);
 					}
 				}
@@ -735,107 +873,116 @@
 			//
 			// Creators
 			//
-			
-			// Creator type menu
-			if (this.editable) {
-				while (this._creatorTypeMenu.hasChildNodes()) {
-					this._creatorTypeMenu.removeChild(this._creatorTypeMenu.firstChild);
-				}
-				
-				var creatorTypes = Zotero.CreatorTypes.getTypesForItemType(this.item.itemTypeID);
-	
-				var localized = {};
-				for (let i = 0; i < creatorTypes.length; i++) {
-					localized[creatorTypes[i].name]
-						= Zotero.CreatorTypes.getLocalizedString(creatorTypes[i].name);
-				}
-				
-				for (let i in localized) {
-					var menuitem = document.createXULElement("menuitem");
-					menuitem.setAttribute("label", localized[i]);
-					menuitem.setAttribute("typeid", Zotero.CreatorTypes.getID(i));
-					this._creatorTypeMenu.appendChild(menuitem);
-				}
-				this._creatorTypeMenu.addEventListener('popuphidden', () => {
-					// If the popup was opened with a mouse click, blur the field to hide icons
-					if (this._creatorTypeMenu.getAttribute("blur-on-hidden")) {
-						document.activeElement.blur();
-						this._creatorTypeMenu.removeAttribute("blur-on-hidden");
+			let max;
+			// If batch-editing, skip creators (for now)
+			if (!this._extraItems?.length) {
+				// Creator type menu
+				if (this.editable) {
+					while (this._creatorTypeMenu.hasChildNodes()) {
+						this._creatorTypeMenu.removeChild(this._creatorTypeMenu.firstChild);
 					}
-				});
-			}
-			
-			// Creator rows
-			
-			// Place, in order of preference, after title, after type,
-			// or at beginning
-			var field = this.getTitleField();
-			if (!field) {
-				field = this._infoTable.querySelector('[fieldName="itemType"]');
-			}
-			if (field) {
-				this._firstRowBeforeCreators = field.closest(".meta-row").nextSibling;
-			}
-			else {
-				this._firstRowBeforeCreators = this._infoTable.firstChild;
-			}
-			
-			this._creatorCount = 0;
-			var num = this.item.numCreators();
-			if (num > 0) {
-				// Limit number of creators display
-				var max = Math.min(num, this._initialVisibleCreators);
-				// If only 1 or 2 more, just display
-				if (num < max + 3 || this._displayAllCreators) {
-					max = num;
-				}
-				for (let i = 0; i < max; i++) {
-					let data = this.item.getCreator(i);
-					this.addCreatorRow(data, data.creatorTypeID, false);
-				}
-				if (this._draggedCreator) {
-					this._draggedCreator = false;
-					// Block hover effects on creators, enable them back on first mouse movement.
-					// See comment in creatorDragPlaceholder() for explanation
-					for (let label of document.querySelectorAll(".meta-label[fieldname^='creator-']")) {
-						label.closest(".meta-row").classList.add("noHover");
+					
+					var creatorTypes = Zotero.CreatorTypes.getTypesForItemType(this.item.itemTypeID);
+		
+					var localized = {};
+					for (let i = 0; i < creatorTypes.length; i++) {
+						localized[creatorTypes[i].name]
+							= Zotero.CreatorTypes.getLocalizedString(creatorTypes[i].name);
 					}
-					let removeHoverBlock = () => {
-						let noHoverRows = document.querySelectorAll('.noHover');
-						noHoverRows.forEach(el => el.classList.remove('noHover'));
-						document.removeEventListener('mousemove', removeHoverBlock);
-					};
-					document.addEventListener('mousemove', removeHoverBlock);
+					
+					for (let i in localized) {
+						var menuitem = document.createXULElement("menuitem");
+						menuitem.setAttribute("label", localized[i]);
+						menuitem.setAttribute("typeid", Zotero.CreatorTypes.getID(i));
+						this._creatorTypeMenu.appendChild(menuitem);
+					}
+					this._creatorTypeMenu.addEventListener('popuphidden', () => {
+						// If the popup was opened with a mouse click, blur the field to hide icons
+						if (this._creatorTypeMenu.getAttribute("blur-on-hidden")) {
+							document.activeElement.blur();
+							this._creatorTypeMenu.removeAttribute("blur-on-hidden");
+						}
+					});
 				}
 				
-				// Additional creators not displayed
-				if (num > max) {
-					this.addMoreCreatorsRow(num - max);
+				// Creator rows
+				
+				// Place, in order of preference, after title, after type,
+				// or at beginning
+				var field = this.getTitleField();
+				if (!field) {
+					field = this._infoTable.querySelector('.meta-label-itemType');
+				}
+				if (field) {
+					this._firstRowBeforeCreators = field.closest(".meta-row").nextSibling;
 				}
 				else {
-					// If we didn't start with creators truncated,
-					// don't truncate for as long as we're viewing
-					// this item, so that added creators aren't
-					// immediately hidden
-					this._displayAllCreators = true;
+					this._firstRowBeforeCreators = this._infoTable.firstChild;
+				}
+				
+				this._addCreatorRowsBulk(() => {
+					this._creatorCount = 0;
+					var num = this.item.numCreators();
+					if (num > 0) {
+						// Limit number of creators display
+						max = Math.min(num, this._initialVisibleCreators);
+						// If only 1 or 2 more, just display
+						if (num < max + 3 || this._displayAllCreators) {
+							max = num;
+						}
+						for (let i = 0; i < max; i++) {
+							let data = this.item.getCreator(i);
+							this.addCreatorRow(data, data.creatorTypeID, false);
+						}
+						if (this._draggedCreator) {
+							this._draggedCreator = false;
+							// Block hover effects on creators, enable them back on first mouse movement.
+							// See comment in creatorDragPlaceholder() for explanation
+							for (let creatorValue of document.querySelectorAll(".creator-type-value")) {
+								creatorValue.closest(".meta-row").classList.add("noHover");
+							}
+							let removeHoverBlock = () => {
+								let noHoverRows = document.querySelectorAll('.noHover');
+								noHoverRows.forEach(el => el.classList.remove('noHover'));
+								document.removeEventListener('mousemove', removeHoverBlock);
+							};
+							document.addEventListener('mousemove', removeHoverBlock);
+						}
+
+						// Additional creators not displayed
+						if (num > max) {
+							this.addMoreCreatorsRow(num - max);
+						}
+						else {
+							// If we didn't start with creators truncated,
+							// don't truncate for as long as we're viewing
+							// this item, so that added creators aren't
+							// immediately hidden
+							this._displayAllCreators = true;
+						}
+					}
+					else if (this.editable && Zotero.CreatorTypes.itemTypeHasCreators(this.item.itemTypeID)) {
+						// Add default row
+						this.addCreatorRow(false, false, false);
+					}
+				});
+
+
+				if (this._showCreatorTypeGuidance) {
+					let creatorTypeLabels = this.querySelectorAll(".creator-type-label");
+					this._id("zotero-author-guidance").show({
+						forEl: creatorTypeLabels[creatorTypeLabels.length - 1]
+					});
+					this._showCreatorTypeGuidance = false;
 				}
 			}
-			else if (this.editable && Zotero.CreatorTypes.itemTypeHasCreators(this.item.itemTypeID)) {
-				// Add default row
-				this.addCreatorRow(false, false, false);
+			else {
+				// In batch-editing mode creator rows are skipped, so the bulk
+				// rendering that makes buttons focusable and refreshes their
+				// status never runs -- do it here for the remaining field buttons
+				this._ensureButtonsFocusable();
+				this._updateCreatorButtonsStatus();
 			}
-			
-			
-			if (this._showCreatorTypeGuidance) {
-				let creatorTypeLabels = this.querySelectorAll(".creator-type-label");
-				this._id("zotero-author-guidance").show({
-					forEl: creatorTypeLabels[creatorTypeLabels.length - 1]
-				});
-				this._showCreatorTypeGuidance = false;
-			}
-
-			this._ensureButtonsFocusable();
-			this._updateCreatorButtonsStatus();
 
 			// Set focus on the last focused field
 			this._restoreFieldFocus();
@@ -869,7 +1016,7 @@
 			// If rowIDs are provided, always update them
 			if (rowIDs?.length > 0) {
 				for (let rowID of rowIDs) {
-					let rowElem = this._infoTable.querySelector(`[data-custom-row-id="${CSS.escape(rowID)}"]`);
+					let rowElem = this._infoTable.querySelector(`.meta-row[data-custom-row-id="${CSS.escape(rowID)}"]`);
 					if (!rowElem) continue;
 					this.updateCustomRowData(rowElem);
 				}
@@ -887,7 +1034,7 @@
 
 			// Add rows that are in the target rows but not in the current rows
 			for (let row of targetRows) {
-				let rowElem = this._infoTable.querySelector(`[data-custom-row-id="${CSS.escape(row.rowID)}"]`);
+				let rowElem = this._infoTable.querySelector(`.meta-row[data-custom-row-id="${CSS.escape(row.rowID)}"]`);
 				if (rowElem) {
 					// If the row is already in the table, and not already updated, update it
 					if (!rowIDs?.includes(row.rowID)) {
@@ -984,7 +1131,7 @@
 				}
 				case "end":
 				default: {
-					let dateAddedRow = this._infoTable.querySelector(".meta-label[fieldname=dateAdded]")?.parentElement;
+					let dateAddedRow = this._infoTable.querySelector(".meta-label-dateAdded")?.parentElement;
 					if (dateAddedRow) {
 						this._infoTable.insertBefore(rowElem, dateAddedRow);
 					}
@@ -1063,7 +1210,7 @@
 			var row = document.createElement('div');
 			row.className = "meta-row";
 			var labelWrapper = document.createElement('div');
-			labelWrapper.className = "meta-label";
+			labelWrapper.className = "meta-label meta-label-itemType";
 			labelWrapper.setAttribute("fieldname", "itemType");
 			var label = this.createLabelElement({
 				id: "itembox-field-itemType-label",
@@ -1150,6 +1297,39 @@
 			return row;
 		}
 		
+		_addCreatorRowsBulk(fn) {
+			this._addingCreatorRowsInBulk = true;
+			// Remove unsaved creator row in the first addCreatorRow() invocation
+			this._needsUnsavedCreatorRemoval = true;
+			try {
+				fn();
+			}
+			finally {
+				this._addingCreatorRowsInBulk = false;
+				this._needsUnsavedCreatorRemoval = false;
+				this._finishCreatorRowChanges();
+			}
+		}
+
+		/**
+		 * Perform final work after adding one or more creator rows:
+		 * - Size added name fields to their content
+		 * - Ensure button focusability
+		 * - Update hidden/disabled status of each button
+		 */
+		_finishCreatorRowChanges() {
+			if (this._addingCreatorRowsInBulk) {
+				return;
+			}
+			let fieldsToSize = this._pendingCreatorSizing;
+			this._pendingCreatorSizing = [];
+			if (fieldsToSize.length) {
+				customElements.get("editable-text").batchSizeToContent(fieldsToSize);
+			}
+			this._ensureButtonsFocusable();
+			this._updateCreatorButtonsStatus();
+		}
+
 		addCreatorRow(creatorData, creatorTypeIDOrName, unsaved, before) {
 			// getCreatorFields(), switchCreatorMode() and handleCreatorAutoCompleteSelect()
 			// may need need to be adjusted if this DOM structure changes
@@ -1237,7 +1417,7 @@
 					fieldName,
 				)
 			);
-			
+			lastNameElem.classList.add("creator-last-name");
 			lastNameElem.placeholder = this._defaultLastName;
 			fieldName = 'creator-' + rowIndex + '-firstName';
 			var firstNameElem = firstlast.appendChild(
@@ -1246,6 +1426,7 @@
 					fieldName,
 				)
 			);
+			firstNameElem.classList.add("creator-first-name");
 			firstNameElem.placeholder = this._defaultFirstName;
 			if (fieldMode > 0) {
 				firstlast.lastChild.hidden = true;
@@ -1319,8 +1500,18 @@
 			
 			this._creatorCount++;
 			
-			// Delete existing unsaved creator row if any
-			this.removeUnsavedCreatorRow();
+			// Delete existing unsaved creator row, if any.
+			// During a bulk add, this only needs to run once, on the first row, rather than
+			// repeating the slow removeUnsavedCreatorRow() procedure for every row in the loop.
+			if (this._addingCreatorRowsInBulk) {
+				if (this._needsUnsavedCreatorRemoval) {
+					this._needsUnsavedCreatorRemoval = false;
+					this.removeUnsavedCreatorRow();
+				}
+			}
+			else {
+				this.removeUnsavedCreatorRow();
+			}
 
 			// If this creator row's type was just switched, remove ".show-on-hover" to avoid buttons appearing
 			// and then immediately disappearing when the css rule kicks in if the row is hovered.
@@ -1335,8 +1526,6 @@
 			}
 			let row = this.addDynamicRow(rowLabel, rowData, before);
 
-			this._ensureButtonsFocusable();
-			
 			/**
 			 * Events handling creator drag-drop reordering
 			 */
@@ -1385,10 +1574,14 @@
 				this.switchCreatorMode(rowData.parentNode, 0, true, false, rowIndex);
 			}
 			
-			lastNameElem.sizeToContent();
-			firstNameElem.sizeToContent();
+			// Queue the name fields to be sized to their content. The actual sizing is batched in
+			// _finishCreatorRowChanges() so that all fields added in one operation are measured and
+			// resized together, which is many orders of magnitude faster than sizing each field
+			// individually.
+			this._pendingCreatorSizing.push(lastNameElem, firstNameElem);
 
 			if (!this.editable) {
+				this._finishCreatorRowChanges();
 				return;
 			}
 
@@ -1407,11 +1600,14 @@
 			// Focus unsaved empty creator row
 			if (unsaved) {
 				rowData.setAttribute("unsaved", true);
+				// Mirror the unsaved attribute with a class so we never have to match on [unsaved=true]
+				rowData.classList.add("unsaved-creator");
 				lastNameElem.focus();
 			}
-			// Refresh creator buttons status, e.g. to disable + button of a row that just added
-			// a new creator
-			this._updateCreatorButtonsStatus();
+
+			// Finalize sizing/button state. A no-op during a bulk add, which finalizes once at the
+			// end (see _addCreatorRowsBulk()).
+			this._finishCreatorRowChanges();
 		}
 		
 		addMoreCreatorsRow(num) {
@@ -1437,12 +1633,14 @@
 			this.addDynamicRow(rowLabel, rowData);
 		}
 		
-		addDateRow(field, value) {
+		addDateRow(field, value, extraFieldValues) {
 			var rowLabel = document.createElement("div");
 			rowLabel.className = "meta-label";
 			rowLabel.setAttribute("fieldname", field);
+			let labelText = this._unionFieldDescriptors?.get(field)?.label
+				?? Zotero.ItemFields.getLocalizedString(field);
 			let label = this.createLabelElement({
-				text: Zotero.ItemFields.getLocalizedString(field),
+				text: labelText,
 				id: `itembox-field-${field}-label`
 			});
 			rowLabel.appendChild(label);
@@ -1452,18 +1650,21 @@
 			
 			var elem = this.createFieldValueElement(
 				Zotero.Date.multipartToStr(value),
-				field
+				field,
+				extraFieldValues
 			);
 
 			elem.setAttribute('aria-labelledby', label.id);
-			// y-m-d status indicator
-			var ymd = document.createElement('span');
-			ymd.id = 'zotero-date-field-status';
-			ymd.textContent = Zotero.Date.strToDate(Zotero.Date.multipartToStr(value))
-					.order.split('').join(' ');
-			ymd.className = "show-on-hover";
 			rowData.appendChild(elem);
-			rowData.appendChild(ymd);
+			// Don't show y-m-d status indicator in batch edit mode
+			if (!this._extraItems.length) {
+				var ymd = document.createElement('span');
+				ymd.id = 'zotero-date-field-status';
+				ymd.textContent = Zotero.Date.strToDate(Zotero.Date.multipartToStr(value))
+						.order.split('').join(' ');
+				ymd.className = "show-on-hover";
+				rowData.appendChild(ymd);
+			}
 			
 			rowData.oncontextmenu = this.createContextMenuHandler(field);
 			
@@ -1541,7 +1742,7 @@
 				firstName.sizeToContent();
 				lastName.sizeToContent();
 				this.modifyCreator(rowIndex, fields);
-				this.item.saveTx();
+				this.item.saveTx({ undoAction: 'undo-action-edit-creator' });
 			}
 		}
 		
@@ -1563,8 +1764,13 @@
 				return true;
 			}
 			
+			// Flush any pending field edits as a separate undo step
+			// before changing the item type
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				await this.item.saveTx({
+					undoAction: 'undo-action-edit-metadata',
+					undoActionArgs: { count: 1 }
+				});
 			}
 			
 			var fieldsToDelete = this.item.getFieldsNotInType(itemTypeID, true);
@@ -1621,7 +1827,7 @@
 				this.item.setType(itemTypeID);
 				
 				if (this.saveOnEdit) {
-					await this.item.saveTx();
+					await this.item.saveTx({ undoAction: 'undo-action-change-type' });
 				}
 				else {
 					this._forceRenderAll();
@@ -1754,8 +1960,9 @@
 			return valueElement;
 		}
 
-		createFieldValueElement(valueText, fieldName) {
+		createFieldValueElement(valueText, fieldName, extraFieldValues = []) {
 			valueText += '';
+			let rawValueText = valueText;
 
 			if (fieldName) {
 				var fieldID = Zotero.ItemFields.getID(fieldName);
@@ -1790,10 +1997,9 @@
 			}
 			
 			let tooltipText;
-			if (fieldID) {
+			if (fieldID && !this._extraItems.length) {
 				// Display the SQL date as a tooltip for date fields
-				// TEMP - filingDate
-				if (Zotero.ItemFields.isFieldOfBase(fieldID, 'date') || fieldName == 'filingDate') {
+				if (Zotero.ItemFields.isDate(fieldID)) {
 					tooltipText = Zotero.Date.multipartToSQL(this.item.getField(fieldName, true));
 				}
 			}
@@ -1827,6 +2033,54 @@
 				// autocomplete for creator names is added in addCreatorRow
 				this.addAutocompleteToElement(valueElement);
 			}
+			
+			valueElement.values = [valueText, ...extraFieldValues];
+			const hasMultipleValues = extraFieldValues.length && extraFieldValues.some(v => (v + '') !== rawValueText);
+			if (hasMultipleValues) {
+				let allValues = [valueText, ...extraFieldValues];
+				let optionCounts = {};
+				for (let v of allValues) {
+					if (v.length > 0) {
+						optionCounts[v] = (optionCounts[v] || 0) + 1;
+					}
+				}
+				let options = Object.keys(optionCounts);
+				// Sort by frequency (most common first), then alphanumerically
+				options.sort((a, b) =>
+					optionCounts[b] - optionCounts[a]
+					|| a.localeCompare(b, undefined, { sensitivity: 'base', numeric: true }));
+				valueElement.multipleValues = true;
+				valueElement.value = '';
+				valueElement.placeholder = Zotero.getString('item-pane-batch-editing-multiple-values-placeholder');
+				if (this._fieldIsClickable(fieldName)) {
+					valueElement.initialValue = valueText;
+					valueElement.autocomplete = {
+						minResultsForPopup: 1,
+						noRollupOnEmptySearch: true,
+						completeSelectedIndex: true,
+						ignoreBlurWhileSearching: false,
+						search: 'zotero-options',
+						searchParam: JSON.stringify({
+							search: 'zotero-options',
+							options: options,
+							includeNoValue: true
+						}),
+						popup: 'PopupAutoComplete',
+					};
+					valueElement.onTextEntered = () => {
+						let input = valueElement.ref;
+						let controller = input?.controller;
+						if (!controller?.matchCount) return;
+						let selectedIndex = input.popup?.selectedIndex ?? -1;
+						if (selectedIndex >= 0
+								&& controller.getStyleAt(selectedIndex) === 'options-ac-no-value') {
+							valueElement._clearValue = true;
+							valueElement.blur();
+						}
+					};
+				}
+			}
+
 			return valueElement;
 		}
 		
@@ -1852,11 +2106,11 @@
 				return;
 			}
 			this.item.removeCreator(index);
-			await this.item.saveTx();
+			await this.item.saveTx({ undoAction: 'undo-action-remove-creator' });
 		}
 		
 		removeUnsavedCreatorRow(onlyIfEmpty = false) {
-			let unsavedCreatorData = this._infoTable.querySelector(".creator-type-value[unsaved=true]");
+			let unsavedCreatorData = this._infoTable.querySelector(".creator-type-value.unsaved-creator");
 			if (!unsavedCreatorData) return;
 			let { firstName, lastName } = this.getCreatorFields(unsavedCreatorData.parentNode);
 			let isEmpty = firstName == "" && lastName == "";
@@ -1864,7 +2118,7 @@
 			
 			unsavedCreatorData.closest(".meta-row").remove();
 			this._creatorCount--;
-			this._updateCreatorButtonsStatus();
+			this._finishCreatorRowChanges();
 		}
 		
 		dateTimeFromUTC(valueText) {
@@ -1919,7 +2173,9 @@
 				}
 			}
 			else {
-				value = this.item.getField(fieldName);
+				value = this._unionFieldDescriptors
+					? this.item.getField(fieldName, false, true)
+					: this.item.getField(fieldName);
 				// Access date needs to be converted from UTC
 				if (value != '') {
 					let localDate;
@@ -2055,11 +2311,11 @@
 				var fields = this.getCreatorFields(row);
 				fields[creatorField] = creator[creatorField];
 				fields[otherField] = creator[otherField];
-
+				
 				this.modifyCreator(creatorIndex, fields);
 				if (this.saveOnEdit) {
 					this.ignoreBlur = true;
-					this.item.saveTx().then(() => {
+					this.item.saveTx({ undoAction: 'undo-action-edit-creator' }).then(() => {
 						this.ignoreBlur = false;
 					});
 				}
@@ -2102,7 +2358,7 @@
 					this._forceRenderAll();
 				}
 			}
-			if (event.key == "Escape" && row.querySelector(".creator-type-value[unsaved=true]")) {
+			if (event.key == "Escape" && row.querySelector(".creator-type-value.unsaved-creator")) {
 				// Escape on an unsaved row deletes it and focuses previous creator
 				event.stopPropagation();
 				row.previousElementSibling.querySelector("editable-text").focus();
@@ -2150,7 +2406,7 @@
 				this._selectField = `itembox-field-value-creator-${newCreator.position}-lastName`;
 				
 				if (this.saveOnEdit) {
-					this.item.saveTx();
+					this.item.saveTx({ undoAction: 'undo-action-edit-creator' });
 				}
 			}
 		}
@@ -2159,7 +2415,7 @@
 			if (this.ignoreBlur || !textbox) {
 				return;
 			}
-
+			
 			var fieldName = textbox.getAttribute('fieldname');
 
 			let isMultiline = Zotero.ItemFields.isMultiline(fieldName);
@@ -2173,6 +2429,10 @@
 				textbox.setAttribute("min-lines", 1);
 			}
 
+			if (textbox.cancelled) {
+				return;
+			}
+
 			if (isCustomRow) {
 				let rowID = textbox.closest(".meta-row").dataset.customRowId;
 				let onSetData = Zotero.ItemPaneManager.getInfoRowHook(rowID, "onSetData");
@@ -2219,10 +2479,14 @@
 			var [field, creatorIndex, creatorField] = fieldName.split('-');
 			
 			// Creator fields
+			let isCreatorField = false;
+			let isCreatorUnsaved = false;
 			if (field == 'creator') {
+				isCreatorField = true;
 				var row = textbox.closest('.meta-row');
 				
 				var otherFields = this.getCreatorFields(row);
+				isCreatorUnsaved = otherFields.isUnsaved;
 				otherFields[creatorField] = value;
 				this.modifyCreator(creatorIndex, otherFields);
 				
@@ -2284,9 +2548,9 @@
 							break;
 						
 						default:
-							// TODO: generalize to all date rows/fields
-							if (Zotero.ItemFields.isFieldOfBase(fieldName, 'date')) {
-								// Parse 'yesterday'/'today'/'tomorrow'
+							// Parse 'yesterday'/'today'/'tomorrow' for date fields -- not applied to Original Date
+							if (Zotero.ItemFields.isDate(fieldName)
+									&& !Zotero.ItemFields.isFieldOfBase(fieldName, 'originalDate')) {
 								value = Zotero.Date.parseDescriptiveString(value);
 							}
 					}
@@ -2296,7 +2560,20 @@
 			}
 			
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				let saveOptions = {};
+				if (isCreatorField) {
+					saveOptions.undoAction = isCreatorUnsaved
+						? 'undo-action-add-creator'
+						: 'undo-action-edit-creator';
+				}
+				else {
+					saveOptions.undoAction = 'undo-action-edit-field';
+					saveOptions.undoActionArgs = {
+						field: Zotero.ItemFields.getLocalizedString(fieldName),
+						count: 1 + this._extraItems.length
+					};
+				}
+				await this._saveItems(saveOptions);
 			}
 		}
 		
@@ -2312,37 +2589,85 @@
 					|| this._clickableFields.indexOf(fieldName) != -1);
 		}
 		
-		_modifyField(field, value) {
-			this.item.setField(field, value);
+		/**
+		 * Check whether a field can be set on an item, considering base field mappings.
+		 */
+		_canSetFieldOnItem(field, item) {
+			let fieldID = Zotero.ItemFields.getID(field);
+			if (!fieldID) return false;
+			if (Zotero.ItemFields.isValidForType(fieldID, item.itemTypeID)) return true;
+			return !!Zotero.ItemFields.getFieldIDFromTypeAndBase(item.itemTypeID, fieldID);
+		}
+
+		_modifyField(field, value, item = null) {
+			let items = item ? [item] : [this.item, ...this._extraItems];
+			for (let i of items) {
+				if (this._unionFieldDescriptors && !this._canSetFieldOnItem(field, i)) {
+					continue;
+				}
+				i.setField(field, value);
+			}
 		}
 		
-		async _setFieldTransformedValue(label, newValue) {
-			label.value = newValue;
-			var fieldName = label.getAttribute('fieldname');
-			this._modifyField(fieldName, newValue);
+		async _saveItems(saveOptions = {}) {
+			// Cache item and extra items to avoid a race condition where, after `hideEditor`,
+			// while we yield for `await Zotero.DB.executeTransaction`, itemBox is rendered for
+			// the new item and this.item is no longer relevant
+			let item = this.item;
+			let extraItems = this._extraItems;
 			
-			if (Zotero.ItemFields.isFieldOfBase(fieldName, 'title')) {
-				let shortTitleVal = this.item.getField('shortTitle');
-				if (newValue.toLowerCase().startsWith(shortTitleVal.toLowerCase())) {
-					this._modifyField('shortTitle', newValue.substring(0, shortTitleVal.length));
+			await Zotero.DB.executeTransaction(async () => {
+				await item.save(saveOptions);
+				for (let extraItem of extraItems) {
+					await extraItem.save(saveOptions);
 				}
+			});
+			if (extraItems.length) {
+				this._forceRenderAll();
 			}
+		}
+		
+		async _setFieldTransformedValue(label, newValues) {
+			let fieldName = label.getAttribute('fieldname');
+			// In batch mode, don't update the label -- it shows a "Multiple" placeholder
+			// that should remain unchanged.
+			if (!this._extraItems.length) {
+				label.value = newValues[0];
+			}
+			let items = [this.item, ...this._extraItems];
+			items.forEach((item, index) => {
+				let newValue = newValues[index];
+				this._modifyField(fieldName, newValue, item);
+				
+				if (Zotero.ItemFields.isFieldOfBase(fieldName, 'title')) {
+					let shortTitleVal = item.getField('shortTitle');
+					if (newValue.toLowerCase().startsWith(shortTitleVal.toLowerCase())) {
+						this._modifyField('shortTitle', newValue.substring(0, shortTitleVal.length), item);
+					}
+				}
+			});
 
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				await this._saveItems({
+					undoAction: 'undo-action-edit-field',
+					undoActionArgs: {
+						field: Zotero.ItemFields.getLocalizedString(fieldName),
+						count: 1 + this._extraItems.length
+					}
+				});
 			}
 		}
-		
+
 
 		// Make sure that irrelevant creators +/- buttons are disabled
 		_updateCreatorButtonsStatus() {
-			let creatorValues = [...this.querySelectorAll(".creator-type-value")];
+			let creatorValues = this.querySelectorAll(".creator-type-value");
 			let row;
 			for (let creatorValue of creatorValues) {
 				row = creatorValue.closest(".meta-row");
 				let { lastName, firstName } = this.getCreatorFields(row);
 				let isEmpty = lastName == "" && firstName == "";
-				let isNextRowUnsavedCreator = row.nextSibling?.querySelector(".creator-type-value[unsaved=true]");
+				let isNextRowUnsavedCreator = row.nextSibling?.querySelector(".creator-type-value.unsaved-creator");
 				let isDefaultEmptyRow = isEmpty && creatorValues.length == 1;
 		
 				if (!this.editable) {
@@ -2359,26 +2684,38 @@
 		}
 
 		getCreatorFields(row) {
-			var typeID = row.querySelector('[typeid]').getAttribute('typeid');
+			var typeID = row.querySelector('.meta-label').getAttribute('typeid');
 			var [label1, label2] = row.querySelectorAll('editable-text');
-			var fieldMode = row.querySelector('[fieldMode]')?.getAttribute('fieldMode');
-			let isUnsavedRow = !!row.querySelector("[unsaved=true]");
-			// Calculate the index this row will occupy after the new row (if it exists) is saved.
-			// This is used for focus management.
-			let creatorsData = [...this.querySelectorAll(".creator-type-value")];
-			let position = creatorsData.findIndex(node => node.parentNode == row);
-			if (position == -1) {
-				position = null;
-			}
-			var fields = {
+			var fieldMode = label1?.getAttribute('fieldMode');
+			let isUnsavedRow = !!row.querySelector(".creator-type-value.unsaved-creator");
+			let position;
+			
+			let fields = {
 				lastName: label1.value.trim(),
 				firstName: label2.value.trim(),
 				fieldMode: fieldMode ? parseInt(fieldMode) : 0,
 				creatorTypeID: parseInt(typeID),
-				position: position,
 				isUnsaved: isUnsavedRow
 			};
-			
+			Object.defineProperty(fields, 'position', {
+				// Calculate the index this row will occupy after the new row (if it exists) is saved.
+				// This is used for focus management.
+				// (We compute this lazily, since the procedure is relatively slow and most callers
+				// don't need it. Needs to be a lambda to avoid aliasing `this`.)
+				get: () => {
+					if (position === undefined) {
+						let creatorsData = [...this.querySelectorAll(".creator-type-value")];
+						position = creatorsData.findIndex(node => node.parentNode == row);
+						if (position == -1) {
+							position = null;
+						}
+					}
+					return position;
+				},
+				set: () => {
+					throw new Error('position is read-only');
+				},
+			});
 			return fields;
 		}
 		
@@ -2410,7 +2747,7 @@
 		 */
 		async swapNames(_event) {
 			var row = this._popupNode.closest('.meta-row');
-			var typeBox = row.querySelector('[fieldname]');
+			var typeBox = row.querySelector('.meta-label');
 			var creatorIndex = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
 			var fields = this.getCreatorFields(row);
 			var lastName = fields.lastName;
@@ -2420,7 +2757,7 @@
 			this.modifyCreator(creatorIndex, fields);
 			
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				await this.item.saveTx({ undoAction: 'undo-action-edit-creator' });
 			}
 		}
 		
@@ -2437,13 +2774,13 @@
 			var row = this._popupNode.closest('.meta-row');
 			let label = row.querySelector('.meta-label');
 			var creatorIndex = parseInt(label.getAttribute('fieldname').split('-')[1]);
-			let [lastName, firstName] = [...row.querySelectorAll("editable-text")];
+			let [lastName, firstName] = row.querySelectorAll("editable-text");
 			lastName.value = Zotero.Utilities.capitalizeName(lastName.value);
 			firstName.value = Zotero.Utilities.capitalizeName(firstName.value);
 			var fields = this.getCreatorFields(row);
 			this.modifyCreator(creatorIndex, fields);
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				await this.item.saveTx({ undoAction: 'undo-action-edit-creator' });
 			}
 		}
 
@@ -2478,8 +2815,8 @@
 				// after creator is dropped, the hover effect often stays at
 				// the row's old location. To workaround that, set noHover class to block all
 				// hover effects on creator rows and then remove it on the first mouse movement in refresh().
-				for (let label of document.querySelectorAll(".meta-label[fieldname^='creator-']")) {
-					label.closest(".meta-row").classList.add("noHover");
+				for (let creatorValue of document.querySelectorAll(".creator-type-value")) {
+					creatorValue.closest(".meta-row").classList.add("noHover");
 				}
 				// Un-hide the moved creator row
 				this.querySelector(".drag-hidden-creator").classList.remove("drag-hidden-creator");
@@ -2557,7 +2894,7 @@
 				this.item.setCreator(i, creators[i]);
 			}
 			if (this.saveOnEdit && !skipSave) {
-				this.item.saveTx();
+				this.item.saveTx({ undoAction: 'undo-action-reorder-creator' });
 			}
 		}
 		
@@ -2620,7 +2957,7 @@
 				return;
 			}
 			
-			let refocusField = this.querySelector(`#${CSS.escape(this._selectField)}:not([disabled="true"])`);
+			let refocusField = this.querySelector(`#${CSS.escape(this._selectField)}:not([disabled])`);
 			// For creator rows, if a focusable node with desired id does not exist, try to focus
 			// the same component from the last available creator row
 			if (!refocusField && this._selectField.startsWith("creator-")) {
@@ -2655,6 +2992,9 @@
 		}
 
 		getTitleField() {
+			if (this._unionFieldDescriptors) {
+				return this._infoTable.querySelector('editable-text[fieldname="title"]');
+			}
 			var titleFieldID = Zotero.ItemFields.getFieldIDFromTypeAndBase(this.item.itemTypeID, 'title');
 			return this._infoTable.querySelector(`editable-text[fieldname="${Zotero.ItemFields.getName(titleFieldID)}"]`);
 		}
@@ -2910,7 +3250,7 @@
 			
 			this.modifyCreator(index, fields);
 			if (this.saveOnEdit) {
-				await this.item.saveTx();
+				await this.item.saveTx({ undoAction: 'undo-action-edit-creator' });
 			}
 		};
 
@@ -2920,7 +3260,7 @@
 			var index = parseInt(typeBox.getAttribute('fieldname').split('-')[1]);
 			var item = this.item;
 			var exists = item.hasCreatorAt(index);
-			var fieldMode = row.querySelector("[fieldMode]").getAttribute("fieldMode");
+			var fieldMode = row.querySelector(".creator-last-name").getAttribute("fieldMode");
 			
 			var moreCreators = item.numCreators() > index + 1;
 			
@@ -2932,10 +3272,10 @@
 			
 			this._id('creator-transform-swap-names').hidden = hideNameSwap;
 			this._id('creator-transform-capitalize').disabled = !this.canCapitalizeCreatorName(row);
-			this._id('zotero-creator-move-sep').setAttribute('hidden', hideMoveSep);
-			this._id('zotero-creator-move-to-top').setAttribute('hidden', hideMoveToTop);
-			this._id('zotero-creator-move-up').setAttribute('hidden', hideMoveUp);
-			this._id('zotero-creator-move-down').setAttribute('hidden', hideMoveDown);
+			this._id('zotero-creator-move-sep').toggleAttribute('hidden', hideMoveSep);
+			this._id('zotero-creator-move-to-top').toggleAttribute('hidden', hideMoveToTop);
+			this._id('zotero-creator-move-up').toggleAttribute('hidden', hideMoveUp);
+			this._id('zotero-creator-move-down').toggleAttribute('hidden', hideMoveDown);
 		};
 
 		_handleCreatorTransformMenuCommand = async (event) => {
@@ -3018,7 +3358,7 @@
 				this._clearSavedFieldFocus();
 			}
 			// If user moves focus outside of empty unsaved creator row, remove it.
-			let unsavedCreatorRow = this.querySelector(".creator-type-value[unsaved=true]")?.closest(".meta-row");
+			let unsavedCreatorRow = this.querySelector(".creator-type-value.unsaved-creator")?.closest(".meta-row");
 			// But not if these parent components receive focus which happens when menus are opened
 			if (["zotero-view-item", "main-window"].includes(focused.id) || !unsavedCreatorRow) return;
 			let focusLeftUnsavedCreatorRow = !unsavedCreatorRow.contains(focused);
diff --git a/chrome/content/zotero/elements/itemDetails.js b/chrome/content/zotero/elements/itemDetails.js
index c441d403da..2e9a705f0a 100644
--- a/chrome/content/zotero/elements/itemDetails.js
+++ b/chrome/content/zotero/elements/itemDetails.js
@@ -68,6 +68,18 @@
 			this._item = item;
 		}
 
+		get extraItems() {
+			return this._extraItems ?? [];
+		}
+
+		set extraItems(val) {
+			if (!Array.isArray(val)) {
+				return;
+			}
+
+			this._extraItems = val.filter(item => item instanceof Zotero.Item && item.isRegularItem());
+		}
+
 		/*
 		 * For contextPane update
 		 */
@@ -96,12 +108,12 @@
 			this._tabID = tabID;
 		}
 
-		get collectionTreeRow() {
-			return this._collectionTreeRow;
+		get collectionTreeRows() {
+			return this._collectionTreeRows;
 		}
 		
-		set collectionTreeRow(collectionTreeRow) {
-			this._collectionTreeRow = collectionTreeRow;
+		set collectionTreeRows(collectionTreeRows) {
+			this._collectionTreeRows = collectionTreeRows;
 		}
 
 		get supportsPinning() {
@@ -238,7 +250,12 @@
 				box.tabID = this.tabID;
 				box.tabType = this.tabType;
 				box.item = item;
-				box.collectionTreeRow = this.collectionTreeRow;
+				box.extraItems = this.extraItems;
+				box.collectionTreeRows = this.collectionTreeRows;
+				if (this.extraItems.length > 0) {
+					// mark everything, except the header and the info pane, as hidden
+					box.hidden = box.dataset.pane !== 'info' && box !== this._header;
+				}
 				// Discard hidden panes
 				if (box.hidden && box.discard) {
 					box.discard();
diff --git a/chrome/content/zotero/elements/itemPane.js b/chrome/content/zotero/elements/itemPane.js
index bd4306fb46..8dac4ac63a 100644
--- a/chrome/content/zotero/elements/itemPane.js
+++ b/chrome/content/zotero/elements/itemPane.js
@@ -40,8 +40,11 @@
 					previousfocus="zotero-items-tree" />
 				
 				<duplicates-merge-pane id="zotero-duplicates-merge-pane" />
-
 				<annotation-items-pane id="zotero-annotations-pane" />
+				<groupbox id="batch-edit-prompt" pack="center" align="center" data-l10n-id="item-pane-batch-editing-prompt">
+					<description id="batch-edit-prompt-message" />
+					<button id="batch-edit-prompt-enable" data-l10n-id="item-pane-batch-editing-enable" />
+				</groupbox>
 			</deck>
 			<item-pane-sidenav id="zotero-view-item-sidenav" no-context-notes="true" class="zotero-view-item-sidenav"/>
 		`);
@@ -52,6 +55,8 @@
 			this._duplicatesPane = this.querySelector("#zotero-duplicates-merge-pane");
 			this._messagePane = this.querySelector("#zotero-item-message");
 			this._annotationsPane = this.querySelector("#zotero-annotations-pane");
+			this._batchEditEnableBtn = this.querySelector("#batch-edit-prompt button");
+			this._batchEditPromptMessage = this.querySelector("#batch-edit-prompt-message");
 			this._sidenav = this.querySelector("#zotero-view-item-sidenav");
 			this._deck = this.querySelector("#zotero-item-pane-content");
 
@@ -59,6 +64,14 @@
 
 			this._notifierID = Zotero.Notifier.registerObserver(this, ['item']);
 
+			this._batchEditEnableBtn.addEventListener("command", () => {
+				this._isBatchEditEnabled = true;
+				this._setBatchEditCollapsible(true);
+				this.render();
+				this.updateItemPaneButtons();
+			});
+			
+			this._isBatchEditEnabled = false;
 			this._translationTarget = null;
 		}
 
@@ -74,12 +87,12 @@
 			this._data = data;
 		}
 
-		get collectionTreeRow() {
-			return this._collectionTreeRow;
+		get collectionTreeRows() {
+			return this._collectionTreeRows;
 		}
 
-		set collectionTreeRow(val) {
-			this._collectionTreeRow = val;
+		set collectionTreeRows(val) {
+			this._collectionTreeRows = val;
 		}
 
 		get itemsView() {
@@ -100,12 +113,12 @@
 		}
 
 		get mode() {
-			return ["message", "item", "note", "duplicates"][this._deck.selectedIndex];
+			return ["message", "item", "note", "duplicates", "annotations", "batch-edit-prompt"][this._deck.selectedIndex];
 		}
 
 		/**
 		 * Set mode of item pane
-		 * @param {"message" | "item" | "note" | "duplicates"} type view type
+		 * @param {"message" | "item" | "note" | "duplicates" | "annotations" | "batch-edit-prompt"} type view type
 		 */
 		set mode(type) {
 			this.setAttribute("view-type", type);
@@ -126,10 +139,26 @@
 			if (this.data.length > 0 && this.data.every(item => item.isAnnotation())) {
 				return renderStatus = this.renderAnnotations(this.data);
 			}
+			
+			// reset the batch editing flag
+			let IDs = this.data.map(item => item.id);
+			if (!(IDs.length === this._prevIDs?.length && IDs.every((id, i) => id === this._prevIDs?.[i]))) {
+				if (this._isBatchEditEnabled) {
+					this._setBatchEditCollapsible(false);
+				}
+				this._isBatchEditEnabled = false;
+				this._prevIDs = IDs;
+			}
+			
+			// Multiple items selected (not duplicates)
+			if (!this.collectionTreeRows[0].isDuplicates() && this.data.length > 1 && this.data.every(item => item.isRegularItem() && !item.isFeedItem)) {
+				// Hide the batch editing UI until the user opts-in
+				renderStatus = this._isBatchEditEnabled ? this.renderItemPane(this.data) : this.renderBatchEditorPrompt();
+			}
 			// Single item selected
-			if (this.data.length == 1) {
+			else if (this.data.length === 1) {
 				let item = this.data[0];
-				
+
 				// If a collection or search is selected, it must be in the trash.
 				if (item instanceof Zotero.Collection || item instanceof Zotero.Search) {
 					renderStatus = this.renderMessage();
@@ -141,7 +170,7 @@
 					renderStatus = this.renderItemPane(item);
 				}
 			}
-			// Zero or multiple items selected
+			// No items selected or multiple, but includes some irregular items
 			else {
 				renderStatus = this.renderMessage();
 			}
@@ -150,7 +179,7 @@
 
 		notify(action, type) {
 			if (type == 'item' && action == 'modify') {
-				if (this.collectionTreeRow && this.collectionTreeRow.isFeedsOrFeed()) {
+				if (this.collectionTreeRows?.[0]?.isFeedsOrFeed()) {
 					this.updateReadLabel();
 				}
 			}
@@ -175,9 +204,12 @@
 			return true;
 		}
 
-		async renderItemPane(item) {
+		async renderItemPane(items) {
 			let previousMode = this.mode;
 			this.mode = "item";
+			if (!Array.isArray(items)) {
+				items = [items];
+			}
 
 			// Fix https://forums.zotero.org/discussion/115450/zotero-7-beta-wrong-vertical-position-in-the-item-pane-after-switching-from-a-note
 			if (previousMode === "note") {
@@ -186,20 +218,21 @@
 					requestIdleCallback(resolve, { timeout: 50 });
 				});
 			}
-			
+
 			this._itemDetails.editable = this.editable;
 			this._itemDetails.tabID = "zotero-pane";
 			this._itemDetails.tabType = "library";
-			this._itemDetails.item = item;
-			this._itemDetails.collectionTreeRow = this.collectionTreeRow;
+			this._itemDetails.item = items[0];
+			this._itemDetails.extraItems = items.slice(1);
+			this._itemDetails.collectionTreeRows = this.collectionTreeRows;
 
 			this._itemDetails.render();
 
-			if (this.getAttribute("collapsed") == "true") {
+			if (this.hasAttribute("collapsed")) {
 				return true;
 			}
-			
-			if (item.isFeedItem) {
+
+			if (items[0].isFeedItem) {
 				let lastTranslationTarget = Zotero.Prefs.get('feeds.lastTranslationTarget');
 				if (lastTranslationTarget) {
 					let id = parseInt(lastTranslationTarget.substr(1));
@@ -218,7 +251,7 @@
 				// if (!item.isTranslated) {
 				// 	item.translate();
 				// }
-				ZoteroPane.startItemReadTimeout(item.id);
+				ZoteroPane.startItemReadTimeout(items[0].id);
 			}
 			return true;
 		}
@@ -229,7 +262,7 @@
 			let count = this.data.length;
 			
 			// Display duplicates merge interface in item pane
-			if (this.collectionTreeRow.isDuplicates()) {
+			if (this.collectionTreeRows[0].isDuplicates()) {
 				if (!this.editable) {
 					if (count) {
 						msg = Zotero.getString('pane.item.duplicates.writeAccessRequired');
@@ -244,7 +277,7 @@
 					
 					// On a Select All of more than a few items, display a row
 					// count instead of the usual item type mismatch error
-					let displayNumItemsOnTypeError = count > 5 && count == this.itemsView.rowCount;
+					let displayNumItemsOnTypeError = count > 5 && count == this.itemsView.objectRowCount;
 					
 					// Initialize the merge pane with the selected items
 					this._duplicatesPane.setItems(this.data, displayNumItemsOnTypeError);
@@ -259,7 +292,7 @@
 				if (count) {
 					let key;
 					// In the trash, we have to check the object type
-					if (this.collectionTreeRow.isTrash()) {
+					if (this.collectionTreeRows[0].isTrash()) {
 						if (this.data.every(x => x instanceof Zotero.Collection)) {
 							key = 'item-pane-message-collections-selected';
 						}
@@ -279,8 +312,8 @@
 					msg = { l10nId: key, l10nArgs: { count } };
 				}
 				else {
-					let count = this.itemsView.rowCount;
-					if (this.collectionTreeRow.isTrash()
+					let count = this.itemsView.objectRowCount;
+					if (this.collectionTreeRows[0].isTrash()
 							&& this.itemsView._rows?.some(
 								x => x.ref instanceof Zotero.Collection || x.ref instanceof Zotero.Search
 							)) {
@@ -298,6 +331,16 @@
 			return true;
 		}
 
+		renderBatchEditorPrompt() {
+			this.mode = 'batch-edit-prompt';
+			document.l10n.setAttributes(
+				this._batchEditPromptMessage,
+				'item-pane-message-items-selected',
+				{ count: this.data.length }
+			);
+			return true;
+		}
+
 		setItemPaneMessage(msg) {
 			this.mode = "message";
 			this._messagePane.render(msg);
@@ -315,7 +358,7 @@
 			}
 			
 			// My Publications buttons
-			var isPublications = this.collectionTreeRow.isPublications();
+			var isPublications = this.collectionTreeRows[0].isPublications();
 			// Show in My Publications view if selected items are all notes or non-linked-file attachments
 			var showMyPublicationsButtons = isPublications
 				&& this.data.every((item) => {
@@ -331,13 +374,13 @@
 
 			// Trash button
 			let nonDeletedItemsSelected = this.data.some(item => !item.deleted);
-			if (this.collectionTreeRow.isTrash() && !nonDeletedItemsSelected) {
+			if (this.collectionTreeRows[0].isTrash() && !nonDeletedItemsSelected) {
 				container.renderCustomHead(this.renderTrashHead.bind(this));
 				return;
 			}
 			
 			// Feed buttons
-			if (this.collectionTreeRow.isFeedsOrFeed()) {
+			if (this.collectionTreeRows[0].isFeedsOrFeed()) {
 				container.renderCustomHead(this.renderFeedHead.bind(this));
 				this.updateReadLabel();
 				return;
@@ -348,6 +391,11 @@
 				return;
 			}
 
+			if (this._isBatchEditEnabled && this.data.length > 1) {
+				container.renderCustomHead(this.renderBatchEditHead.bind(this));
+				return;
+			}
+			
 			container.renderCustomHead();
 		}
 
@@ -413,7 +461,7 @@
 		renderAnnotationsHead(data) {
 			let { doc, append } = data;
 			let button = doc.createXULElement("button");
-			button.disabled = !this.collectionTreeRow.editable;
+			button.disabled = !this.collectionTreeRows.every(o => o.editable);
 			button.id = 'zotero-item-pane-note-from-annotations';
 			if (Zotero.Items.getTopLevel(this.data).length == 1) {
 				button.label = Zotero.getString('pane.items.menu.addNoteFromAnnotations');
@@ -426,6 +474,28 @@
 			append(button);
 		}
 
+		renderBatchEditHead(data) {
+			let { doc, append } = data;
+			let description = doc.createXULElement("description");
+			document.l10n.setAttributes(
+				description,
+				'item-pane-batch-editing-header',
+				{ count: this.data.length }
+			);
+			let icon = doc.createElement("span");
+			icon.className = "batch-edit-head-icon";
+			let doneButton = doc.createXULElement("button");
+			doneButton.setAttribute("default", "true");
+			document.l10n.setAttributes(doneButton, 'item-pane-batch-editing-done');
+			doneButton.addEventListener("command", () => {
+				this._setBatchEditCollapsible(false);
+				this._isBatchEditEnabled = false;
+				this.render();
+				this.updateItemPaneButtons();
+			});
+			append(icon, description, doneButton);
+		}
+
 		updateReadLabel() {
 			var items = this.data;
 			var isUnread = false;
@@ -535,6 +605,25 @@
 			this.setTranslateButton();
 		}
 
+		_setBatchEditCollapsible(enabled) {
+			let section = this._itemDetails.querySelector('collapsible-section[data-pane="info"]');
+			if (!section) return;
+			if (enabled) {
+				// Force open without saving to prefs, so the previous state is preserved
+				section._skipSaveOpenState = true;
+				section.open = true;
+				section._skipSaveOpenState = false;
+				section.collapsible = false;
+				section.showContextMenu = false;
+			}
+			else {
+				section.collapsible = true;
+				section.showContextMenu = true;
+				// Restore the pref-saved open state
+				section._restoreOpenState();
+			}
+		}
+
 		getCurrentPane(mode = undefined) {
 			if (!mode) {
 				// Guess a mode from the current data
@@ -543,7 +632,7 @@
 					mode = "annotations";
 				}
 				// No/multiple objects are selected OR selected object is a trashed collection/search
-				else if (!this.data.length || this.data.length > 1
+				else if (!this.data.length || (this.data.length > 1 && !this._isBatchEditEnabled)
 					|| this.data[0] instanceof Zotero.Collection || this.data[0] instanceof Zotero.Search) {
 					mode = "message";
 				}
@@ -595,7 +684,7 @@
 		}
 
 		handleResize() {
-			if (this.getAttribute("collapsed")) {
+			if (this.hasAttribute("collapsed")) {
 				this.removeAttribute("width");
 				this.removeAttribute("height");
 			}
@@ -643,6 +732,10 @@
 					this._deck.selectedIndex = 4;
 					break;
 				}
+				case "batch-edit-prompt": {
+					this._deck.selectedIndex = 5;
+					break;
+				}
 			}
 			let isViewingItem = type == "item";
 			let isViewingDuplicates = type == "duplicates";
diff --git a/chrome/content/zotero/elements/itemPaneHeader.js b/chrome/content/zotero/elements/itemPaneHeader.js
index 3da017133a..679029d0f5 100644
--- a/chrome/content/zotero/elements/itemPaneHeader.js
+++ b/chrome/content/zotero/elements/itemPaneHeader.js
@@ -70,6 +70,10 @@
 
 		_editable = true;
 		
+		get _renderDependencies() {
+			return [this._tabID, this._item?.id, this.extraItems?.length ?? 0];
+		}
+
 		get item() {
 			return this._item;
 		}
@@ -150,8 +154,8 @@
 				event.preventDefault();
 				let menupopup = ZoteroPane.buildFieldTransformMenu({
 					target: this.titleField,
-					onTransform: (newValue) => {
-						this._setTransformedValue(newValue);
+					onTransform: (newValues) => {
+						this._setTransformedValue(newValues[0]);
 					},
 				});
 				
@@ -197,9 +201,15 @@
 			if (newValue.toLowerCase().startsWith(shortTitleVal.toLowerCase())) {
 				this._item.setField('shortTitle', newValue.substring(0, shortTitleVal.length));
 			}
-			await this._item.saveTx();
+			await this._item.saveTx({
+				undoAction: 'undo-action-edit-field',
+				undoActionArgs: {
+					field: Zotero.ItemFields.getLocalizedString(this._titleFieldID),
+					count: 1
+				}
+			});
 		}
-		
+
 		async save() {
 			if (!this.editable) {
 				return;
@@ -209,7 +219,13 @@
 					throw new Error('Item has not been added to library');
 				}
 				this._item.setField(this._titleFieldID, this.titleField.value);
-				await this._item.saveTx();
+				await this._item.saveTx({
+					undoAction: 'undo-action-edit-field',
+					undoActionArgs: {
+						field: Zotero.ItemFields.getLocalizedString(this._titleFieldID),
+						count: 1
+					}
+				});
 			}
 			this._forceRenderAll();
 		}
@@ -231,6 +247,12 @@
 			if (this._item.isAttachment()) {
 				headerMode = 'title';
 			}
+			
+			if (this.extraItems?.length) {
+				headerMode = 'none';
+			}
+
+			this.classList.toggle('batch-edit', !!this.extraItems?.length);
 
 			this.title.hidden = true;
 			this.creatorYear.hidden = true;
@@ -416,7 +438,7 @@
 				let menuitem = document.createXULElement('menuitem');
 				menuitem.setAttribute('data-l10n-id', 'item-pane-header-' + headerMode);
 				menuitem.setAttribute('type', 'radio');
-				menuitem.setAttribute('checked', headerMode === selectedMode);
+				menuitem.toggleAttribute('checked', headerMode === selectedMode);
 				menuitem.addEventListener('command', () => {
 					Zotero.Prefs.set(PREF_HEADER_MODE, headerMode);
 				});
diff --git a/chrome/content/zotero/elements/itemPaneSectionElementBase.mjs b/chrome/content/zotero/elements/itemPaneSectionElementBase.mjs
index 661a62c5d7..efd8025dab 100644
--- a/chrome/content/zotero/elements/itemPaneSectionElementBase.mjs
+++ b/chrome/content/zotero/elements/itemPaneSectionElementBase.mjs
@@ -59,12 +59,12 @@ export class ItemPaneSectionElementBase extends XULElementBase {
 		this.setAttribute('tabType', tabType);
 	}
 
-	get collectionTreeRow() {
-		return this._collectionTreeRow;
+	get collectionTreeRows() {
+		return this._collectionTreeRows;
 	}
 
-	set collectionTreeRow(collectionTreeRow) {
-		this._collectionTreeRow = collectionTreeRow;
+	set collectionTreeRows(collectionTreeRows) {
+		this._collectionTreeRows = collectionTreeRows;
 	}
 
 	_syncRenderPending = false;
diff --git a/chrome/content/zotero/elements/librariesCollectionsBox.js b/chrome/content/zotero/elements/librariesCollectionsBox.js
index 5eb173b07e..1a322ff4bc 100644
--- a/chrome/content/zotero/elements/librariesCollectionsBox.js
+++ b/chrome/content/zotero/elements/librariesCollectionsBox.js
@@ -66,7 +66,7 @@ import { getCSSIcon } from 'components/icons';
 		}
 
 		get _renderDependencies() {
-			return [...super._renderDependencies, this.collectionTreeRow?.id];
+			return [...super._renderDependencies, this.collectionTreeRows?.map(o => o.id).join(',')];
 		}
 
 		init() {
@@ -148,14 +148,17 @@ import { getCSSIcon } from 'components/icons';
 						Zotero.getString('pane.items.removeFromOther', [obj.name])
 					)) {
 						contextItem.removeFromCollection(obj.id);
-						contextItem.saveTx();
+						contextItem.saveTx({
+							undoAction: 'undo-action-remove-from-collection',
+							undoActionArgs: { count: 1 }
+						});
 					}
 				});
 				row.append(remove);
 			}
 			
 			let isCurrent = this.tabType === 'library'
-				&& this.collectionTreeRow?.id == obj.treeViewID;
+				&& this.collectionTreeRows.map(o => o.id).includes(obj.treeViewID);
 			box.classList.toggle('current', isCurrent);
 
 			// Disable clicky if this is a context row or we're already in the library/collection it points to
diff --git a/chrome/content/zotero/elements/notesContext.js b/chrome/content/zotero/elements/notesContext.js
index a26340c577..8c0ffa0063 100644
--- a/chrome/content/zotero/elements/notesContext.js
+++ b/chrome/content/zotero/elements/notesContext.js
@@ -192,7 +192,7 @@
 				let { id, screenX, screenY } = event.detail;
 				let item = Zotero.Items.get(id);
 				if (item) {
-					this.querySelector('.context-pane-list-move-to-trash').setAttribute('disabled', !this.editable);
+					this.querySelector('.context-pane-list-move-to-trash').toggleAttribute('disabled', !this.editable);
 					let popup = this.querySelector('.context-pane-list-popup');
 					popup.dataset.itemId = id;
 					popup.openPopupAtScreen(screenX, screenY, true);
@@ -203,8 +203,8 @@
 				this._handleAddChildNotePopupClick(event);
 			});
 			this.notesList.addEventListener('add-child', (event) => {
-				this.querySelector('.context-pane-add-child-note').setAttribute('disabled', !this.editable);
-				this.querySelector('.context-pane-add-child-note-from-annotations').setAttribute('disabled', !this.editable);
+				this.querySelector('.context-pane-add-child-note').toggleAttribute('disabled', !this.editable);
+				this.querySelector('.context-pane-add-child-note-from-annotations').toggleAttribute('disabled', !this.editable);
 				Zotero.MenuManager.updateMenuPopup(addChildNotePopup, "notesPane/addItemNote", {
 					event: undefined,
 					getContext: () => {
@@ -227,8 +227,8 @@
 				this._handleAddStandaloneNotePopupClick(event);
 			});
 			this.notesList.addEventListener('add-standalone', (event) => {
-				this.querySelector('.context-pane-add-standalone-note').setAttribute('disabled', !this.editable);
-				this.querySelector('.context-pane-add-standalone-note-from-annotations').setAttribute('disabled', !this.editable);
+				this.querySelector('.context-pane-add-standalone-note').toggleAttribute('disabled', !this.editable);
+				this.querySelector('.context-pane-add-standalone-note-from-annotations').toggleAttribute('disabled', !this.editable);
 				Zotero.MenuManager.updateMenuPopup(addStandaloneNotePopup, "notesPane/addStandaloneNote", {
 					event: undefined,
 					getContext: () => {
diff --git a/chrome/content/zotero/elements/queryTextbox.js b/chrome/content/zotero/elements/queryTextbox.js
new file mode 100644
index 0000000000..e4a575d9b5
--- /dev/null
+++ b/chrome/content/zotero/elements/queryTextbox.js
@@ -0,0 +1,385 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+
+    Copyright © 2026 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+
+    This file is part of Zotero.
+
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+    ***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+{
+	// Enough of the library's tags or creators to scroll through without holding
+	// the list open on a one-letter prefix
+	const MAX_LOOKUP_VALUES = 100;
+
+	// The element scripts load on first use of their tag, so create one to get
+	// search-textbox defined before extending it
+	document.createXULElement("search-textbox");
+
+	/**
+	 * A search box that shows the parts of a search query (see
+	 * Zotero.SearchQuery) as they're typed: the field, operator, and value of
+	 * each condition are colored, and everything else reads as plain text.
+	 *
+	 * An <input> can't render styled text, so the colored copy is a layer
+	 * behind it, drawn from the same tokens the parser produces and kept in
+	 * step with the input's own scrolling. The input's text is transparent, so
+	 * what's on screen is the layer, and everything the input does otherwise --
+	 * selection, IME, accessibility -- is untouched.
+	 */
+	class QueryTextbox extends customElements.get("search-textbox") {
+		connectedCallback() {
+			if (this.delayConnectedCallback() || this.connected) {
+				return;
+			}
+			super.connectedCallback();
+
+			const stylesheet = document.createElement("link");
+			stylesheet.rel = "stylesheet";
+			stylesheet.href = "chrome://zotero/skin/query-textbox.css";
+			this.shadowRoot.prepend(stylesheet);
+
+			this._highlightLayer = document.createElement("div");
+			this._highlightLayer.className = "query-highlight";
+			this._highlightLayer.setAttribute("aria-hidden", "true");
+			this.inputField.before(this._highlightLayer);
+
+			// The layer is positioned over the input rather than laid out with
+			// it, so it has to follow the input's box
+			this._resizeObserver = new ResizeObserver(() => this._syncGeometry());
+			this._resizeObserver.observe(this.inputField);
+
+			this.inputField.addEventListener("input", () => {
+				this.updateHighlighting();
+				this.updateCompletions();
+			});
+			this.inputField.addEventListener("scroll", () => this._syncScroll());
+			// The caret moving is as much a reason to offer something else as
+			// the text changing
+			this.inputField.addEventListener("keyup", (event) => {
+				if (["ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) {
+					this.updateCompletions();
+				}
+			});
+			this.inputField.addEventListener("click", () => this.updateCompletions());
+			this.inputField.addEventListener("blur", () => this.hideCompletions());
+			// Before the base class's own Enter and Escape handling, which the
+			// list takes over while it's open
+			this.addEventListener("keydown", event => this._handleCompletionKey(event), true);
+			// Rendering mid-composition would replace the text being composed
+			this.inputField.addEventListener("compositionstart", () => {
+				this._composing = true;
+			});
+			this.inputField.addEventListener("compositionend", () => {
+				this._composing = false;
+				this.updateHighlighting();
+				this.updateCompletions();
+			});
+			this.updateHighlighting();
+		}
+
+		set value(val) {
+			super.value = val;
+			// Setting the value doesn't fire input
+			this.updateHighlighting();
+			this.hideCompletions();
+		}
+
+		get value() {
+			return this.inputField.value;
+		}
+
+		/**
+		 * Redraw the layer from the current value
+		 */
+		updateHighlighting() {
+			if (!this._highlightLayer || this._composing) {
+				return;
+			}
+			let value = this.inputField.value;
+			let tokens = value ? Zotero.SearchQuery.tokenize(value) : [];
+			// Recognized conditions are what the coloring is for, so a query
+			// without any leaves the input to draw its own text
+			let hasCondition = tokens.some(token => token.type === 'field');
+			this.toggleAttribute("highlighted", hasCondition);
+			this._syncGeometry();
+			this._highlightLayer.replaceChildren();
+			if (hasCondition) {
+				for (let token of tokens) {
+					let span = document.createElement("span");
+					span.className = "query-token-" + token.type;
+					span.textContent = value.slice(token.start, token.end);
+					this._highlightLayer.append(span);
+				}
+			}
+			this._syncScroll();
+		}
+
+		/**
+		 * Show completions for what's being typed at the caret, or hide the
+		 * list if there's nothing to offer (see
+		 * Zotero.SearchQuery.getCompletions())
+		 */
+		async updateCompletions() {
+			if (this._composing) {
+				return;
+			}
+			let value = this.inputField.value;
+			let completions = value
+				? Zotero.SearchQuery.getCompletions(value, this.inputField.selectionStart)
+				: null;
+			// A query that changes while a lookup is in flight makes its results
+			// obsolete
+			let generation = this._completionGeneration = (this._completionGeneration || 0) + 1;
+			if (completions && completions.lookup) {
+				completions = {
+					...completions,
+					completions: await this._lookupValues(completions)
+				};
+				if (generation !== this._completionGeneration) {
+					return;
+				}
+			}
+			if (!completions || !completions.completions.length) {
+				this.hideCompletions();
+				return;
+			}
+			this._completions = completions;
+			// The getter builds the list along with the popup that holds it
+			let popup = this._completionPopup;
+			let list = this._completionList;
+			list.replaceChildren();
+			for (let completion of completions.completions) {
+				let row = document.createXULElement("richlistitem");
+				let label = document.createElement("span");
+				label.className = "completion-label";
+				if (completion.color) {
+					let swatch = document.createElement("span");
+					swatch.className = "completion-swatch";
+					swatch.style.backgroundColor = completion.color;
+					label.append(swatch);
+					label.classList.add("colored");
+				}
+				label.append(completion.label);
+				row.append(label);
+				// The description explains what a name maps to ("by:" is the
+				// Creator condition), so a name that already says it doesn't
+				// need it: "attachment tag:" is self-evidently about tags
+				if (completion.description && !completion.label.replace(/:$/, '').toLowerCase()
+						.includes(completion.description.toLowerCase())) {
+					let description = document.createElement("span");
+					description.className = "completion-description";
+					description.textContent = completion.description;
+					row.append(description);
+				}
+				row.completion = completion;
+				list.append(row);
+			}
+			// Nothing is selected until the user moves into the list, so Enter
+			// runs the search it would have run
+			list.clearSelection();
+			if (popup.state === "closed") {
+				popup.openPopup(this.inputField, "after_start");
+			}
+		}
+
+		// Values a condition takes that come from the library, from the same
+		// search the Advanced Search fields use
+		_lookupValues({ lookup, prefix }) {
+			let params = { ...lookup };
+			// Values from every library the search covers
+			let libraryIDs = Zotero.getActiveZoteroPane()?.getSelectedLibraryIDs() || [];
+			if (libraryIDs.length) {
+				params.libraryIDs = libraryIDs;
+			}
+			// A tag with an assigned color shows it
+			let colors = new Map();
+			if (lookup.fieldName === 'tag') {
+				for (let id of libraryIDs.length ? libraryIDs : [Zotero.Libraries.userLibraryID]) {
+					for (let [name, data] of Zotero.Tags.getColors(id)) {
+						if (!colors.has(name)) {
+							colors.set(name, data.color);
+						}
+					}
+				}
+			}
+			let search = Cc["@mozilla.org/autocomplete/search;1?name=zotero"]
+				.createInstance(Ci.nsIAutoCompleteSearch);
+			return new Promise((resolve) => {
+				search.startSearch(prefix, JSON.stringify(params), null, {
+					onSearchResult: (_, result) => {
+						// Results arrive in batches as the query runs
+						if (result.searchResult === Ci.nsIAutoCompleteResult.RESULT_SUCCESS_ONGOING
+								|| result.searchResult
+									=== Ci.nsIAutoCompleteResult.RESULT_NOMATCH_ONGOING) {
+							return;
+						}
+						let values = [];
+						for (let i = 0; i < result.matchCount && i < MAX_LOOKUP_VALUES; i++) {
+							values.push(result.getValueAt(i));
+						}
+						resolve(values.map(value => ({
+							text: Zotero.SearchQuery.formatValue(value),
+							label: value,
+							color: colors.get(value)
+						})));
+					}
+				});
+			});
+		}
+
+		hideCompletions() {
+			// Results from a lookup still in flight would reopen the list
+			this._completionGeneration = (this._completionGeneration || 0) + 1;
+			if (this._popup && this._popup.state !== "closed") {
+				this._popup.hidePopup();
+			}
+		}
+
+		get _completionPopup() {
+			if (!this._popup) {
+				this._popup = document.createXULElement("panel");
+				this._popup.className = "query-completions";
+				this._popup.setAttribute("noautofocus", "true");
+				this._popup.setAttribute("ignorekeys", "true");
+				this._popup.setAttribute("consumeoutsideclicks", "never");
+				this._completionList = document.createXULElement("richlistbox");
+				// On mousedown rather than click: focus never leaves the
+				// input, and the blur that clicking would cause won't close
+				// the list before the click can land
+				this._completionList.addEventListener("mousedown", (event) => {
+					let row = event.button === 0 && event.target.closest("richlistitem");
+					if (row) {
+						event.preventDefault();
+						this._acceptCompletion(row);
+					}
+				});
+				this._popup.append(this._completionList);
+				// A popup in a shadow root gets none of the window's styles, so
+				// it goes in the document alongside the other popups
+				let popupset = document.querySelector("popupset");
+				(popupset || document.documentElement).append(this._popup);
+			}
+			return this._popup;
+		}
+
+		// Replace what's being typed with the given or selected completion,
+		// leaving the caret after it so the next part can be typed or
+		// completed in turn
+		_acceptCompletion(row) {
+			row = row || this._completionList.selectedItem || this._completionList.firstChild;
+			if (!row || !this._completions) {
+				return false;
+			}
+			let { type, start, end } = this._completions;
+			let value = this.inputField.value;
+			this.inputField.value = value.slice(0, start) + row.completion.text + value.slice(end);
+			let caret = start + row.completion.text.length;
+			this.inputField.setSelectionRange(caret, caret);
+			this.hideCompletions();
+			// Search and redraw as though it had been typed, and offer what
+			// comes next -- the values of the condition just completed
+			this.inputField.dispatchEvent(new Event("input", { bubbles: true }));
+			// A completed value finishes the clause: there's nothing to offer
+			// next, so don't reopen the list with the value itself
+			if (type === 'value') {
+				this.hideCompletions();
+			}
+			return true;
+		}
+
+		_handleCompletionKey(event) {
+			if (!this._popup || this._popup.state === "closed" || event.altKey) {
+				return;
+			}
+			let list = this._completionList;
+			switch (event.key) {
+				case "ArrowDown":
+				case "ArrowUp": {
+					let rows = list.itemCount;
+					let index = list.selectedIndex;
+					list.selectedIndex = event.key === "ArrowDown"
+						? (index + 1) % rows
+						: (index <= 0 ? rows - 1 : index - 1);
+					// Moving the selection with the list unfocused doesn't
+					// scroll it into view
+					list.ensureIndexIsVisible(list.selectedIndex);
+					break;
+				}
+				case "Enter":
+					// Only once the user has moved into the list -- otherwise
+					// Enter is the search it has always been, with the list
+					// out of its way
+					if (list.selectedIndex === -1 || !this._acceptCompletion()) {
+						this.hideCompletions();
+						return;
+					}
+					break;
+				case "Tab":
+					if (!this._acceptCompletion()) {
+						return;
+					}
+					break;
+				case "Escape":
+					this.hideCompletions();
+					break;
+				default:
+					return;
+			}
+			event.preventDefault();
+			event.stopPropagation();
+		}
+
+		disconnectedCallback() {
+			super.disconnectedCallback();
+			this._resizeObserver?.disconnect();
+			this._popup?.remove();
+		}
+
+		_syncScroll() {
+			if (this._highlightLayer) {
+				this._highlightLayer.scrollLeft = this.inputField.scrollLeft;
+			}
+		}
+
+		// Match the input's box and text metrics, so the two render in the
+		// same place
+		_syncGeometry() {
+			if (!this._highlightLayer) {
+				return;
+			}
+			let input = this.inputField;
+			let style = window.getComputedStyle(input);
+			let layer = this._highlightLayer.style;
+			layer.left = input.offsetLeft + "px";
+			layer.top = input.offsetTop + "px";
+			layer.width = input.offsetWidth + "px";
+			layer.height = input.offsetHeight + "px";
+			for (let property of ['paddingInlineStart', 'paddingInlineEnd', 'paddingTop',
+					'paddingBottom', 'font', 'letterSpacing', 'textIndent']) {
+				layer[property] = style[property];
+			}
+			this._syncScroll();
+		}
+	}
+
+	customElements.define("query-textbox", QueryTextbox);
+}
diff --git a/chrome/content/zotero/elements/quickSearchTextbox.js b/chrome/content/zotero/elements/quickSearchTextbox.js
index 58ce7e3727..79f51869e1 100644
--- a/chrome/content/zotero/elements/quickSearchTextbox.js
+++ b/chrome/content/zotero/elements/quickSearchTextbox.js
@@ -33,8 +33,15 @@
 			this.searchTextbox = null;
 			MozXULElement.insertFTLIfNeeded("zotero.ftl");
 			this.content = MozXULElement.parseXULToFragment(`
-				<hbox id="search-wrapper" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-				</hbox>
+				<deck id="search-deck">
+					<hbox id="search-wrapper">
+					</hbox>
+					<hbox id="advanced-search-indicator">
+						<label id="advanced-search-label" crop="end"/>
+						<toolbarbutton class="zotero-clicky advanced-collapse-button" tabindex="0"/>
+						<toolbarbutton class="zotero-clicky advanced-close-button" data-l10n-id="advanced-search-close" tabindex="0"/>
+					</hbox>
+				</deck>
 			`, ['chrome://zotero/locale/zotero.dtd']);
 		}
 
@@ -86,7 +93,7 @@
 
 			dropmarkerShadow.append(s1, s2, dropmarker);
 
-			let searchBox = document.createXULElement("search-textbox");
+			let searchBox = document.createXULElement("query-textbox");
 			searchBox.id = "zotero-tb-search-textbox";
 			// Enable applying styles to the input field
 			searchBox.inputField.setAttribute("part", "search-input");
@@ -95,6 +102,43 @@
 			wrapper.appendChild(dropmarkerHost);
 			wrapper.appendChild(searchBox);
 			
+			// Add Advanced Search button at the end of the field in main window
+			if (document.documentElement.getAttribute('windowtype') === 'navigator:browser') {
+				let advancedButton = document.createXULElement('toolbarbutton');
+				advancedButton.id = 'zotero-tb-search-advanced-button';
+				advancedButton.tabIndex = -1;
+				document.l10n.setAttributes(advancedButton, 'quicksearch-advanced-search-button');
+				advancedButton.addEventListener('command', (event) => {
+					// Don't trigger a quick search via the oncommand handler
+					event.stopPropagation();
+					// If there's text in the field, seed the Advanced Search with it,
+					// reproducing the current quick search mode as editable conditions.
+					let mode = Zotero.Prefs.get('search.quicksearch-mode');
+					if (this.value) {
+						ZoteroPane.openAdvancedSearchFromQuickSearch(this.value, mode);
+					}
+					else {
+						ZoteroPane.toggleAdvancedSearchState('open');
+					}
+				});
+				wrapper.appendChild(advancedButton);
+			}
+			
+			this.deck = this.firstElementChild;
+			
+			this.querySelector('.advanced-collapse-button').addEventListener('command', (event) => {
+				event.stopPropagation();
+				ZoteroPane.toggleAdvancedSearchState('collapsed');
+			});
+			this.querySelector('.advanced-close-button').addEventListener('command', (event) => {
+				event.stopPropagation();
+				// if activated via the keyboard, move focus to the Advanced Search button
+				let triggeredByKeyboard = [MouseEvent.MOZ_SOURCE_KEYBOARD, MouseEvent.MOZ_SOURCE_UNKNOWN].includes(event.inputSource);
+				ZoteroPane.toggleAdvancedSearchState('closed');
+				if (triggeredByKeyboard) {
+					this.querySelector('#zotero-tb-search-advanced-button').focus();
+				}
+			});
 			
 			// If Alt-Up/Down, show popup
 			this.addEventListener('keypress', (event) => {
@@ -132,20 +176,13 @@
 				popup.append(item);
 			}
 			
-			// Add Advanced Search menu item in main window
-			if (document.documentElement.getAttribute('windowtype') === 'navigator:browser') {
-				let separator = document.createXULElement('menuseparator');
-				popup.append(separator);
-				let advancedSearchOption = document.createXULElement('menuitem');
-				advancedSearchOption.label = Zotero.getString("zotero.toolbar.advancedSearch");
-				advancedSearchOption.addEventListener("command", () => {
-					ZoteroPane.openAdvancedSearchWindow();
-				});
-				popup.append(advancedSearchOption);
-			}
-			
 			return this._searchModePopup = popup;
 		}
+		
+		onCollectionSelected() {
+			this.searchTextbox.value = '';
+			this.updateMode();
+		}
 
 		updateMode() {
 			let mode = Zotero.Prefs.get("search.quicksearch-mode");
@@ -158,6 +195,34 @@
 			this.searchModePopup.querySelector(`menuitem[value="${mode}"]`)
 				.setAttribute('checked', 'true');
 			document.l10n.setAttributes(this.searchTextbox.inputField, "quicksearch-input", { placeholder: this._searchModes[mode] });
+
+			let advancedSearchDeck = document.getElementById('zotero-advanced-search-pane-deck');
+			if (advancedSearchDeck) {
+				let state = advancedSearchDeck.state;
+				let selectedSearchType = advancedSearchDeck.selectedSearchType;
+				
+				document.l10n.setAttributes(
+					this.querySelector('#advanced-search-label'),
+					selectedSearchType === 'temporary' ? 'advanced-search' : 'edit-saved-search',
+				);
+				this.deck.selectedIndex = state === 'closed' ? 0 : 1;
+				this.toggleAttribute('advanced-search-open', state !== 'closed');
+				this.querySelector('#advanced-search-indicator').dataset.collapsed = state === 'collapsed';
+				this.querySelector('.advanced-collapse-button').hidden = selectedSearchType === 'saved';
+				document.l10n.setAttributes(
+					this.querySelector('.advanced-collapse-button'),
+					state === 'collapsed' ? 'advanced-search-expand' : 'advanced-search-collapse'
+				);
+			}
+		}
+		
+		focus(options) {
+			if (this.deck.selectedIndex === 0) {
+				this._searchModePopup.flattenedTreeParentNode.focus(options);
+			}
+			else {
+				Services.focus.moveFocus(window, this.deck.selectedPanel, Services.focus.MOVEFOCUS_FORWARD, 0);
+			}
 		}
 
 		_id(id) {
diff --git a/chrome/content/zotero/elements/relatedBox.js b/chrome/content/zotero/elements/relatedBox.js
index 6f92f14a64..6024d1f613 100644
--- a/chrome/content/zotero/elements/relatedBox.js
+++ b/chrome/content/zotero/elements/relatedBox.js
@@ -178,6 +178,7 @@ import { getCSSItemTypeIcon } from 'components/icons';
 				return;
 			}
 			await Zotero.DB.executeTransaction(async () => {
+				Zotero.UndoHistory.stageAction('undo-action-add-related');
 				for (let relItem of relItems) {
 					if (this._item.addRelatedItem(relItem)) {
 						await this._item.save({
@@ -197,6 +198,7 @@ import { getCSSItemTypeIcon } from 'components/icons';
 			let item = await Zotero.Items.getAsync(id);
 			if (item) {
 				await Zotero.DB.executeTransaction(async () => {
+					Zotero.UndoHistory.stageAction('undo-action-remove-related');
 					if (this._item.removeRelatedItem(item)) {
 						await this._item.save({
 							skipDateModifiedUpdate: true
diff --git a/chrome/content/zotero/elements/richlistCheckbox.js b/chrome/content/zotero/elements/richlistCheckbox.js
index b3bada01ff..c0ecee9a0d 100644
--- a/chrome/content/zotero/elements/richlistCheckbox.js
+++ b/chrome/content/zotero/elements/richlistCheckbox.js
@@ -37,7 +37,7 @@
 		connectedCallback() {
 			this._checkbox = document.createXULElement('checkbox');
 			this._checkbox.setAttribute('native', 'true');
-			this._checkbox.setAttribute('checked', this.checked);
+			this._checkbox.toggleAttribute('checked', this.checked);
 			this._checkbox.addEventListener('focus', () => this.control.focus());
 			this._label = document.createElement('label');
 			this._label.textContent = this.label;
@@ -75,12 +75,12 @@
 		}
 		
 		get checked() {
-			return JSON.parse(this.getAttribute('checked'));
+			return this.hasAttribute('checked');
 		}
 
 		set checked(val) {
-			this._checkbox.setAttribute('checked', !!val);
-			this.setAttribute('checked', !!val);
+			this._checkbox.toggleAttribute('checked', !!val);
+			this.toggleAttribute('checked', !!val);
 		}
 	}
 	
diff --git a/chrome/content/zotero/elements/searchTextbox.js b/chrome/content/zotero/elements/searchTextbox.js
new file mode 100644
index 0000000000..3812fb5c3e
--- /dev/null
+++ b/chrome/content/zotero/elements/searchTextbox.js
@@ -0,0 +1,264 @@
+// Adapted from Mozilla toolkit/content/widgets/search-textbox.js, removed in Firefox 153
+// Modified to not set aria-autocomplete, which confuses screen readers
+
+// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+{
+  class MozSearchTextbox extends MozXULElement {
+    constructor() {
+      super();
+
+      MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
+
+      this.inputField = document.createElement("input");
+
+      const METHODS = [
+        "focus",
+        "blur",
+        "select",
+        "setUserInput",
+        "setSelectionRange",
+      ];
+      for (const method of METHODS) {
+        this[method] = (...args) => this.inputField[method](...args);
+      }
+
+      const READ_WRITE_PROPERTIES = [
+        "defaultValue",
+        "placeholder",
+        "readOnly",
+        "size",
+        "selectionStart",
+        "selectionEnd",
+      ];
+      for (const property of READ_WRITE_PROPERTIES) {
+        Object.defineProperty(this, property, {
+          enumerable: true,
+          get() {
+            return this.inputField[property];
+          },
+          set(val) {
+            this.inputField[property] = val;
+          },
+        });
+      }
+
+      this.attachShadow({ mode: "open" });
+      this.addEventListener("input", this);
+      this.addEventListener("keypress", this);
+      this.addEventListener("mousedown", this);
+    }
+
+    static get inheritedAttributes() {
+      return {
+        input:
+          "value,maxlength,disabled,size,readonly,placeholder,tabindex,accesskey,inputmode,spellcheck",
+        ".textbox-search-icon": "label=searchbuttonlabel,disabled",
+        ".textbox-search-clear": "disabled",
+      };
+    }
+
+    connectedCallback() {
+      if (this.delayConnectedCallback() || this.connected) {
+        return;
+      }
+
+      document.l10n.connectRoot(this.shadowRoot);
+
+      this.connected = true;
+      this.textContent = "";
+
+      const stylesheet = document.createElement("link");
+      stylesheet.rel = "stylesheet";
+      stylesheet.href = "chrome://zotero/skin/search-textbox.css";
+
+      const textboxSign = document.createXULElement("image");
+      textboxSign.className = "textbox-search-sign";
+      textboxSign.part = "search-sign";
+
+      const input = this.inputField;
+      input.setAttribute("inputmode", "search");
+      input.autocomplete = "off"; // not applicable in XUL docs and confuses aria.
+      input.addEventListener("focus", this);
+      input.addEventListener("blur", this);
+
+      const searchBtn = (this._searchButtonIcon =
+        document.createXULElement("image"));
+      searchBtn.className = "textbox-search-icon";
+      searchBtn.addEventListener("click", e => this._iconClick(e));
+
+      const clearBtn = document.createXULElement("image");
+      clearBtn.className = "textbox-search-clear";
+      clearBtn.part = "clear-icon";
+      clearBtn.setAttribute("role", "button");
+      document.l10n.setAttributes(
+        clearBtn,
+        "text-action-search-text-box-clear"
+      );
+      clearBtn.addEventListener("click", () => this._clearSearch());
+
+      const deck = (this._searchIcons = document.createXULElement("deck"));
+      deck.className = "textbox-search-icons";
+      deck.append(searchBtn, clearBtn);
+      this.shadowRoot.append(stylesheet, textboxSign, input, deck);
+
+      this._timer = null;
+
+      // Ensure the button state is up to date:
+      // eslint-disable-next-line no-self-assign
+      this.searchButton = this.searchButton;
+
+      this.initializeAttributeInheritance();
+    }
+
+    disconnectedCallback() {
+      document.l10n.disconnectRoot(this.shadowRoot);
+    }
+
+    set timeout(val) {
+      this.setAttribute("timeout", val);
+    }
+
+    get timeout() {
+      return parseInt(this.getAttribute("timeout")) || 500;
+    }
+
+    set searchButton(val) {
+      if (val) {
+        this.setAttribute("searchbutton", "true");
+        this.inputField.removeAttribute("aria-autocomplete");
+        this._searchButtonIcon.setAttribute("role", "button");
+      } else {
+        this.removeAttribute("searchbutton");
+        this._searchButtonIcon.setAttribute("role", "none");
+      }
+    }
+
+    get searchButton() {
+      return this.getAttribute("searchbutton") == "true";
+    }
+
+    set value(val) {
+      this.inputField.value = val;
+
+      if (val) {
+        this._searchIcons.selectedIndex = this.searchButton ? 0 : 1;
+      } else {
+        this._searchIcons.selectedIndex = 0;
+      }
+
+      if (this._timer) {
+        clearTimeout(this._timer);
+      }
+    }
+
+    get value() {
+      return this.inputField.value;
+    }
+
+    get editor() {
+      return this.inputField.editor;
+    }
+
+    set disabled(val) {
+      this.inputField.disabled = val;
+      if (val) {
+        this.setAttribute("disabled", "true");
+      } else {
+        this.removeAttribute("disabled");
+      }
+    }
+
+    get disabled() {
+      return this.inputField.disabled;
+    }
+
+    on_blur() {
+      this.removeAttribute("focused");
+    }
+
+    on_focus() {
+      this.setAttribute("focused", "true");
+    }
+
+    on_input() {
+      if (this.searchButton) {
+        this._searchIcons.selectedIndex = 0;
+        return;
+      }
+      if (this._timer) {
+        clearTimeout(this._timer);
+      }
+      this._timer =
+        this.timeout && setTimeout(this._fireCommand, this.timeout, this);
+      this._searchIcons.selectedIndex = this.value ? 1 : 0;
+    }
+
+    on_keypress(event) {
+      switch (event.keyCode) {
+        case KeyEvent.DOM_VK_ESCAPE:
+          if (this._clearSearch()) {
+            event.preventDefault();
+            event.stopPropagation();
+          }
+          break;
+        case KeyEvent.DOM_VK_RETURN:
+          this._enterSearch();
+          event.preventDefault();
+          event.stopPropagation();
+          break;
+      }
+    }
+
+    on_mousedown() {
+      if (!this.hasAttribute("focused")) {
+        this.setSelectionRange(0, 0);
+        this.focus();
+      }
+    }
+
+    _fireCommand(me) {
+      if (me._timer) {
+        clearTimeout(me._timer);
+      }
+      me._timer = null;
+      me.doCommand();
+    }
+
+    _iconClick() {
+      if (this.searchButton) {
+        this._enterSearch();
+      } else {
+        this.focus();
+      }
+    }
+
+    _enterSearch() {
+      if (this.disabled) {
+        return;
+      }
+      if (this.searchButton && this.value && !this.readOnly) {
+        this._searchIcons.selectedIndex = 1;
+      }
+      this._fireCommand(this);
+    }
+
+    _clearSearch() {
+      if (!this.disabled && !this.readOnly && this.value) {
+        this.value = "";
+        this._fireCommand(this);
+        this._searchIcons.selectedIndex = 0;
+        return true;
+      }
+      return false;
+    }
+  }
+
+  customElements.define("search-textbox", MozSearchTextbox);
+}
diff --git a/chrome/content/zotero/elements/styleConfigurator.js b/chrome/content/zotero/elements/styleConfigurator.js
index 69cefc5bda..8269453b67 100644
--- a/chrome/content/zotero/elements/styleConfigurator.js
+++ b/chrome/content/zotero/elements/styleConfigurator.js
@@ -144,9 +144,12 @@
 				val = '';
 			}
 			
+			val = Zotero.Styles.resolveLocale(val);
 			this._value = val;
 			const styleData = this._style ? Zotero.Styles.get(this._style) : null;
-			this.localeListEl.value = styleData && styleData.effectiveLocale || this._value;
+			this.localeListEl.value = Zotero.Styles.resolveLocale(
+				styleData && styleData.effectiveLocale || this._value
+			);
 		}
 
 		get style() {
@@ -157,7 +160,9 @@
 			this._style = style;
 			const styleData = style ? Zotero.Styles.get(style) : null;
 			this.localeListEl.disabled = !style || !!styleData.effectiveLocale;
-			this.localeListEl.value = styleData && styleData.effectiveLocale || this._value || this.fallbackLocale;
+			this.localeListEl.value = Zotero.Styles.resolveLocale(
+				styleData && styleData.effectiveLocale || this._value || this.fallbackLocale
+			);
 		}
 
 		connectedCallback() {
@@ -171,7 +176,7 @@
 			this._value = this.getAttribute('value');
 
 			await Zotero.Styles.init();
-			this.fallbackLocale = Zotero.Styles?.primaryDialects[Zotero.locale] || Zotero.locale;
+			this.fallbackLocale = Zotero.Styles.resolveLocale(Zotero.locale);
 
 			const menuLocales = Zotero.Utilities.deepCopy(Zotero.Styles.locales);
 			const menuLocalesKeys = Object.keys(menuLocales).sort();
diff --git a/chrome/content/zotero/elements/tagsBox.js b/chrome/content/zotero/elements/tagsBox.js
index 9e36ee5e02..c6b20555e8 100644
--- a/chrome/content/zotero/elements/tagsBox.js
+++ b/chrome/content/zotero/elements/tagsBox.js
@@ -239,13 +239,14 @@
 
 			// "-" button
 			if (this.editable) {
-				remove.setAttribute('disabled', false);
+				remove.removeAttribute('disabled');
 				remove.addEventListener('click', async (_event) => {
 					if (tagData) {
 						let item = this.item;
 						this.remove(tagName);
 						try {
 							item.removeTag(tagName);
+							this._pendingRemovalCount++;
 							// Save item after a debounce to avoid triggering multiple
 							// save operations. If there are many tags in the library,
 							// db transaction may not keep up with UI changes, and cause
@@ -466,7 +467,7 @@
 						this.add(value);
 						try {
 							this.item.replaceTag(oldValue, value);
-							await this.item.saveTx();
+							await this.item.saveTx({ undoAction: 'undo-action-change-tag' });
 						}
 						catch (e) {
 							this._forceRenderAll();
@@ -483,7 +484,10 @@
 							nextRowElem?.focus();
 						}
 						this.item.removeTag(oldValue);
-						await this.item.saveTx();
+						await this.item.saveTx({
+							undoAction: 'undo-action-remove-tag',
+							undoActionArgs: { count: 1 }
+						});
 					}
 					catch (e) {
 						this._forceRenderAll();
@@ -503,7 +507,10 @@
 				}
 
 				tags.forEach(tag => this.item.addTag(tag));
-				await this.item.saveTx();
+				await this.item.saveTx({
+					undoAction: 'undo-action-add-tag',
+					undoActionArgs: { count: 1 }
+				});
 			}
 			// Single tag at end
 			else {
@@ -518,7 +525,10 @@
 				this.add(value);
 				this.item.addTag(value);
 				try {
-					await this.item.saveTx();
+					await this.item.saveTx({
+						undoAction: 'undo-action-add-tag',
+						undoActionArgs: { count: 1 }
+					});
 				}
 				catch (e) {
 					this._forceRenderAll();
@@ -602,7 +612,9 @@
 		removeAll = () => {
 			if (Services.prompt.confirm(null, "", Zotero.getString('pane.item.tags.removeAll'))) {
 				this.item.setTags([]);
-				this.item.saveTx();
+				this.item.saveTx({
+					undoAction: 'undo-action-remove-all-tags'
+				});
 			}
 		};
 
@@ -652,8 +664,15 @@
 			}
 		}
 
+		_pendingRemovalCount = 0;
+
 		_saveItemDebounced = Zotero.Utilities.debounce(async (item) => {
-			await item.saveTx();
+			let count = this._pendingRemovalCount;
+			this._pendingRemovalCount = 0;
+			await item.saveTx({
+				undoAction: 'undo-action-remove-tags-from-item',
+				undoActionArgs: { count }
+			});
 		});
 
 		_id(id) {
diff --git a/chrome/content/zotero/elements/utils/collapsiblePane.mjs b/chrome/content/zotero/elements/utils/collapsiblePane.mjs
index 6970d9598d..9e7b354199 100644
--- a/chrome/content/zotero/elements/utils/collapsiblePane.mjs
+++ b/chrome/content/zotero/elements/utils/collapsiblePane.mjs
@@ -30,11 +30,11 @@
  * @returns {boolean}
  */
 export function isPaneCollapsed(pane) {
-	let collapsibleParent = pane.closest('splitter:not([hidden="true"]) + *');
+	let collapsibleParent = pane.closest('splitter:not([hidden]) + *');
 	if (!collapsibleParent) {
 		return false;
 	}
-	return collapsibleParent.getAttribute('collapsed') === 'true';
+	return collapsibleParent.hasAttribute('collapsed');
 }
 
 /**
@@ -44,7 +44,7 @@ export function isPaneCollapsed(pane) {
  * @param {boolean} collapsed
  */
 export function setPaneCollapsed(pane, collapsed) {
-	let collapsibleParent = pane.closest('splitter:not([hidden="true"]) + *');
+	let collapsibleParent = pane.closest('splitter:not([hidden]) + *');
 	if (!collapsibleParent) {
 		return;
 	}
diff --git a/chrome/content/zotero/elements/zoteroSearch.js b/chrome/content/zotero/elements/zoteroSearch.js
index a73b56e1b7..3853876eeb 100644
--- a/chrome/content/zotero/elements/zoteroSearch.js
+++ b/chrome/content/zotero/elements/zoteroSearch.js
@@ -37,35 +37,14 @@
 
 	class ZoteroSearch extends SearchElementBase {
 		content = MozXULElement.parseXULToFragment(`
-			<vbox xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-					id="search-box" flex="1" onkeypress="this.closest('zoterosearch').handleKeyPress(event)">
-				<hbox align="center">
-					<label id="libraryMenu-label" value="&zotero.search.searchInLibrary;" control="libraryMenu"/>
-					<menulist id="libraryMenu" aria-labelledby="libraryMenu-label" oncommand="this.closest('zoterosearch').updateLibrary();" native="true">
-						<menupopup/>
-					</menulist>
-				</hbox>
-				<groupbox>
-					<caption align="center">
-						<label id="joinModeMenu-label" value="&zotero.search.joinMode.prefix;"/>
-						<menulist id="joinModeMenu" aria-labelledby="joinModeMenu-label" oncommand="this.closest('zoterosearch').updateJoinMode();" native="true">
-							<menupopup>
-								<menuitem label="&zotero.search.joinMode.any;" value="any"/>
-								<menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/>
-							</menupopup>
-						</menulist>
-						<label value="&zotero.search.joinMode.suffix;"/>
-					</caption>
-					<vbox id="conditions"/>
-				</groupbox>
-				<hbox>
-					<checkbox id="recursiveCheckbox" label="&zotero.search.recursive.label;" oncommand="this.closest('zoterosearch').updateCheckbox('recursive');" native="true"/>
-					<checkbox id="noChildrenCheckbox" label="&zotero.search.noChildren;" oncommand="this.closest('zoterosearch').updateCheckbox('noChildren');" native="true"/>
-				</hbox>
-				<hbox>
-					<checkbox id="includeParentsAndChildrenCheckbox" label="&zotero.search.includeParentsAndChildren;" oncommand="this.closest('zoterosearch').updateCheckbox('includeParentsAndChildren');" native="true"/>
-				</hbox>
-			</vbox>
+			<search-condition-group root="true"/>
+			<vbox id="search-binding-hint" hidden="true"/>
+			<hbox id="search-option-checkboxes">
+				<checkbox id="recursiveCheckbox" label="&zotero.search.recursive.label;" native="true"/>
+			</hbox>
+			<hbox id="search-legacy-options" align="center" hidden="true">
+				<checkbox id="includeParentsAndChildrenCheckbox" label="&zotero.search.includeParentsAndChildren;" native="true"/>
+			</hbox>
 		`, ['chrome://zotero/locale/zotero.dtd', 'chrome://zotero/locale/searchbox.dtd']);
 
 		get search() {
@@ -74,131 +53,359 @@
 
 		set search(val) {
 			this.searchRef = val;
-
-			var libraryMenu = this.querySelector('#libraryMenu');
-			var libraries = Zotero.Libraries.getAll();
-			Zotero.Utilities.Internal.buildLibraryMenu(
-				libraryMenu, libraries, this.searchRef.libraryID
-			);
-			if (this.searchRef.id) {
-				libraryMenu.disabled = true;
+			// Setting condition controls' values during a render shouldn't trigger a
+			// rebuild of the search from the half-built tree
+			this._rendering = true;
+			try {
+				this.renderConditions();
 			}
-			this.updateLibrary();
-
-			this.querySelector('#joinModeMenu').removeAttribute('condition');
-			this.querySelector('#joinModeMenu').value = 'all';
-
-			var conditionsBox = this.querySelector('#conditions');
-			while (conditionsBox.hasChildNodes()) {
-				conditionsBox.removeChild(conditionsBox.firstChild);
+			finally {
+				this._rendering = false;
 			}
+		}
 
+		init() {
+			this.rootGroup = this.querySelector('search-condition-group[root]');
+			this.addEventListener('keypress', event => this.handleKeyPress(event));
+			// Re-evaluate which remove buttons are enabled and which groups can bind to the
+			// same descendant as the conditions change
+			this.addEventListener('input', (event) => {
+				this.clearPendingAdd(event);
+				this.updateRemoveButtons();
+				this.updateBindingMenus();
+				this.updateBindingHint();
+				this.updateLevelWarning();
+				this.updateSearchOptions();
+			});
+			this.addEventListener('command', (event) => {
+				this.clearPendingAdd(event);
+				this.updateRemoveButtons();
+				this.updateBindingMenus();
+				this.updateBindingHint();
+				this.updateLevelWarning();
+				this.updateSearchOptions();
+			});
+		}
+
+		// A condition row added via the "+" button doesn't count toward the binding hint or
+		// level warning until the user engages with it, so adding a row (seeded with the previous
+		// row's condition) doesn't immediately warn before they've had a chance to change it.
+		// This clears that flag when a value edit bubbles up from a row -- typing in the field
+		// or picking from a value menu. Changing the condition doesn't bubble here (its menu
+		// stops propagation), so onConditionSelected() has to clear the flag itself.
+		clearPendingAdd(event) {
+			let row = event.target.closest && event.target.closest('zoterosearchcondition');
+			if (row) {
+				row._pendingAdd = false;
+			}
+		}
+
+		// Build the condition tree (root group, nested groups, and search-global
+		// checkboxes) from the search's flat condition list
+		renderConditions() {
+			var root = this.rootGroup;
+
+			this.querySelector('#recursiveCheckbox').checked = false;
+			// 'Include parent and child items' is a legacy hack subsumed by result levels;
+			// its checkbox is shown only for an existing search that still carries the flag
+			this.querySelector('#includeParentsAndChildrenCheckbox').checked = false;
+			this.querySelector('#search-legacy-options').hidden = true;
+
+			root.clear();
+
+			// Walk the flat conditions, pushing/popping a group stack on the group
+			// markers. A 'joinMode' applies to the group on top of the stack; anything
+			// else becomes a condition row or a nested group within it.
+			var stack = [root];
 			var conditions = this.search.getConditions();
 			for (let id in conditions) {
 				let condition = conditions[id];
-				// Checkboxes
 				switch (condition.condition) {
 					case 'recursive':
+						this.querySelector('#recursiveCheckbox').checked = condition.operator == 'true';
+						continue;
+
+					// Legacy "show only top-level items" is exactly result level = item, so
+					// fold it into the root result level rather than a checkbox
 					case 'noChildren':
+						if (condition.operator == 'true') {
+							root.resultLevel = 'item';
+						}
+						continue;
+
+					// Legacy include-parents-and-children: keep it editable for searches that
+					// have it, but don't offer it on new ones
 					case 'includeParentsAndChildren':
-					{
-						let checkbox = condition.condition + 'Checkbox';
-						this.querySelector(`#${checkbox}`).setAttribute('condition', id);
-						this.querySelector(`#${checkbox}`).checked = condition.operator == 'true';
+						this.querySelector('#includeParentsAndChildrenCheckbox').checked
+							= condition.operator == 'true';
+						if (condition.operator == 'true') {
+							this.querySelector('#search-legacy-options').hidden = false;
+						}
+						continue;
+
+					case 'joinMode':
+						stack[stack.length - 1].joinMode = condition.operator;
+						continue;
+
+					case 'resultLevel':
+						stack[stack.length - 1].resultLevel = condition.operator;
+						continue;
+
+					case 'groupStart': {
+						let group = document.createXULElement('search-condition-group');
+						stack[stack.length - 1].conditionsContainer.appendChild(group);
+						stack.push(group);
 						continue;
 					}
-				}
 
-				if (condition.condition == 'joinMode') {
-					this.querySelector('#joinModeMenu').setAttribute('condition', id);
-					this.querySelector('#joinModeMenu').value = condition.operator;
+					case 'groupEnd':
+						if (stack.length > 1) {
+							stack.pop();
+						}
+						continue;
+
+					default:
+						stack[stack.length - 1].addCondition(condition);
+				}
+			}
+
+			// The root always shows at least one condition, even for an empty search
+			if (!root.conditionsContainer.childElementCount) {
+				root.addCondition();
+			}
+
+			this.updateRemoveButtons();
+			this.updateBindingMenus();
+			this.updateBindingHint();
+			this.updateLevelWarning();
+			this.updateSearchOptions();
+		}
+
+		// "Search subcollections" only affects Collection conditions (it expands them to
+		// their descendants), so show it only when the search actually has one
+		updateSearchOptions() {
+			let hasCollection = [...this.querySelectorAll('zoterosearchcondition')]
+				.some(row => row.selectedCondition == 'collection');
+			this.querySelector('#search-option-checkboxes').hidden = !hasCollection;
+		}
+
+		// Refresh each nested group's same-entity binding menu (visibility and options)
+		updateBindingMenus() {
+			for (let group of this.querySelectorAll('search-condition-group')) {
+				group.updateBindingMenu();
+			}
+		}
+
+		// Refresh every group's level warning. Each group flags only its own conditions, so the
+		// message sits on the group whose conditions actually conflict and speaks to that group's
+		// controls (see SearchConditionGroup.updateLevelWarning).
+		updateLevelWarning() {
+			for (let group of this.querySelectorAll('search-condition-group')) {
+				group.updateLevelWarning();
+			}
+		}
+
+		// Offer to bind ungrouped sibling conditions at the root. The root can't bind itself
+		// (it returns the result level), so 2+ of its conditions sharing a level below the
+		// result level are wrappable into a "same attachment" group -- surfaced as a hint
+		// with a button per such level. Nested groups use their own binding menu instead.
+		updateBindingHint() {
+			var hint = this.querySelector('#search-binding-hint');
+			var resultLevel = this.rootGroup.resultLevel;
+			var counts = {};
+			for (let row of this.rootGroup.conditionsContainer.children) {
+				// Skip a row just added via "+" until the user engages with it, so adding a row
+				// doesn't immediately suggest grouping it
+				if (row.localName != 'zoterosearchcondition' || row._pendingAdd) {
+					continue;
+				}
+				let level = row.conditionLevel;
+				if (Zotero.Search._isAncestorLevel(resultLevel, level)) {
+					counts[level] = (counts[level] || 0) + 1;
+				}
+			}
+			var levels = ['attachment', 'note', 'annotation'].filter(l => counts[l] >= 2);
+			// Only rebuild when the set of bindable levels changes, so re-running this on every
+			// keystroke doesn't recreate the rows and make the hint flicker.
+			let key = levels.join(',');
+			if (key === this._bindingHintKey) {
+				return;
+			}
+			this._bindingHintKey = key;
+			hint.replaceChildren();
+			if (!levels.length) {
+				hint.hidden = true;
+				return;
+			}
+			// One self-contained line per level: a statement naming that level and a button to
+			// group its conditions into one entity. Separate lines when 2+ levels each qualify.
+			for (let level of levels) {
+				let row = document.createXULElement('hbox');
+				row.setAttribute('align', 'center');
+				let label = document.createXULElement('label');
+				label.setAttribute('data-l10n-id', 'advanced-search-binding-hint-' + level);
+				let button = document.createXULElement('button');
+				button.setAttribute('data-l10n-id', 'advanced-search-bind-same-' + level);
+				button.addEventListener('command', () => this.rootGroup.bindSameEntity(level));
+				row.append(label, button);
+				hint.append(row);
+			}
+			hint.hidden = false;
+		}
+
+		// Regenerate the search's flat condition list from the current tree. The DOM is
+		// the source of truth: on any edit we walk the groups in order and rebuild
+		// search._conditions from scratch.
+		updateSearch() {
+			if (this._rendering || !this.search) {
+				return;
+			}
+
+			// Refresh the binding menus first: a condition edit can disqualify a group's
+			// same-entity binding, and collectGroup() below serializes the binding state
+			this.updateBindingMenus();
+
+			var flat = [];
+			this.collectGroup(this.rootGroup, flat, true);
+
+			// Search-global options. noChildren is no longer emitted here -- it's carried by
+			// the result level (resultLevel = item). includeParentsAndChildren is emitted only when
+			// its legacy checkbox is present and still checked, so unchecking it drops it.
+			// 'recursive' only does anything alongside a Collection condition, so emit it only
+			// when the search has one, matching the checkbox's visibility.
+			if (this.querySelector('#recursiveCheckbox').checked
+					&& flat.some(c => c.condition == 'collection')) {
+				flat.push({ condition: 'recursive', operator: 'true', value: null });
+			}
+			if (this.querySelector('#includeParentsAndChildrenCheckbox').checked) {
+				flat.push({ condition: 'includeParentsAndChildren', operator: 'true', value: null });
+			}
+
+			this.rebuildConditions(flat);
+
+			// Any mutation runs through here (including paths whose menus stopPropagation, like
+			// changing or removing a condition), so refresh the derived UI from one place
+			this.updateBindingHint();
+			this.updateLevelWarning();
+			this.updateSearchOptions();
+		}
+
+		// Append a group's serialized form to `flat`. The root contributes its
+		// conditions directly; a nested group is wrapped in groupStart/groupEnd markers.
+		// A 'joinMode' marker is emitted only for 'any'; 'all' is the default and is omitted.
+		collectGroup(group, flat, isRoot) {
+			if (!isRoot) {
+				flat.push({ condition: 'groupStart', operator: 'true', value: '' });
+			}
+			if (group.joinMode == 'any') {
+				flat.push({ condition: 'joinMode', operator: 'any', value: null });
+			}
+			// A concrete result level is emitted as a marker inside the group, like joinMode; 'any'
+			// (the default) is omitted
+			if (group.resultLevel && group.resultLevel != 'any') {
+				flat.push({ condition: 'resultLevel', operator: group.resultLevel, value: null });
+			}
+			for (let child of group.conditionsContainer.children) {
+				if (child.localName == 'zoterosearchcondition') {
+					let data = child.getConditionData();
+					if (data) {
+						flat.push(data);
+					}
+				}
+				else if (child.localName == 'search-condition-group') {
+					this.collectGroup(child, flat, false);
+				}
+			}
+			if (!isRoot) {
+				flat.push({ condition: 'groupEnd', operator: 'true', value: '' });
+			}
+		}
+
+		rebuildConditions(flat) {
+			var search = this.search;
+			var count = Object.keys(search.getConditions()).length;
+			// removeCondition() renumbers the remaining conditions, so 0 is always the
+			// next one to remove
+			for (let i = 0; i < count; i++) {
+				search.removeCondition(0);
+			}
+			for (let condition of flat) {
+				search.addCondition(condition.condition, condition.operator, condition.value);
+			}
+		}
+
+		// Enable the remove (-) button on each condition. The root's last remaining
+		// condition can be removed only once it's populated, which resets it to the
+		// default empty condition.
+		updateRemoveButtons() {
+			var rootContainer = this.rootGroup.conditionsContainer;
+			var loneRootCondition = rootContainer.childElementCount == 1
+					&& rootContainer.firstElementChild.localName == 'zoterosearchcondition'
+				? rootContainer.firstElementChild
+				: null;
+			for (let row of this.querySelectorAll('zoterosearchcondition')) {
+				if (row == loneRootCondition && !row.isPopulated()) {
+					row.disableRemoveButton();
 				}
 				else {
-					this.addCondition(condition);
+					row.enableRemoveButton();
 				}
 			}
 		}
 
-		addCondition(ref) {
-			var conditionsBox = this.querySelector('#conditions');
-			var condition = document.createXULElement('zoterosearchcondition');
-			condition.setAttribute('flex', '1');
-			
-			conditionsBox.appendChild(condition);
-			
-			// Default to an empty 'title' condition
-			if (!ref) {
-				ref = this.search.getCondition(this.search.addCondition("title", "contains", ""));
+		// Remove a condition row, pruning any groups it empties. The root always keeps
+		// at least one condition, so emptying it resets it to a single empty default.
+		removeRow(row, focusRemoveButton) {
+			var group = row.closest('search-condition-group');
+			// Remember the row's place so focus can move there after a keyboard removal
+			var index = [...group.conditionsContainer.children].indexOf(row);
+			row.remove();
+			// A group left with no conditions is removed, bubbling up toward the root
+			while (!group.isRoot && !group.conditionsContainer.childElementCount) {
+				let parent = group.parentElement.closest('search-condition-group');
+				// The pruned group's slot in its parent is now where focus should land
+				index = [...parent.conditionsContainer.children].indexOf(group);
+				group.remove();
+				group = parent;
 			}
-			
-			condition.initWithParentAndCondition(this, ref);
-			
-			if (conditionsBox.childNodes.length == 2) {
-				conditionsBox.childNodes[0].enableRemoveButton();
-			}
-			else if (conditionsBox.childNodes.length == 1) {
-				conditionsBox.childNodes[0].disableRemoveButton();
-			}
-		}
 
-		removeCondition(id) {
-			var conditionsBox = this.querySelector('#conditions');
-			
-			this.search.removeCondition(id);
-			
-			for (var i = 0, len = conditionsBox.childNodes.length; i < len; i++) {
-				if (conditionsBox.childNodes[i].conditionID == id) {
-					conditionsBox.removeChild(conditionsBox.childNodes[i]);
-					break;
+			var reset = this.ensureNotEmpty();
+			this.updateSearch();
+			this.updateRemoveButtons();
+			if (reset) {
+				// The removed button is gone, so move focus to the new condition's drop-down
+				this.rootGroup.conditionsContainer.firstElementChild
+					.querySelector('#conditionsmenu').focus();
+			}
+			else if (focusRemoveButton && group.isConnected) {
+				// After a keyboard removal, move focus to the remove button of the row
+				// that took the removed row's place, or the last row if the removed row
+				// was last, so conditions can be deleted in succession from the keyboard
+				let rows = group.conditionsContainer.children;
+				let next = rows[index] || rows[rows.length - 1];
+				// A nested group may now hold that slot; focus its first condition
+				if (next && next.localName == 'search-condition-group') {
+					next = next.querySelector('zoterosearchcondition');
+				}
+				if (next) {
+					let button = next.querySelector('#remove');
+					// A disabled remove button can't take focus, so fall back to the drop-down
+					let target = button.hasAttribute('disabled')
+						? next.querySelector('#conditionsmenu')
+						: button;
+					setTimeout(() => target.focus({ focusVisible: true }));
 				}
 			}
-			
-			if (conditionsBox.childNodes.length == 1) {
-				conditionsBox.childNodes[0].disableRemoveButton();
-			}
 		}
 
-		updateLibrary() {
-			var menu = this.querySelector('#libraryMenu');
-			var libraryID = parseInt(menu.selectedItem.value);
-			
-			if (this.onLibraryChange) {
-				this.onLibraryChange(libraryID);
-			}
-			if (!this.searchRef.id) {
-				this.searchRef.libraryID = libraryID;
-			}
-			
-			[...this.querySelector('#conditions').childNodes].forEach(x => x.onLibraryChange());
-		}
-
-		updateJoinMode() {
-			var menu = this.querySelector('#joinModeMenu');
-			if (menu.hasAttribute('condition')) this.search.updateCondition(menu.getAttribute('condition'), 'joinMode', menu.value, null);
-			else menu.setAttribute('condition', this.search.addCondition('joinMode', menu.value, null));
-		}
-
-		updateCheckbox(condition) {
-			var checkbox = this.querySelector('#' + condition + 'Checkbox');
-			var value = checkbox.checked ? 'true' : 'false';
-			if (checkbox.hasAttribute('condition')) {
-				this.search.updateCondition(checkbox.getAttribute('condition'),
-					condition, value, null);
-			}
-			else {
-				checkbox.setAttribute('condition',
-					this.search.addCondition(condition, value, null));
-			}
-		}
-
-		// Calls updateSearch() on all search conditions
-		updateSearch() {
-			var conditionsBox = this.querySelector('#conditions');
-			if (conditionsBox.hasChildNodes()) {
-				for (var i = 0, len = conditionsBox.childNodes.length; i < len; i++) {
-					conditionsBox.childNodes[i].updateSearch();
-				}
+		// The root always shows at least one condition. Returns true if a default
+		// condition had to be added back.
+		ensureNotEmpty() {
+			if (!this.rootGroup.conditionsContainer.childElementCount) {
+				this.rootGroup.addCondition();
+				return true;
 			}
+			return false;
 		}
 
 		handleKeyPress(event) {
@@ -209,27 +416,496 @@
 			}
 			switch (event.keyCode) {
 				case event.DOM_VK_RETURN:
-					this.active = true;
-					
 					if (event.shiftKey) {
-						this.addCondition();
-					}
-					else {
-						this.doCommand();
+						// Add to the group holding the focused control, falling back to the root
+						let group = event.target.closest
+							&& event.target.closest('search-condition-group');
+						let row = (group || this.rootGroup).addCondition();
+						// Don't let the new row trigger the binding hint/warning until the user
+						// engages with it (see clearPendingAdd)
+						row._pendingAdd = true;
+						this.updateSearch();
+						this.updateRemoveButtons();
+						// Move focus to the new row's drop-down so it can be set from the keyboard
+						this.focusNewCondition(row);
 					}
 					break;
 			}
 		}
+
+		// Move focus to a newly added condition's drop-down. Deferred so it isn't
+		// immediately undone by the platform's own handling of the key event that
+		// triggered the addition (which otherwise keeps focus on the source element).
+		focusNewCondition(row) {
+			let menu = row.querySelector('#conditionsmenu');
+			setTimeout(() => menu.focus({ focusVisible: true }));
+		}
 	}
 	customElements.define("zoterosearch", ZoteroSearch);
 
+	class SearchConditionGroup extends SearchElementBase {
+		content = MozXULElement.parseXULToFragment(`
+			<groupbox class="search-condition-group">
+				<caption align="center">
+					<label class="result-level-prefix"/>
+					<menulist class="result-level-menu" native="true" data-l10n-id="advanced-search-result-level-menu">
+						<menupopup>
+							<menuitem value="any" data-l10n-id="advanced-search-result-level-any" selected="true"/>
+							<menuitem value="item" data-l10n-id="advanced-search-result-level-item"/>
+							<menuitem value="attachment" data-l10n-id="advanced-search-result-level-attachment"/>
+							<menuitem value="note" data-l10n-id="advanced-search-result-level-note"/>
+							<menuitem value="annotation" data-l10n-id="advanced-search-result-level-annotation"/>
+						</menupopup>
+					</menulist>
+					<label class="join-mode-prefix" value="&zotero.search.joinMode.prefix;"/>
+					<menulist class="join-mode-menu" native="true" aria-label="&zotero.search.joinMode.prefix;">
+						<menupopup>
+							<menuitem label="&zotero.search.joinMode.any;" value="any"/>
+							<menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/>
+						</menupopup>
+					</menulist>
+					<label class="join-mode-following" data-l10n-id="advanced-search-of-the-following" hidden="true"/>
+					<menulist class="binding-menu" native="true" hidden="true" data-l10n-id="advanced-search-binding-menu">
+						<menupopup/>
+					</menulist>
+					<label class="join-mode-suffix" value="&zotero.search.joinMode.suffix;"/>
+					<spacer flex="1"/>
+					<hbox class="group-actions">
+						<toolbarbutton class="remove-group zotero-clicky zotero-clicky-minus" tabindex="0" hidden="true" data-l10n-id="advanced-search-remove-group-btn" onclick="this.closest('search-condition-group').onRemoveGroupClicked()"/>
+						<toolbarbutton class="add-condition zotero-clicky zotero-clicky-plus" tabindex="0" data-l10n-id="advanced-search-add-btn" onclick="this.closest('search-condition-group').onAddSiblingClicked()"/>
+						<toolbarbutton class="ungroup-group zotero-clicky search-group-button" tabindex="0" hidden="true" data-l10n-id="advanced-search-ungroup-btn" onclick="this.closest('search-condition-group').onUngroupClicked()"/>
+						<html:div class="group-action-placeholder"/>
+					</hbox>
+				</caption>
+				<vbox class="conditions"/>
+				<hbox class="level-warning" hidden="true">
+					<description/>
+				</hbox>
+			</groupbox>
+		`, ['chrome://zotero/locale/zotero.dtd', 'chrome://zotero/locale/searchbox.dtd']);
+
+		init() {
+			this.joinMenu = this.querySelector('.join-mode-menu');
+			this.resultLevelMenu = this.querySelector('.result-level-menu');
+			this.bindingMenu = this.querySelector('.binding-menu');
+			this.conditionsContainer = this.querySelector('.conditions');
+			// The group's own warning element, stashed at init to avoid re-querying.
+			this.levelWarning = this.querySelector('.level-warning');
+
+			// The result level is tracked here and reflected to whichever control is active: the root's
+			// result-level menu ("Find ..."), or a nested group's binding menu ("... in the
+			// same attachment"). collectGroup/renderConditions read and write `resultLevel`.
+			this._resultLevel = 'any';
+
+			// The root surfaces the result-level menu; a nested group hides it and instead
+			// shows a binding menu (built on demand by updateBindingMenu) when it holds
+			// conditions that can be bound to the same descendant.
+			this.resultLevelMenu.value = 'any';
+			var scopePrefix = this.querySelector('.result-level-prefix');
+			if (this.isRoot) {
+				// Read as one sentence: "Find [Top-level items] matching [all] of the following:"
+				scopePrefix.setAttribute('data-l10n-id', 'advanced-search-result-level-prefix-root');
+				this.querySelector('.join-mode-prefix').setAttribute('data-l10n-id', 'advanced-search-join-prefix-root');
+				this.resultLevelControl = this.resultLevelMenu;
+			}
+			else {
+				// Nested: "Match [all] of the following:" -- the result level lives on the
+				// root. The binding menu (and its hiding of the suffix) is set up in
+				// updateBindingMenu().
+				this.resultLevelMenu.hidden = true;
+				scopePrefix.hidden = true;
+				this.resultLevelControl = this.bindingMenu;
+			}
+
+			// Keep the stored result level in sync when the user changes the control (the
+			// command target may be the menulist or a menuitem inside it), so a nested
+			// binding that later hides still round-trips its last value
+			this.addEventListener('command', (event) => {
+				if (this.resultLevelControl && this.resultLevelControl.contains(event.target)) {
+					this._resultLevel = this.resultLevelControl.value || 'any';
+				}
+			});
+			// At init the group has no nested groups yet, so these resolve to its own
+			// caption buttons
+			this.addConditionButton = this.querySelector('.add-condition');
+			this.removeGroupButton = this.querySelector('.remove-group');
+			this.ungroupButton = this.querySelector('.ungroup-group');
+
+			// remove-group and ungroup default to hidden in the template, so the root only also
+			// hides its add button. A nested group shows all three and swaps the empty spacer
+			// for the ungroup button.
+			if (this.isRoot) {
+				this.addConditionButton.hidden = true;
+			}
+			else {
+				this.removeGroupButton.hidden = false;
+				this.ungroupButton.hidden = false;
+				this.querySelector('.group-action-placeholder').hidden = true;
+			}
+		}
+
+		get isRoot() {
+			return this.hasAttribute('root');
+		}
+
+		get searchElement() {
+			return this.closest('zoterosearch');
+		}
+
+		get search() {
+			return this.searchElement && this.searchElement.search;
+		}
+
+		get joinMode() {
+			return this.joinMenu.value;
+		}
+
+		set joinMode(val) {
+			this.joinMenu.value = val;
+		}
+
+		// The group's result level: 'any' (no level constraint -- mixed result for the root,
+		// plain grouping for a nested group) or a concrete 'item'/'attachment'/'note'/
+		// 'annotation' level for cross-level mapping. The active control's current
+		// selection is the source of truth; fall back to the stored value for a nested
+		// binding menu that's hidden (it has no options to read).
+		get resultLevel() {
+			if (this.resultLevelControl && !this.resultLevelControl.hidden) {
+				return this.resultLevelControl.value || 'any';
+			}
+			return this._resultLevel;
+		}
+
+		set resultLevel(val) {
+			this._resultLevel = val || 'any';
+			// Reflect to the active control if it currently offers a matching option; the
+			// binding menu's options are (re)built by updateBindingMenu()
+			let popup = this.resultLevelControl && this.resultLevelControl.querySelector('menupopup');
+			if (popup && [...popup.children].some(item => item.value == this._resultLevel)) {
+				this.resultLevelControl.value = this._resultLevel;
+			}
+		}
+
+		// Build the nested-group binding menu ("... in the same attachment"), shown when
+		// binding is meaningful -- 2+ conditions sharing a level below the result level --
+		// or when the group is already bound.
+		updateBindingMenu() {
+			if (this.isRoot) {
+				return;
+			}
+			let resultLevel = 'any';
+			if (this.searchElement && this.searchElement.rootGroup) {
+				resultLevel = this.searchElement.rootGroup.resultLevel;
+			}
+			// Count this group's direct condition rows by level, keeping only levels below the
+			// result level -- those are what a group can bind to the same entity. A mixed
+			// ('any') result anchors a bound group to the top-level item (see
+			// Zotero.Search.combineConditions), so treat it as 'item' here.
+			let bindableBelow = resultLevel == 'any' ? 'item' : resultLevel;
+			let counts = {};
+			// Conditions that match at every level (a tag, say) can be bound to any of them
+			let anyLevel = 0;
+			for (let row of this.conditionsContainer.children) {
+				// Skip a row just added via "+" until the user engages with it, so adding a row
+				// doesn't immediately suggest grouping it
+				if (row.localName != 'zoterosearchcondition' || row._pendingAdd) {
+					continue;
+				}
+				let level = row.conditionLevel;
+				if (level == 'any') {
+					anyLevel++;
+				}
+				else if (Zotero.Search._isAncestorLevel(bindableBelow, level)) {
+					counts[level] = (counts[level] || 0) + 1;
+				}
+			}
+			// The levels this group can bind to at all: one of its conditions matches there, or
+			// -- for a condition that matches anywhere -- any level below the result level
+			let optionLevels = ['attachment', 'note', 'annotation'].filter(l => counts[l]
+				|| (anyLevel && Zotero.Search._isAncestorLevel(bindableBelow, l)));
+			// Drop a stored binding once it isn't one of them, as when the result level moves
+			// down to the bound level and binding there stops meaning anything
+			if (this._resultLevel != 'any' && !optionLevels.includes(this._resultLevel)) {
+				this._resultLevel = 'any';
+			}
+			// Binding is offered once it would mean something: a level shared by 2+ conditions
+			// ties them to one entity, and a condition that matches at any level is narrowed to
+			// the bound one. An existing binding stays visible (and clearable) even when its
+			// group no longer qualifies, so it can't invisibly constrain the group from a
+			// hidden menu.
+			if (this._resultLevel == 'any' && !anyLevel
+					&& !optionLevels.some(l => counts[l] >= 2)) {
+				this.bindingMenu.hidden = true;
+				// Plain group: "Match [all] of the following:" (the suffix carries the colon)
+				this.querySelector('.join-mode-suffix').hidden = false;
+				this.querySelector('.join-mode-following').hidden = true;
+				this._bindingMenuKey = null;
+				return;
+			}
+
+			// Rebuild the popup only when its option set changes. Rebuilding it on every refresh
+			// would replace the menuitems mid-selection -- when the change came from this menu
+			// itself -- and wedge the drop-down.
+			let key = optionLevels.join(',');
+			if (key !== this._bindingMenuKey) {
+				this._bindingMenuKey = key;
+				let popup = this.bindingMenu.querySelector('menupopup');
+				popup.replaceChildren();
+				let separate = document.createXULElement('menuitem');
+				separate.setAttribute('value', 'any');
+				separate.setAttribute('data-l10n-id', 'advanced-search-binding-separate');
+				popup.append(separate);
+				for (let level of optionLevels) {
+					let item = document.createXULElement('menuitem');
+					item.setAttribute('value', level);
+					item.setAttribute('data-l10n-id', 'advanced-search-binding-same-' + level);
+					popup.append(item);
+				}
+			}
+			this.bindingMenu.hidden = false;
+			// Bound group: "Match [all] of the following in the same attachment". The binding
+			// phrase ends the caption, so swap the legacy "of the following:" (with its colon)
+			// for the colon-less "of the following" that precedes the binding menu.
+			this.querySelector('.join-mode-suffix').hidden = true;
+			this.querySelector('.join-mode-following').hidden = false;
+			this.bindingMenu.value = this._resultLevel;
+		}
+
+		// The level this group's conditions are actually matched at: its own result level (the
+		// result type for the root, the binding for a nested group) if set, otherwise the level
+		// it inherits from its enclosing group. Mirrors the engine, where an unbound
+		// ("separately") group maps its conditions to the parent's level rather than
+		// combining them at no level.
+		effectiveLevel() {
+			if (this.resultLevel != 'any') {
+				return this.resultLevel;
+			}
+			let parent = this.parentElement && this.parentElement.closest('search-condition-group');
+			return parent ? parent.effectiveLevel() : this.resultLevel;
+		}
+
+		// Warn when this group's own conditions can never combine: a child whose level can't
+		// reach the group's effective level, or -- with no level anywhere up the chain (a mixed
+		// result type) -- an "all" of children on different item-hierarchy branches. Each group
+		// flags only its own conditions, so the message sits where the problem is.
+		updateLevelWarning() {
+			let ownLevel = this.resultLevel;
+			let level = this.effectiveLevel();
+			// Collect each direct child's level: a condition row's, or a nested group's binding
+			// (null for a "+"-added row not yet engaged with).
+			let childLevels = [...this.conditionsContainer.children].map((child) => {
+				if (child.localName == 'zoterosearchcondition') {
+					return child._pendingAdd ? null : child.conditionLevel;
+				}
+				if (child.localName == 'search-condition-group') {
+					return child.resultLevel;
+				}
+				return null;
+			})
+				// Drop those nulls and 'any', which combines with anything
+				.filter(l => l && l != 'any');
+
+			let messageID = null;
+			let args = null;
+			let resultTypeArgs = () => {
+				let item = this.resultLevelMenu.querySelector('menuitem[value="item"]');
+				return { topLevelItems: item ? item.getAttribute('label') : 'top-level items' };
+			};
+			if (level != 'any') {
+				// A child that can't reach the effective level can never match here
+				if (childLevels.some(l => !this.levelsCombine(l, level))) {
+					if (!this.isRoot && ownLevel != 'any') {
+						// This group's own binding is the constraint, so "match separately" fixes it
+						messageID = 'advanced-search-group-warning-unreachable';
+						args = { entity: ownLevel };
+					}
+					else {
+						// The result type (this group's, or one it inherits) is the constraint
+						messageID = 'advanced-search-level-warning-unreachable';
+						args = resultTypeArgs();
+					}
+				}
+			}
+			else if (this.joinMode == 'all' && new Set(childLevels).size >= 2) {
+				// No level anywhere up the chain (mixed result type): ANDing conditions on
+				// different branches can never all match
+				let anyItem = this.joinMenu.querySelector('menuitem[value="any"]');
+				let matchAny = anyItem ? anyItem.getAttribute('label') : 'any';
+				if (this.isRoot) {
+					messageID = 'advanced-search-level-warning-mixed';
+					args = { matchAny, ...resultTypeArgs() };
+				}
+				else {
+					// Reachable only when the result type is "any", so setting one fixes it too
+					messageID = 'advanced-search-group-warning-mixed';
+					args = { matchAny, ...resultTypeArgs() };
+				}
+			}
+
+			// Only touch the DOM when the message changes, so re-running on every keystroke
+			// doesn't re-translate the string and make the warning flicker.
+			let key = messageID ? messageID + '\n' + JSON.stringify(args) : '';
+			if (key === this._levelWarningKey) {
+				return;
+			}
+			this._levelWarningKey = key;
+			if (messageID) {
+				document.l10n.setAttributes(this.levelWarning.querySelector('description'), messageID, args);
+			}
+			this.levelWarning.hidden = !messageID;
+		}
+
+		// Two levels combine if one is an ancestor of the other (or equal); 'any' matches any.
+		levelsCombine(a, b) {
+			return a == 'any' || b == 'any' || a == b
+				|| Zotero.Search._isAncestorLevel(a, b) || Zotero.Search._isAncestorLevel(b, a);
+		}
+
+		// Wrap this group's direct condition rows that match `level` into a new child group
+		// bound to that level ("the same attachment"). Used by the discoverability hint.
+		// Rows are rebuilt from their data rather than moved, since detaching a custom element
+		// wipes its contents.
+		bindSameEntity(level) {
+			let rows = [...this.conditionsContainer.children].filter(
+				row => row.localName == 'zoterosearchcondition' && row.conditionLevel == level);
+			if (rows.length < 2) {
+				return;
+			}
+			let newGroup = document.createXULElement('search-condition-group');
+			this.conditionsContainer.insertBefore(newGroup, rows[0]);
+			for (let row of rows) {
+				let data = row.getConditionData();
+				let ref;
+				if (data) {
+					let [condition, mode] = Zotero.SearchConditions.parseCondition(data.condition);
+					ref = { id: undefined, condition, mode, operator: data.operator, value: data.value };
+				}
+				newGroup.addCondition(ref);
+				row.remove();
+			}
+			newGroup.resultLevel = level;
+
+			let search = this.searchElement;
+			search.updateSearch();
+			search.updateRemoveButtons();
+			search.updateBindingMenus();
+			search.updateBindingHint();
+		}
+
+		clear() {
+			this.joinMode = 'all';
+			this.resultLevel = 'any';
+			while (this.conditionsContainer.firstChild) {
+				this.conditionsContainer.removeChild(this.conditionsContainer.firstChild);
+			}
+		}
+
+		// Add a condition row to this group. Inserts before `beforeNode` if given (e.g.
+		// right after the row whose "+" was clicked), otherwise appends.
+		addCondition(ref, beforeNode) {
+			var condition = document.createXULElement('zoterosearchcondition');
+			condition.setAttribute('flex', '1');
+			this.conditionsContainer.insertBefore(condition, beforeNode || null);
+
+			// Default to an empty 'title' condition
+			if (!ref) {
+				ref = { id: undefined, condition: 'title', operator: 'contains', value: '', mode: undefined };
+			}
+
+			condition.initWithParentAndCondition(this.searchElement, ref);
+			return condition;
+		}
+
+		// "+" in the group caption: add a sibling condition in the parent group, after
+		// this group -- the group's caption row acts as the group's single line item in
+		// its parent, so its "+" mirrors a condition row's "+". The root has no parent,
+		// so its "+" stays hidden.
+		onAddSiblingClicked() {
+			var parent = this.parentElement.closest('search-condition-group');
+			if (!parent) {
+				return;
+			}
+			var row = parent.addCondition(null, this.nextElementSibling);
+			// Don't let the new row trigger the binding hint/warning until the user engages with
+			// it (see ZoteroSearch.clearPendingAdd)
+			row._pendingAdd = true;
+			var search = this.searchElement;
+			search.updateSearch();
+			search.updateRemoveButtons();
+			row.querySelector('#conditionsmenu').focus();
+		}
+
+		onRemoveGroupClicked() {
+			var search = this.searchElement;
+			var parent = this.parentElement.closest('search-condition-group');
+			this.remove();
+			// Removing a group can leave its parent empty; prune up toward the root
+			while (parent && !parent.isRoot && !parent.conditionsContainer.childElementCount) {
+				let grandparent = parent.parentElement.closest('search-condition-group');
+				parent.remove();
+				parent = grandparent;
+			}
+			search.ensureNotEmpty();
+			search.updateSearch();
+			search.updateRemoveButtons();
+		}
+
+		// "Ungroup": dissolve this group, moving its conditions (and any nested groups) up into
+		// the parent in this group's place and dropping this group's own join mode and binding.
+		// The inverse of a condition row's group button.
+		onUngroupClicked() {
+			var search = this.searchElement;
+			var parent = this.parentElement.closest('search-condition-group');
+			if (!parent) {
+				return;
+			}
+			this.rebuildChildrenInto(parent, this);
+			this.remove();
+			search.updateSearch();
+			search.updateRemoveButtons();
+			search.updateBindingMenus();
+			search.updateBindingHint();
+		}
+
+		// Recreate this group's children inside `target`, before `beforeNode`, preserving any
+		// nested groups and their join mode and result level. Rows are rebuilt from their data
+		// rather than moved, since detaching a custom element wipes its contents.
+		rebuildChildrenInto(target, beforeNode) {
+			for (let child of [...this.conditionsContainer.children]) {
+				if (child.localName == 'zoterosearchcondition') {
+					let ref;
+					let data = child.getConditionData();
+					if (data) {
+						let [condition, mode] = Zotero.SearchConditions.parseCondition(data.condition);
+						ref = { id: undefined, condition, mode, operator: data.operator, value: data.value };
+					}
+					target.addCondition(ref, beforeNode);
+				}
+				else if (child.localName == 'search-condition-group') {
+					let newGroup = document.createXULElement('search-condition-group');
+					target.conditionsContainer.insertBefore(newGroup, beforeNode);
+					newGroup.joinMode = child.joinMode;
+					newGroup.resultLevel = child.resultLevel;
+					child.rebuildChildrenInto(newGroup, null);
+				}
+			}
+		}
+	}
+	customElements.define("search-condition-group", SearchConditionGroup);
+
 	class ZoteroSearchCondition extends XULElementBase {
 		content = MozXULElement.parseXULToFragment(`
 			<html:div class="search-condition">
 				<popupset id="condition-tooltips"/>
 				
 				<menulist id="conditionsmenu" oncommand="this.closest('zoterosearchcondition').onConditionSelected(event.target.value); event.stopPropagation()" native="true">
-					<menupopup onpopupshown="this.closest('zoterosearchcondition').revealSelectedCondition()">
+					<menupopup nonnative="true" onpopupshown="if (event.target == this) this.closest('zoterosearchcondition').revealSelectedCondition()">
+						<menu id="attachment-conditions-menu">
+							<menupopup/>
+						</menu>
+						<menu id="annotation-conditions-menu">
+							<menupopup/>
+						</menu>
 						<menu id="more-conditions-menu" label="&zotero.general.more;">
 							<menupopup/>
 						</menu>
@@ -245,6 +921,7 @@
 				<zoterosearchagefield id="value-date-age" class="value-date-age" hidden="true"/>
 				<toolbarbutton id="remove" tabindex="0" data-l10n-id="advanced-search-remove-btn" class="zotero-clicky zotero-clicky-minus" value="-" onclick="this.closest('zoterosearchcondition').onRemoveClicked(event)"/>
 				<toolbarbutton id="add" tabindex="0" data-l10n-id="advanced-search-add-btn" class="zotero-clicky zotero-clicky-plus" value="+" onclick="this.closest('zoterosearchcondition').onAddClicked(event)"/>
+				<toolbarbutton id="group" tabindex="0" data-l10n-id="advanced-search-group-btn" class="zotero-clicky search-group-button" onclick="this.closest('zoterosearchcondition').onGroupClicked(event)"/>
 			</html:div>
 		`, ['chrome://zotero/locale/zotero.dtd', 'chrome://zotero/locale/searchbox.dtd']);
 
@@ -259,37 +936,76 @@
 				'isGreaterThan',
 				'isBefore',
 				'isAfter',
-				'isInTheLast'
+				'isInTheLast',
+				'isEmpty',
+				'isNotEmpty'
 			];
 			var operatorsList = this.querySelector('#operatorsmenu');
 			
 			// Build operator menu
 			for (let operator of operators) {
-				operatorsList.appendItem(
-					Zotero.getString('searchOperator.' + operator),
-					operator
-				);
+				// isEmpty/isNotEmpty are localized in Fluent; the others in zotero.properties
+				let label = ['isEmpty', 'isNotEmpty'].includes(operator)
+					? Zotero.getString('search-operator-' + operator)
+					: Zotero.getString('searchOperator.' + operator);
+				operatorsList.appendItem(label, operator);
 			}
 			
 			// Build conditions menu
 			var conditionsMenu = this.querySelector('#conditionsmenu');
 			var moreConditionsMenu = this.querySelector('#more-conditions-menu');
+			var attachmentConditionsMenu = this.querySelector('#attachment-conditions-menu');
+			var annotationConditionsMenu = this.querySelector('#annotation-conditions-menu');
 			var conditions = Zotero.SearchConditions.getStandardConditions();
-			
+
+			// Most conditions are in submenus, so the menulist's own find-as-you-type can't
+			// reach them. Match on the full name rather than the short label the attachment
+			// and annotation submenus show, since the full name is what the menulist shows
+			// once the condition is selected.
+			Zotero.Utilities.Internal.addMenuFindAsYouType(
+				conditionsMenu.menupopup,
+				item => Zotero.SearchConditions.getLocalizedName(item.value)
+			);
+
+			// Label the submenus and seed the top-level entries with them, so the
+			// headings sort alphabetically alongside the primary conditions
+			attachmentConditionsMenu.setAttribute(
+				'label', Zotero.getString('search-conditions-submenu-attachment')
+			);
+			annotationConditionsMenu.setAttribute(
+				'label', Zotero.getString('search-conditions-submenu-annotation')
+			);
+			let topLevelEntries = [
+				{ label: attachmentConditionsMenu.getAttribute('label'), node: attachmentConditionsMenu },
+				{ label: annotationConditionsMenu.getAttribute('label'), node: annotationConditionsMenu },
+			];
+
 			for (let condition of conditions) {
 				let menuitem;
-				if (this.isPrimaryCondition(condition.name)) {
+				let submenu = this.getConditionSubmenu(condition.name);
+				// Attachment- and annotation-level conditions go in their own submenus,
+				// with a short label since the submenu heading supplies the context
+				if (submenu == 'attachment' || submenu == 'annotation') {
+					let parentMenu = submenu == 'attachment'
+						? attachmentConditionsMenu
+						: annotationConditionsMenu;
+					menuitem = parentMenu.appendItem(
+						Zotero.getString('search-conditions-short-' + condition.name),
+						condition.name
+					);
+				}
+				else if (this.isPrimaryCondition(condition.name)) {
 					menuitem = document.createXULElement('menuitem');
 					menuitem.setAttribute('label', condition.localized);
 					menuitem.setAttribute('value', condition.name);
-					moreConditionsMenu.before(menuitem);
+					topLevelEntries.push({ label: condition.localized, node: menuitem });
 				}
 				else {
 					menuitem = moreConditionsMenu.appendItem(
 						condition.localized, condition.name
 					);
 				}
-				
+
 				var baseFields = null;
 				try {
 					baseFields = Zotero.ItemFields.getTypeFieldsFromBase(condition.name);
@@ -348,6 +1064,15 @@
 					menuitem.setAttribute('tooltip', condition.name + '-tooltip');
 				}
 			}
+
+			// Insert the top-level conditions and the two submenus alphabetically,
+			// before the catch-all "More" submenu
+			let collation = Zotero.getLocaleCollation();
+			topLevelEntries.sort((a, b) => collation.compareString(1, a.label, b.label));
+			for (let entry of topLevelEntries) {
+				moreConditionsMenu.before(entry.node);
+			}
+
 			conditionsMenu.selectedIndex = 0;
 		}
 
@@ -355,26 +1080,44 @@
 			switch (condition) {
 				case 'anyField':
 				case 'collection':
+				case 'savedSearch':
 				case 'creator':
 				case 'title':
 				case 'date':
 				case 'dateAdded':
 				case 'dateModified':
-				case 'lastRead':
 				case 'itemType':
-				case 'fileTypeID':
 				case 'publicationTitle':
 				case 'tag':
 				case 'note':
-				case 'childNote':
-				case 'fulltextContent':
 					return true;
 			}
-			
+
 			return false;
 		}
 
-		onConditionSelected(conditionName, reload) {
+		// Conditions that live in the Attachment or Annotation submenu rather than
+		// at the top level of the conditions menu. Returns 'attachment', 'annotation',
+		// or null.
+		getConditionSubmenu(condition) {
+			switch (condition) {
+				case 'fulltextContent':
+				case 'fileTypeID':
+				case 'attachmentStorageType':
+				case 'lastRead':
+					return 'attachment';
+				case 'annotationText':
+				case 'annotationComment':
+				case 'annotationType':
+				case 'annotationColor':
+				case 'annotationAuthor':
+					return 'annotation';
+			}
+
+			return null;
+		}
+
+		async onConditionSelected(conditionName, reload) {
 			var conditionsMenu = this.querySelector('#conditionsmenu');
 			var operatorsList = this.querySelector('#operatorsmenu');
 			
@@ -386,9 +1129,24 @@
 				return;
 			}
 			
+			// Carry the user's live edit forward to the new condition, since this.value is
+			// otherwise only set at load time and would revert on a switch. Skipped during the
+			// initial load, when there's no prior condition.
+			if (this.selectedCondition) {
+				this.value = this.getCurrentValue();
+			}
+
+			// Changing the condition counts as engaging with a "+"-added row (see clearPendingAdd)
+			this._pendingAdd = false;
+
 			this.selectedCondition = conditionName;
 			this.selectedOperator = operatorsList.value;
-			
+
+			// Invalidate any in-flight async value-menu population (annotationAuthor) from a
+			// previous selection, and clear the pending flag for synchronous conditions
+			let valueMenuToken = this._valueMenuToken = {};
+			this._valueMenuPending = false;
+
 			var condition = Zotero.SearchConditions.get(conditionName);
 			var operators = condition.operators;
 			
@@ -414,7 +1172,7 @@
 			for (var i = 0, len = operatorsList.firstChild.childNodes.length; i < len; i++) {
 				var val = operatorsList.firstChild.childNodes[i].getAttribute('value');
 				var hidden = !operators[val];
-				operatorsList.firstChild.childNodes[i].setAttribute('hidden', hidden);
+				operatorsList.firstChild.childNodes[i].toggleAttribute('hidden', hidden);
 				if (!hidden && (selectThis === null || this.selectedOperator == val)) {
 					selectThis = i;
 				}
@@ -425,30 +1183,16 @@
 			// Generate drop-down menu instead of textbox for certain conditions
 			switch (conditionName) {
 				case 'collection':
+				{
+					this.createCollectionValueMenu(this.parent.search.libraryID);
+					break;
+				}
+				case 'savedSearch':
 				{
 					let rows = [];
-					
-					var libraryID = this.parent.search.libraryID;
-					
-					// Add collections
-					let cols = Zotero.Collections.getByLibrary(libraryID, true);
-					for (let col of cols) {
-						// Indent subcollections
-						var indent = '';
-						if (col.level) {
-							for (let j = 1; j < col.level; j++) {
-								indent += '    ';
-							}
-							indent += '- ';
-						}
-						rows.push({
-							name: indent + Zotero.Utilities.trimInternal(col.name),
-							value: 'C' + col.key,
-							image: Zotero.Collection.prototype.treeViewImage
-						});
-					}
-					
-					// Add saved searches
+
+					let libraryID = this.parent.search.libraryID;
+
 					let searches = Zotero.Searches.getByLibrary(libraryID);
 					for (let search of searches) {
 						if (search.id != this.parent.search.id) {
@@ -459,6 +1203,7 @@
 							});
 						}
 					}
+
 					this.createValueMenu(rows);
 					break;
 				}
@@ -490,6 +1235,59 @@
 					this.createValueMenu(rows);
 					break;
 				}
+				case 'annotationType':
+				{
+					let types = [
+						['highlight', Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT],
+						['underline', Zotero.Annotations.ANNOTATION_TYPE_UNDERLINE],
+						['note', Zotero.Annotations.ANNOTATION_TYPE_NOTE],
+						['text', Zotero.Annotations.ANNOTATION_TYPE_TEXT],
+						['image', Zotero.Annotations.ANNOTATION_TYPE_IMAGE],
+						['ink', Zotero.Annotations.ANNOTATION_TYPE_INK],
+					];
+					let rows = types.map(([name, value]) => ({
+						name: Zotero.getString('reader-' + name + '-annotation-short'),
+						value
+					}));
+					this.createValueMenu(rows);
+					break;
+				}
+				case 'annotationColor':
+				{
+					let rows = Zotero.Annotations.COLORS.map(([name, value]) => ({
+						name: Zotero.getString(name),
+						value
+					}));
+					this.createValueMenu(rows);
+					break;
+				}
+				case 'annotationAuthor':
+				{
+					// The author list loads asynchronously; until the menu is populated, the
+					// row serializes its stored value (see getConditionData())
+					this._valueMenuPending = true;
+					let authors = await Zotero.Annotations.getAllAuthors(this.parent.search.libraryID);
+					// A newer selection took over while the list was loading
+					if (valueMenuToken !== this._valueMenuToken) {
+						return;
+					}
+					let collation = Zotero.getLocaleCollation();
+					let rows = authors.map(a => ({ name: a.name, value: a.userID }));
+					rows.sort((a, b) => collation.compareString(1, a.name, b.name));
+					this.createValueMenu(rows);
+					this._valueMenuPending = false;
+					break;
+				}
+				case 'attachmentStorageType':
+				{
+					let rows = ['storedFile', 'linkedFile', 'webLink'].map(type => ({
+						name: Zotero.getString('attachment-storage-type-' + type),
+						value: type
+					}));
+					
+					this.createValueMenu(rows);
+					break;
+				}
 				default:
 				{
 					if (operatorsList.value == 'isInTheLast') {
@@ -508,7 +1306,9 @@
 						}
 						
 						// Update field drop-down if applicable
-						this.querySelector('#valuefield').update(conditionName, this.mode);
+						this.querySelector('#valuefield').update(
+							conditionName, this.mode, this.parent && this.parent.scopeLibraryIDs
+						);
 					}
 				}
 			}
@@ -518,16 +1318,33 @@
 
 		onOperatorSelected() {
 			var operatorsList = this.querySelector('#operatorsmenu');
-			
+
+			// Restore a value field blanked for isEmpty/isNotEmpty (see below)
+			this.querySelector('#valuefield').style.visibility = '';
+
 			// Drop-down menu
 			if (this.selectedCondition == 'collection'
+					|| this.selectedCondition == 'savedSearch'
 					|| this.selectedCondition == 'itemType'
-					|| this.selectedCondition == 'fileTypeID') {
+					|| this.selectedCondition == 'fileTypeID'
+					|| this.selectedCondition == 'annotationType'
+					|| this.selectedCondition == 'annotationColor'
+					|| this.selectedCondition == 'annotationAuthor'
+					|| this.selectedCondition == 'attachmentStorageType') {
 				this.querySelector('#valuefield').hidden = true;
 				this.querySelector('#valuemenu').hidden = false;
 				this.querySelector('#value-date-age').hidden = true;
 			}
 			
+			// isEmpty/isNotEmpty take no value, so blank the value field, keeping its space
+			// so the row's buttons stay aligned with other rows
+			else if (operatorsList.value == 'isEmpty' || operatorsList.value == 'isNotEmpty') {
+				this.querySelector('#valuefield').hidden = false;
+				this.querySelector('#valuefield').style.visibility = 'hidden';
+				this.querySelector('#valuemenu').hidden = true;
+				this.querySelector('#value-date-age').hidden = true;
+			}
+			
 			// Textbox + units dropdown for isInTheLast operator
 			else if (operatorsList.value == 'isInTheLast') {
 				// If switching from text field, clear value
@@ -557,10 +1374,19 @@
 				document.l10n.setAttributes(valueMenu, 'advanced-search-condition-input', { label: valueMenu.label });
 			}
 			this.updateMenuCheckboxesRecursive(operatorsList, operatorsList.selectedItem.getAttribute('value'));
+
+			// Changing the condition or operator is a mutation like add/remove, so rebuild the
+			// search and refresh the derived UI (binding hint, level warning) right away. The
+			// condition/operator menus stopPropagation, so this won't happen via event bubbling.
+			// (updateSearch no-ops during the initial render via its own guard.)
+			if (this.parent) {
+				this.parent.updateSearch();
+			}
 		}
 
 		createValueMenu(rows) {
 			let valueMenu = this.querySelector('#valuemenu');
+			valueMenu.removeAttribute('tooltiptext');
 
 			while (valueMenu.hasChildNodes()) {
 				valueMenu.removeChild(valueMenu.firstChild);
@@ -577,6 +1403,96 @@
 			
 			if (this.value) {
 				valueMenu.value = this.value;
+				// If the value isn't in the menu (e.g., a saved search from another
+				// library after a library change), fall back to the first item
+				if (!valueMenu.selectedItem) {
+					valueMenu.selectedIndex = 0;
+				}
+			}
+		}
+
+		// Subcollections are shown in submenus, which the menulist can't select from, so
+		// the selection is kept in this.value (see showSelectedCollection())
+		createCollectionValueMenu(libraryID) {
+			let valueMenu = this.querySelector('#valuemenu');
+			valueMenu.removeAllItems();
+			let menupopup = valueMenu.appendChild(document.createXULElement('menupopup'));
+			// macOS renders a menulist's popup as a native menu, which can't be opened to a
+			// submenu and ignores CSS. Opt this one out so the path to the selected
+			// collection can be shown.
+			menupopup.setAttribute('nonnative', 'true');
+			
+			// If the stored collection isn't in this library (e.g., after a library change),
+			// select the first one
+			let selected = (this.value?.startsWith('C')
+					&& Zotero.Collections.getByLibraryAndKey(libraryID, this.value.substr(1)))
+				|| Zotero.Collections.getByLibrary(libraryID)[0];
+			
+			Zotero.Utilities.Internal.createMenuForTarget(
+				Zotero.Libraries.get(libraryID),
+				menupopup,
+				selected?.treeViewID,
+				(event, collection) => this.onCollectionSelected(event, collection),
+				null,
+				{ filter: target => target.objectType == 'collection' }
+			);
+			this.showSelectedCollection(selected);
+
+			// Open the submenus down to the selected collection
+			menupopup.addEventListener('popupshown', (event) => {
+				if (event.target != menupopup) {
+					return;
+				}
+				let item = menupopup.querySelector(`menuitem[checked]`);
+				let menus = [];
+				for (let menu = item?.closest('menu'); menu && menupopup.contains(menu);
+					menu = menu.parentElement?.closest('menu')) {
+					menus.unshift(menu);
+				}
+				let openNext = (index) => {
+					let menu = menus[index];
+					if (!menu) {
+						return;
+					}
+					menu.menupopup.addEventListener(
+						'popupshown', () => openNext(index + 1), { once: true }
+					);
+					menu.open = true;
+				};
+				// Wait for the outer popup to finish its own popupshown handling
+				setTimeout(() => openNext(0));
+			});
+		}
+
+		onCollectionSelected(event, collection) {
+			this.showSelectedCollection(collection);
+			// Clicking the row of a collection that has subcollections selects it without
+			// closing the menu or firing a command event
+			if (event.target.localName == 'menu') {
+				let valueMenu = this.querySelector('#valuemenu');
+				valueMenu.menupopup.hidePopup();
+				valueMenu.dispatchEvent(new Event('command', { bubbles: true }));
+			}
+		}
+
+		// The condition's value, since a collection in a submenu can't be the menulist's
+		// selected item and so can't be read back off the control
+		showSelectedCollection(collection) {
+			this.value = collection ? 'C' + collection.key : '';
+			let valueMenu = this.querySelector('#valuemenu');
+			// A top-level collection can still be the selected item, which lets the popup
+			// open positioned on it. One in a submenu can't, so set the label and icon
+			// directly instead.
+			valueMenu.selectedItem = null;
+			if (collection) {
+				valueMenu.value = collection.treeViewID;
+				valueMenu.setAttribute('label', collection.name);
+				valueMenu.setAttribute('image', collection.treeViewImage);
+				let names = [];
+				for (let c = collection; c; c = c.parentID && Zotero.Collections.get(c.parentID)) {
+					names.unshift(c.name);
+				}
+				valueMenu.setAttribute('tooltiptext', names.join(' \u203A '));
 			}
 		}
 
@@ -584,7 +1500,18 @@
 			this.parent = parent;
 			this.conditionID = condition.id;
 			var menu = this.querySelector('#conditionsmenu');
-			
+
+			// Collection and saved search conditions resolve within a single library, so
+			// remove both when the selection spans multiple libraries
+			if (this.parent.scopeLibraryIDs && this.parent.scopeLibraryIDs.length > 1) {
+				for (let value of ['collection', 'savedSearch']) {
+					let item = menu.querySelector(`menuitem[value="${value}"]`);
+					if (item) {
+						item.remove();
+					}
+				}
+			}
+
 			if (this.parent.search) {
 				this.dontupdate = true;	//so that the search doesn't get updated while we are creating controls.
 				var prefix = '';
@@ -600,15 +1527,7 @@
 						break;
 				}
 				
-				// Map certain conditions to other menu items
-				let uiCondition = condition.condition;
-				switch (condition.condition) {
-					case 'savedSearch':
-						uiCondition = 'collection';
-						break;
-				}
-				
-				menu.setAttribute('value', uiCondition);
+				menu.setAttribute('value', condition.condition);
 				
 				// Convert datetimes from UTC to localtime
 				if ((condition.condition == 'accessDate'
@@ -630,56 +1549,92 @@
 			this.onConditionSelected(menu.value);
 		}
 
-		updateSearch() {
-			if (this.parent && this.parent.search && !this.dontupdate) {
-				var condition = this.selectedCondition;
-				var operator = this.querySelector('#operatorsmenu').value;
-				let value;
-				
-				// Regular text field
-				if (!this.querySelector('#valuefield').hidden) {
-					value = this.querySelector('#valuefield').value;
-					
-					// Convert datetimes to UTC before saving
-					switch (condition) {
-						case 'accessDate':
-						case 'dateAdded':
-						case 'dateModified':
-							if (Zotero.Date.isSQLDateTime(value)) {
-								value = Zotero.Date.dateToSQL(Zotero.Date.sqlToDate(value), true);
-							}
-					}
-					
-					// Append mode to condition
-					if (this.querySelector('#valuefield').mode) {
-						condition += '/' + this.querySelector('#valuefield').mode;
-					}
-				}
-				
-				// isInTheLast operator
-				else if (!this.querySelector('#value-date-age').hidden) {
-					value = this.querySelector('#value-date-age').value;
-				}
-				
-				// Handle special C1234 and S5678 form for
-				// collections and searches
-				else if (condition == 'collection') {
-					var letter = this.querySelector('#valuemenu').value.substr(0, 1);
-					if (letter == 'C') {
-						condition = 'collection';
-					}
-					else if (letter == 'S') {
-						condition = 'savedSearch';
-					}
-					value = this.querySelector('#valuemenu').value.substr(1);
-				}
-				
-				// Regular drop-down menu
-				else {
-					value = this.querySelector('#valuemenu').value;
-				}
-				this.parent.search.updateCondition(this.conditionID, condition, operator, value);
+		// The live value from whichever value control is currently shown, in the same prefixed
+		// form this.value is stored in (so it can be carried across a condition change)
+		getCurrentValue() {
+			// While a value menu is still being populated asynchronously, the old control is
+			// still the visible one, so use the stored value (see getConditionData())
+			if (this._valueMenuPending) {
+				return this.value;
 			}
+			// The collection menu can't always hold the selection (see showSelectedCollection())
+			if (this.selectedCondition == 'collection') {
+				return this.value;
+			}
+			let valueField = this.querySelector('#valuefield');
+			if (!valueField.hidden) {
+				return valueField.value;
+			}
+			let ageField = this.querySelector('#value-date-age');
+			if (!ageField.hidden) {
+				return ageField.value;
+			}
+			return this.querySelector('#valuemenu').value;
+		}
+
+		// Return this row's current {condition, operator, value} for serialization.
+		// The owning <zoterosearch> collects these across the tree and rebuilds the
+		// search from scratch. Returns null while the row is still being set up.
+		getConditionData() {
+			if (!(this.parent && this.parent.search) || this.dontupdate) {
+				return null;
+			}
+
+			var condition = this.selectedCondition;
+			var operator = this.querySelector('#operatorsmenu').value;
+			let value;
+
+			// A value menu still being populated asynchronously (annotationAuthor) hasn't been
+			// swapped in yet, so serialize the stored value rather than reading the wrong control
+			if (this._valueMenuPending) {
+				return { condition, operator, value: this.value || '' };
+			}
+
+			// isEmpty/isNotEmpty have no value
+			if (operator == 'isEmpty' || operator == 'isNotEmpty') {
+				return { condition, operator, value: '' };
+			}
+
+			// Regular text field
+			if (!this.querySelector('#valuefield').hidden) {
+				value = this.querySelector('#valuefield').value;
+
+				// Convert datetimes to UTC before saving
+				switch (condition) {
+					case 'accessDate':
+					case 'dateAdded':
+					case 'dateModified':
+						if (Zotero.Date.isSQLDateTime(value)) {
+							value = Zotero.Date.dateToSQL(Zotero.Date.sqlToDate(value), true);
+						}
+				}
+
+				// Append mode to condition
+				if (this.querySelector('#valuefield').mode) {
+					condition += '/' + this.querySelector('#valuefield').mode;
+				}
+			}
+
+			// isInTheLast operator
+			else if (!this.querySelector('#value-date-age').hidden) {
+				value = this.querySelector('#value-date-age').value;
+			}
+
+			// Values take the special C1234/S5678 form. A collection can be in a submenu,
+			// which a menulist can't select from, so its selection is kept on the condition.
+			else if (condition == 'collection') {
+				value = this.value.substr(1);
+			}
+			else if (condition == 'savedSearch') {
+				value = this.querySelector('#valuemenu').value.substr(1);
+			}
+
+			// Regular drop-down menu
+			else {
+				value = this.querySelector('#valuemenu').value;
+			}
+
+			return { condition, operator, value };
 		}
 
 		updateMenuCheckboxesRecursive(menu, value) {
@@ -728,35 +1683,93 @@
 			return false;
 		}
 
-		onLibraryChange() {
-			switch (this.selectedCondition) {
-				case 'collection':
-					this.onConditionSelected(this.selectedCondition, true);
-					break;
-			}
-		}
-
-		onRemoveClicked() {
+		onRemoveClicked(event) {
 			if (this.parent) {
-				window.resizeBy(0, -1 * this.getBoundingClientRect().height);
-				window.dispatchEvent(new CustomEvent('resize'));
-				this.parent.removeCondition(this.conditionID);
+				// A keyboard-synthesized click has detail 0, unlike a mouse click
+				this.parent.removeRow(this, event?.detail === 0);
 			}
 		}
 
 		onAddClicked(event) {
 			event.preventDefault();
-			if (this.parent) {
-				let ref = this.parent.search.getCondition(
-					this.parent.search.addCondition(
-						this.querySelector('#conditionsmenu').getAttribute('data-value'),
-						this.querySelector('#operatorsmenu').value,
-						""
-					)
-				);
-				this.parent.addCondition(ref);
-				window.resizeBy(0, this.getBoundingClientRect().height);
+			if (!this.parent) {
+				return;
 			}
+			// Add a sibling condition right after this one, seeded with this row's
+			// condition and operator
+			let group = this.closest('search-condition-group');
+			let row = group.addCondition({
+				id: undefined,
+				condition: this.querySelector('#conditionsmenu').getAttribute('data-value'),
+				operator: this.querySelector('#operatorsmenu').value,
+				value: '',
+				mode: undefined
+			}, this.nextElementSibling);
+			// Don't let the seeded row trigger the binding hint/warning until the user engages
+			// with it (see ZoteroSearch.clearPendingAdd)
+			row._pendingAdd = true;
+			this.parent.updateSearch();
+			this.parent.updateRemoveButtons();
+			// When activated from the keyboard (a synthesized click has detail 0,
+			// unlike a mouse click), move focus to the new row's drop-down
+			if (event.detail === 0) {
+				this.parent.focusNewCondition(row);
+			}
+		}
+
+		// Wrap this condition in a new group in its place, so further conditions can be
+		// added to the group to combine with it under a separate join mode
+		onGroupClicked(event) {
+			event.preventDefault();
+			if (!this.parent) {
+				return;
+			}
+			var group = this.closest('search-condition-group');
+			// Rebuild the condition inside the new group rather than moving the row, since
+			// detaching a custom element wipes its contents
+			var ref;
+			var data = this.getConditionData();
+			if (data) {
+				let [condition, mode] = Zotero.SearchConditions.parseCondition(data.condition);
+				ref = { id: undefined, condition, mode, operator: data.operator, value: data.value };
+			}
+			var newGroup = document.createXULElement('search-condition-group');
+			group.conditionsContainer.insertBefore(newGroup, this);
+			newGroup.addCondition(ref);
+			this.remove();
+
+			this.parent.updateSearch();
+			this.parent.updateRemoveButtons();
+			newGroup.conditionsContainer.firstElementChild.querySelector('#conditionsmenu').focus();
+		}
+
+		// The item level this condition matches at ('item' by default), used to decide
+		// cross-level binding in a group. A condition can match natively at multiple
+		// levels (an array). A level set that includes the top level (e.g., numTags,
+		// which matches at every level) can map to any other level, so it combines
+		// with anything, like 'any'.
+		get conditionLevel() {
+			let data = this.selectedCondition && Zotero.SearchConditions.get(this.selectedCondition);
+			let level = (data && data.level) || 'item';
+			if (Array.isArray(level) && level.includes('item')) {
+				return 'any';
+			}
+			return level;
+		}
+
+		// Whether a value has been entered, used to decide whether the last
+		// remaining condition can be cleared back to the default state
+		isPopulated() {
+			let valueField = this.querySelector('#valuefield');
+			if (!valueField.hidden) {
+				return !!valueField.value;
+			}
+			let ageField = this.querySelector('#value-date-age');
+			if (!ageField.hidden) {
+				return !!ageField.querySelector('.input').value;
+			}
+			// The drop-down value menus (collection, item type, etc.) always have a selection
+			return true;
 		}
 
 		disableRemoveButton() {
@@ -767,7 +1780,7 @@
 
 		enableRemoveButton() {
 			var button = this.querySelector("#remove");
-			button.setAttribute('disabled', false);
+			button.removeAttribute('disabled');
 			button.setAttribute('onclick', "this.closest('zoterosearchcondition').onRemoveClicked(event)");
 		}
 	}
@@ -819,7 +1832,7 @@
 			
 			var selectedIndex = -1;
 			for (var i = 0; i < menu.childNodes.length; i++) {
-				if (menu.childNodes[i].getAttribute('checked') == 'true') {
+				if (menu.childNodes[i].hasAttribute('checked')) {
 					selectedIndex = i;
 					break;
 				}
@@ -841,7 +1854,7 @@
 			throw new Error('Invalid search textbox popup');
 		}
 
-		update(condition, mode) {
+		update(condition, mode, scopeLibraryIDs) {
 			var textbox = this.querySelector('#search-textbox');
 			var button = this.querySelector('#textbox-button');
 			
@@ -890,11 +1903,15 @@
 						
 						default:
 							textbox.setAttribute('disableautocomplete', 'false');
-							
-							// TODO: Provide current libraryID
+
 							var autocompleteParams = {
 								fieldName: condition
 							};
+							// Scope suggestions to the selected libraries (the same set the
+							// collection condition menu uses). Empty/unset falls back to all libraries.
+							if (scopeLibraryIDs && scopeLibraryIDs.length) {
+								autocompleteParams.libraryIDs = scopeLibraryIDs;
+							}
 							switch (condition) {
 								case 'creator':
 								case 'author':
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
index 7c0c9cdc5f..86519766d0 100644
--- a/chrome/content/zotero/fileInterface.js
+++ b/chrome/content/zotero/fileInterface.js
@@ -40,7 +40,7 @@ ChromeUtils.defineESModuleGetters(globalThis, {
  **/
 var Zotero_File_Exporter = function () {
 	this.name = Zotero.getString("fileInterface.exportedItems");
-	this.collection = false;
+	this.collections = false;
 	this.items = false;
 }
 
@@ -131,9 +131,10 @@ Zotero_File_Exporter.prototype.save = async function () {
 		return;
 	}
 	
-	if(this.collection) {
-		translation.setCollection(this.collection);
-	} else if(this.items) {
+	if (this.collections) {
+		translation.setCollections(this.collections);
+	}
+	else if (this.items) {
 		translation.setItems(this.items);
 	} else if(this.libraryID === undefined) {
 		throw new Error('No export configured');
@@ -190,8 +191,8 @@ var Zotero_File_Interface = new function () {
 	 */
 	this.exportFile = async function () {
 		var exporter = new Zotero_File_Exporter();
-		exporter.libraryID = ZoteroPane_Local.getSelectedLibraryID();
-		if (exporter.libraryID === false) {
+		exporter.libraryID = ZoteroPane_Local.getSelectedLibraryIDs()[0];
+		if (exporter.libraryID === undefined) {
 			throw new Error('No library selected');
 		}
 		exporter.name = Zotero.Libraries.getName(exporter.libraryID);
@@ -201,22 +202,31 @@ var Zotero_File_Interface = new function () {
 	/*
 	 * exports a collection or saved search
 	 */
-	function exportCollection() {
+	async function exportCollection() {
 		var exporter = new Zotero_File_Exporter();
 	
-		var collection = ZoteroPane_Local.getSelectedCollection();
-		if(collection) {
-			exporter.name = collection.getName();
-			exporter.collection = collection;
-		} else {
+		var collections = ZoteroPane_Local.getSelectedCollections();
+		var searches = ZoteroPane_Local.getSelectedSavedSearches();
+		if (collections.length && !searches.length) {
+			exporter.name = collections.map(c => c.getName()).join(', ');
+			exporter.collections = collections;
+		}
+		else if (collections.length) {
+			// Saved searches can't be exported as collections, so export all the items shown
+			exporter.name = collections.map(c => c.getName())
+				.concat(searches.map(s => s.name))
+				.join(', ');
+			exporter.items = await ZoteroPane.getUnfilteredItems();
+			if (!exporter.items.length) throw ("No items to save");
+		}
+		else {
 			// find sorted items
 			exporter.items = ZoteroPane_Local.getSortedItems();
-			if(!exporter.items) throw ("No items to save");
+			if (!exporter.items) throw ("No items to save");
 			
 			// find name
-			var search = ZoteroPane_Local.getSelectedSavedSearch();
-			if(search) {
-				exporter.name = search.name;
+			if (searches.length) {
+				exporter.name = searches.map(s => s.name).join(', ');
 			}
 		}
 		exporter.save();
@@ -378,7 +388,7 @@ var Zotero_File_Interface = new function () {
 		var libraryID = Zotero.Libraries.userLibraryID;
 		try {
 			let zp = Zotero.getActiveZoteroPane();
-			libraryID = zp.getSelectedLibraryID();
+			libraryID = zp.getSelectedLibraryIDs()[0];
 		}
 		catch (e) {
 			Zotero.logError(e);
@@ -405,6 +415,7 @@ var Zotero_File_Interface = new function () {
 	 * @param {Function} [options.onBeforeImport] - Callback to receive translation object, useful
 	 *     for displaying progress in a different way. This also causes an error to be throw
 	 *     instead of shown in the main window.
+	 * @param {AbortSignal} [options.signal] - Signal to cancel the import before it begins
 	 */
 	this.importFile = async function (options = {}) {
 		if (!options) {
@@ -423,6 +434,7 @@ var Zotero_File_Interface = new function () {
 		var addToLibraryRoot = options.addToLibraryRoot;
 		var linkFiles = options.linkFiles;
 		var onBeforeImport = options.onBeforeImport;
+		var signal = options.signal;
 		
 		if (createNewCollection === undefined && !addToLibraryRoot) {
 			createNewCollection = true;
@@ -442,6 +454,7 @@ var Zotero_File_Interface = new function () {
 		var defaultNewCollectionPrefix = Zotero.getString("fileInterface.imported");
 		
 		var translation;
+		var tmpDirectory;
 		
 		if (options.mendeleyAuth || options.mendeleyCode) {
 			translation = await _getMendeleyTranslation();
@@ -477,8 +490,16 @@ var Zotero_File_Interface = new function () {
 			}
 			else if (file.path.endsWith('@www.mendeley.com.sqlite')
 					|| file.path.endsWith('online.sqlite')) {
-				// Keep in sync with importWizard.js
-				throw new Error('Encrypted Mendeley database');
+				let decrypted = await _decryptMendeleyDatabase(file.path);
+				tmpDirectory = decrypted.tmpDirectory;
+				translation = await _getMendeleyTranslation();
+				translation.createNewCollection = createNewCollection;
+				defaultNewCollectionPrefix = Zotero.getString(
+					'fileInterface.appImportCollection', 'Mendeley'
+				);
+				// Attachments are looked for beside the selected database, not the copy
+				translation.sourceDirectory = PathUtils.parent(file.path);
+				file = Zotero.File.pathToFile(decrypted.path);
 			}
 			
 			if (!translation) {
@@ -487,14 +508,33 @@ var Zotero_File_Interface = new function () {
 			translation.setLocation(file);
 		}
 
-		return _finishImport({
-			translation,
-			createNewCollection,
-			addToLibraryRoot,
-			linkFiles,
-			defaultNewCollectionPrefix,
-			onBeforeImport
-		});
+		try {
+			// Cancelled while the file was being prepared, before there was a
+			// translation to interrupt
+			if (signal?.aborted) {
+				return false;
+			}
+			
+			return await _finishImport({
+				translation,
+				createNewCollection,
+				addToLibraryRoot,
+				linkFiles,
+				defaultNewCollectionPrefix,
+				onBeforeImport
+			});
+		}
+		finally {
+			if (tmpDirectory) {
+				try {
+					Zotero.debug(`Removing decrypted Mendeley database in ${tmpDirectory}`);
+					await IOUtils.remove(tmpDirectory, { recursive: true, ignoreAbsent: true });
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+			}
+		}
 	};
 	
 	
@@ -581,15 +621,15 @@ var Zotero_File_Interface = new function () {
 		}
 		
 		var libraryID = Zotero.Libraries.userLibraryID;
-		var importCollection = null;
+		var importCollections = [];
 		try {
 			let zp = Zotero.getActiveZoteroPane();
-			libraryID = zp.getSelectedLibraryID();
+			libraryID = zp.getSelectedLibraryIDs()[0];
 			if (addToLibraryRoot) {
 				await zp.collectionsView.selectLibrary(libraryID);
 			}
 			else if (!createNewCollection) {
-				importCollection = zp.getSelectedCollection();
+				importCollections = zp.getSelectedCollections();
 			}
 		}
 		catch (e) {
@@ -614,10 +654,11 @@ var Zotero_File_Interface = new function () {
 			else {
 				collectionName = defaultNewCollectionPrefix + " " + (new Date()).toLocaleString();
 			}
-			importCollection = new Zotero.Collection;
+			let importCollection = new Zotero.Collection;
 			importCollection.libraryID = libraryID;
 			importCollection.name = collectionName;
 			await importCollection.saveTx();
+			importCollections = [importCollection];
 		}
 
 		translation.setTranslator(translators[0]);
@@ -650,7 +691,8 @@ var Zotero_File_Interface = new function () {
 		try {
 			await translation.translate({
 				libraryID,
-				collections: importCollection ? [importCollection.id] : null,
+				collections: importCollections.length ? importCollections.map(c => c.id) : null,
+				autoCreatedCollectionID: createNewCollection ? importCollections[0].id : null,
 				linkFiles,
 				saveOptions: {
 					notifierQueue
@@ -702,22 +744,46 @@ var Zotero_File_Interface = new function () {
 	};
 	
 	
+	/**
+	 * Decrypt a Mendeley database into a temporary directory
+	 *
+	 * importFile() removes the directory once the import has ended, so that an
+	 * unencrypted copy of the user's library isn't left behind.
+	 *
+	 * @param {String} path - Encrypted Mendeley database
+	 * @return {Promise<Object>} - Path of the decrypted database and of the
+	 *     temporary directory containing it
+	 */
+	var _decryptMendeleyDatabase = async function (path) {
+		let { decryptDatabase, isDatabaseInUse } = ChromeUtils.importESModule(
+			"chrome://zotero/content/import/mendeley/mendeleyDecrypt.mjs"
+		);
+		// The database can only be read once Mendeley has written out its
+		// write-ahead log, which it does when it closes
+		if (await isDatabaseInUse(path)) {
+			// Keep in sync with importWizard.js
+			throw new Error('Mendeley database in use');
+		}
+		let tmpDirectory = PathUtils.join(
+			Zotero.getTempDirectory().path, 'mendeley-' + Zotero.Utilities.randomString()
+		);
+		// The decrypted database is readable without a password, so on Unix keep it
+		// out of reach of other users on the machine
+		await Zotero.File.createDirectoryIfMissingAsync(tmpDirectory, { unixMode: 0o700 });
+		try {
+			let decryptedPath = PathUtils.join(tmpDirectory, PathUtils.filename(path));
+			await decryptDatabase(path, decryptedPath);
+			return { path: decryptedPath, tmpDirectory };
+		}
+		catch (e) {
+			await IOUtils.remove(tmpDirectory, { recursive: true, ignoreAbsent: true });
+			throw e;
+		}
+	};
+	
+	
 	var _getMendeleyTranslation = async function () {
-		let Zotero_Import_Mendeley;
-		if (true) {
-			({ Zotero_Import_Mendeley } = ChromeUtils.importESModule("chrome://zotero/content/import/mendeley/mendeleyImport.mjs"));
-		}
-		// TEMP: Load uncached from ~/zotero-client for development
-		else {
-			const { FileUtils } = ChromeUtils.importESModule("resource://gre/modules/FileUtils.sys.mjs");
-			let file = FileUtils.getDir("Home", []);
-			file = OS.Path.join(
-				file.path,
-				'zotero-client', 'chrome', 'content', 'zotero', 'import', 'mendeley', 'mendeleyImport.mjs'
-			);
-			let fileURI = OS.Path.toFileURI(file);
-			({ Zotero_Import_Mendeley } = ChromeUtils.importESModule(fileURI));
-		}
+		let { Zotero_Import_Mendeley } = ChromeUtils.importESModule("chrome://zotero/content/import/mendeley/mendeleyImport.mjs");
 		return new Zotero_Import_Mendeley();
 	};
 	
@@ -726,18 +792,18 @@ var Zotero_File_Interface = new function () {
 	 * Creates a bibliography from a collection or saved search
 	 */
 	this.bibliographyFromCollection = async function () {
-		var items = ZoteroPane.getSortedItems();
+		var items = await ZoteroPane.getUnfilteredItems();
 		
 		// Find collection name
 		var name = false;
-		var collection = ZoteroPane.getSelectedCollection();
-		if (collection) {
-			name = collection.name;
+		var collections = ZoteroPane.getSelectedCollections();
+		if (collections.length) {
+			name = collections.map(c => c.name).join(', ');
 		}
 		else {
-			let search = ZoteroPane.getSelectedSavedSearch();
-			if (search) {
-				name = search.name;
+			let searches = ZoteroPane.getSelectedSavedSearches();
+			if (searches.length) {
+				name = searches.map(s => s.name).join(', ');
 			}
 		}
 		
@@ -805,7 +871,6 @@ var Zotero_File_Interface = new function () {
 				output = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, 'text');
 			}
 		}
-		cslEngine.free();
 
 		var str = Components.classes["@mozilla.org/supports-string;1"].
 				  createInstance(Components.interfaces.nsISupportsString);
diff --git a/chrome/content/zotero/fileRenamingDialog.js b/chrome/content/zotero/fileRenamingDialog.js
index ec5dac071c..f72327ec53 100644
--- a/chrome/content/zotero/fileRenamingDialog.js
+++ b/chrome/content/zotero/fileRenamingDialog.js
@@ -82,7 +82,7 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 		let library = Zotero.Libraries.get(this._currentLibraryID);
 		let isAdmin = this.isUserLibrary || library.isAdmin;
 		this.renameFilesBtn.hidden = !isAdmin;
-		this.renameFilesBtn.disabled = !autoRenameEnabled || this._isRenameFilesBtnDisabled();
+		this.renameFilesBtn.disabled = !autoRenameEnabled || !this.settingsEl.templateValid || this._isRenameFilesBtnDisabled();
 	},
 
 	_isRenameFilesBtnDisabled: function () {
@@ -103,7 +103,14 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 	},
 
 	_handleDoneClick: async function () {
-		// "Done" button -- prompt if dirty, then close
+		if (this._shouldPromptInvalidTemplate()) {
+			let wantsReset = await this._promptInvalidTemplate(this._currentLibraryID);
+			if (!wantsReset) {
+				this.settingsEl.formatTemplateTextarea.focus();
+				return;
+			}
+			await this._resetTemplateToDefault(this._currentLibraryID);
+		}
 		if (this._shouldPromptRename(this._currentLibraryID)) {
 			let wantsRename = await this._promptRename(this._currentLibraryID);
 			if (wantsRename) {
@@ -170,16 +177,28 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 		if (newLibraryID === previousLibraryID) {
 			return;
 		}
+		if (this._shouldPromptInvalidTemplate()) {
+			// Revert picker so the previous library is visible behind the prompt
+			this.libraryPicker.value = String(previousLibraryID);
+			let wantsReset = await this._promptInvalidTemplate(previousLibraryID);
+			if (!wantsReset) {
+				// User chose to fix the template -- stay on the current library
+				this.settingsEl.formatTemplateTextarea.focus();
+				return;
+			}
+			await this._resetTemplateToDefault(previousLibraryID);
+		}
 		if (this._shouldPromptRename(previousLibraryID)) {
 			// Revert picker so the previous library is visible behind the prompt
 			this.libraryPicker.value = String(previousLibraryID);
 			let wantsRename = await this._promptRename(previousLibraryID);
 			if (wantsRename && !this._openRenameFilesPreview(previousLibraryID)) {
 				// User cancelled the preview -- stay on the current library
+				this._updateButtons();
 				return;
 			}
-			this.libraryPicker.value = String(newLibraryID);
 		}
+		this.libraryPicker.value = String(newLibraryID);
 		this._currentLibraryID = newLibraryID;
 		this.loadSettingsForLibrary(newLibraryID);
 		this._updateButtons();
@@ -198,11 +217,11 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 			Zotero.Prefs.set('autoRenameFiles.fileTypes', enabledFileTypes);
 			Zotero.Prefs.set('autoRenameFiles.linked', renameLinkedEnabled);
 
-			// Handle template changes
+			// Handle template changes; never push an invalid template to sync
 			if (formatTemplate.replace(/\s/g, '') === '') {
 				Zotero.SyncedSettings.clear(Zotero.Libraries.userLibraryID, 'attachmentRenameTemplate');
 			}
-			else {
+			else if (this.settingsEl.templateValid) {
 				Zotero.SyncedSettings.set(Zotero.Libraries.userLibraryID, 'attachmentRenameTemplate', formatTemplate);
 			}
 
@@ -210,13 +229,23 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 				&& enabledFileTypes === base.fileTypes
 				&& formatTemplate === base.formatTemplate
 				&& renameLinkedEnabled === base.renameLinked;
-			Zotero.Prefs.set('autoRenameFiles.done', settingsMatch && this._baselineDone);
+			// Only flip the pending-rename state for a valid template
+			if (this.settingsEl.templateValid) {
+				Zotero.Prefs.set('autoRenameFiles.done', settingsMatch && this._baselineDone);
+			}
 			this._settingsChanged = !settingsMatch;
 		}
 		else {
 			Zotero.SyncedSettings.set(this.libraryID, 'autoRenameFiles', autoRenameEnabled);
 			Zotero.SyncedSettings.set(this.libraryID, 'autoRenameFilesFileTypes', enabledFileTypes);
-			Zotero.SyncedSettings.set(this.libraryID, 'attachmentRenameTemplate', formatTemplate);
+
+			// Handle template changes; never push an empty or invalid template to sync
+			if (formatTemplate.replace(/\s/g, '') === '') {
+				Zotero.SyncedSettings.clear(this.libraryID, 'attachmentRenameTemplate');
+			}
+			else if (this.settingsEl.templateValid) {
+				Zotero.SyncedSettings.set(this.libraryID, 'attachmentRenameTemplate', formatTemplate);
+			}
 
 			this._settingsChanged = autoRenameEnabled !== base.autoRenameEnabled
 				|| enabledFileTypes !== base.fileTypes
@@ -230,17 +259,27 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 		if (this._forceClose) {
 			return true;
 		}
+		if (!this._shouldPromptInvalidTemplate() && !this._shouldPromptRename(this._currentLibraryID)) {
+			return true;
+		}
+		event.preventDefault();
+		if (this._shouldPromptInvalidTemplate()) {
+			let wantsReset = await this._promptInvalidTemplate(this._currentLibraryID);
+			if (!wantsReset) {
+				this.settingsEl.formatTemplateTextarea.focus();
+				return false;
+			}
+			await this._resetTemplateToDefault(this._currentLibraryID);
+		}
 		if (this._shouldPromptRename(this._currentLibraryID)) {
-			event.preventDefault();
 			let wantsRename = await this._promptRename(this._currentLibraryID);
 			if (wantsRename) {
 				this._openRenameFilesPreview(this._currentLibraryID);
 			}
-			this._forceClose = true;
-			window.close();
-			return false;
 		}
-		return true;
+		this._forceClose = true;
+		window.close();
+		return false;
 	},
 
 	_handleDonePrefChange: function () {
@@ -255,12 +294,58 @@ var FileRenamingDialog = { // eslint-disable-line no-unused-vars
 		if (!this._settingsChanged) {
 			return false;
 		}
+		if (!this.settingsEl.templateValid) {
+			return false;
+		}
 		if (libraryID === Zotero.Libraries.userLibraryID) {
 			return Zotero.Prefs.get('autoRenameFiles') && !Zotero.Prefs.get('autoRenameFiles.done');
 		}
 		return Zotero.Attachments.isAutoRenameFilesEnabledForLibrary(libraryID);
 	},
 
+	_shouldPromptInvalidTemplate: function () {
+		return this._settingsChanged && !this.settingsEl.templateValid;
+	},
+
+	_promptInvalidTemplate: async function (libraryID) {
+		let isUserLib = libraryID === Zotero.Libraries.userLibraryID;
+		let bodyID = isUserLib
+			? { id: 'file-renaming-invalid-template-prompt-body' }
+			: { id: 'file-renaming-invalid-template-prompt-body-library', args: { library: Zotero.Libraries.get(libraryID).name } };
+		let [title, description, reset, cancel] = await document.l10n.formatValues([
+			'file-renaming-invalid-template-prompt-title',
+			bodyID,
+			'general-reset-to-default',
+			'general-go-back'
+		]);
+		let index = Zotero.Prompt.confirm({
+			title,
+			text: description,
+			button0: reset,
+			button1: cancel,
+			defaultButton: 1
+		});
+		return index === 0;
+	},
+
+	_resetTemplateToDefault: async function (libraryID) {
+		await Zotero.SyncedSettings.clear(libraryID, 'attachmentRenameTemplate');
+		// Recompute the pending-changes state against the baseline, since handleSettingsChange()
+		// skips the update while the template is invalid
+		let isUserLib = libraryID === Zotero.Libraries.userLibraryID;
+		let base = this._baselineSettings;
+		let settingsMatch = this.settingsEl.autoRenameEnabled === base.autoRenameEnabled
+			&& this.settingsEl.enabledFileTypes === base.fileTypes
+			&& this.DEFAULT_ATTACHMENT_RENAME_TEMPLATE === base.formatTemplate
+			&& (!isUserLib || this.settingsEl.renameLinkedEnabled === base.renameLinked);
+		if (isUserLib) {
+			Zotero.Prefs.set('autoRenameFiles.done', settingsMatch && this._baselineDone);
+		}
+		// Show the default template in place of the invalid one
+		this.settingsEl.setAttribute('format-template', this.DEFAULT_ATTACHMENT_RENAME_TEMPLATE);
+		this._settingsChanged = !settingsMatch;
+	},
+
 	_promptRename: async function (libraryID) {
 		let isUserLib = libraryID === Zotero.Libraries.userLibraryID;
 		let bodyID = isUserLib
diff --git a/chrome/content/zotero/import/importWizard.js b/chrome/content/zotero/import/importWizard.js
index b5ea6a7de8..6653c1f608 100644
--- a/chrome/content/zotero/import/importWizard.js
+++ b/chrome/content/zotero/import/importWizard.js
@@ -37,6 +37,7 @@ const { directAuth } = mendeleyAPIUtils;
 const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 	file: null,
 	folder: null,
+	importAbortController: null,
 	isZotfileInstalled: false,
 	libraryID: null,
 	mendeleyAuth: null,
@@ -91,12 +92,8 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 			.addEventListener('keyup', (ev) => {
 				document.getElementById('import-other').checked = ev.currentTarget.value.length > 0;
 			});
-		document
-			.querySelector('a')
-			.addEventListener('click', this.onURLInteract.bind(this));
-		document
-			.querySelector('a')
-			.addEventListener('keydown', this.onURLInteract.bind(this));
+		document.addEventListener('click', this.onURLInteract.bind(this));
+		document.addEventListener('keydown', this.onURLInteract.bind(this));
 		document
 			.querySelector('#page-done-error > button')
 			.addEventListener('click', this.onReportErrorInteract.bind(this));
@@ -154,20 +151,23 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 		}
 	},
 
-	skipToDonePage(label, description, showReportErrorButton = false, isMendeleyError = false) {
+	// Mendeley errors are shown in their own element, which links to the relevant
+	// documentation, so they're passed as an l10n id rather than as a description
+	skipToDonePage(label, description, showReportErrorButton = false, mendeleyErrorId = null) {
 		this.wizard.getPageById('page-done').dataset.headerLabelId = label;
 
-		if (!isMendeleyError) {
-			if (Array.isArray(description)) {
-				document.getElementById('page-done-description').dataset.l10nId = description[0];
-				document.getElementById('page-done-description').dataset.l10nArgs = JSON.stringify(description[1]);
-			}
-			else {
-				document.getElementById('page-done-description').dataset.l10nId = description;
-			}
+		if (mendeleyErrorId) {
+			document.getElementById('page-done-error-mendeley').dataset.l10nId = mendeleyErrorId;
+		}
+		else if (Array.isArray(description)) {
+			document.getElementById('page-done-description').dataset.l10nId = description[0];
+			document.getElementById('page-done-description').dataset.l10nArgs = JSON.stringify(description[1]);
+		}
+		else {
+			document.getElementById('page-done-description').dataset.l10nId = description;
 		}
 
-		document.getElementById('page-done-error-mendeley').style.display = isMendeleyError ? 'block' : 'none';
+		document.getElementById('page-done-error-mendeley').style.display = mendeleyErrorId ? 'block' : 'none';
 		document.getElementById('page-done-error').style.display = showReportErrorButton ? 'block' : 'none';
 
 		const doneQueueContainer = document.getElementById('done-queue-container');
@@ -215,6 +215,8 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 
 		const rv = await fp.show();
 		if (rv !== fp.returnOK && rv !== fp.returnReplace) {
+			// Re-enable "continue", disabled while the file picker was up
+			this.wizard.canAdvance = true;
 			return;
 		}
 
@@ -231,6 +233,8 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 
 		const rv = await fp.show();
 		if (rv !== fp.returnOK && rv !== fp.returnReplace) {
+			// Re-enable "continue", disabled while the file picker was up
+			this.wizard.canAdvance = true;
 			return;
 		}
 
@@ -408,9 +412,16 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 	},
 
 	onURLInteract(ev) {
+		let link = ev.target.closest?.('a[href]');
+		if (!link) {
+			return;
+		}
 		if (ev.type === 'click' || (ev.type === 'keydown' && ev.key === ' ')) {
-			Zotero.launchURL(ev.currentTarget.getAttribute('href'));
-			window.close();
+			Zotero.launchURL(link.getAttribute('href'));
+			// Closing mid-wizard would lose progress, so only close once done
+			if (link.closest('wizardpage')?.getAttribute('pageid') == 'page-done') {
+				window.close();
+			}
 			ev.preventDefault();
 		}
 	},
@@ -423,6 +434,10 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 	},
 
 	onCancel() {
+		// The file can still be getting prepared, e.g. an encrypted Mendeley database
+		// being decrypted, in which case there's no translation to interrupt yet
+		this.importAbortController?.abort();
+
 		if (this.translation && this.translation.interrupt) {
 			this.translation.interrupt();
 		}
@@ -435,6 +450,7 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 	async startImport() {
 		this.wizard.canAdvance = false;
 		this.wizard.canRewind = false;
+		this.importAbortController = new AbortController();
 
 		const fileHandling = document.getElementById('file-handling').value;
 		const linkFiles = fileHandling === 'link';
@@ -465,7 +481,8 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 				newItemsOnly,
 				onBeforeImport: this.onBeforeImport.bind(this),
 				recreateStructure,
-				relinkOnly
+				relinkOnly,
+				signal: this.importAbortController.signal
 			});
 
 			// Cancelled by user or due to error
@@ -484,8 +501,14 @@ const Zotero_Import_Wizard = { // eslint-disable-line no-unused-vars
 			);
 		}
 		catch (e) {
-			if (e.message == 'Encrypted Mendeley database') {
-				this.skipToDonePage('general-error', [], false, true);
+			if (e.message == 'Mendeley database in use') {
+				this.skipToDonePage('general-error', 'import-mendeley-db-in-use');
+			}
+			else if (e.message == 'Cannot derive Mendeley database key') {
+				this.skipToDonePage('general-error', null, false, 'import-mendeley-cannot-decrypt');
+			}
+			else if (e.message == 'Unsupported Mendeley database encryption') {
+				this.skipToDonePage('general-error', null, false, 'import-mendeley-unsupported');
 			}
 			else {
 				const translatorLabel = this.translation?.translator?.[0]?.label;
diff --git a/chrome/content/zotero/import/importWizard.xhtml b/chrome/content/zotero/import/importWizard.xhtml
index 8801b50236..9533f1966c 100644
--- a/chrome/content/zotero/import/importWizard.xhtml
+++ b/chrome/content/zotero/import/importWizard.xhtml
@@ -103,7 +103,7 @@
 		</wizardpage>
 		<wizardpage pageid="page-done">
 			<div id="page-done-description"></div>
-			<div id="page-done-error-mendeley" data-l10n-id="import-mendeley-encrypted">
+			<div id="page-done-error-mendeley">
 				<html:a data-l10n-name="mendeley-import-kb" href="https://www.zotero.org/support/kb/mendeley_import" />
 			</div>
 			<div id="page-done-error">
diff --git a/chrome/content/zotero/import/mendeley/mendeleyDecrypt.mjs b/chrome/content/zotero/import/mendeley/mendeleyDecrypt.mjs
new file mode 100644
index 0000000000..12d5c0c676
--- /dev/null
+++ b/chrome/content/zotero/import/mendeley/mendeleyDecrypt.mjs
@@ -0,0 +1,246 @@
+/**
+ * Decryption for encrypted Mendeley Desktop library databases.
+ *
+ * Mendeley encrypts the local library with the SQLite Encryption Extension,
+ * which Zotero's SQLite cannot read. The 256-bit key is a constant compiled
+ * into Mendeley Desktop, put through a fixed obfuscation and then XOR-folded
+ * with the account's profile UUID, which is the database filename stem.
+ *
+ * Pages are encrypted with AES-256-OFB. Each page carries its own nonce in the
+ * reserved space at the end of the page, which is left in the clear, and the
+ * initialization vector is that nonce prefixed with the page number.
+ */
+
+const OBFUSCATED_KEY = 'e5431aeb503dcf0ab92d3e936c0bbb40fc7e0a9448699a77dac9cb6276d288bd';
+const DEOBFUSCATION_XOR = 0x62;
+const KEY_SIZE = 32;
+const UUID_SIZE = 16;
+const BLOCK_SIZE = 16;
+const RESERVED_SIZE = 12;
+const MIN_PAGE_SIZE = 512;
+const MAX_PAGE_SIZE = 65536;
+// Null-terminated, so this plus its terminator is the first 16 bytes of the file
+const SQLITE_MAGIC = 'SQLite format 3';
+// Page size and reserved-space fields, which are never encrypted so that the
+// page layout stays readable
+const CLEAR_HEADER_START = 16;
+const CLEAR_HEADER_END = 24;
+
+function hexToBytes(hex) {
+	let bytes = new Uint8Array(hex.length / 2);
+	for (let i = 0; i < bytes.length; i++) {
+		bytes[i] = parseInt(hex.slice(i * 2, i * 2 + 2), 16);
+	}
+	return bytes;
+}
+
+function reverseBytes(hex) {
+	let reversed = '';
+	for (let i = hex.length - 2; i >= 0; i -= 2) {
+		reversed += hex.slice(i, i + 2);
+	}
+	return reversed;
+}
+
+function getBaseKey() {
+	let obfuscated = hexToBytes(OBFUSCATED_KEY);
+	let key = new Uint8Array(KEY_SIZE);
+	for (let i = 0; i < KEY_SIZE; i++) {
+		let byte = obfuscated[i] ^ DEOBFUSCATION_XOR;
+		key[i] = ((byte << 4) | (byte >> 4)) & 0xFF;
+	}
+	return key;
+}
+
+/**
+ * Mendeley stores the profile UUID in the Windows GUID layout, where the first
+ * three fields are little-endian rather than big-endian
+ */
+function uuidToBytes(uuid) {
+	let parts = /^([0-9a-f]{8})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{4})-([0-9a-f]{12})$/i.exec(uuid);
+	if (!parts) {
+		throw new Error(`Invalid Mendeley profile UUID: ${uuid}`);
+	}
+	let [, timeLow, timeMid, timeHigh, clockSeq, node] = parts;
+	return hexToBytes(
+		reverseBytes(timeLow) + reverseBytes(timeMid) + reverseBytes(timeHigh) + clockSeq + node
+	);
+}
+
+function getLibraryKey(profileUUID) {
+	let key = getBaseKey();
+	let uuid = uuidToBytes(profileUUID);
+	for (let i = 0; i < UUID_SIZE; i++) {
+		key[i] ^= uuid[i];
+		key[KEY_SIZE - 1 - i] ^= uuid[i];
+	}
+	return key;
+}
+
+function getPageSize(header) {
+	let pageSize = (header[CLEAR_HEADER_START] << 8) | header[CLEAR_HEADER_START + 1];
+	// The maximum page size doesn't fit in the two-byte field and is stored as 1
+	return pageSize == 1 ? MAX_PAGE_SIZE : pageSize;
+}
+
+function hasSQLiteMagic(page) {
+	return String.fromCharCode(...page.subarray(0, SQLITE_MAGIC.length)) == SQLITE_MAGIC
+		&& page[SQLITE_MAGIC.length] == 0;
+}
+
+/**
+ * AES-256-OFB keystream.
+ *
+ * WebCrypto has no OFB mode, but CBC-encrypting a zero-filled buffer produces
+ * the same sequence: with an all-zero plaintext, each ciphertext block is
+ * E(key, previousBlock XOR 0), which is the OFB feedback relation. That gets
+ * the whole page's keystream from a single call instead of one per block.
+ */
+async function getKeystream(key, iv, length) {
+	let blocks = Math.ceil(length / BLOCK_SIZE);
+	let keystream = await crypto.subtle.encrypt(
+		{ name: 'AES-CBC', iv }, key, new Uint8Array(blocks * BLOCK_SIZE)
+	);
+	return new Uint8Array(keystream, 0, length);
+}
+
+/**
+ * Decrypt a single page in place
+ */
+async function decryptPage(key, pageNumber, page) {
+	let encryptedSize = page.length - RESERVED_SIZE;
+	let iv = new Uint8Array(BLOCK_SIZE);
+	new DataView(iv.buffer).setUint32(0, pageNumber, true);
+	iv.set(page.subarray(encryptedSize), 4);
+
+	let clearHeader = pageNumber == 1
+		? page.slice(CLEAR_HEADER_START, CLEAR_HEADER_END)
+		: null;
+
+	let keystream = await getKeystream(key, iv, encryptedSize);
+	for (let i = 0; i < encryptedSize; i++) {
+		page[i] ^= keystream[i];
+	}
+
+	// The keystream advances over the unencrypted header fields, so they have to
+	// be put back rather than skipped
+	if (clearHeader) {
+		page.set(clearHeader, CLEAR_HEADER_START);
+	}
+}
+
+async function importKey(rawKey) {
+	return crypto.subtle.importKey('raw', rawKey, { name: 'AES-CBC' }, false, ['encrypt']);
+}
+
+/**
+ * Find the key that decrypts the database, or null if none of them do
+ */
+async function findKey(data, pageSize, profileUUID) {
+	// online.sqlite, the database Mendeley uses before you sign in, has no
+	// profile UUID to fold in and uses the unfolded key
+	let candidates = profileUUID
+		? [getLibraryKey(profileUUID), getBaseKey()]
+		: [getBaseKey()];
+	for (let candidate of candidates) {
+		let key = await importKey(candidate);
+		let firstPage = data.slice(0, pageSize);
+		await decryptPage(key, 1, firstPage);
+		if (hasSQLiteMagic(firstPage)) {
+			return key;
+		}
+	}
+	return null;
+}
+
+/**
+ * Get the Mendeley profile UUID a database is keyed to, from its filename
+ *
+ * @param {String} path
+ * @return {String|null}
+ */
+export function getProfileUUID(path) {
+	let match = /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})@www\.mendeley\.com\.sqlite$/i
+		.exec(PathUtils.filename(path));
+	return match ? match[1] : null;
+}
+
+/**
+ * Check whether a file is an encrypted Mendeley database
+ *
+ * @param {String} path
+ * @return {Promise<Boolean>}
+ */
+export async function isEncryptedDatabase(path) {
+	let header;
+	try {
+		header = await IOUtils.read(path, { maxBytes: CLEAR_HEADER_END });
+	}
+	catch {
+		return false;
+	}
+	if (header.length < CLEAR_HEADER_END || hasSQLiteMagic(header)) {
+		return false;
+	}
+	let pageSize = getPageSize(header);
+	return header[20] == RESERVED_SIZE
+		&& pageSize >= MIN_PAGE_SIZE
+		&& pageSize <= MAX_PAGE_SIZE
+		&& (pageSize & (pageSize - 1)) == 0;
+}
+
+/**
+ * Check whether Mendeley still has the database open
+ *
+ * SQLite removes both files when the last connection closes cleanly, so either
+ * one means Mendeley is still running, or crashed leaving changes that exist
+ * only in the write-ahead log.
+ *
+ * @param {String} path
+ * @return {Promise<Boolean>}
+ */
+export async function isDatabaseInUse(path) {
+	if (await IOUtils.exists(path + '-shm')) {
+		return true;
+	}
+	if (await IOUtils.exists(path + '-wal')) {
+		let { size } = await IOUtils.stat(path + '-wal');
+		return size > 0;
+	}
+	return false;
+}
+
+/**
+ * Decrypt a Mendeley database to a new file
+ *
+ * The decrypted copy keeps the reserved space the encryption used for its
+ * nonces.
+ *
+ * @param {String} sourcePath - Encrypted database
+ * @param {String} targetPath - Path to write the decrypted database to
+ */
+export async function decryptDatabase(sourcePath, targetPath) {
+	let data = await IOUtils.read(sourcePath);
+	let pageSize = getPageSize(data);
+	if (data.length < CLEAR_HEADER_END
+			|| data[20] != RESERVED_SIZE
+			|| pageSize < MIN_PAGE_SIZE
+			|| data.length % pageSize) {
+		// Keep in sync with importWizard.js
+		throw new Error('Unsupported Mendeley database encryption');
+	}
+
+	let key = await findKey(data, pageSize, getProfileUUID(sourcePath));
+	if (!key) {
+		// Keep in sync with importWizard.js
+		throw new Error('Cannot derive Mendeley database key');
+	}
+
+	for (let pageNumber = 1; pageNumber <= data.length / pageSize; pageNumber++) {
+		await decryptPage(
+			key, pageNumber, data.subarray((pageNumber - 1) * pageSize, pageNumber * pageSize)
+		);
+	}
+
+	await IOUtils.write(targetPath, data);
+}
diff --git a/chrome/content/zotero/import/mendeley/mendeleyImport.mjs b/chrome/content/zotero/import/mendeley/mendeleyImport.mjs
index 42ca8ef648..5f44b6f5eb 100644
--- a/chrome/content/zotero/import/mendeley/mendeleyImport.mjs
+++ b/chrome/content/zotero/import/mendeley/mendeleyImport.mjs
@@ -32,6 +32,9 @@ export var Zotero_Import_Mendeley = function () {
 	this.relinkOnly = false;
 	this.numRelinked = 0;
 	this.skipNotebooks = false;
+	// Directory the database was selected from, if it isn't the one the database is read
+	// from -- i.e. when an encrypted database is read from a decrypted copy
+	this.sourceDirectory = null;
 	
 	this._tokens = null;
 	this._credentials = null;
@@ -1698,7 +1701,7 @@ Zotero_Import_Mendeley.prototype._isTempDownloadedFile = function (path) {
  * Get the path to use for a file that exists, or false if none
  *
  * This can be either the original path or, for a file in the Downloaded directory, in a directory
- * relative to the database.
+ * relative to where the database was selected from.
  *
  * @return {String|false}
  */
@@ -1712,7 +1715,7 @@ Zotero_Import_Mendeley.prototype._getRealFilePath = async function (path) {
 	}
 	// For file paths in Downloaded folder, try relative to database if not found at the
 	// absolute location, in case this is a DB backup
-	var dataDir = PathUtils.parent(this._file);
+	var dataDir = this.sourceDirectory || PathUtils.parent(this._file);
 	var altPath = OS.Path.join(dataDir, 'Downloaded', PathUtils.filename(path));
 	if (altPath != path && await OS.File.exists(altPath)) {
 		return altPath;
diff --git a/chrome/content/zotero/integration/citationDialog.js b/chrome/content/zotero/integration/citationDialog.js
index 1dff8c0b15..9972e3b36a 100644
--- a/chrome/content/zotero/integration/citationDialog.js
+++ b/chrome/content/zotero/integration/citationDialog.js
@@ -131,6 +131,8 @@ async function onLoad() {
 	await IOManager.toggleDialogMode(initialMode);
 	// most of IO handling relies on currentLayout being defined so it must follow setInitialDialogMode
 	IOManager.init();
+	// set the text of the citation preview
+	CitationPreview.update();
 	// explicitly focus bubble input so one can begin typing right away
 	_id("bubble-input").refocusInput();
 	// wait to call functions that rely on io.getItems() or io.sort() till all cited data is loaded
@@ -258,8 +260,9 @@ async function setDialogType(type) {
 	_id("keepSorted").disabled = !io.sortable || !DIALOG_STATE.isCitingItems();
 	_id("keepSorted").checked = !_id("keepSorted").disabled && !io.citation.properties.unsorted;
 	if (DIALOG_STATE.isCitingItems()) {
-		_id("settings-button").hidden = !io.sortable;
 		_id("keepSorted").disabled = !io.sortable;
+		_id("keepSorted").parentElement.hidden = !io.sortable;
+		CitationPreview.update();
 		if (!DIALOG_STATE.loaded) {
 			_id("keepSorted").checked = io.sortable && !io.citation.properties.unsorted;
 		}
@@ -451,7 +454,7 @@ class Layout {
 		else {
 			// Make sure the collectionTreeRow is defined to
 			// avoid errors thrown when filter is set on first load
-			while (!this.itemsView.collectionTreeRow) {
+			while (!this.itemsView.collectionTreeRows) {
 				await Zotero.Promise.delay(10);
 			}
 			await this.refreshItemsList();
@@ -596,14 +599,16 @@ class LibraryLayout extends Layout {
 		IOManager.updateBubbleInput();
 	}
 
+	// Resolves once the resize animation has fully completed
 	async resizeWindow() {
 		await Helpers.smoothResizingPromise;
 		let bubbleInputHeight = Helpers.getSearchRowHeight();
 		let suggestedItemsHeight = _id("library-other-items").getBoundingClientRect().height;
 		let minTableHeight = 400;
+		let citationPreview = _id("citation-preview").getBoundingClientRect().height;
 		let bottomHeight = _id("bottom-area-wrapper").getBoundingClientRect().height;
 
-		let minHeight = bubbleInputHeight + suggestedItemsHeight + bottomHeight + minTableHeight;
+		let minHeight = bubbleInputHeight + suggestedItemsHeight + citationPreview + bottomHeight + minTableHeight;
 
 		let targetWidth = Math.max(window.innerWidth, this.MIN_WIDTH);
 		let targetHeight = Math.max(minHeight, lastSetWindowHeight);
@@ -612,13 +617,16 @@ class LibraryLayout extends Layout {
 		if (needsResize) {
 			doc.documentElement.style.removeProperty('min-height');
 			ignoreWindowResizing = true;
-			Helpers.smoothResize(targetWidth, targetHeight, {
-				onComplete: () => {
-					_id("bubble-input").refocusInput();
-					doc.documentElement.style.minHeight = `${minHeight}px`;
-					document.documentElement.setAttribute("dialog-layout", this.type);
-					ignoreWindowResizing = false;
-				},
+			await new Promise((resolve) => {
+				Helpers.smoothResize(targetWidth, targetHeight, {
+					onComplete: () => {
+						_id("bubble-input").refocusInput();
+						doc.documentElement.style.minHeight = `${minHeight}px`;
+						document.documentElement.setAttribute("dialog-layout", this.type);
+						ignoreWindowResizing = false;
+						resolve();
+					},
+				});
 			});
 		}
 		// ensure dialog-layout and min-height is set even if window does not need resizing
@@ -673,13 +681,19 @@ class LibraryLayout extends Layout {
 				let icon = getCSSIcon('plus-circle');
 				iconWrapper.append(icon);
 				// add aria-label for screen readers to announce if this item is added
+				let count = this._getItemsViewIconClickItems(index).length;
 				if (inCitation) {
-					doc.l10n.setAttributes(cell, "integration-citationDialog-items-table-added");
+					doc.l10n.setAttributes(cell, "integration-citationDialog-items-table-added", { count });
 				}
 				else {
-					doc.l10n.setAttributes(cell, "integration-citationDialog-items-table");
+					doc.l10n.setAttributes(cell, "integration-citationDialog-items-table", { count });
 				}
 				iconWrapper.append(icon);
+				// refresh the tooltip's item count, since the selection can change
+				// without this row re-rendering
+				cell.addEventListener("mouseenter", () => {
+					doc.l10n.setArgs(cell, { count: this._getItemsViewIconClickItems(index).length });
+				});
 				iconWrapper.addEventListener("click", () => {
 					this._handleItemsViewIconClick(index);
 				});
@@ -776,7 +790,8 @@ class LibraryLayout extends Layout {
 			hideSources: ['duplicates', 'trash', 'feeds'],
 			initialFolder: Zotero.Prefs.get("integration.citationDialogCollectionLastSelected"),
 			onActivate: () => {},
-			filterLibraryIDs: io.filterLibraryIDs
+			filterLibraryIDs: io.filterLibraryIDs,
+			multiSelect: true
 		});
 		// Add aria-description with instructions on what this collection tree is for
 		// Voiceover announces the description placed on the actual tree when focus enters it
@@ -869,10 +884,18 @@ class LibraryLayout extends Layout {
 	}
 	
 	async _onCollectionSelection() {
-		var collectionTreeRow = this.collectionsView.getRow(this.collectionsView.selection.focused);
 		if (!this.collectionsView.selection.count) return;
-		// Collection not changed
-		if (this.itemsView && this.itemsView.collectionTreeRow && this.itemsView.collectionTreeRow.id == collectionTreeRow.id) {
+		// Show the union of all selected collections (cross-library selections are
+		// grouped by library in the items view, as in List mode)
+		let selectedRows = [...this.collectionsView.selection.selected]
+			.sort((a, b) => a - b)
+			.map(index => this.collectionsView.getRow(index));
+		// Collection selection not changed
+		if (this.itemsView
+				&& Zotero.Utilities.arrayEquals(
+					selectedRows.map(row => row.id).sort(),
+					this.itemsView.collectionTreeRows.map(row => row.id).sort()
+				)) {
 			return;
 		}
 		// _onCollectionSelection will be called during initiation. It can take a while
@@ -880,41 +903,45 @@ class LibraryLayout extends Layout {
 		if (currentLayout?.type !== "library") return;
 
 		this.itemsView.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
-		
-		// Load library data if necessary
-		var library = Zotero.Libraries.get(collectionTreeRow.ref.libraryID);
-		if (!library.getDataLoaded('item')) {
-			Zotero.debug("Waiting for items to load for library " + library.libraryID);
-			await library.waitForDataLoad('item');
+
+		// Load item data for each selected library if necessary
+		for (let libraryID of new Set(selectedRows.map(row => row.ref.libraryID))) {
+			let library = Zotero.Libraries.get(libraryID);
+			if (!library.getDataLoaded('item')) {
+				Zotero.debug("Waiting for items to load for library " + library.libraryID);
+				await library.waitForDataLoad('item');
+			}
 		}
-		
-		await this.itemsView.changeCollectionTreeRow({
+
+		// Restrict each collection's items to those relevant to the current citation mode
+		let filterItemsForMode = async (items) => {
+			// In add-note mode, note parent checks call item.getNotes(), which requires childItems
+			if (DIALOG_STATE.isAddingNote()) {
+				let regularItems = items.filter(item => SearchHandler.isItemWithNotes(item));
+				if (regularItems.length) {
+					await Zotero.Items.loadDataTypes(regularItems, ['childItems']);
+				}
+				// when citing notes, only keep notes or note parents
+				items = items.filter(item => item.isNote() || item.getNotes().length);
+			}
+			// when adding annotations, only keep annotations, their attachments, and their top-level items
+			if (DIALOG_STATE.isAddingAnnotations()) {
+				return SearchHandler.keepItemsWithAnnotations(items);
+			}
+			return items;
+		};
+
+		await this.itemsView.changeCollectionTreeRows(selectedRows.map(collectionTreeRow => ({
 			id: collectionTreeRow.id,
-			getItems: async () => {
-				let items = await collectionTreeRow.getItems();
-				// In add-note mode, note parent checks call item.getNotes(), which requires childItems
-				if (DIALOG_STATE.isAddingNote()) {
-					let regularItems = items.filter(item => SearchHandler.isItemWithNotes(item));
-					if (regularItems.length) {
-						await Zotero.Items.loadDataTypes(regularItems, ['childItems']);
-					}
-					// when citing notes, only keep notes or note parents
-					items = items.filter(item => item.isNote() || item.getNotes().length);
-				}
-				// when adding annotations, only keep annotations, their attachments, and their top-level items
-				if (DIALOG_STATE.isAddingAnnotations()) {
-					return SearchHandler.keepItemsWithAnnotations(items);
-				}
-				return items;
-			},
+			getItems: async () => filterItemsForMode(await collectionTreeRow.getItems()),
 			isSearch: () => true,
 			isSearchMode: () => true,
 			setSearch: (searchText, mode) => collectionTreeRow.setSearch(searchText, mode),
 			clearCache: () => collectionTreeRow.clearCache(),
 			ref: collectionTreeRow.ref
-		});
+		})));
 		await this.itemsView.setFilter('citation-search', SearchHandler.searchValue);
-		
+
 		this.itemsView.clearItemsPaneMessage();
 	}
 
@@ -931,18 +958,35 @@ class LibraryLayout extends Layout {
 		}
 	}
 
-	// click on + icon will add the item to the citation
+	// click on + icon will add the item(s) to the citation
 	_handleItemsViewIconClick(index) {
 		let rowNode = doc.getElementById(`${this.itemsView.id}-row-${index}`);
 		let rowTopBeforeRefresh = rowNode.getBoundingClientRect().top;
+		let items = this._getItemsViewIconClickItems(index);
 		this.itemsView.selection.clearSelection();
-		let row = this.itemsView.getRow(index);
-		// after adding the item, try to keep the mouse over it even if the bubble-input gets taller
-		IOManager.addItemsToCitation([row.ref]).then(() => {
+		// after adding the items, try to keep the mouse over the clicked row
+		// even if the bubble-input gets taller
+		IOManager.addItemsToCitation(items).then(() => {
 			this._scrollItemTreeToRow(rowNode.id, rowTopBeforeRefresh);
 		});
 	}
 
+	// items that a click on the + icon of the given row will add: all selected
+	// items if the row is part of the current selection, otherwise just this row's item
+	_getItemsViewIconClickItems(index) {
+		let items;
+		if (this.itemsView.selection.isSelected(index)) {
+			items = this.itemsView.getSelectedItems();
+		}
+		else {
+			items = [this.itemsView.getRow(index).ref];
+		}
+		if (DIALOG_STATE.isAddingAnnotations()) {
+			items = items.filter(item => item.isAnnotation());
+		}
+		return items;
+	}
+
 	_handleSelectionChangeWithAnnotation() {
 		let selectedItems = this.itemsView.getSelectedItems().filter(item => item.isAnnotation() || item.isFileAttachment() || item.isRegularItem());
 		let selectedAnnotations = selectedItems.flatMap(item => SearchHandler.getAllAnnotations(item));
@@ -997,7 +1041,9 @@ class LibraryLayout extends Layout {
 		// If the itemTree is still loading, wait for it to finish
 		await this.itemsView.waitForLoad();
 		// Scroll to the first cited item
-		let firstCitedRow = this.itemsView._rows.findIndex(row => CitationDataManager.itemAddedCache.has(row.ref.id));
+		let firstCitedRow = this.itemsView._rows.findIndex(
+			row => row.isObjectRow && CitationDataManager.itemAddedCache.has(row.ref.id)
+		);
 		if (firstCitedRow == -1) return;
 		this.itemsView.ensureRowsAreVisible([firstCitedRow]);
 	}
@@ -1006,10 +1052,11 @@ class LibraryLayout extends Layout {
 	// scroll it back up so that the mouse remains over the same row as before click
 	// do not do it on click of the first row, since then the mouse will be on a header
 	_scrollItemTreeToRow(rowID, rowTopBeforeRefresh) {
-		let rowIndex = rowID.split("-")[4];
+		let rowIndex = parseInt(rowID.split("-").at(-1));
 		if (rowIndex === 0) return;
 		this.itemsView.ensureRowIsVisible(rowIndex);
 		let rowAfterRefresh = doc.querySelector(`#zotero-items-tree #${rowID}`);
+		if (!rowAfterRefresh) return;
 		let rowTopAfterRefresh = rowAfterRefresh.getBoundingClientRect().top;
 		let delta = rowTopAfterRefresh - rowTopBeforeRefresh;
 		if (delta > 0.1) {
@@ -1092,6 +1139,7 @@ class ListLayout extends Layout {
 		IOManager.updateBubbleInput();
 	}
 
+	// Resolves only once the resize animation has fully completed
 	async resizeWindow() {
 		await Helpers.smoothResizingPromise;
 		let bubbleInputHeight = Helpers.getSearchRowHeight();
@@ -1112,11 +1160,12 @@ class ListLayout extends Layout {
 			marginOfError = Zotero.isWin ? 6 : 2;
 		}
 
-		// height of the bottom section
+		// height of citation preview (0 when hidden) and the bottom section
+		let citationPreview = _id("citation-preview").getBoundingClientRect().height;
 		let bottomHeight = _id("bottom-area-wrapper").getBoundingClientRect().height;
 
 		// set min height and resize the window
-		let autoHeight = bubbleInputHeight + sectionsHeight + sectionsWrapperPadding + bottomHeight + marginOfError;
+		let autoHeight = bubbleInputHeight + sectionsHeight + sectionsWrapperPadding + citationPreview + bottomHeight + marginOfError;
 		// window.resizeTo(X,Y) resizes the window so that it's outerHeight == Y. On mac and windows,
 		// innerHeight and outerHeight are the same. On linux, the outerHeight > innerHeight, perhaps
 		// outerHeight there includes chrome, borders, etc. This difference is accounted for below, so that the dialog
@@ -1124,24 +1173,39 @@ class ListLayout extends Layout {
 		if (Zotero.isLinux) {
 			autoHeight += (window.outerHeight - window.innerHeight);
 		}
-		let minHeight = bubbleInputHeight + bottomHeight;
-		doc.documentElement.style.minHeight = `${minHeight}px`;
+		let minHeight = bubbleInputHeight + citationPreview + bottomHeight;
 
 		// cap window height at the height last set by the user
 		autoHeight = Math.min(autoHeight, lastSetWindowHeight);
 		let targetWidth = Math.min(window.innerWidth, this.MIN_WIDTH);
+
+		// Skip the resize animation if the window is already at the target size.
+		let needsResize = Math.round(window.innerWidth) !== Math.round(targetWidth) || Math.round(window.innerHeight) !== Math.round(autoHeight);
+		if (!needsResize) {
+			doc.documentElement.style.minHeight = `${minHeight}px`;
+			document.documentElement.setAttribute("dialog-layout", this.type);
+			return;
+		}
+
+		// Clear the min-height floor so the window can animate freely (including shrinking);
+		// it's restored to the new value in onComplete below.
+		doc.documentElement.style.removeProperty("min-height");
 		ignoreWindowResizing = true;
 		
-		// Timeout is required likely to allow minHeight update to settle
-		setTimeout(() => {
-			Helpers.smoothResize(targetWidth, autoHeight, {
-				onComplete: () => {
-					_id("bubble-input").refocusInput();
-					document.documentElement.setAttribute("dialog-layout", this.type);
-					ignoreWindowResizing = false;
-				},
-			});
-		}, 10);
+		// Timeout is required likely to allow the min-height removal to settle
+		await new Promise((resolve) => {
+			setTimeout(() => {
+				Helpers.smoothResize(targetWidth, autoHeight, {
+					onComplete: () => {
+						_id("bubble-input").refocusInput();
+						doc.documentElement.style.minHeight = `${minHeight}px`;
+						document.documentElement.setAttribute("dialog-layout", this.type);
+						ignoreWindowResizing = false;
+						resolve();
+					},
+				});
+			}, 10);
+		});
 	}
 
 	_markRoundedCorners() {
@@ -1181,6 +1245,7 @@ class ListLayout extends Layout {
 const IOManager = {
 	sectionExpandedStatus: {},
 	_skipInputAcceptOnEnterUntil: 0,
+	_timesItemsAdded: 0,
 
 	// most essential IO functionality that is added immediately on load
 	preInit() {
@@ -1224,6 +1289,7 @@ const IOManager = {
 		});
 
 		_id("includeComments").addEventListener("click", () => this._toggleIncludeComments());
+		_id("display-preview-button").addEventListener("click", () => this._toggleDisplayPreview());
 
 		// open settings popup on btn click
 		_id("settings-button").addEventListener("click", event => _id("settings-popup").openPopup(event.target, "before_end"));
@@ -1267,10 +1333,12 @@ const IOManager = {
 		let isInitialModeSetting = currentLayout === undefined;
 		currentLayout = newMode === "library" ? libraryLayout : listLayout;
 
+		// Reflect visibility of the citation preview after the layout switch.
+		CitationPreview.update();
+
 		// Wait for window resize before running search to avoid stutter with large libraries
 		if (!isInitialModeSetting) {
 			await currentLayout.resizeWindow();
-			await Helpers.smoothResizingPromise;
 		}
 
 		// do not show View menubar with itemTree-specific options in list mode
@@ -1317,6 +1385,7 @@ const IOManager = {
 			};
 		}), DIALOG_STATE.type);
 		_id("accept-button").disabled = !CitationDataManager.items.length;
+		CitationPreview.update();
 	},
 
 	async addItemsToCitation(items, { noInputRefocus, index } = { index: null }) {
@@ -1373,11 +1442,21 @@ const IOManager = {
 			// Do not record just-added bubbles if locator is already provided
 			this._clearJustAddedBubbles();
 		}
-		else {
-			// If no locator is provided, record which bubbles were just added.
-			// If a locator is typed next, these bubbles will receive it.
+		else if (bubbleItems.length == 1) {
+			// If no locator is provided, record the just-added bubble.
+			// If a locator is typed next, that bubble will receive it.
 			this._justAddedBubbles = bubbleItems;
+			// Only show the placeholder guidance on the first add -- after
+			// that, the user presumably knows about the shortcut
+			_id("bubble-input").showJustAddedPlaceholder = DIALOG_STATE.isCitingItems()
+				&& this._timesItemsAdded < 1;
 		}
+		else {
+			// A multi-item add doesn't enter locator-typing mode, so typed text
+			// starts a new search instead of setting a page number on every added item
+			this._clearJustAddedBubbles();
+		}
+		this._timesItemsAdded++;
 		await CitationDataManager.addItems({ bubbleItems, index });
 		// Refresh the itemTree if in library mode
 		if (currentLayout.type == "library") {
@@ -1394,6 +1473,9 @@ const IOManager = {
 			doc.querySelector("guidance-panel").setAttribute("x", Math.round(width / 2));
 			IOManager.showFirstRunDialog();
 		}
+		// Render the preview before refreshing the list so resizeWindow measures its real height;
+		// otherwise the debounced render lands after the resize and overflows the window.
+		await CitationPreview.render();
 		// Always refresh items list to make sure the opened and selected items are up to date
 		await currentLayout.refreshItemsList();
 		if (!noInputRefocus) {
@@ -1663,6 +1745,9 @@ const IOManager = {
 				input.value = "";
 				input.dispatchEvent(new Event('input', { bubbles: true }));
 				this.updateBubbleInput();
+				// The typed-locator shortcut has been used, so stop showing the tip
+				// about it in the item details popup
+				Zotero.Prefs.set("integration.citationDialogShowLocatorTip", false);
 				return;
 			}
 		}
@@ -1703,9 +1788,14 @@ const IOManager = {
 
 	_deleteItem(dialogReferenceID) {
 		CitationDataManager.deleteItem({ dialogReferenceID });
+		// If the citation is emptied, show the placeholder guidance again on the next add
+		if (!CitationDataManager.items.length) {
+			this._timesItemsAdded = 0;
+		}
 		if (currentLayout.type == "library") {
 			libraryLayout.refreshItemsView();
 		}
+		this._clearJustAddedBubbles();
 		this.updateBubbleInput();
 		// Always refresh items list to make sure the opened and selected items are up to date
 		currentLayout.refreshItemsList();
@@ -1803,9 +1893,14 @@ const IOManager = {
 			bubbleItem.label = "page";
 		}
 		IOManager._hideLoadingSpinner();
-		// Clear the input and update bubbles
+		// Clear the input and update bubbles. The placeholder stays, since both of its
+		// suggestions still apply -- typed digits keep appending to the locator, and
+		// any other input starts a search
 		input.value = "";
 		IOManager.updateBubbleInput();
+		// The typed-locator shortcut has been used, so stop showing the tip
+		// about it in the item details popup
+		Zotero.Prefs.set("integration.citationDialogShowLocatorTip", false);
 		// Disable Enter on input from accepting the dialog for the next 500ms;
 		// If one intends to confirmed the numeric locator by pressing Enter (via _handleInputEnter),
 		// we ensure that the Enter keypress won't happen right after when the locator is added to
@@ -1819,11 +1914,18 @@ const IOManager = {
 	// and Enter is presses, just-added bubbles get that locator.
 	_clearJustAddedBubbles(event) {
 		if (!this._justAddedBubbles) return;
-		// on keydown, only proceed if it's an arrow key
-		let navigationKeys = ["ArrowUp", "ArrowDown", "ArrowRight", "ArrowLeft"];
-		if (event && event.type == "keydown" && !navigationKeys.includes(event.key)) return;
+		// On keydown, only proceed for left/right arrows, which move to another
+		// reference (e.g. to explicitly search for a year). Up/down arrows just move
+		// the list selection while focus remains in the input, so locator entry
+		// stays active.
+		if (event && event.type == "keydown" && !["ArrowLeft", "ArrowRight"].includes(event.key)) return;
+		// On focusout, only proceed if focus moved elsewhere within the dialog. When
+		// the window itself loses focus (e.g., on Cmd-Tab to another app to check a
+		// page number), the input remains focused and locator entry stays active.
+		if (event && event.type == "focusout" && !doc.hasFocus()) return;
 		// clear just added bubbles and update bubble input to reflect that
 		this._justAddedBubbles = null;
+		_id("bubble-input").showJustAddedPlaceholder = false;
 		this.updateBubbleInput();
 	},
 
@@ -1862,6 +1964,31 @@ const IOManager = {
 		Zotero.Prefs.set("integration.annotationDialogIncludeComments", includeComments);
 	},
 
+	async _toggleDisplayPreview() {
+		let newShown = !Zotero.Prefs.get("integration.citationPreviewShown");
+		Zotero.Prefs.set("integration.citationPreviewShown", newShown);
+		// Reflect the pressed state right away, since revealing the preview is deferred until resize
+		_id("display-preview-button").setAttribute("aria-pressed", newShown ? "true" : "false");
+		let preview = _id("citation-preview");
+		if (newShown) {
+			// Lay the preview out off-flow via .measuring (real height, but invisible and not
+			// pushing the list around) so resizeWindow grows the window to fit it; then drop it
+			// into view once there's room, avoiding a momentary squeeze of the list.
+			await CitationPreview.render();
+			preview.classList.add("measuring");
+			preview.hidden = false;
+			await currentLayout.resizeWindow();
+			preview.classList.remove("measuring");
+			CitationPreview.update();
+		}
+		else {
+			// Hide first, then shrink -- freeing the space before the window contracts looks clean.
+			preview.classList.remove("measuring");
+			CitationPreview.update();
+			currentLayout.resizeWindow();
+		}
+	},
+
 	// Return focus to where it was before click moved focus.
 	// If it's not possible, refocus the last input in bubble-input so that
 	// focus is not just lost.
@@ -1939,6 +2066,64 @@ const IOManager = {
 	}
 };
 
+// Manages the citation preview shown in the bottom area of both layouts.
+const CitationPreview = {
+	// Lazily create _renderDebounced on first use
+	get _renderDebounced() {
+		delete CitationPreview._renderDebounced;
+		CitationPreview._renderDebounced = Zotero.Utilities.debounce(() => CitationPreview.render(), 250);
+		return CitationPreview._renderDebounced;
+	},
+
+	// The rendered text is kept in sync with the cited items even while the preview is hidden,
+	// so it can be measured and revealed instantly when toggled on.
+	update() {
+		let prefShown = Zotero.Prefs.get("integration.citationPreviewShown");
+		let isCitingItems = DIALOG_STATE.isCitingItems();
+		let hasPreview = !!io.preview;
+		let isEmpty = !CitationDataManager.items.length;
+		// The preview pane appears when citing at least one item and the caller has
+		// provided a preview function
+		let isRelevant = isCitingItems && hasPreview && !isEmpty;
+		_id("citation-preview").hidden = !(isRelevant && prefShown);
+		if (isEmpty) {
+			_id("citation-preview-content").innerHTML = "";
+			_id("citation-preview-error").hidden = true;
+		}
+		// The toggle button is hidden when there's no preview and is restored to its last
+		// state when the preview pane appears
+		let toggleBtn = _id("display-preview-button");
+		toggleBtn.hidden = !isRelevant;
+		toggleBtn.setAttribute("aria-pressed", prefShown ? "true" : "false");
+		if (!isEmpty) {
+			CitationPreview._renderDebounced();
+		}
+	},
+
+	async render() {
+		if (!DIALOG_STATE.isCitingItems()) return;
+		if (!CitationDataManager.items.length) return;
+		if (!io.preview) return;
+
+		CitationDataManager.updateCitationObject();
+		let html;
+		try {
+			html = await io.preview("html");
+		}
+		catch (e) {
+			// A preview failure usually means the citation itself won't process, but that
+			// error belongs to the insertion step -- just flag the preview as unavailable
+			Zotero.logError(e);
+		}
+		// Re-check after the await in case the user cleared items
+		if (!CitationDataManager.items.length) return;
+		let errored = html === undefined;
+		_id("citation-preview-content").hidden = errored;
+		_id("citation-preview-error").hidden = !errored;
+		_id("citation-preview-content").innerHTML = errored ? "" : html;
+	},
+};
+
 // Representation of a single entry in the citation.
 class BubbleItem {
 	// Can be created from either Zotero.Item or citation item from io.citation.citationItems
@@ -2125,7 +2310,16 @@ const CitationDataManager = {
 		if (!ioIsReady) return;
 		Zotero.debug("Citation Dialog: sorting items");
 		this.updateCitationObject();
-		await io.sort();
+		try {
+			await io.sort();
+		}
+		catch (e) {
+			// Sorting runs the citation through the processor, so it can fail like the
+			// preview does. Keep the current order -- if the citation can't be processed,
+			// the error will surface when it's inserted into the document.
+			Zotero.logError(e);
+			return;
+		}
 		// sync the order of this.items with io.citation.sortedItems
 		let sortedIOItems = io.citation.sortedItems.map(entry => entry[1]);
 		let sortedItems = sortedIOItems.map((sortedItem) => {
diff --git a/chrome/content/zotero/integration/citationDialog.xhtml b/chrome/content/zotero/integration/citationDialog.xhtml
index 722af2ae97..6cd90058a6 100644
--- a/chrome/content/zotero/integration/citationDialog.xhtml
+++ b/chrome/content/zotero/integration/citationDialog.xhtml
@@ -31,7 +31,9 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	drawintitlebar-platforms="mac,win"
-	resizable="false">
+	resizable="false"
+	windowtype="zotero:citation-dialog"
+	>
 	<head>
 		<title data-l10n-id="integration-citationDialog"></title>
 		<link rel="localization" href="zotero.ftl"/>
@@ -105,6 +107,14 @@
 		</div>
 
 		<div id="bottom-area" class="layout">
+			<div class="divider"></div>
+			<div id="citation-preview" class="vbox" data-dialog-type="citation">
+				<div id="citation-preview-wrapper" class="vbox">
+					<div id="citation-preview-content"></div>
+					<div id="citation-preview-error" data-l10n-id="integration-citationDialog-preview-error" hidden="true"></div>
+				</div>
+				<div class="divider subtle"></div>
+			</div>
 			<div id="bottom-area-wrapper" class="hbox">
 				<div id="dialog-type-setting" class="segmented-switch" data-arrow-nav="horizontal" data-tabindex="70" role="radiogroup" aria-orientation="horizontal">
 					<div id="dialog-type-citation" class="option keyboard-clickable" value="citation" role="radio" aria-checked="false" tabindex="-1" data-arrow-nav-enabled="true" data-l10n-id="integration-citationDialog-btn-type-citation">
@@ -119,7 +129,9 @@
 				</div>
 				<div class="hbox" style="flex:1"></div>
 				<div id="bottom-btn-group" class="hbox">
-					<div id="dialog-mode-setting" data-dialog-type="citation,add-note" class="segmented-switch" role="radiogroup" data-arrow-nav="horizontal" data-tabindex="80" aria-orientation="horizontal">
+					<button id="display-preview-button" class="btn-icon" data-dialog-type="citation" data-l10n-id="integration-citationDialog-btn-displayPreview" aria-pressed="false" tabindex="-1" data-tabindex="80"></button>
+					<button id="settings-button" class="btn-icon icon-citation-dialog-settings" data-l10n-id="integration-citationDialog-btn-settings" tabindex="-1" data-tabindex="81"></button>
+					<div id="dialog-mode-setting" data-dialog-type="citation,add-note" class="segmented-switch" role="radiogroup" data-arrow-nav="horizontal" data-tabindex="82" aria-orientation="horizontal">
 						<div id="dialog-mode-list" class="option keyboard-clickable" value="list" role="radio" aria-checked="false" tabindex="-1" data-arrow-nav-enabled="true">
 							<span data-l10n-id="integration-citationDialog-mode-list"></span>
 						</div>
@@ -127,13 +139,12 @@
 							<span data-l10n-id="integration-citationDialog-mode-library"></span>
 						</div>
 					</div>
-					<button id="settings-button" class="btn-icon icon-citation-dialog-settings" data-l10n-id="integration-citationDialog-btn-settings" tabindex="-1" data-tabindex="81"></button>
 				</div>
 			</div>
 		</div>
 
 		<div id="popups">
-			<xul:panel id="itemDetails">
+			<xul:panel id="itemDetails" consumeoutsideclicks="false">
 				<div class="vbox popup">
 					<div class="details-header hbox">
 						<span class="icon icon-item-type"></span>
@@ -145,6 +156,9 @@
 							<!--fx128: size="0" forces select have default native style -->
 							<select name="locator" id="label" class="details-label" size="0"></select>
 							<input id="locator" class="details-data" aria-labelledby="label" aria-describedby="itemDetails-combinedInfo"/>
+							<div class="details-locator-info" data-l10n-id="integration-citationDialog-details-locator-info">
+								<a data-l10n-name="docs-link" class="link" tabindex="0" href="https://www.zotero.org/support/word_processor_plugin_usage#page_and_other_locators" onclick="Zotero.launchURL(this.href)"/>
+							</div>
 							
 							<label class="details-label" for="prefix" data-l10n-id="integration-citationDialog-details-prefix"></label>
 							<input id="prefix" class="details-data"/>
diff --git a/chrome/content/zotero/integration/citationDialog/keyboardHandler.mjs b/chrome/content/zotero/integration/citationDialog/keyboardHandler.mjs
index d5e82f99da..0928ac5cd8 100644
--- a/chrome/content/zotero/integration/citationDialog/keyboardHandler.mjs
+++ b/chrome/content/zotero/integration/citationDialog/keyboardHandler.mjs
@@ -49,8 +49,8 @@ export class CitationDialogKeyboardHandler {
 	// lower-level components
 	captureKeydown(event) {
 		let cmdOrCtrl = Zotero.isMac ? event.metaKey : event.ctrlKey;
-		// Cmd/Ctrl-Enter will always accept the dialog regardless of the target (unless within a panel)
-		if (event.key == "Enter" && cmdOrCtrl && !event.target.closest("panel")) {
+		// Cmd/Ctrl-Enter will always accept the dialog regardless of the target
+		if (event.key == "Enter" && cmdOrCtrl) {
 			this.doc.dispatchEvent(new CustomEvent("dialog-accepted"));
 			event.stopPropagation();
 			event.preventDefault();
diff --git a/chrome/content/zotero/integration/citationDialog/popupHandler.mjs b/chrome/content/zotero/integration/citationDialog/popupHandler.mjs
index 1d1ce61f34..22e165f528 100644
--- a/chrome/content/zotero/integration/citationDialog/popupHandler.mjs
+++ b/chrome/content/zotero/integration/citationDialog/popupHandler.mjs
@@ -99,6 +99,9 @@ export class CitationDialogPopupsHandler {
 		popup.style.top = `${bubbleRect.bottom + 10}px`;
 
 		this._getNode("#itemDetails .show").hidden = !this.bubbleItem.item.id;
+		// Hide the typed-locator tip once the shortcut has been used
+		this._getNode("#itemDetails .details-locator-info").hidden
+			= !Zotero.Prefs.get("integration.citationDialogShowLocatorTip");
 		let topLevelItem = this.bubbleItem.item.topLevelItem;
 
 		// Add header and fill inputs with their values
diff --git a/chrome/content/zotero/integration/citationDialog/searchHandler.mjs b/chrome/content/zotero/integration/citationDialog/searchHandler.mjs
index ce4d37c487..ecadead5b8 100644
--- a/chrome/content/zotero/integration/citationDialog/searchHandler.mjs
+++ b/chrome/content/zotero/integration/citationDialog/searchHandler.mjs
@@ -155,7 +155,7 @@ export class CitationDialogSearchHandler {
 	// for the library search to complete to show these results.
 	async refreshSelectedAndOpenItems() {
 		if (this.openItems === null) {
-			this.openItems = await this._getReaderOpenItems();
+			this.openItems = await this._getOpenTabItems();
 		}
 		if (this.selectedItems === null) {
 			this.selectedItems = this._getSelectedLibraryItems();
@@ -291,15 +291,18 @@ export class CitationDialogSearchHandler {
 	}
 
 	// make sure that each item appears only in one group.
-	// Items that are selected are removed from opened.
-	// Items that are selected or opened are removed from cited.
-	// Items that are selected or opened or cited are removed from library results.
+	// Items that are opened are removed from selected.
+	// Items that are opened or selected are removed from cited.
+	// Items that are opened or selected or cited are removed from library results.
 	_deduplicate() {
 		let selectedIDs = new Set(this.results.selected.map(item => item.id));
 		let openIDs = new Set(this.results.open.map(item => item.id));
 		let citedIDs = new Set(this.results.cited.map(item => item.id));
 
-		this.results.open = this.results.open.filter(item => !selectedIDs.has(item.id));
+		this.results.selected = this.results.selected.filter(item => !openIDs.has(item.id));
+		if (this.results.selectedItems) {
+			this.results.selectedItems = this.results.selectedItems.filter(item => !openIDs.has(item.id));
+		}
 		this.results.cited = this.results.cited.filter(item => !selectedIDs.has(item.id) && !openIDs.has(item.id));
 		this.results.found = this.results.found.filter(item => !selectedIDs.has(item.id) && !openIDs.has(item.id) && !citedIDs.has(item.id));
 	}
@@ -346,8 +349,10 @@ export class CitationDialogSearchHandler {
 		return citedItems;
 	}
 
-	async _getReaderOpenItems() {
-		if (this.dialogState.isAddingNote()) return [];
+	async _getOpenTabItems() {
+		// When adding a note, suggest notes open in note tabs. Otherwise, suggest
+		// items open in reader tabs.
+		let tabType = this.dialogState.isAddingNote() ? 'note' : 'reader';
 		let tabs = [];
 		let win = Zotero.getMainWindow();
 		// If the main window is open, use it to get open tabs
@@ -360,34 +365,56 @@ export class CitationDialogSearchHandler {
 			if (!mainWindowLastState) return [];
 			tabs = mainWindowLastState.tabs;
 		}
-		let itemIDs = tabs.filter(t => t.type === 'reader').sort((a, b) => {
-			// Sort selected tab first
-			if (a.selected) return -1;
-			else if (b.selected) return 1;
-			// Then in reverse chronological select order
-			else if (a.timeUnselected && b.timeUnselected) return b.timeUnselected - a.timeUnselected;
-			// Then in reverse order for tabs that never got loaded in this session
-			else if (a.timeUnselected) return -1;
-			return 1;
-		}).map(t => t.data.itemID);
-		if (!itemIDs.length) return [];
+		tabs = tabs.filter(t => t.type === tabType);
+		if (!tabs.length) return [];
 
-		// Fetch top-most items and load necessary data, in case tabs belong to an unloaded library
-		let items = [];
-		for (let itemID of itemIDs) {
-			let item = await Zotero.Items.getAsync(itemID);
-			if (item && item.parentItemID) {
+		// Fetch each tab's top-most item and load necessary data, in case tabs belong
+		// to an unloaded library
+		let tabItems = [];
+		for (let tab of tabs) {
+			let item = await Zotero.Items.getAsync(tab.data.itemID);
+			if (item && item.parentItemID && tabType === 'reader') {
 				item = await Zotero.Items.getAsync(item.parentItemID);
 			}
-			items.push(item);
+			if (item) {
+				tabItems.push({ tab, item });
+			}
 		}
-		if (this.dialogState.isAddingAnnotations()) {
+
+		if (this.selectedItems === null) {
+			this.selectedItems = this._getSelectedLibraryItems();
+		}
+		let selectedItemIDs = new Set(this.selectedItems.map(item => item.id));
+		tabItems.sort((a, b) => {
+			// Sort selected tab first
+			if (a.tab.selected) return -1;
+			else if (b.tab.selected) return 1;
+			// Then tabs whose items are selected in the item tree, since they get
+			// deduplicated out of the Selected Items group
+			let aItemSelected = selectedItemIDs.has(a.item.id);
+			let bItemSelected = selectedItemIDs.has(b.item.id);
+			if (aItemSelected !== bItemSelected) return aItemSelected ? -1 : 1;
+			// Then in reverse chronological select order
+			if (a.tab.timeUnselected && b.tab.timeUnselected) return b.tab.timeUnselected - a.tab.timeUnselected;
+			// Then in reverse order for tabs that never got loaded in this session
+			else if (a.tab.timeUnselected) return -1;
+			return 1;
+		});
+		let items = tabItems.map(tabItem => tabItem.item);
+
+		if (this.dialogState.isAddingNote()) {
+			await Zotero.Items.loadDataTypes(items);
+			items = items.filter(i => i.isNote());
+		}
+		else if (this.dialogState.isAddingAnnotations()) {
 			// Make sure annotations are loaded on unloaded tabs from unloaded libraries
 			await this._ensureRelevantItemsAreLoaded(items);
 			items = this.keepItemsWithAnnotations(items);
 		}
 		else {
 			await Zotero.Items.loadDataTypes(items);
+			// Exclude non-citeable items (e.g., a standalone attachment open in a tab)
+			items = items.filter(i => i.isRegularItem());
 		}
 		// Return deduplicated items since there may be multiple tabs opened for the same
 		// top-level item (duplicate tabs or a multiple attachments belonging to the same item)
@@ -395,7 +422,7 @@ export class CitationDialogSearchHandler {
 	}
 
 	_getSelectedLibraryItems() {
-		let selected = Zotero.getActiveZoteroPane()?.getSelectedItems() || [];
+		let selected = Zotero.getActiveZoteroPane()?.getSelectedItems(false, { libraryTabOnly: true }) || [];
 		if (this.dialogState.isAddingNote()) {
 			return selected.filter(i => i.isNote()) || [];
 		}
diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx
index fe213796bb..4bbe9be9e6 100644
--- a/chrome/content/zotero/itemTree.jsx
+++ b/chrome/content/zotero/itemTree.jsx
@@ -219,8 +219,6 @@ class ItemTreeRowProvider {
 			return true;
 		}
 		return row.isContainerEmpty({
-			searchMode: this._searchMode,
-			searchItemIDs: this._searchItemIDs,
 			includeTrashed: this._includeTrashed,
 		});
 	}
@@ -258,6 +256,7 @@ class ItemTreeRowProvider {
 			let level = this.getLevel(index);
 			// Remove child rows
 			while ((index + 1 < this._rows.length) && (this.getLevel(index + 1) > level)) {
+				this.itemTree.selection.adjustForRowRemoval(index + 1, true);
 				this._removeRow(index + 1, true);
 				count++;
 			}
@@ -283,6 +282,7 @@ class ItemTreeRowProvider {
 				count++;
 				this._addRow(childRows[i], index + i + 1, true);
 			}
+			this.itemTree.selection.adjustForRowInsertion(index, count);
 
 			this._rows[index].isOpen = true;
 		}
@@ -292,14 +292,26 @@ class ItemTreeRowProvider {
 	}
 
 	toggleOpenState(index, skipRowMapRefresh = false) {
+		let selection = this.itemTree.selection;
+		let preserveDetachedFocus = !selection.isSelected(selection.focused);
 		this.itemTree._cacheState();
+		let selectedBefore = this.itemTree._cachedSelection;
 		this._toggleOpenState(index, skipRowMapRefresh);
 		// Preserve viewport when toggling a container instead of jumping to the current selection.
 		this.runListeners('update', true, {
-			restoreSelection: true,
+			restoreSelection: !preserveDetachedFocus,
 			expandCollapsedParents: false,
 			restoreScroll: true,
 		});
+		if (preserveDetachedFocus) {
+			// Collapsing a container with selected descendants moves their selection to the
+			// container row, and listeners have to be notified of the new selection
+			let selectedAfter = this.itemTree.getSelectedObjects();
+			if (selectedAfter.length != selectedBefore.length
+					|| selectedAfter.some(ref => !selectedBefore.includes(ref))) {
+				selection._updateTree();
+			}
+		}
 	}
 
 	/**
@@ -1046,11 +1058,23 @@ var ItemTree = class ItemTree extends LibraryTree {
 	get visibilityGroup() {
 		return 'default';
 	}
-	
+
 	get viewType() {
 		return 'library';
 	}
 
+	/**
+	 * Trees not backed by a collection tree selection (e.g. the citation
+	 * explorer's) have no rows and no special view behavior
+	 */
+	get collectionTreeRows() {
+		return [];
+	}
+
+	get viewMode() {
+		return 'default';
+	}
+
 	get isSortable() {
 		return true;
 	}
@@ -1121,6 +1145,7 @@ var ItemTree = class ItemTree extends LibraryTree {
 		for (let id of this._prefsObserverIDs) {
 			Zotero.Prefs.unregisterObserver(id);
 		}
+		this.clearEventListeners();
 		this._writeColumnPrefsToFile(true);
 	}
 
@@ -1333,6 +1358,12 @@ var ItemTree = class ItemTree extends LibraryTree {
 	}
 	
 	handleActivate(event, indices) {
+		// Skip non-selectable rows (e.g. library headers and spacers), which aren't real items
+		// and can be double-clicked via the opaque sticky header
+		indices = indices.filter(index => this.isSelectable(index));
+		if (!indices.length) {
+			return;
+		}
 		let items = indices.map(index => this.getRow(index).ref);
 		this.props.onActivate(event, items);
 	}
@@ -1346,9 +1377,13 @@ var ItemTree = class ItemTree extends LibraryTree {
 			return false;
 		}
 		
-		// Handle arrow keys specially on multiple selection, since
-		// otherwise the tree just applies it to the last-selected row
-		if (this.selection.count > 1 && ["ArrowLeft", "ArrowRight"].includes(event.key)) {
+		// If selection count is greater than 1 and the focused row wasn't
+		// moved out of the selection - toggle open/closed all rows in that selection
+		// Otherwise if the focused row has moved out of the selection, toggle state
+		// of the focused row (handled in virtualized-table and this conditional should match that)
+		if (this.selection.count > 1
+				&& this.selection.isSelected(this.selection.focused)
+				&& [Zotero.arrowPreviousKey, Zotero.arrowNextKey].includes(event.key)) {
 			if (event.key == Zotero.arrowNextKey) {
 				this.expandSelectedRows();
 			}
@@ -1424,6 +1459,9 @@ var ItemTree = class ItemTree extends LibraryTree {
 
 				multiSelect: this.props.multiSelect,
 
+				stickySectionHeaders: true,
+				isSectionHeader: index => this.getRow(index)?.type == 'library-header',
+
 				onSelectionChange: this._handleSelectionChange.bind(this),
 				isSelectable: this.isSelectable.bind(this),
 				getParentIndex: this.getParentIndex.bind(this),
@@ -1492,23 +1530,31 @@ var ItemTree = class ItemTree extends LibraryTree {
 				await this.expandToItem(id);
 				if (!this._rowMap[id]) {
 					// The row is still not found
-					// Clear the quick search and tag selection and try again (once)
+					// Clear the quick search, tag selection, and advanced search
+					// and try again (once)
 					if (!noRecurse && window.ZoteroPane) {
-						let hasQuickSearch = !!this.collectionTreeRow.searchText;
-						let hasTagFilters = this.collectionTreeRow.tags?.size > 0;
-						if (hasQuickSearch || hasTagFilters) {
-							// Clear all searches set on the collection tree row directly on
-							// collectionTreeRow (vs using ZoteroPane functions) to avoid
+						let hasQuickSearch = !!this.collectionTreeRows[0].searchText;
+						let hasTagFilters = this.collectionTreeRows[0].tags?.size > 0;
+						let hasAdvancedSearch = !!this.collectionTreeRows[0].advancedSearch;
+						if (hasQuickSearch || hasTagFilters || hasAdvancedSearch) {
+							// Clear all searches set on the collection tree rows directly on
+							// the rows (vs using ZoteroPane functions) to avoid
 							// refreshing the itemTree multiple times at the same time, which can lead
 							// to tag selector not showing all tags after quickSearch is cleared
-							this.collectionTreeRow.setTags(new Set());
-							this.collectionTreeRow.setSearch('');
-							// Clear quickSearch text field and tag selection without
-							// rerunning search
+							for (let collectionTreeRow of this.collectionTreeRows) {
+								collectionTreeRow.setTags(new Set());
+								collectionTreeRow.setSearch('');
+								collectionTreeRow.setAdvancedSearch(null);
+							}
+							// Clear tag selection, quicksearch text field, and advanced search
+							// without rerunning search
 							if (window.ZoteroPane.tagSelector) {
 								window.ZoteroPane.tagSelector.clearTagSelection();
 							}
 							window.ZoteroPane.clearQuicksearch(true);
+							if (hasAdvancedSearch) {
+								await window.ZoteroPane.setAdvancedSearchState('closed', { skipRefresh: true });
+							}
 							// Rerun search and refresh the itemTree
 							await this.refreshAndMaintainSelection();
 							// Try to select the item(s) again
@@ -1782,7 +1828,19 @@ var ItemTree = class ItemTree extends LibraryTree {
 	 * @return {Zotero.Item[]|Integer[]} - An array of Zotero.Item objects or itemIDs
 	 */
 	getSortedItems(asIDs) {
-		return this._rows.map(row => asIDs ? row.ref.id : row.ref);
+		return this._rows
+			.filter(row => row.isObjectRow)
+			.map(row => asIDs ? row.ref.id : row.ref);
+	}
+
+	/**
+	 * Number of visible rows representing objects, excluding library headers
+	 * and spacers
+	 *
+	 * @return {Integer}
+	 */
+	get objectRowCount() {
+		return this._rows.reduce((count, row) => count + (row.isObjectRow ? 1 : 0), 0);
 	}
 
 	/**
@@ -2131,7 +2189,7 @@ var ItemTree = class ItemTree extends LibraryTree {
 			.forEach((column, i) => {
 				let menuItem = document.createXULElement('menuitem');
 				menuItem.setAttribute('type', 'checkbox');
-				menuItem.setAttribute('checked', this.getSortField() == column.dataKey);
+				menuItem.toggleAttribute('checked', this.getSortField() == column.dataKey);
 				menuItem.setAttribute('label', formatColumnName(column));
 				menuItem.addEventListener('command', () => {
 					this.toggleSort(i, true);
@@ -2186,10 +2244,23 @@ var ItemTree = class ItemTree extends LibraryTree {
 		div.classList.toggle('first-highlighted', this._highlightedRows.has(rowData.id) && !this._highlightedRows.has(prevRowID));
 		div.classList.toggle('last-highlighted', this._highlightedRows.has(rowData.id) && !this._highlightedRows.has(nextRowID));
 		div.classList.toggle('annotation-row', row.type === 'annotation');
+		div.classList.toggle('library-header-row', row.type === 'library-header');
+		div.classList.toggle('spacer-row', row.type === 'spacer');
 		if (row.type !== 'annotation') {
 			div.classList.remove('tight');
 		}
 		
+		let { firstColumn } = columns.reduce((acc, column) => {
+			return !column.hidden && column.ordinal < acc.lowestOrdinal
+				? { lowestOrdinal: column.ordinal, firstColumn: column }
+				: acc;
+		}, { lowestOrdinal: Infinity, firstColumn: null });
+
+		this._renderCtx.firstColumn = firstColumn;
+		this._renderCtx.includeTrashed = this.rowProvider.includeTrashed;
+
+		row.renderRow(div, index, columns, rowData, this._renderCtx);
+		
 		if (this._dropRow == index) {
 			let span;
 			if (Zotero.DragDrop.currentOrientation != 0) {
@@ -2202,17 +2273,6 @@ var ItemTree = class ItemTree extends LibraryTree {
 			}
 		}
 
-		let { firstColumn } = columns.reduce((acc, column) => {
-			return !column.hidden && column.ordinal < acc.lowestOrdinal
-				? { lowestOrdinal: column.ordinal, firstColumn: column }
-				: acc;
-		}, { lowestOrdinal: Infinity, firstColumn: null });
-
-		this._renderCtx.firstColumn = firstColumn;
-		this._renderCtx.includeTrashed = this.rowProvider.includeTrashed;
-
-		row.renderRow(div, index, columns, rowData, this._renderCtx);
-
 		if (!oldDiv) {
 			if (this.props.dragAndDrop && row.isDraggable) {
 				div.setAttribute('draggable', true);
@@ -2344,8 +2404,8 @@ var ItemTree = class ItemTree extends LibraryTree {
 		row.numNotes = treeRow.numNotes() || "";
 		row.feed = (treeRow.ref.isFeedItem && Zotero.Feeds.get(treeRow.ref.libraryID).name) || "";
 		row.lastRead = row.isItem ? treeRow.ref.getItemLastRead() : "";
-		row.addedBy = row.isItem && treeRow.getAddedBy();
-		row.lastModifiedBy = row.isItem && treeRow.getLastModifiedBy();
+		row.addedBy = row.isItem ? treeRow.getAddedBy() : "";
+		row.lastModifiedBy = row.isItem ? treeRow.getLastModifiedBy() : "";
 		row.title = treeRow.getDisplayTitle();
 		
 		const columns = this.getColumns();
@@ -2559,7 +2619,7 @@ var ItemTree = class ItemTree extends LibraryTree {
 			}
 			// Initial hidden value
 			else if (!("hidden" in column)) {
-				if (hasDefaultIn && this.collectionTreeRow) {
+				if (hasDefaultIn && this.collectionTreeRows.length) {
 					column.hidden = !(column.defaultIn && this._matchesViewType(column.defaultIn));
 				}
 				else {
@@ -2585,7 +2645,7 @@ var ItemTree = class ItemTree extends LibraryTree {
 		}
 
 		// Force sort indicator for views with a fixed sort order
-		if (this.collectionTreeRow?.isRecentlyRead()) {
+		if (this.viewMode == 'recentlyRead') {
 			let col = this._columns.find(c => c.dataKey === 'lastRead');
 			if (col) {
 				col.sortDirection = -1;
@@ -2593,7 +2653,24 @@ var ItemTree = class ItemTree extends LibraryTree {
 			}
 		}
 
-		return this._columns.sort((a, b) => a.ordinal - b.ordinal);
+		let sortedColumns = this._columns.sort((a, b) => a.ordinal - b.ordinal);
+
+		// If no column has an explicit sort direction (e.g., a fresh profile that
+		// has never had a column header clicked), mark the default sort column --
+		// the first visible column, matching getSortField() -- as the sorted
+		// column. The view is already sorted ascending by this column (see
+		// getSortDirection()'s fallback), but without an explicit sortDirection
+		// the first click on the header would just set the direction to its
+		// default instead of reversing the sort.
+		if (!this._sortedColumn) {
+			let defaultColumn = sortedColumns.find(column => !column.hidden);
+			if (defaultColumn) {
+				defaultColumn.sortDirection = 1;
+				this._sortedColumn = defaultColumn;
+			}
+		}
+
+		return sortedColumns;
 	}
 	
 	_getColumn(index) {
@@ -2762,7 +2839,7 @@ var ItemTree = class ItemTree extends LibraryTree {
 		else {
 			if (this._sortedColumn) {
 				delete this._sortedColumn.sortDirection;
-				if (columnSettings[column.dataKey]) {
+				if (columnSettings[this._sortedColumn.dataKey]) {
 					delete columnSettings[this._sortedColumn.dataKey].sortDirection;
 				}
 			}
diff --git a/chrome/content/zotero/itemTreeRow.js b/chrome/content/zotero/itemTreeRow.js
index 09099c1548..e4c1acf4f8 100644
--- a/chrome/content/zotero/itemTreeRow.js
+++ b/chrome/content/zotero/itemTreeRow.js
@@ -33,6 +33,16 @@ class ItemTreeRow {
 		return 'item';
 	}
 
+	/**
+	 * Whether the row represents an object in the view, as opposed to a
+	 * library header or spacer. Callers that operate on the view's contents
+	 * (counting rows, collecting items, walking top-level rows) should skip
+	 * rows where this is false.
+	 */
+	get isObjectRow() {
+		return true;
+	}
+
 	get isDraggable() {
 		return false;
 	}
@@ -451,17 +461,21 @@ class FileItemTreeRow extends ZoteroItemTreeRow {
 		return true;
 	}
 
-	isContainerEmpty({ searchMode, searchItemIDs } = {}) {
-		if (Zotero.Prefs.get("hideContextAnnotationRows") && searchMode) {
-			return !this.ref.getAnnotations().some(annotation => searchItemIDs.has(annotation.id));
-		}
+	isContainerEmpty() {
 		return this.ref.numAnnotations() == 0;
 	}
 
 	getChildItems({ searchMode, searchItemIDs } = {}) {
 		let annotations = this.ref.getAnnotations();
-		if (Zotero.Prefs.get("hideContextAnnotationRows") && searchMode) {
-			annotations = annotations.filter(annotation => searchItemIDs.has(annotation.id));
+		// With "Hide Non-Matching Annotations" enabled, if any of the attachment's
+		// annotations match a search, show only those and hide the rest. If none match,
+		// show them all, since otherwise the attachment couldn't be expanded to browse its
+		// annotations at all.
+		if (searchMode && Zotero.Prefs.get("hideContextAnnotationRows")) {
+			let matches = annotations.filter(annotation => searchItemIDs.has(annotation.id));
+			if (matches.length) {
+				annotations = matches;
+			}
 		}
 		return annotations;
 	}
@@ -631,6 +645,100 @@ class SearchItemTreeRow extends ItemTreeRow {
  * Dispatch order: Collection, Search, annotation item, file attachment item,
  * generic Zotero.Item, and finally the base ItemTreeRow fallback.
  */
+/**
+ * Non-selectable section header row shown above each library's items when the
+ * items list displays a multi-library selection. Wraps a Zotero.Library.
+ */
+class LibraryHeaderItemTreeRow extends ItemTreeRow {
+	constructor(library, label, iconName) {
+		super(library, 0, false);
+		// Label and icon are computed from the selection (see
+		// CollectionViewItemTreeRow._computeSectionHeaders); fall back to the library's
+		// own name/icon when not provided
+		this._label = label;
+		this._iconName = iconName;
+	}
+
+	get type() {
+		return 'library-header';
+	}
+
+	get isObjectRow() {
+		return false;
+	}
+
+	getDisplayTitle() {
+		return this._label ?? Zotero.Libraries.getName(this.ref.libraryID);
+	}
+
+	getField(field) {
+		if (field == 'title') {
+			return this.getDisplayTitle();
+		}
+		return '';
+	}
+
+	getIcon() {
+		// An explicit null icon name means render no icon (e.g. the single-library
+		// summary header), distinct from undefined (use the library's own icon)
+		if (this._iconName === null) {
+			return null;
+		}
+		let iconName = this._iconName
+			?? (this.ref.libraryType == 'group' ? 'library-group' : 'library');
+		let icon = getCSSIcon(iconName);
+		icon.classList.add('icon-item-type');
+		return icon;
+	}
+
+	renderRow(div, _index, _columns, _rowData, _renderCtx) {
+		// Single cell with an optional icon and the label, spanning the row
+		let span = document.createElement('span');
+		span.className = 'cell primary library-header';
+		let textSpan = document.createElement('span');
+		textSpan.className = 'cell-text';
+		textSpan.textContent = this.getDisplayTitle();
+		let icon = this.getIcon();
+		if (icon) {
+			span.append(icon, textSpan);
+		}
+		else {
+			// No icon, but reserve its space so the label still lines up with item titles
+			let spacer = document.createElement('span');
+			spacer.className = 'library-header-icon-spacer';
+			span.append(spacer, textSpan);
+		}
+		div.appendChild(span);
+	}
+}
+
+/**
+ * A blank, non-selectable row providing one row of whitespace above a library header
+ * (see CollectionViewItemTreeRow._insertLibraryHeaders). Kept separate from the header
+ * row so the header stays a uniform height and pins flush to the top when sticky.
+ */
+class SpacerItemTreeRow extends ItemTreeRow {
+	constructor(library) {
+		super(library, 0, false, 'spacer-' + library.libraryID);
+	}
+
+	get type() {
+		return 'spacer';
+	}
+
+	get isObjectRow() {
+		return false;
+	}
+
+	getField() {
+		return '';
+	}
+
+	renderRow(_div, _index, _columns, _rowData, _renderCtx) {
+		// Intentionally empty -- the row's height alone provides the whitespace
+	}
+}
+
 ItemTreeRow.create = function (ref, level, isOpen) {
 	if (ref instanceof Zotero.Collection) return new CollectionItemTreeRow(ref, level, isOpen);
 	if (ref instanceof Zotero.Search) return new SearchItemTreeRow(ref, level, isOpen);
@@ -646,3 +754,5 @@ module.exports.FileItemTreeRow = FileItemTreeRow;
 module.exports.AnnotationItemTreeRow = AnnotationItemTreeRow;
 module.exports.CollectionItemTreeRow = CollectionItemTreeRow;
 module.exports.SearchItemTreeRow = SearchItemTreeRow;
+module.exports.SpacerItemTreeRow = SpacerItemTreeRow;
+module.exports.LibraryHeaderItemTreeRow = LibraryHeaderItemTreeRow;
diff --git a/chrome/content/zotero/libraryTree.js b/chrome/content/zotero/libraryTree.js
index 5c682ba20c..ee80a5b157 100644
--- a/chrome/content/zotero/libraryTree.js
+++ b/chrome/content/zotero/libraryTree.js
@@ -56,6 +56,22 @@ var LibraryTree = class LibraryTree extends React.Component {
 		return this._waitForEvent('select');
 	}
 
+	componentDidMount() {
+		// Create an element where we can create drag images to be displayed next to the cursor while dragging
+		// since for multiple item drags we need to display all the elements
+		let elem = this._dragImageContainer = document.createElement("div");
+		elem.style.width = "100%";
+		elem.style.height = "2000px";
+		elem.style.position = "absolute";
+		elem.style.top = "-10000px";
+		elem.className = "drag-image-container";
+		this.domEl.appendChild(elem);
+	}
+
+	componentWillUnmount() {
+		this.domEl.removeChild(this._dragImageContainer);
+	}
+
 	componentDidCatch(error, info) {
 		// Async operations might attempt to update the react components
 		// after window close in tests, which will cause unnecessary crashing
@@ -118,6 +134,28 @@ var LibraryTree = class LibraryTree extends React.Component {
 		return this._rowMap[id];
 	}
 
+	/**
+	 * Get selected tree rows
+	 */
+	getSelectedRows() {
+		var indexes = this.selection ? Array.from(this.selection.selected) : [];
+		indexes = indexes.filter(index => index < this._rows.length);
+		try {
+			return indexes.map(index => this.getRow(index));
+		}
+		catch (e) {
+			Zotero.debug(indexes);
+			throw e;
+		}
+	}
+
+	/**
+	 * Get selected objects, including collections and searches in the trash in item trees
+	 */
+	getSelectedObjects() {
+		return this.getSelectedRows().map(row => row.ref);
+	}
+
 	/**
 	 * Add a tree row to the main array, update the row count, tell the treebox that the row
 	 * count changed, and update the row map
@@ -157,8 +195,8 @@ var LibraryTree = class LibraryTree extends React.Component {
 		let level = this.getLevel(index);
 
 		// Maintain selection unless specified otherwise
-		if (!skipSelectionUpdate && index <= this.selection.focused) {
-			this.selection.select(this.selection.focused - 1);
+		if (!skipSelectionUpdate) {
+			this.selection.adjustForRowRemoval(index);
 		}
 
 		this._rows.splice(index, 1);
@@ -214,16 +252,6 @@ var LibraryTree = class LibraryTree extends React.Component {
 		this.tree && this.tree.scrollToRow(index);
 	}
 
-	_updateHeight = () => {
-		this.forceUpdate(() => {
-			if (this.tree) {
-				this.tree.rerender();
-			}
-		});
-	}
-
-	updateHeight = Zotero.Utilities.debounce(this._updateHeight, 200);
-
 	updateFontSize() {
 		this.tree.updateFontSize();
 	}
@@ -248,11 +276,45 @@ var LibraryTree = class LibraryTree extends React.Component {
 		// the same action as the dropEffect. This allows the dropEffect setting
 		// (which we use in the tree's canDrop() and drop() to determine the desired
 		// action) to be changed, even if the cursor doesn't reflect the new setting.
+		//
+		// The effect also has to be one of the actions allowed at drag start: on Windows,
+		// OLE refuses the drop entirely if it isn't. Some drags allow only 'copy' (see
+		// Zotero.Utilities.Internal.onDragItems()), so a 'move' within Zotero has to be sent
+		// as a 'copy'. The trees' onDrop() handlers act on the effect set here, kept in
+		// Zotero.DragDrop.currentDropEffect, rather than on the drop event's dropEffect, so
+		// the drop still moves.
+		Zotero.DragDrop.currentDropEffect = effect;
+		let allowed = event.dataTransfer.effectAllowed;
+		if (effect != 'none' && allowed && !['uninitialized', 'all'].includes(allowed)
+				&& !allowed.toLowerCase().includes(effect)) {
+			effect = ['copy', 'move', 'link'].find(x => allowed.toLowerCase().includes(x)) || 'none';
+		}
 		if (Zotero.isWin || Zotero.isLinux) {
 			event.dataTransfer.effectAllowed = effect;
 		}
 		event.dataTransfer.dropEffect = effect;
 	}
+
+	/**
+	 * Start a drag using HTML 5 Drag and Drop
+	 */
+	onDragStart(event, index) {
+		// Propagate selection before we set the drag image if dragging not one of the selected rows
+		if (!this.selection.isSelected(index)) {
+			this.selection.select(index);
+		}
+		// Set drag image
+		const dragElems = this.domEl.querySelectorAll('.selected');
+		for (let elem of dragElems) {
+			elem = elem.cloneNode(true);
+			elem.style.position = "initial";
+			this._dragImageContainer.appendChild(elem);
+		}
+	}
+
+	onDragEnd(_event, _index) {
+		this._dragImageContainer.innerHTML = "";
+	}
 };
 
 Zotero.Utilities.Internal.makeClassEventDispatcher(LibraryTree);
diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 938c09c164..bc0a222b4c 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 938c09c164a60b3cfeabe61089f1bf4c3ea6a4ed
+Subproject commit bc0a222b4ca526126faf892c35b2b7b1215c10eb
diff --git a/chrome/content/zotero/locateMenu.js b/chrome/content/zotero/locateMenu.js
index 35aa69fb69..d7d8b68fb4 100644
--- a/chrome/content/zotero/locateMenu.js
+++ b/chrome/content/zotero/locateMenu.js
@@ -29,7 +29,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUti
  * This object contains the various functions for the interface
  */
 var Zotero_LocateMenu = new function () {
-	XPCOMUtils.defineLazyServiceGetter(this, "ios", "@mozilla.org/network/io-service;1", "nsIIOService");
+	XPCOMUtils.defineLazyServiceGetter(this, "ios", "@mozilla.org/network/io-service;1", Ci.nsIIOService);
 	
   	/**
   	 * Clear and build the locate menu
diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js
index 6abc11f2ba..91c464623b 100644
--- a/chrome/content/zotero/lookup.js
+++ b/chrome/content/zotero/lookup.js
@@ -28,6 +28,9 @@
  * @namespace
  */
 var Zotero_Lookup = new function () {
+	this._button = null;
+	this._accepted = false;
+
 	/**
 	 * Performs a lookup by DOI, PMID, or ISBN on the given textBox value
 	 * and adds any items it can.
@@ -41,7 +44,6 @@ var Zotero_Lookup = new function () {
 	 * @param toggleProgress {function} - Callback to toggle progress on/off
 	 * @returns {Promise<Zotero.Item[]>}
 	 */
-	this._button = null;
 	this.addItemsFromIdentifier = async function (textBox, childItem, toggleProgress) {
 		var identifiers = Zotero.Utilities.extractIdentifiers(textBox.value);
 		if (!identifiers.length) {
@@ -70,9 +72,9 @@ var Zotero_Lookup = new function () {
 		}
 		else {
 			try {
-				libraryID = ZoteroPane.getSelectedLibraryID();
-				let collection = ZoteroPane.getSelectedCollection();
-				collections = collection ? [collection.id] : false;
+				libraryID = ZoteroPane.getSelectedLibraryIDs()[0];
+				let selectedCollections = ZoteroPane.getSelectedCollections();
+				collections = selectedCollections.length ? selectedCollections.map(c => c.id) : false;
 			}
 			catch (e) {
 				/** TODO: handle this **/
@@ -137,6 +139,8 @@ var Zotero_Lookup = new function () {
 	 * Try a lookup and hide popup if successful
 	 */
 	this.accept = async function (textBox) {
+		this._accepted = true;
+		
 		let newItems = await Zotero_Lookup.addItemsFromIdentifier(
 			textBox,
 			false,
@@ -147,7 +151,12 @@ var Zotero_Lookup = new function () {
 			// Send the focus to the item tree after the popup closes
 			ZoteroPane.lastFocusedElement = null;
 			document.getElementById("zotero-lookup-panel").hidePopup();
-			document.getElementById("item-tree-main-default").focus();
+			// The item tree's DOM id has a view-specific suffix, so use the current view's id
+			document.getElementById(ZoteroPane.itemsView.id).focus();
+		}
+		else {
+			// Hide on failure too
+			document.getElementById("zotero-lookup-panel").hidePopup();
 		}
 		return false;
 	};
@@ -163,6 +172,11 @@ var Zotero_Lookup = new function () {
 	};
 	
 	this.onFocusOut = function (event) {
+		// Ignore focus loss caused by the window being deactivated
+		if (Services.focus.activeWindow !== window) {
+			return;
+		}
+
 		// If the lookup popup was triggered by the lookup button,
 		// we want to return there on focus out. So we check
 		// (1) that we came from a button and (2) that
@@ -182,14 +196,53 @@ var Zotero_Lookup = new function () {
 	};
 	
 	
-	/**
-	 * Focuses the field
-	 */
 	this.onShown = function (event) {
 		// Ignore context menu
 		if (event.originalTarget.id != 'zotero-lookup-panel') return;
+
+		this._accepted = false;
 		
+		// Focus the field
 		this.getActivePanel().querySelector('textarea').focus();
+
+		// Add handlers to dismiss the popup when contextually appropriate.
+		// We set noautohide="true" so the popup doesn't lose input when
+		// switching windows (e.g., so you can build a long list of identifiers
+		// copied from another app), but that means we need to manually handle
+		// closing on click outside (_onMouseDown) and closing on a window
+		// switch when there's no content (_onBlur)
+		window.addEventListener('mousedown', this._onMouseDown, { capture: true });
+		document.getElementById('zotero-lookup-panel').addEventListener('blur', this._onBlur, { capture: true });
+	};
+
+
+	/**
+	 * Hide on a click outside the panel
+	 */
+	this._onMouseDown = (event) => {
+		// Ignore clicks inside the panel or any popup (e.g. its context menu);
+		// only a click outside dismisses it
+		if (event.target.closest("panel, menupopup")) {
+			return;
+		}
+		document.getElementById("zotero-lookup-panel").hidePopup();
+		// Prevent the toolbar button's own handlers from triggering, so the
+		// popup doesn't immediately reopen
+		if (document.getElementById("zotero-tb-lookup").contains(event.target)) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	};
+
+
+	this._onBlur = () => {
+		if (Services.focus.activeWindow === window) {
+			return;
+		}
+		let textBox = document.getElementById('zotero-lookup-textbox');
+		if (textBox.value.trim() === '') {
+			document.getElementById('zotero-lookup-panel').hidePopup();
+		}
 	};
 	
 	
@@ -200,7 +253,12 @@ var Zotero_Lookup = new function () {
 		// Ignore context menu
 		if (event.originalTarget.id != 'zotero-lookup-panel') return;
 		
-		document.getElementById("zotero-lookup-textbox").value = "";
+		window.removeEventListener('mousedown', this._onMouseDown, { capture: true });
+		document.getElementById('zotero-lookup-panel').removeEventListener('blur', this._onBlur, { capture: true });
+
+		if (this._accepted) {
+			document.getElementById("zotero-lookup-textbox").value = "";
+		}
 		Zotero_Lookup.setShowProgress(false);
 		
 		// Revert to single-line when closing
diff --git a/chrome/content/zotero/merge.js b/chrome/content/zotero/merge.js
index 356caf63c9..2f9d97c56f 100644
--- a/chrome/content/zotero/merge.js
+++ b/chrome/content/zotero/merge.js
@@ -298,7 +298,7 @@ var Zotero_Merge_Window = new function () {
 		var nextButton = _wizard.getButton("next");
 		
 		if (Zotero.isMac) {
-			nextButton.setAttribute("hidden", "false");
+			nextButton.removeAttribute("hidden");
 			_wizard.getButton("finish").setAttribute("hidden", "true");
 		}
 		else {
@@ -315,7 +315,7 @@ var Zotero_Merge_Window = new function () {
 		
 		if (Zotero.isMac) {
 			_wizard.getButton("next").setAttribute("hidden", "true");
-			finishButton.setAttribute("hidden", "false");
+			finishButton.removeAttribute("hidden");
 		}
 		// Windows and Linux use a deck to switch between the Next and Finish buttons
 		else {
diff --git a/chrome/content/zotero/mergeItems.mjs b/chrome/content/zotero/mergeItems.mjs
index 2ed9518f10..496b4dd844 100644
--- a/chrome/content/zotero/mergeItems.mjs
+++ b/chrome/content/zotero/mergeItems.mjs
@@ -4,6 +4,10 @@ export function mergeItems(item, otherItems) {
 	Zotero.debug("Merging items");
 	
 	return Zotero.DB.executeTransaction(async function () {
+		Zotero.UndoHistory.stageAction(
+			'undo-action-merge-items',
+			{ count: otherItems.length + 1 }
+		);
 		var toSave = {};
 		toSave[item.id] = item;
 
diff --git a/chrome/content/zotero/modules/commandLineOptions.mjs b/chrome/content/zotero/modules/commandLineOptions.mjs
index d1c343b460..fbfecc29dd 100644
--- a/chrome/content/zotero/modules/commandLineOptions.mjs
+++ b/chrome/content/zotero/modules/commandLineOptions.mjs
@@ -19,6 +19,7 @@ export var TestOptions = {
 	bail: false,
 	startAt: false,
 	stopAt: false,
+	shard: false,
 	grep: false,
 	timeout: false,
 	retries: 0,
diff --git a/chrome/content/zotero/modules/filePicker.mjs b/chrome/content/zotero/modules/filePicker.mjs
index 47f07568ec..441d255766 100644
--- a/chrome/content/zotero/modules/filePicker.mjs
+++ b/chrome/content/zotero/modules/filePicker.mjs
@@ -121,7 +121,8 @@ FilePicker.prototype.filterAllowURLs = 0x80;
 FilePicker.prototype.filterAudio = 0x100;
 FilePicker.prototype.filterVideo = 0x200;
 
-['addToRecentDocs', 'defaultExtension', 'defaultString', 'displayDirectory', 'filterIndex'].forEach((prop) => {
+['addToRecentDocs', 'defaultExtension', 'defaultString', 'displayDirectory', 'filterIndex',
+		'okButtonLabel'].forEach((prop) => {
 	/**
 	 * @name FilePicker#addToRecentDocs
 	 * @type Boolean
@@ -154,6 +155,12 @@ FilePicker.prototype.filterVideo = 0x200;
 	 * @desc The (0-based) index of the filter which is currently selected in the file picker dialog.
 	 *   Set this to choose a particular filter to be selected by default.
 	 */
+	/**
+	 * @name FilePicker#okButtonLabel
+	 * @type String
+	 * @desc A custom label for the button the user uses to accept the file picker, if supported
+	 *   by the platform. This should be set before calling show().
+	 */
 	Object.defineProperty(FilePicker.prototype, prop, {
 		// TODO: Others
 		get: function () {
diff --git a/chrome/content/zotero/modules/optionsAutoComplete.mjs b/chrome/content/zotero/modules/optionsAutoComplete.mjs
new file mode 100644
index 0000000000..8a24dcfcf5
--- /dev/null
+++ b/chrome/content/zotero/modules/optionsAutoComplete.mjs
@@ -0,0 +1,82 @@
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+const OPTIONS_AC_CLASS_ID = Components.ID('{882f1f42-c1ff-458c-9157-06a4a55d32e8}');
+const OPTIONS_AC_NAME = "zotero-options";
+const OPTIONS_AC_CONTRACT_ID = `@mozilla.org/autocomplete/search;1?name=${OPTIONS_AC_NAME}`;
+
+function makeResult(searchString, matches, { noValueLabel, values } = {}) {
+	const r = Cc["@mozilla.org/autocomplete/simple-result;1"]
+		.createInstance(Ci.nsIAutoCompleteSimpleResult);
+
+	r.setSearchString(searchString);
+
+	if (matches.length === 0 && !noValueLabel) {
+		r.setSearchResult(Ci.nsIAutoCompleteResult.RESULT_NOMATCH);
+		r.setDefaultIndex(-1);
+		return r;
+	}
+
+	r.setSearchResult(Ci.nsIAutoCompleteResult.RESULT_SUCCESS);
+	r.setDefaultIndex(0);
+
+	for (let i = 0; i < matches.length; i++) {
+		let label = matches[i];
+		let value = values?.[i] ?? label;
+		r.appendMatch(label, "", null, "options-ac-value", value, label);
+	}
+	if (noValueLabel) {
+		r.appendMatch("", noValueLabel, null, "options-ac-no-value", "", noValueLabel);
+	}
+	return r;
+}
+
+export class OptionsAutoComplete {
+	static init() {
+		const registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
+		if (registrar.isCIDRegistered(OPTIONS_AC_CLASS_ID)) {
+			return;
+		}
+		registrar.registerFactory(
+			OPTIONS_AC_CLASS_ID, "", OPTIONS_AC_CONTRACT_ID, new OptionsAutoComplete()
+		);
+	}
+
+	// nsIAutoCompleteSearch
+	startSearch(searchString, searchParams, previousResult, listener) {
+		searchParams = JSON.parse(searchParams);
+		if (!searchParams) {
+			throw new Error("Invalid JSON passed to autocomplete");
+		}
+
+		let allOptions = searchParams?.options ?? [];
+		let allValues = searchParams?.optionValues ?? allOptions;
+		let search = (searchString || "").toLowerCase();
+		let filtered = allOptions
+			.map((label, i) => ({ label, value: allValues[i] ?? label }))
+			.filter(({ value }) => value.toLowerCase().startsWith(search))
+			.slice(0, 10);
+		let matches = filtered.map(({ label }) => label);
+		let values = filtered.map(({ value }) => value);
+		let noValueLabel = searchParams?.includeNoValue && !searchString
+			? Zotero.getString('item-pane-batch-editing-clear-values')
+			: null;
+		const result = makeResult(searchString, matches, { noValueLabel, values });
+		listener.onSearchResult(this, result);
+	}
+
+	// nsIAutoCompleteSearch
+	stopSearch() {
+	}
+
+	// nsIFactory
+	createInstance(iid) {
+		return this.QueryInterface(iid);
+	}
+}
+
+OptionsAutoComplete.prototype.classID = OPTIONS_AC_CLASS_ID;
+OptionsAutoComplete.prototype.QueryInterface = ChromeUtils.generateQI([
+	"nsIFactory",
+	"nsIAutoCompleteSearch",
+]);
diff --git a/chrome/content/zotero/modules/rtf.mjs b/chrome/content/zotero/modules/rtf.mjs
index ed0d235475..aafb1458f6 100644
--- a/chrome/content/zotero/modules/rtf.mjs
+++ b/chrome/content/zotero/modules/rtf.mjs
@@ -642,6 +642,5 @@ export async function replaceCitations(content, citations, citationItemIDs, styl
 		}
 	}
 
-	cslEngine.free();
 	return content;
 }
diff --git a/chrome/content/zotero/modules/templates.mjs b/chrome/content/zotero/modules/templates.mjs
new file mode 100644
index 0000000000..ca9d9a6bb9
--- /dev/null
+++ b/chrome/content/zotero/modules/templates.mjs
@@ -0,0 +1,495 @@
+/*
+	***** BEGIN LICENSE BLOCK *****
+	
+	Copyright © 2026 Corporation for Digital Scholarship
+					 Vienna, Virginia, USA
+					 http://zotero.org
+	
+	This file is part of Zotero.
+	
+	Zotero is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	Zotero is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+	
+	***** END LICENSE BLOCK *****
+*/
+
+/**
+ * Regular-expression source matching the body of a `quote`-delimited string: any run of
+ * characters -- including newlines -- up to the closing quote. Backslashes are ordinary
+ * characters (there is no escaping), so the first `quote` always closes the string. Shared by
+ * the template tokenizer and the string-literal parser so they agree on what a string is.
+ *
+ * @param {String} quote - The delimiting quote character (`"` or `'`).
+ * @returns {String} A regular-expression source fragment.
+ */
+function quotedStringBodySource(quote) {
+	return `[^${quote}]*`;
+}
+
+/**
+ * Match the body and closing quote of a string literal that opens at `str[i]` (which must be a
+ * `"` or `'`), using the shared quoted-string grammar. The match's `[0]` spans everything after
+ * the opening quote up to and including the closing quote.
+ *
+ * @param {String} str
+ * @param {Number} i - Index of the opening quote within `str`.
+ * @returns {Array|null} The RegExp match, or null if the string is never closed.
+ */
+function matchQuotedString(str, i) {
+	let quote = str[i];
+	return str.slice(i + 1).match(new RegExp('^' + quotedStringBodySource(quote) + quote));
+}
+
+/**
+ * Scan a template (or a bracketed statement's interior) and yield one token per structural
+ * element, so the tokenizer, validator and condition splitter share a single pass over the
+ * `{{`/`}}` grammar instead of each re-implementing the quote-skipping and depth-tracking.
+ *
+ * Yields `{ type, start, end, depth }` tokens, where `type` is one of:
+ *   - `text`   -- a run of ordinary characters; `depth` is the nesting level it sits in
+ *   - `string` -- a quoted string consumed whole, so its `{{`/`}}` are not delimiters
+ *   - `open`   -- a `{{`; `depth` is the level it opens from (0 at the top level)
+ *   - `close`  -- a `}}`; `depth` is the level it returns to (negative for a stray closer)
+ *
+ * Quoted strings are recognized with the shared grammar. By default they are only recognized
+ * inside a statement (depth > 0); pass `quotesAtDepthZero` for callers that scan a statement's
+ * interior, where the top level is already inside a statement.
+ *
+ * @param {String} str
+ * @param {Object} [options]
+ * @param {Boolean} [options.quotesAtDepthZero=false] - Recognise quoted strings at depth 0 too.
+ * @yields {Object} A `{ type, start, end, depth }` token.
+ */
+function* scanTemplateStructure(str, { quotesAtDepthZero = false } = {}) {
+	let depth = 0;
+	let textStart = 0;
+	let i = 0;
+	while (i < str.length) {
+		if ((quotesAtDepthZero || depth > 0) && (str[i] === '"' || str[i] === "'")) {
+			if (i > textStart) {
+				yield { type: 'text', start: textStart, end: i, depth };
+			}
+			let match = matchQuotedString(str, i);
+			// An unterminated quote swallows the rest, leaving any open `{{` unclosed
+			let end = match ? i + match[0].length + 1 : str.length;
+			yield { type: 'string', start: i, end, depth };
+			i = end;
+			textStart = i;
+		}
+		else if (str.slice(i, i + 2) === '{{') {
+			if (i > textStart) {
+				yield { type: 'text', start: textStart, end: i, depth };
+			}
+			yield { type: 'open', start: i, end: i + 2, depth };
+			depth++;
+			i += 2;
+			textStart = i;
+		}
+		else if (str.slice(i, i + 2) === '}}') {
+			if (i > textStart) {
+				yield { type: 'text', start: textStart, end: i, depth };
+			}
+			depth--;
+			yield { type: 'close', start: i, end: i + 2, depth };
+			i += 2;
+			textStart = i;
+		}
+		else {
+			i++;
+		}
+	}
+	if (str.length > textStart) {
+		yield { type: 'text', start: textStart, end: str.length, depth };
+	}
+}
+
+/**
+ * Splits a template string by its outer-most `{{` and `}}` brackets, returning an array
+ * of alternating literal-text and bracketed-statement parts (statements retain their braces).
+ *
+ * `{{` and `}}` that appear inside a quoted string literal within a statement are treated as
+ * ordinary characters rather than delimiters, so a statement such as `{{ "{{" }}` is returned
+ * as a single part.
+ *
+ * @param {String} input - The template string to split.
+ * @returns {String[]} An array of text and bracketed-statement parts.
+ */
+export function parseTemplateBrackets(input) {
+	let result = [];
+	let startIndex = 0;
+	
+	for (let token of scanTemplateStructure(input)) {
+		if (token.type === 'open' && token.depth === 0) {
+			result.push(input.slice(startIndex, token.start));
+			startIndex = token.start;
+		}
+		else if (token.type === 'close' && token.depth === 0) {
+			result.push(input.slice(startIndex, token.end));
+			startIndex = token.end;
+		}
+	}
+
+	if (startIndex < input.length) {
+		result.push(input.slice(startIndex));
+	}
+
+	return result;
+}
+
+/**
+ * If the statement is a single quoted string literal (e.g. `"foo"` or `'foo'`), return its
+ * unquoted contents; otherwise return null. Backslashes are ordinary characters, so the first
+ * matching quote closes the literal.
+ *
+ * @param {String} statement - A `{{ }}` statement with its braces already stripped.
+ * @returns {String|null}
+ */
+function parseStringLiteral(statement) {
+	statement = statement.trim();
+	let quote = statement[0];
+	if (quote !== '"' && quote !== "'") {
+		return null;
+	}
+	let match = statement.match(new RegExp(`^${quote}(${quotedStringBodySource(quote)})${quote}$`));
+	return match ? match[1] : null;
+}
+
+/**
+ * A basic templating engine
+ *
+ * - 'if' statement does case-insensitive string comparison
+ * -  functions can be called from if statements but must be wrapped in {{}} if arguments are passed (e.g. {{myFunction arg1="foo" arg2="bar"}})
+ *
+ * Vars example:
+ *  {
+ * 	  color: '#ff6666',
+ * 	  highlight: '<span class="highlight">This is a highlight</span>,
+ *    comment: 'This is a comment',
+ *    citation: '<span class="citation">(Author, 1900)</citation>',
+ *    image: '<img src="…"/>',
+ *    tags: (attrs) => ['tag1', 'tag2'].map(tag => tag.name).join(attrs.join || ' ')
+ *  }
+ *
+ * Template example:
+ *  {{if color == '#ff6666'}}
+ *    <h2>{{highlight}}</h2>
+ *  {{elseif color == '#2ea8e5'}}
+ *    {{if comment}}<p>{{comment}}:</p>{{endif}}<blockquote>{{highlight}}</blockquote><p>{{citation}}</p>
+ *  {{else}}
+ *    <p>{{highlight}} {{citation}} {{comment}} {{if tags}} #{{tags join=' #'}}{{endif}}</p>
+ *  {{endif}}
+ *
+ * @param {String} template
+ * @param {Object} vars
+ * @returns {String} HTML
+ */
+export function generateHTMLFromTemplate(template, vars) {
+	let hyphenToCamel = varName => varName.replace(/-(.)/g, (_, g1) => g1.toUpperCase());
+
+	let getAttributes = (part) => {
+		// Match `name="value"` pairs, reusing the shared string-literal grammar for the value
+		// so quote and newline handling stay in lockstep with the rest of the engine
+		let dq = quotedStringBodySource('"');
+		let sq = quotedStringBodySource("'");
+		let attrsRegexp = new RegExp(String.raw`([\w-]*) *=+ *(?:"(${dq})"|'(${sq})')`, 'g');
+		let attrs = {};
+		let match;
+		while ((match = attrsRegexp.exec(part))) {
+			// Exactly one quote branch matches; an empty value ('') is preserved
+			attrs[hyphenToCamel(match[1])] = match[2] ?? match[3];
+		}
+		return attrs;
+	};
+
+	
+	let evaluateIdentifier = (ident, args = {}) => {
+		// A missing operand (e.g. an empty `{{}}` used in a comparison) has no identifier
+		if (typeof ident !== 'string') {
+			return '';
+		}
+		ident = hyphenToCamel(ident);
+
+		if (!(ident in vars)) {
+			return '';
+		}
+
+		let identValue = typeof vars[ident] === 'function' ? vars[ident](args) : vars[ident];
+
+		if (Array.isArray(identValue)) {
+			return identValue.length ? identValue.join(',') : '';
+		}
+
+		if (typeof identValue !== 'string') {
+			throw new Error(`Identifier "${ident}" does not evaluate to a string`);
+		}
+		
+		return identValue;
+	};
+	
+	// evaluates extracted (i.e. without brackets) statement (e.g. `sum a="1" b="2"`) into a string value
+	let evaluateStatement = (statement) => {
+		statement = statement.trim();
+		// A bare string literal evaluates to its contents, matching how the top-level loop renders
+		// `{{ "x" }}`, so a nested statement is consistent whether at the top level or in a condition
+		let literal = parseStringLiteral(statement);
+		if (literal !== null) {
+			return literal;
+		}
+		let operator = statement.split(/\s+/, 1)[0];
+		let args = statement.slice(operator.length).trim();
+
+		return evaluateIdentifier(operator, getAttributes(args));
+	};
+
+	// splits raw (i.e. bracketed) statement (e.g. `{{ sum a="1" b="2" }}) into operator and arguments (e.g. ['sum', 'a="1" b="2"'])
+	let splitStatement = (statement) => {
+		statement = statement.slice(2, -2).trim();
+		let operator = statement.split(/\s+/, 1)[0];
+		let args = statement.slice(operator.length).trim();
+		return [operator, args];
+	};
+
+	// We allow unquoted numbers in conditions, e.g. `a == 1` or `a == 1.0`  but not `a == 1.0.0` or `a == 1st edition`
+	let asNumber = (string) => {
+		if (typeof string === 'number') {
+			return string;
+		}
+		let number = parseFloat(string);
+		if (!Number.isNaN(number) && string?.trim().match(/^[+-]?\d+(\.\d+)?$/)) {
+			return number;
+		}
+		return null;
+	};
+
+	// evaluates a single operand (nested statement, string literal, identifier or number)
+	let evaluateOperand = (operand) => {
+		operand = operand.trim();
+		if (operand.startsWith('{{') && operand.endsWith('}}')) {
+			return evaluateStatement(operand.slice(2, -2));
+		}
+		let literal = parseStringLiteral(operand);
+		if (literal !== null) {
+			return literal;
+		}
+		return asNumber(operand) ?? evaluateIdentifier(operand) ?? '';
+	};
+
+	// evaluates a condition (e.g. `a == "b"`) into a boolean value
+	let evaluateCondition = (condition) => {
+		let comparators = ['==', '!=', "<=", ">=", '<', '>'];
+		condition = condition.trim();
+		
+		// Find the top-level comparator in `cond`, skipping quoted strings (via the shared
+		// string grammar) and nested `{{...}}` statements, so a `}}`, quote or comparator
+		// inside a quoted operand argument is never mistaken for template structure. The
+		// condition is a statement interior, so quotes are recognized at depth 0 too.
+		let splitCondition = (cond) => {
+			for (let token of scanTemplateStructure(cond, { quotesAtDepthZero: true })) {
+				if (token.type !== 'text' || token.depth !== 0) {
+					continue;
+				}
+				for (let i = token.start; i < token.end; i++) {
+					for (let comparator of comparators) {
+						if (cond.startsWith(comparator, i)) {
+							return {
+								left: cond.slice(0, i),
+								comparator,
+								right: cond.slice(i + comparator.length),
+							};
+						}
+					}
+				}
+			}
+			return null;
+		};
+
+		// Unwrap a `{{ }}` that spans the whole condition when its interior holds a comparison
+		// (e.g. `{{ authorsCount == "2" }}`), so it's evaluated as one; a wrapped function call
+		// without a comparator (e.g. `{{ myFn arg="x" }}`) is left for the truthiness path below
+		let wrapping = parseTemplateBrackets(condition);
+		while (wrapping.length === 2 && wrapping[1] === condition && splitCondition(condition.slice(2, -2).trim())) {
+			condition = condition.slice(2, -2).trim();
+			wrapping = parseTemplateBrackets(condition);
+		}
+
+		let split = splitCondition(condition);
+		
+		if (!split) {
+			// condition is a statement or identifier without a comparator
+			if (condition.startsWith('{{')) {
+				return !!evaluateStatement(condition.slice(2, -2));
+			}
+			return !!evaluateIdentifier(condition);
+		}
+
+		let left = evaluateOperand(split.left);
+		let comparator = split.comparator;
+		let right = evaluateOperand(split.right);
+
+		// Compare numerically only when both operands are numeric; otherwise compare
+		// case-insensitively as strings, coercing a bare number back to a string
+		let leftNumber = asNumber(left);
+		let rightNumber = asNumber(right);
+		let bothNumbers = leftNumber !== null && rightNumber !== null;
+		let leftValue = bothNumbers ? leftNumber : String(left).toLowerCase();
+		let rightValue = bothNumbers ? rightNumber : String(right).toLowerCase();
+
+		switch (comparator) {
+			default:
+			case '==':
+				return leftValue == rightValue;
+			case '!=':
+				return leftValue != rightValue;
+			case ">=":
+				return leftValue >= rightValue;
+			case "<=":
+				return leftValue <= rightValue;
+			case '>':
+				return leftValue > rightValue;
+			case '<':
+				return leftValue < rightValue;
+		}
+	};
+
+	let html = '';
+	let levels = [{ condition: true }];
+	let parts = parseTemplateBrackets(template);
+
+	for (let i = 0; i < parts.length; i++) {
+		let part = parts[i];
+		let level = levels[levels.length - 1];
+
+		if (part.startsWith('{{')) {
+			let [operator, args] = splitStatement(part);
+		
+			if (operator === 'if') {
+				level = { condition: false, executed: false, parentCondition: levels[levels.length - 1].condition };
+				levels.push(level);
+			}
+			if (['if', 'elseif'].includes(operator)) {
+				if (!level.executed) {
+					level.condition = level.parentCondition && evaluateCondition(args);
+					level.executed = level.condition;
+				}
+				else {
+					level.condition = false;
+				}
+				continue;
+			}
+			else if (operator === 'else') {
+				level.condition = level.parentCondition && !level.executed;
+				level.executed = level.condition;
+				continue;
+			}
+			else if (operator === 'endif') {
+				// Don't pop the base level for an unbalanced {{endif}} (i.e. one without a matching
+				// {{if}}), which would leave `levels` empty and cause `level` to be undefined on the
+				// next iteration
+				if (levels.length > 1) {
+					levels.pop();
+				}
+				continue;
+			}
+			if (level.condition) {
+				let literal = parseStringLiteral(part.slice(2, -2));
+				if (literal !== null) {
+					html += literal;
+				}
+				else {
+					let attrs = getAttributes(part);
+					html += evaluateIdentifier(operator, attrs);
+				}
+			}
+		}
+		else if (level.condition) {
+			html += part;
+		}
+	}
+	return html;
+}
+
+/**
+ * Check whether a template is well-formed -- its `{{`/`}}` brackets are matched (ignoring
+ * braces inside string literals) and its {{if}}/{{endif}} blocks are balanced. Syntactic check only.
+ *
+ * @param {String} template
+ * @returns {Boolean} True if the template is well-formed, false if it is malformed
+ */
+export function isTemplateValid(template) {
+	if (typeof template !== 'string') {
+		return false;
+	}
+	let depth = 0;
+	let statementStart = 0;
+	// One entry per open {{if}} block, tracking whether its {{else}} has been seen
+	let levels = [];
+	for (let token of scanTemplateStructure(template)) {
+		if (token.type === 'open') {
+			if (depth === 0) {
+				statementStart = token.start;
+			}
+			depth++;
+		}
+		else if (token.type === 'close') {
+			// A `}}` with no open `{{` is a stray closer
+			if (depth === 0) {
+				return false;
+			}
+			depth--;
+			// A nested `{{ }}` is part of its statement's text; only validate complete
+			// top-level statements
+			if (depth > 0) {
+				continue;
+			}
+			let statement = template.slice(statementStart + 2, token.start).trim();
+			let operator = statement.split(/\s+/, 1)[0];
+			let level = levels[levels.length - 1];
+			switch (operator) {
+				case 'if':
+					// An empty condition is allowed: it evaluates to false (forcing any {{else}}),
+					// which the engine has always rendered, so keep such templates valid
+					levels.push({ seenElse: false });
+					break;
+				case 'elseif':
+					// An elseif outside of an if block, or after that block's else, is unbalanced
+					if (!level || level.seenElse) {
+						return false;
+					}
+					break;
+				case 'else':
+					// An else outside of an if block, or a second else in the same block, is unbalanced
+					if (!level || level.seenElse) {
+						return false;
+					}
+					level.seenElse = true;
+					break;
+				case 'endif':
+					// An endif without a matching if is unbalanced
+					if (!level) {
+						return false;
+					}
+					levels.pop();
+					break;
+				default:
+					// A statement beginning with a quote must be a well-formed string literal;
+					// anything else (e.g. `"x" y="z"`) is malformed
+					if ((statement.startsWith('"') || statement.startsWith("'"))
+							&& parseStringLiteral(statement) === null) {
+						return false;
+					}
+			}
+		}
+	}
+	// An unclosed `{{` leaves depth > 0; any unmatched {{if}} leaves a level open
+	return depth === 0 && levels.length === 0;
+}
diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index 8abdd7ea89..45e91c80fe 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -41,7 +41,6 @@ async function onLoad() {
 	}
 	
 	let itemID = parseInt(io.itemID);
-	let collectionID = parseInt(io.collectionID);
 	let parentItemKey = io.parentItemKey;
 	let ref;
 
@@ -65,9 +64,6 @@ async function onLoad() {
 			ref = Zotero.Items.getByLibraryAndKey(parentItemKey);
 			noteEditor.parentItem = ref;
 		}
-		else if (collectionID && collectionID != 'undefined') {
-			noteEditor.collection = Zotero.Collections.get(collectionID);
-		}
 		noteEditor.refresh();
 	}
 	
diff --git a/chrome/content/zotero/osfile.mjs b/chrome/content/zotero/osfile.mjs
index 830cb28311..f8e192008a 100644
--- a/chrome/content/zotero/osfile.mjs
+++ b/chrome/content/zotero/osfile.mjs
@@ -233,32 +233,20 @@ export let OS = {
 			);
 			
 			try {
-				if (Services.appinfo.OS === "Darwin") {
-					const libc = ctypes.open(
-						Services.appinfo.OS === "Darwin" ? "libSystem.B.dylib" : "libc.so"
-					);
-					
-					const symlink = libc.declare(
-						"symlink",
-						ctypes.default_abi,
-						ctypes.int, // return value
-						ctypes.char.ptr, // target
-						ctypes.char.ptr //linkpath
-					);
-					
-					if (symlink(pathTarget, pathCreate)) {
-						throw new Error("Failed to create symlink at " + pathCreate);
-					}
-				}
-				// The above is failing with "invalid ELF header" for libc.so on GitHub Actions, so
-				// just use ln -s on non-macOS systems
-				else {
-					let ln = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-					ln.initWithPath("/bin/ln");
-					let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
-					process.init(ln);
-					let args = ["-s", pathTarget, pathCreate];
-					process.run(true, args, args.length);
+				const libc = ctypes.open(
+					Services.appinfo.OS === "Darwin" ? "libSystem.B.dylib" : "libc.so.6"
+				);
+				
+				const symlink = libc.declare(
+					"symlink",
+					ctypes.default_abi,
+					ctypes.int, // return value
+					ctypes.char.ptr, // target
+					ctypes.char.ptr //linkpath
+				);
+				
+				if (symlink(pathTarget, pathCreate)) {
+					throw new Error("Failed to create symlink at " + pathCreate);
 				}
 			}
 			catch (e) {
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
index c4cb89d0a1..985510fd5a 100644
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@@ -44,7 +44,7 @@ var Zotero_Preferences = {
 
 		this.navigation.addEventListener('mouseover', event => this._handleNavigationMouseOver(event));
 		this.navigation.addEventListener('select', () => this._handleNavigationSelect());
-		this.searchField.addEventListener('command', () => this._search(this.searchField.value));
+		this.searchField.addEventListener('command', () => this._search(this.searchField.value.trim()));
 		
 		document.getElementById('prefs-subpane-back-button').addEventListener('command', () => {
 			let parent = this.panes.get(this.navigation.value).parent;
@@ -608,12 +608,6 @@ ${str}
 			attributeFilter: ['preference']
 		});
 
-		// parseXULToFragment() doesn't convert oncommand attributes into actual
-		// listeners, so we'll do it here
-		for (let elem of container.querySelectorAll('[oncommand]')) {
-			elem.oncommand = elem.getAttribute('oncommand');
-		}
-
 		for (let child of container.children) {
 			let event = new Event('load');
 			event.waitUntil = (promise) => {
@@ -699,6 +693,7 @@ ${str}
 		let termForDisplay = Zotero.Utilities.trimInternal(term).toLowerCase();
 		term = this._normalizeSearch(term);
 
+		let scrolled = false;
 		for (let paneContainer of this.content.querySelectorAll(':scope > .pane-container')) {
 			let roots = paneContainer.children;
 			while (roots.length === 1 && roots[0].childElementCount) {
@@ -719,6 +714,11 @@ ${str}
 							range.setStart(node, index);
 							range.setEnd(node, index + term.length);
 							this._getSearchSelection().addRange(range);
+							
+							if (!scrolled) {
+								node.parentElement?.scrollIntoView({ block: 'center' });
+								scrolled = true;
+							}
 						}
 						else if (node.nodeType == Node.ELEMENT_NODE) {
 							// For element nodes, wrap the element and add a tooltip
@@ -743,6 +743,11 @@ ${str}
 							// https://searchfox.org/mozilla-central/rev/703391c381f92a73d9a938cbe0d33ca64d94583b/browser/components/preferences/findInPage.js#689-691
 							let tooltipRect = tooltip.getBoundingClientRect();
 							tooltip.style.left = `calc(50% - ${tooltipRect.width / 2}px)`;
+							
+							if (!scrolled) {
+								node.scrollIntoView({ block: 'center' });
+								scrolled = true;
+							}
 						}
 
 						let tabPanel = this._closest(node, 'tabpanels > tabpanel');
@@ -776,7 +781,7 @@ ${str}
 	 * @return {Promise<Node[]>}
 	 */
 	async _findNodesMatching(root, term) {
-		const EXCLUDE_SELECTOR = 'input, [hidden]:not([hidden="false"]), [no-highlight]';
+		const EXCLUDE_SELECTOR = 'input, [hidden], [no-highlight]';
 
 		let matched = new Set();
 		let treeWalker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
@@ -826,16 +831,25 @@ ${str}
 					localizedStrings = localizedStrings.flatMap((message, i) => {
 						// If we got something from Fluent, use the value and relevant attributes
 						if (message) {
-							return [message.value, message.attributes?.title, message.attributes?.label];
+							let attributeValues = (message.attributes ?? [])
+								.filter(attr => attr.name === 'title' || attr.name === 'label')
+								.map(attr => attr.value);
+							return [message.value, ...attributeValues];
 						}
 
 						// If we didn't, try strings from DTDs and properties
 						let key = stringKeys[i];
-						return [
-							Zotero.Intl.strings.hasOwnProperty(key)
-								? Zotero.Intl.strings[key]
-								: Zotero.getString(key)
-						];
+						if (Zotero.Intl.strings.hasOwnProperty(key)) {
+							return [Zotero.Intl.strings[key]];
+						}
+						try {
+							return [Zotero.getString(key)];
+						}
+						catch (e) {
+							// Don't let one missing string abort the entire search
+							Zotero.logError(e);
+							return [];
+						}
 					}).filter(Boolean)
 						.map(this._normalizeSearch)
 						.filter(Boolean);
diff --git a/chrome/content/zotero/preferences/preferences_account.jsx b/chrome/content/zotero/preferences/preferences_account.jsx
index 0e0119f982..8efe289f30 100644
--- a/chrome/content/zotero/preferences/preferences_account.jsx
+++ b/chrome/content/zotero/preferences/preferences_account.jsx
@@ -233,7 +233,25 @@ Zotero_Preferences.Sync = {
 		}
 
 		// Validate and store the API key
-		await Zotero.Sync.Runner.checkLoginSession(sessionToken, result);
+		try {
+			await Zotero.Sync.Runner.checkLoginSession(sessionToken, result);
+		}
+		catch (e) {
+			// The session already created a key on the server, so revoke it rather than
+			// leaving an active key we can't use
+			if (result.apiKey) {
+				try {
+					await Zotero.Sync.Runner.getAPIClient({ apiKey: result.apiKey })
+						.deleteAPIKey();
+				}
+				catch (e2) {
+					Zotero.logError(e2);
+				}
+			}
+			this._pendingSessionToken = null;
+			this._showLoginDefault();
+			throw e;
+		}
 
 		// Handle secmod.db issue when storing the API key
 		// This can happen when people have a very old profile directory (e.g., from 2013)
@@ -914,19 +932,15 @@ Zotero_Preferences.Sync = {
 		//
 		var libraryMenu = document.getElementById('sync-reset-library-menu');
 		// Some options need to be disabled when certain libraries are selected
-		libraryMenu.onchange = (event) => {
-			this.onResetLibraryChange(parseInt(event.target.value));
-		}
+		libraryMenu.addEventListener('command', () => {
+			this.onResetLibraryChange(parseInt(libraryMenu.value));
+		});
 		this.onResetLibraryChange(Zotero.Libraries.userLibraryID);
 		document.querySelectorAll('#sync-reset-radiogroup radio')
 			.forEach(radio => radio.removeAttribute('selected'));
 		var libraries = Zotero.Libraries.getAll()
 			.filter(x => x.libraryType == 'user' || x.libraryType == 'group');
 		Zotero.Utilities.Internal.buildLibraryMenu(libraryMenu, libraries);
-		// Disable read-only libraries, at least until there are options that make sense for those
-		Array.from(libraryMenu.querySelectorAll('menuitem'))
-			.filter(x => x.getAttribute('data-editable') == 'false')
-			.forEach(x => x.disabled = true);
 		
 		for (let row of document.querySelectorAll('#sync-reset-radiogroup > *')) {
 			row.addEventListener('click', function (event) {
@@ -943,18 +957,29 @@ Zotero_Preferences.Sync = {
 	
 	onResetLibraryChange: function (libraryID) {
 		var library = Zotero.Libraries.get(libraryID);
-		var section = document.getElementById('reset-file-sync-history');
+		this.toggleResetOption('reset-file-sync-history', true);
+		this.toggleResetOption('restore-to-server', library.editable);
+	},
+	
+	
+	toggleResetOption: function (id, enabled) {
+		var section = document.getElementById(id);
 		var radio = section.querySelector('radio');
-		if (library.filesEditable) {
+		if (enabled) {
 			section.removeAttribute('disabled');
 			radio.disabled = false;
 		}
 		else {
 			section.setAttribute('disabled', '');
-			// If radio we're disabling is already selected, select the first one in the list
-			// instead
+			// If the radio we're disabling is already selected, move the selection to the first
+			// enabled one instead.
 			if (radio.selected) {
-				document.querySelector('#sync-reset-radiogroup > div:first-child radio').selected = true;
+				let enabledRadio = document.querySelector(
+					'#sync-reset-radiogroup > div:not([disabled]) radio'
+				);
+				if (enabledRadio) {
+					document.getElementById('sync-reset-radiogroup').selectedItem = enabledRadio;
+				}
 			}
 			radio.disabled = true;
 		}
diff --git a/chrome/content/zotero/preferences/preferences_advanced.js b/chrome/content/zotero/preferences/preferences_advanced.js
index 7c831f471c..1021c26d27 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.js
+++ b/chrome/content/zotero/preferences/preferences_advanced.js
@@ -52,13 +52,6 @@ Zotero_Preferences.Advanced = {
 		
 		this.onDataDirLoad();
 
-		document.getElementById('fulltext-rebuildIndex').setAttribute('label',
-			Zotero.getString('zotero.preferences.search.rebuildIndex')
-				+ Zotero.getString('punctuation.ellipsis'));
-		document.getElementById('fulltext-clearIndex').setAttribute('label',
-			Zotero.getString('zotero.preferences.search.clearIndex')
-				+ Zotero.getString('punctuation.ellipsis'));
-		
 		this.updateIndexStats();
 		this.updateLocalAPIUI();
 		document.getElementById('zotero-prefpane-advanced-enable-local-api').addEventListener('synctopreference', () => {
@@ -202,7 +195,7 @@ Zotero_Preferences.Advanced = {
 					
 					if (index == 0) {
 						// Safety first
-						await Zotero.DB.backUpDatabase();
+						await Zotero.DB.backUpDatabase({ force: true });
 						
 						// Fix the errors
 						await Zotero.Schema.integrityCheck(true);
@@ -386,96 +379,55 @@ Zotero_Preferences.Advanced = {
 	},
 	
 	updateIndexStats: async function () {
-		var stats = await Zotero.Fulltext.getIndexStats();
-		document.getElementById('fulltext-stats-indexed')
-			.setAttribute('value', stats.indexed);
-		document.getElementById('fulltext-stats-partial')
-			.setAttribute('value', stats.partial);
-		document.getElementById('fulltext-stats-unindexed')
-			.setAttribute('value', stats.unindexed);
-		document.getElementById('fulltext-stats-words')
-			.setAttribute('value', stats.words);
-	},
-	
-	
-	rebuildIndexPrompt: async function () {
-		var buttons = [
-			document.getElementById('fulltext-rebuildIndex'),
-			document.getElementById('fulltext-clearIndex')
-		];
-		buttons.forEach(b => b.disabled = true);
-		
-		var ps = Services.prompt;
-		var buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
-			+ ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL
-			+ ps.BUTTON_POS_2 * ps.BUTTON_TITLE_IS_STRING;
-		
-		var index = ps.confirmEx(null,
-			Zotero.getString('zotero.preferences.search.rebuildIndex'),
-			Zotero.getString('zotero.preferences.search.rebuildWarning',
-				Zotero.getString('zotero.preferences.search.indexUnindexed')),
-			buttonFlags,
-			Zotero.getString('zotero.preferences.search.rebuildIndex'),
-			null,
-			// Position 2 because of https://bugzilla.mozilla.org/show_bug.cgi?id=345067
-			Zotero.getString('zotero.preferences.search.indexUnindexed'),
-			null, {});
-		
-		try {
-			if (index == 0) {
-				await Zotero.Fulltext.rebuildIndex();
-			}
-			else if (index == 2) {
-				await Zotero.Fulltext.rebuildIndex(true)
-			}
-			
-			await this.updateIndexStats();
+		// Stop any pending refresh; we'll reschedule below if indexing is still in progress
+		if (this._indexStatsTimeoutID) {
+			clearTimeout(this._indexStatsTimeoutID);
+			this._indexStatsTimeoutID = null;
 		}
-		catch (e) {
-			Zotero.alert(null, Zotero.getString('general.error'), e);
+		// Bail if the pane is no longer shown (e.g., a scheduled refresh fired after navigating away)
+		let progressBox = document.getElementById('fulltext-stats-progress-box');
+		if (!progressBox) {
+			return;
 		}
-		finally {
-			buttons.forEach(b => b.disabled = false);
-		}
-	},
 
-	clearIndexPrompt: async function () {
-		var buttons = [
-			document.getElementById('fulltext-rebuildIndex'),
-			document.getElementById('fulltext-clearIndex')
-		];
-		buttons.forEach(b => b.disabled = true);
-		
-		var ps = Services.prompt;
-		var buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
-			+ ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL
-			+ ps.BUTTON_POS_2 * ps.BUTTON_TITLE_IS_STRING;
-		
-		var index = ps.confirmEx(null,
-			Zotero.getString('zotero.preferences.search.clearIndex'),
-			Zotero.getString('zotero.preferences.search.clearWarning',
-				Zotero.getString('zotero.preferences.search.clearNonLinkedURLs')),
-			buttonFlags,
-			Zotero.getString('zotero.preferences.search.clearIndex'),
-			null,
-			// Position 2 because of https://bugzilla.mozilla.org/show_bug.cgi?id=345067
-			Zotero.getString('zotero.preferences.search.clearNonLinkedURLs'), null, {});
-		
-		try {
-			if (index == 0) {
-				await Zotero.Fulltext.clearIndex();
-			}
-			else if (index == 2) {
-				await Zotero.Fulltext.clearIndex(true);
-			}
-			
-			await this.updateIndexStats();
+		let stats = await Zotero.FullText.getIndexStats();
+		document.getElementById('fulltext-stats-indexed').textContent = stats.indexed.toLocaleString();
+		document.getElementById('fulltext-stats-partial').textContent = stats.partial.toLocaleString();
+		document.getElementById('fulltext-stats-notes').textContent = stats.notesIndexed.toLocaleString();
+		document.getElementById('fulltext-stats-not-available').textContent = stats.notAvailable.toLocaleString();
+
+		// Indexed + Partial + indexed notes are already what's in the search index, so they're the
+		// bar's numerator. Pending work across the auto-draining queues: extracted content not yet
+		// in the index (remaining), indexable attachments not yet extracted (unindexedQueue), and
+		// notes not yet indexed or edited since their last index update (noteQueue). Show the bar
+		// while anything's pending; otherwise "up to date". Items with no local file or content
+		// aren't counted here -- nothing local can index them -- so "up to date" can sit next to a
+		// nonzero "not available".
+		let inIndex = stats.indexed + stats.partial + stats.notesIndexed;
+		let pending = stats.remaining + stats.unindexedQueue + stats.noteQueue;
+		let total = inIndex + pending;
+		let complete = document.getElementById('fulltext-stats-complete');
+		if (pending > 0 && total > 0) {
+			let progress = document.getElementById('fulltext-stats-progress');
+			progress.max = total;
+			progress.value = inIndex;
+			document.l10n.setAttributes(
+				document.getElementById('fulltext-stats-progress-label'),
+				'fulltext-index-status-indexing',
+				{ indexed: inIndex, total }
+			);
+			progressBox.hidden = false;
+			complete.hidden = true;
+			// While this pane is open, drive the queues actively in small batches rather than
+			// waiting for idle, so they advance as the user watches, then refresh promptly
+			await Zotero.FullText.processAttachmentIndexQueue({ maxTime: 500 });
+			await Zotero.FullText.processAttachmentExtractionQueue({ maxTime: 500 });
+			await Zotero.FullText.processNoteIndexQueue({ maxTime: 500 });
+			this._indexStatsTimeoutID = setTimeout(() => this.updateIndexStats(), 250);
 		}
-		catch (e) {
-			Zotero.alert(null, Zotero.getString('general.error'), e);
-		}
-		finally {
-			buttons.forEach(b => b.disabled = false);
+		else {
+			progressBox.hidden = true;
+			complete.hidden = false;
 		}
 	},
 
@@ -485,24 +437,42 @@ Zotero_Preferences.Advanced = {
 		
 		let checkbox = document.getElementById('zotero-prefpane-advanced-enable-local-api');
 		let availableMessage = document.getElementById('zotero-prefpane-advanced-local-api-available');
+		let authorizationsSection = document.getElementById('zotero-prefpane-advanced-local-api-write-authorizations');
 		let serverDisabledSection = document.getElementById('zotero-prefpane-advanced-server-disabled');
 		
 		if (!serverEnabled) {
 			checkbox.disabled = true;
 			availableMessage.hidden = true;
+			authorizationsSection.hidden = true;
 			serverDisabledSection.hidden = false;
 			return;
 		}
 		
 		checkbox.disabled = false;
 		availableMessage.hidden = !localAPIEnabled;
+		authorizationsSection.hidden = !localAPIEnabled;
 		serverDisabledSection.hidden = true;
 		
 		document.l10n.setArgs(availableMessage, {
 			url: `http://localhost:${Zotero.Server.port}/api/`
 		});
+		
+		if (localAPIEnabled) {
+			this.updateLocalAPIClearAuthorizationsButton();
+		}
 	},
 	
+	async updateLocalAPIClearAuthorizationsButton() {
+		let clearButton = document.getElementById('zotero-prefpane-advanced-local-api-clear');
+		let count = await Zotero.Server.LocalAPI.getAuthorizationCount();
+		clearButton.disabled = count === 0;
+	},
+
+	async clearLocalAPIAuthorizations() {
+		await Zotero.Server.LocalAPI.clearAuthorizations();
+		await this.updateLocalAPIClearAuthorizationsButton();
+	},
+
 	enableServerForLocalAPI() {
 		Zotero.Prefs.set('httpServer.enabled', true);
 		Zotero.Utilities.Internal.quit(true);
diff --git a/chrome/content/zotero/preferences/preferences_advanced.xhtml b/chrome/content/zotero/preferences/preferences_advanced.xhtml
index cc0901cfcc..0140a75edb 100644
--- a/chrome/content/zotero/preferences/preferences_advanced.xhtml
+++ b/chrome/content/zotero/preferences/preferences_advanced.xhtml
@@ -49,6 +49,13 @@
 				>
 					<html:code class="local-api-url" data-l10n-name="url"/>
 				</label>
+				<hbox id="zotero-prefpane-advanced-local-api-write-authorizations" align="center" hidden="true">
+					<button
+						id="zotero-prefpane-advanced-local-api-clear"
+						data-l10n-id="preferences-advanced-local-api-clear-authorizations"
+						oncommand="Zotero_Preferences.Advanced.clearLocalAPIAuthorizations()"
+					/>
+				</hbox>
 				<hbox id="zotero-prefpane-advanced-server-disabled" align="center" hidden="true">
 					<label data-l10n-id="preferences-advanced-server-disabled"/>
 					<button
@@ -241,15 +248,6 @@
 		<groupbox aria-label="&zotero.preferences.search.fulltextCache;">
 			<label><html:h2>&zotero.preferences.search.fulltextCache;</html:h2></label>
 			
-			<hbox>
-				<button id="fulltext-rebuildIndex" flex="1" oncommand="Zotero_Preferences.Advanced.rebuildIndexPrompt()"
-					data-search-strings="zotero.preferences.search.rebuildWarning"/>
-				<button id="fulltext-clearIndex" flex="1" oncommand="Zotero_Preferences.Advanced.clearIndexPrompt()"
-					data-search-strings="zotero.preferences.search.clearWarning"/>
-			</hbox>
-			
-			<separator/>
-			
 			<hbox align="center">
 				<html:label for="fulltext-maxLength">&zotero.preferences.fulltext.textMaxLength;</html:label>
 				<html:input id="fulltext-maxLength" type="text" size="10" preference="extensions.zotero.fulltext.textMaxLength"/>
@@ -268,18 +266,31 @@
 		<groupbox id="fulltext-stats" tabindex="0" aria-label="&zotero.preferences.search.indexStats;" aria-describedby="fulltext-stats-grid">
 			<label><html:h2>&zotero.preferences.search.indexStats;</html:h2></label>
 			
-			<vbox class="form-grid" id="fulltext-stats-grid">
-				<label value="&zotero.preferences.search.indexStats.indexed;"/>
-				<label id="fulltext-stats-indexed"/>
-	
-				<label value="&zotero.preferences.search.indexStats.partial;"/>
-				<label id="fulltext-stats-partial"/>
-	
-				<label value="&zotero.preferences.search.indexStats.unindexed;"/>
-				<label id="fulltext-stats-unindexed"/>
-	
-				<label value="&zotero.preferences.search.indexStats.words;"/>
-				<label id="fulltext-stats-words"/>
+			<vbox id="fulltext-stats-status">
+				<hbox align="center" id="fulltext-stats-progress-box" hidden="true">
+					<html:progress id="fulltext-stats-progress" value="0" max="1"/>
+					<label id="fulltext-stats-progress-label"/>
+				</hbox>
+				<label id="fulltext-stats-complete" data-l10n-id="fulltext-index-status-complete" hidden="true"/>
+			</vbox>
+
+			<vbox id="fulltext-stats-grid">
+				<hbox>
+					<label data-l10n-id="fulltext-stats-attachments-indexed"/>
+					<label id="fulltext-stats-indexed"/>
+				</hbox>
+				<hbox>
+					<label data-l10n-id="fulltext-stats-partially-indexed"/>
+					<label id="fulltext-stats-partial"/>
+				</hbox>
+				<hbox>
+					<label data-l10n-id="fulltext-stats-not-available"/>
+					<label id="fulltext-stats-not-available"/>
+				</hbox>
+				<hbox>
+					<label data-l10n-id="fulltext-stats-notes-indexed"/>
+					<label id="fulltext-stats-notes"/>
+				</hbox>
 			</vbox>
 		</groupbox>	
 	</vbox>
diff --git a/chrome/content/zotero/preferences/preferences_general.js b/chrome/content/zotero/preferences/preferences_general.js
index 8a5ed51084..2c1f6324e9 100644
--- a/chrome/content/zotero/preferences/preferences_general.js
+++ b/chrome/content/zotero/preferences/preferences_general.js
@@ -438,7 +438,7 @@ Zotero_Preferences.General = {
 			menuitem.setAttribute('type', 'checkbox');
 			currentMenuPopup.appendChild(menuitem);
 			var checked = r.url == Zotero.Prefs.get('openURL.resolver');
-			menuitem.setAttribute('checked', checked);
+			menuitem.toggleAttribute('checked', checked);
 			if (checked) {
 				selectedName = r.name;
 			}
@@ -449,7 +449,7 @@ Zotero_Preferences.General = {
 			openURLMenu.setAttribute('label', selectedName);
 			// If we found a match, update stored name
 			Zotero.Prefs.set('openURL.name', selectedName);
-			firstItem.setAttribute('checked', false);
+			firstItem.removeAttribute('checked');
 		}
 		// Custom
 		else {
diff --git a/chrome/content/zotero/preferences/preferences_general.xhtml b/chrome/content/zotero/preferences/preferences_general.xhtml
index 8f9abc4e30..00f7d2901c 100644
--- a/chrome/content/zotero/preferences/preferences_general.xhtml
+++ b/chrome/content/zotero/preferences/preferences_general.xhtml
@@ -26,6 +26,11 @@
 	onload="Zotero_Preferences.General.init()"
 	onunload="Zotero_Preferences.General.uninit()"
 >
+	<linkset>
+		<!-- Load file renaming dialog strings for search keywords -->
+		<html:link rel="localization" href="fileRenaming.ftl"/>
+	</linkset>
+	
 	<vbox class="main-section">
 		<groupbox aria-labelledby="preferences-appearance-title">
 			<label><html:h2 id="preferences-appearance-title" data-l10n-id="preferences-appearance-title"/></label>
@@ -217,6 +222,23 @@
 			</vbox>
 		</groupbox>
 
+		<groupbox id="zotero-prefpane-read-aloud-groupbox" aria-labelledby="preferences-read-aloud-title">
+			<label><html:h2 id="preferences-read-aloud-title" data-l10n-id="preferences-read-aloud-title"/></label>
+
+			<hbox align="center">
+				<label data-l10n-id="preferences-read-aloud-highlight-granularity" control="read-aloud-highlight-granularity-menulist"/>
+				<menulist id="read-aloud-highlight-granularity-menulist"
+						preference="extensions.zotero.reader.readAloud.highlightGranularity"
+						native="true">
+					<menupopup>
+						<menuitem data-l10n-id="preferences-read-aloud-highlight-granularity-paragraph" value="paragraph"/>
+						<menuitem data-l10n-id="preferences-read-aloud-highlight-granularity-sentence" value="sentence"/>
+						<menuitem data-l10n-id="preferences-read-aloud-highlight-granularity-word" value="word"/>
+					</menupopup>
+				</menulist>
+			</hbox>
+		</groupbox>
+
 		<groupbox id="zotero-prefpane-note-groupbox" aria-labelledby="preferences-note-title">
 			<label><html:h2 id="preferences-note-title" data-l10n-id="preferences-note-title"/></label>
 			<checkbox id="open-note-in-new-window"
diff --git a/chrome/content/zotero/publicationsDialog.js b/chrome/content/zotero/publicationsDialog.js
index caf236a842..f3d75c7f22 100644
--- a/chrome/content/zotero/publicationsDialog.js
+++ b/chrome/content/zotero/publicationsDialog.js
@@ -66,9 +66,9 @@ const Zotero_Publications_Dialog = { // eslint-disable-line no-unused-vars, came
 		this.wizard = id('publications-dialog-wizard');
 
 		id('include-files')
-			.addEventListener('CheckboxStateChange', this.onIntroPageCheckboxChange.bind(this));
+			.addEventListener('command', this.onIntroPageCheckboxChange.bind(this));
 		id('confirm-authorship-checkbox')
-			.addEventListener('CheckboxStateChange', this.onIntroPageCheckboxChange.bind(this));
+			.addEventListener('command', this.onIntroPageCheckboxChange.bind(this));
 		id('sharing-radiogroup')
 			.addEventListener('select', this.onLicenseAspectRadioChange.bind(this));
 		id('choose-adaptations')
@@ -76,7 +76,7 @@ const Zotero_Publications_Dialog = { // eslint-disable-line no-unused-vars, came
 		id('choose-commercial')
 			.addEventListener('select', this.onLicenseAspectRadioChange.bind(this));
 		id('keep-rights-checkbox')
-			.addEventListener('CheckboxStateChange', this.onKeepRightsCheckboxChange.bind(this));
+			.addEventListener('command', this.onKeepRightsCheckboxChange.bind(this));
 		this.wizard.getPageById('intro')
 			.addEventListener('pageshow', this.onIntroPageShow.bind(this));
 		this.wizard.getPageById('choose-sharing')
diff --git a/chrome/content/zotero/renameFiles.mjs b/chrome/content/zotero/renameFiles.mjs
index 5da8ebfbe2..3275053960 100644
--- a/chrome/content/zotero/renameFiles.mjs
+++ b/chrome/content/zotero/renameFiles.mjs
@@ -32,9 +32,9 @@ export const DEFAULT_AUTO_RENAME_FILE_TYPES = "application/pdf,application/epub+
 
 const getExtension = filename => filename.match(/\.([^.]+)$/)?.[1] ?? '';
 
-const getNewFileNameData = async (attachmentItem, parentItem) => {
+const getNewFileNameData = async (attachmentItem, parentItem, formatString) => {
 	const newFileBaseName = Zotero.Attachments.getFileBaseNameFromItem(
-		parentItem, { attachmentTitle: attachmentItem.getField('title') }
+		parentItem, { formatString, attachmentTitle: attachmentItem.getField('title') }
 	);
 
 	const path = await attachmentItem.getFilePathAsync();
@@ -67,6 +67,8 @@ export async function renameFilesFromParent({ libraryID = null, pretend = false,
 	};
 	
 	libraryID = libraryID ?? Zotero.Libraries.userLibraryID;
+	// Resolve (and validate) the library's template once for the whole batch
+	let formatString = Zotero.Attachments.getAttachmentRenameTemplate(libraryID);
 	let items = await Zotero.Items.getAll(libraryID, false, true);
 	adjustProgressBy(0.01); // move the progress bar slightly while we load required data
 
@@ -93,7 +95,7 @@ export async function renameFilesFromParent({ libraryID = null, pretend = false,
 			continue;
 		}
 
-		const { newName, isFilePresent } = await getNewFileNameData(attachmentItem, parentItem);
+		const { newName, isFilePresent } = await getNewFileNameData(attachmentItem, parentItem, formatString);
 		Zotero.debug(`Renaming attachment ${attachmentItem.id} on parent item ${parentItem.id} to ${newName}`);
 
 		if (newName !== attachmentItem.attachmentFilename) {
@@ -252,9 +254,11 @@ export function registerAutoRenameFileFromParent() {
 
 				let parentItemBefore = parentItem.clone(null, { skipTags: true, includeCollections: false });
 				let validFields = Zotero.ItemFields.getItemTypeFields(parentItem.itemTypeID).map(fieldID => Zotero.ItemFields.getName(fieldID));
+				let previousItemType = null;
 				for (let [key, value] of changes) {
 					if (key === 'itemType') {
-						parentItemBefore.setType(value);
+						// Defer the type change until after the field changes below
+						previousItemType = value;
 					}
 					else if (key === 'creators') {
 						parentItemBefore.setCreators(Object.values(value));
@@ -263,6 +267,11 @@ export function registerAutoRenameFileFromParent() {
 						parentItemBefore.setField(key, value);
 					}
 				}
+				if (previousItemType !== null) {
+					// Revert the type last. The field values above were recorded under the
+					// current type's field names, so they are base-field migrated by `setType()`
+					parentItemBefore.setType(Zotero.ItemTypes.getID(previousItemType));
+				}
 
 				await attachmentItem.loadDataType('itemData');
 				let previousMetadataBaseName = Zotero.Attachments.getFileBaseNameFromItem(
diff --git a/chrome/content/zotero/reportInterface.js b/chrome/content/zotero/reportInterface.js
index 1131c911f1..3a3f018453 100644
--- a/chrome/content/zotero/reportInterface.js
+++ b/chrome/content/zotero/reportInterface.js
@@ -25,52 +25,69 @@
 
 
 var Zotero_Report_Interface = new function() {
-	/*
-	 * Load a report for the currently selected collection
+	/**
+	 * Load a report for the selected collections/searches
 	 */
 	this.loadCollectionReport = function () {
+		var libraryID = ZoteroPane_Local.getSelectedLibraryIDs()[0];
+		var collections = ZoteroPane_Local.getSelectedCollections();
+		var items = collections.length
+			? _getCollectionItems(collections)
+			: ZoteroPane_Local.getSortedItems();
+		if (!items.length) {
+			throw new Error('No items in selected collections');
+		}
+		
 		var sortColumn = ZoteroPane_Local.getSortField();
-		var queryString = '?sort=' + sortColumn
-			+ '&direction=' + (ZoteroPane.getSortDirection() == 1 ? 'asc' : 'desc');
-		
-		var url = 'zotero://report/';
-		
-		var source = ZoteroPane_Local.getSelectedCollection();
-		if (!source) {
-			source = ZoteroPane_Local.getSelectedSavedSearch();
-		}
-		if (!source) {
-			throw new Error('No collection currently selected');
-		}
-		
-		url += Zotero.API.getLibraryPrefix(source.libraryID) + '/';
-		
-		if (source instanceof Zotero.Collection) {
-			url += 'collections/' + source.key;
-		}
-		else {
-			url += 'searches/' + source.key;
-		}
-		
-		url += '/items' + queryString;
+		var url = 'zotero://report/'
+			+ Zotero.API.getLibraryPrefix(libraryID) + '/'
+			+ 'items?sort=' + sortColumn
+			+ '&direction=' + (ZoteroPane.getSortDirection() == 1 ? 'asc' : 'desc')
+			+ '&itemKey=' + items.map(item => item.key).join(',');
 		
 		Zotero.openInViewer(url, { allowJavaScript: false });
 	}
 	
 	
-	/*
+	/**
 	 * Load a report for the currently selected items
 	 */
 	this.loadItemReport = function () {
-		var libraryID = ZoteroPane_Local.getSelectedLibraryID();
 		var items = ZoteroPane_Local.getSelectedItems();
-		
 		if (!items || !items.length) {
 			throw new Error('No items currently selected');
 		}
 		
-		var url = 'zotero://report/' + Zotero.API.getLibraryPrefix(libraryID) + '/items'
-			+ '?itemKey=' + items.map(item => item.key).join(',');
+		var libraryID = items[0].libraryID;
+		var url = 'zotero://report/'
+			+ Zotero.API.getLibraryPrefix(libraryID) + '/'
+			+ 'items?itemKey=' + items.map(item => item.key).join(',');
+
 		Zotero.openInViewer(url, { allowJavaScript: false });
 	}
+
+
+	/**
+	 * Get all items from the given collections, respecting recursiveCollections
+	 */
+	function _getCollectionItems(collections) {
+		var items = new Set();
+		var recursive = Zotero.Prefs.get('recursiveCollections');
+		for (let collection of collections) {
+			for (let item of collection.getChildItems()) {
+				items.add(item);
+			}
+			if (recursive) {
+				for (let desc of collection.getDescendents(false, 'collection')) {
+					let col = Zotero.Collections.get(desc.id);
+					if (col) {
+						for (let item of col.getChildItems()) {
+							items.add(item);
+						}
+					}
+				}
+			}
+		}
+		return [...items];
+	}
 }
diff --git a/chrome/content/zotero/searchDialog.js b/chrome/content/zotero/searchDialog.js
deleted file mode 100644
index 62cb4f1734..0000000000
--- a/chrome/content/zotero/searchDialog.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
-*/
-
-"use strict";
-
-var itemsView;
-var collectionsView;
-var io;
-
-function doLoad()
-{
-	// Set font size from pref
-	var sbc = document.getElementById('zotero-search-box-container');
-	Zotero.UIProperties.registerRoot(sbc);
-	
-	io = window.arguments[0];
-	
-	var searchBox = document.getElementById('search-box');
-	searchBox.groups = io.dataIn.groups;
-	searchBox.search = io.dataIn.search;
-	let searchName = document.getElementById('search-name');
-	searchName.value = io.dataIn.name;
-	searchName.select();
-
-	document.addEventListener('dialogaccept', doAccept);
-}
-
-function doUnload()
-{
-
-}
-
-function doAccept()
-{
-	document.getElementById('search-box').search.name = document.getElementById('search-name').value;
-	try {
-		let searchBox = document.getElementById('search-box');
-		searchBox.updateSearch();
-		io.dataOut = {
-			json: searchBox.search.toJSON()
-		};
-	}
-	catch (e) {
-		Zotero.debug(e, 1);
-		Components.utils.reportError(e);
-		throw (e);
-	}
-}
diff --git a/chrome/content/zotero/searchDialog.xhtml b/chrome/content/zotero/searchDialog.xhtml
deleted file mode 100644
index eed0e8195b..0000000000
--- a/chrome/content/zotero/searchDialog.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero-platform/content/zotero.css" type="text/css"?>
-
-<!DOCTYPE bindings SYSTEM "chrome://zotero/locale/searchbox.dtd">
-
-<window
-	title="&zotero.search.search;"
-	orient="vertical"
-	onload="doLoad();"
-	onunload="doUnload();"
-	drawintitlebar-platforms="mac"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:html="http://www.w3.org/1999/xhtml">
-<dialog
-	id="zotero-search-dialog"
-	buttons="cancel,accept">
-
-	<script>
-		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
-		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
-		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
-		Services.scriptloader.loadSubScript("chrome://zotero/content/searchDialog.js", this);
-	</script>
-	
-	<popupset>
-		<panel is="autocomplete-richlistbox-popup"
-			id="search-autocomplete-popup"
-			type="autocomplete-richlistbox"
-			noautofocus="true"/>
-	</popupset>
-	
-	<vbox id="zotero-search-box-container" flex="1">
-		<hbox align="center">
-			<label control="search-name" value="&zotero.search.name;"/>
-			<html:input id="search-name" type="text" width="275" maxlength="80"/>
-		</hbox>
-		<zoterosearch id="search-box" flex="1"/>
-	</vbox>
-</dialog>
-</window>
diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index d69e3a122a..ef93302d0d 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -139,7 +139,7 @@ var onCollectionSelected = async function () {
 	var collectionTreeRow = collectionsView.getRow(collectionsView.selection.focused);
 	if (!collectionsView.selection.count) return;
 	// Collection not changed
-	if (itemsView && itemsView.collectionTreeRow && itemsView.collectionTreeRow.id == collectionTreeRow.id) {
+	if (itemsView && itemsView.collectionTreeRows[0]?.id == collectionTreeRow.id) {
 		return;
 	}
 	collectionTreeRow.setSearch('');
@@ -154,7 +154,7 @@ var onCollectionSelected = async function () {
 		await library.waitForDataLoad('item');
 	}
 	
-	await itemsView.changeCollectionTreeRow(collectionTreeRow);
+	await itemsView.changeCollectionTreeRows([collectionTreeRow]);
 	
 	itemsView.clearItemsPaneMessage();
 };
diff --git a/chrome/content/zotero/standalone/hiddenWindow.xhtml b/chrome/content/zotero/standalone/hiddenWindow.xhtml
index 753984acd5..f5b7eb0642 100644
--- a/chrome/content/zotero/standalone/hiddenWindow.xhtml
+++ b/chrome/content/zotero/standalone/hiddenWindow.xhtml
@@ -111,10 +111,15 @@
 						accesskey="&aboutProduct.accesskey;"
 						label="&aboutProduct.label;"
 						oncommand="openAbout()"/>
+				<!-- macOS 13 changed "Preferences" to "Settings" so one of these gets picked -->
 				<menuitem id="menu_preferences"
 						label="&preferencesCmdMac.label;"
 						key="key_preferencesCmdMac"
 						oncommand="openPreferences()"/>
+				<menuitem id="menu_settings"
+						data-l10n-id="menu-application-settings"
+						key="key_preferencesCmdMac"
+						oncommand="openPreferences()"/>
 				<menuitem id="menu_mac_services"
 						label="&servicesMenuMac.label;"/>
 				<menuitem id="menu_mac_hide_app"
diff --git a/chrome/content/zotero/standalone/standalone.js b/chrome/content/zotero/standalone/standalone.js
index a7723e998b..6b933333fe 100644
--- a/chrome/content/zotero/standalone/standalone.js
+++ b/chrome/content/zotero/standalone/standalone.js
@@ -237,9 +237,51 @@ const ZoteroStandalone = new function () {
 		this.updateQuickCopyOptions();
 		// goUpdateGlobalEditMenuItems(true) is necessary to update Edit menu when contenteditable is focused
 		window.goUpdateGlobalEditMenuItems(true);
+		this._updateUndoRedoLabels();
 
 		this.onUpdateCustomMenus(event, 'edit');
 	};
+
+	this._updateUndoRedoLabels = function () {
+		let undoItem = document.getElementById('menu_undo');
+		let redoItem = document.getElementById('menu_redo');
+		if (!undoItem || !redoItem) return;
+
+		// When a native text-editing controller handles undo/redo
+		// (e.g. focused input), show generic labels and let it take over
+		let nativeUndo = Zotero.UndoHistory.hasNativeUndo(document);
+		let nativeRedo = Zotero.UndoHistory.hasNativeRedo(document);
+
+		let undoAction = !nativeUndo && Zotero.UndoHistory.getUndoAction();
+		if (undoAction) {
+			let actionLabel = Zotero.ftl.formatValueSync(
+				undoAction.action, undoAction.actionArgs || undefined
+			);
+			let fullLabel = Zotero.ftl.formatValueSync(
+				'menu-edit-undo-action', { action: actionLabel }
+			);
+			undoItem.removeAttribute('data-l10n-id');
+			undoItem.setAttribute('label', fullLabel);
+		}
+		else {
+			document.l10n.setAttributes(undoItem, 'text-action-undo');
+		}
+
+		let redoAction = !nativeRedo && Zotero.UndoHistory.getRedoAction();
+		if (redoAction) {
+			let actionLabel = Zotero.ftl.formatValueSync(
+				redoAction.action, redoAction.actionArgs || undefined
+			);
+			let fullLabel = Zotero.ftl.formatValueSync(
+				'menu-edit-redo-action', { action: actionLabel }
+			);
+			redoItem.removeAttribute('data-l10n-id');
+			redoItem.setAttribute('label', fullLabel);
+		}
+		else {
+			document.l10n.setAttributes(redoItem, 'text-action-redo');
+		}
+	};
 	
 	/**
 	 * Builds new item menu
@@ -466,15 +508,15 @@ const ZoteroStandalone = new function () {
 		// Panes
 		this.updateMenuItemCheckmark(
 			'view-menuitem-collections-pane',
-			document.getElementById('zotero-collections-pane').getAttribute('collapsed') != 'true'
+			!document.getElementById('zotero-collections-pane').hasAttribute('collapsed')
 		);
 		this.updateMenuItemCheckmark(
 			'view-menuitem-item-pane',
-			document.getElementById('zotero-item-pane').getAttribute('collapsed') != 'true'
+			!document.getElementById('zotero-item-pane').hasAttribute('collapsed')
 		);
 		this.updateMenuItemCheckmark(
 			'view-menuitem-tag-selector',
-			document.getElementById('zotero-tag-selector-container').getAttribute('collapsed') != 'true'
+			!document.getElementById('zotero-tag-selector-container').hasAttribute('collapsed')
 		);
 		
 		// Font size
@@ -594,9 +636,9 @@ const ZoteroStandalone = new function () {
 			case 'collections-pane':
 				var collectionsPane = document.getElementById('zotero-collections-pane');
 				// Show
-				if (collectionsPane.getAttribute('collapsed') == 'true') {
+				if (collectionsPane.hasAttribute('collapsed')) {
 					document.getElementById('zotero-collections-splitter').setAttribute('state', 'open');
-					collectionsPane.setAttribute('collapsed', false);
+					collectionsPane.removeAttribute('collapsed');
 				}
 				// Hide
 				else {
@@ -609,9 +651,9 @@ const ZoteroStandalone = new function () {
 			case 'item-pane':
 				var itemPane = document.getElementById('zotero-item-pane');
 				// Show
-				if (itemPane.getAttribute('collapsed') == 'true') {
+				if (itemPane.hasAttribute('collapsed')) {
 					document.getElementById('zotero-items-splitter').setAttribute('state', 'open');
-					itemPane.setAttribute('collapsed', false);
+					itemPane.removeAttribute('collapsed');
 				}
 				// Hide
 				else {
@@ -794,13 +836,13 @@ const ZoteroStandalone = new function () {
 		
 		// Make our own removal prompt instead of using BrowserAddonUI.promptRemoveExtension() from
 		// browser-addons.js
-		doc.ownerGlobal.promptRemoveExtension = function (addon) {
+		doc.documentGlobal.promptRemoveExtension = function (addon) {
 			var { name } = addon;
 			var ps = Services.prompt;
 			var buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
 				+ ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL;
 			var result = ps.confirmEx(
-				doc.ownerGlobal,
+				doc.documentGlobal,
 				Zotero.getString('addons.remove.title', name),
 				Zotero.getString('addons.remove.text', [name, Zotero.appName]),
 				buttonFlags,
diff --git a/chrome/content/zotero/tabs.js b/chrome/content/zotero/tabs.js
index 66c280a2fb..886441100c 100644
--- a/chrome/content/zotero/tabs.js
+++ b/chrome/content/zotero/tabs.js
@@ -123,7 +123,7 @@ var Zotero_Tabs = new function () {
 		focusFirst: {
 			library: async () => {
 				let collectionsPane = document.getElementById("zotero-collections-pane");
-				if (collectionsPane.getAttribute("collapsed")) {
+				if (collectionsPane.hasAttribute("collapsed")) {
 					document.getElementById('zotero-tb-add').focus();
 					return;
 				}
@@ -202,12 +202,12 @@ var Zotero_Tabs = new function () {
 			}
 		},
 		undoClose: {
-			reader: async (tab, _tabIndex) => {
+			reader: async (tab, tabIndex) => {
 				if (Zotero.Items.exists(tab.data.itemID)) {
 					await Zotero.Reader.open(tab.data.itemID,
 						null,
 						{
-							tabIndex: tab.index,
+							tabIndex,
 							openInBackground: true,
 							allowDuplicate: true
 						}
@@ -216,12 +216,12 @@ var Zotero_Tabs = new function () {
 				}
 				return false;
 			},
-			note: async (tab, _tabIndex) => {
+			note: async (tab, tabIndex) => {
 				if (Zotero.Items.exists(tab.data.itemID)) {
 					await Zotero.Notes.open(tab.data.itemID,
 						null,
 						{
-							tabIndex: tab.index,
+							tabIndex,
 							openInBackground: true,
 							allowDuplicate: true
 						}
@@ -404,7 +404,7 @@ var Zotero_Tabs = new function () {
 		}));
 		// Disable File > Close menuitem if multiple tabs are open
 		const multipleTabsOpen = this._tabs.length > 1;
-		document.getElementById('cmd_close').setAttribute('disabled', multipleTabsOpen);
+		document.getElementById('cmd_close').toggleAttribute('disabled', multipleTabsOpen);
 		var { tab } = this._getTab(this._selectedID);
 		if (!tab) {
 			return;
@@ -441,7 +441,7 @@ var Zotero_Tabs = new function () {
 		if (width) {
 			let sidebarWidth = `${width}px`;
 			let placeholder = document.getElementById('zotero-reader-sidebar-pane');
-			placeholder.setAttribute('collapsed', sidebarWidth ? 'false' : 'true');
+			placeholder.toggleAttribute('collapsed', !sidebarWidth);
 			placeholder.setAttribute('width', sidebarWidth);
 		}
 
@@ -697,7 +697,7 @@ var Zotero_Tabs = new function () {
 	};
 	
 	this.setAudioStatus = function (id, status) {
-		if (typeof title != 'object' || !('active' in status && 'paused' in status)) {
+		if (!status || typeof status != 'object' || !('active' in status && 'paused' in status)) {
 			throw new Error(`'status' should be an object with { active, paused } properties`);
 		}
 		var { tab } = this._getTab(id);
@@ -722,8 +722,10 @@ var Zotero_Tabs = new function () {
 	 * Close tabs
 	 *
 	 * @param {String|Array<String>|undefined} ids One or more ids, or empty for the current tab
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.skipHistory=false] - Don't make the tabs reopenable with undoClose()
 	 */
-	this.close = function (ids) {
+	this.close = function (ids, { skipHistory = false } = {}) {
 		if (!ids) {
 			ids = [this._selectedID];
 		}
@@ -779,7 +781,9 @@ var Zotero_Tabs = new function () {
 				}
 			});
 		}
-		this._history.push(historyEntry);
+		if (!skipHistory) {
+			this._history.push(historyEntry);
+		}
 		Zotero.Notifier.trigger('close', 'tab', [closedIDs], true);
 		this._update();
 	};
@@ -990,7 +994,8 @@ var Zotero_Tabs = new function () {
 			return;
 		}
 		var { tab, tabIndex } = this._getTab(id);
-		this.close(tab.id);
+		// The tab stays open, so it isn't reopenable
+		this.close(tab.id, { skipHistory: true });
 		this.add({
 			id: tab.id,
 			type: `${tab.type}-unloaded`,
@@ -1197,7 +1202,7 @@ var Zotero_Tabs = new function () {
 			// Move to start
 			menuitem = document.createXULElement('menuitem');
 			menuitem.setAttribute('label', Zotero.getString('tabs.moveToStart'));
-			menuitem.setAttribute('disabled', tabIndex == 1);
+			menuitem.toggleAttribute('disabled', tabIndex == 1);
 			menuitem.addEventListener('command', () => {
 				this.move(id, 1);
 			});
@@ -1205,7 +1210,7 @@ var Zotero_Tabs = new function () {
 			// Move to end
 			menuitem = document.createXULElement('menuitem');
 			menuitem.setAttribute('label', Zotero.getString('tabs.moveToEnd'));
-			menuitem.setAttribute('disabled', tabIndex == this._tabs.length - 1);
+			menuitem.toggleAttribute('disabled', tabIndex == this._tabs.length - 1);
 			menuitem.addEventListener('command', () => {
 				this.move(id, this._tabs.length);
 			});
@@ -1214,7 +1219,7 @@ var Zotero_Tabs = new function () {
 			if (this._hasHook(tabContentType, 'moveToNewWindow')) {
 				menuitem = document.createXULElement('menuitem');
 				menuitem.setAttribute('label', Zotero.getString('tabs.moveToWindow'));
-				menuitem.setAttribute('disabled', false);
+				menuitem.removeAttribute('disabled');
 				menuitem.addEventListener('command', () => {
 					let { tabContentType } = this.parseTabType(tab.type);
 					let moveHook = this._getHook(tabContentType, 'moveToNewWindow');
@@ -1266,7 +1271,7 @@ var Zotero_Tabs = new function () {
 					this._history.length ? this._history[this._history.length - 1].length : 1
 				)
 			);
-			menuitem.setAttribute('disabled', !this._history.length);
+			menuitem.toggleAttribute('disabled', !this._history.length);
 			menuitem.addEventListener('command', () => {
 				this.undoClose();
 			});
diff --git a/chrome/content/zotero/tagColorChooser.js b/chrome/content/zotero/tagColorChooser.js
index 95a95a6047..ac33b40cf5 100644
--- a/chrome/content/zotero/tagColorChooser.js
+++ b/chrome/content/zotero/tagColorChooser.js
@@ -76,7 +76,7 @@ var Zotero_Tag_Color_Chooser = new function() {
 				colorPicker.color = color;
 				dialog.buttons = "cancel,accept";
 			}
-			colorPicker.setAttribute('disabled', 'false');
+			colorPicker.removeAttribute('disabled');
 			
 			var numColors = tagColors.size;
 			var max = colorData ? numColors : numColors + 1;
@@ -86,7 +86,7 @@ var Zotero_Tag_Color_Chooser = new function() {
 				tagPosition.appendItem(i, i-1);
 			}
 			if (numColors) {
-				tagPosition.setAttribute('disabled', 'false');
+				tagPosition.removeAttribute('disabled');
 				if (colorData) {
 					tagPosition.selectedIndex = colorData.position;
 				}
diff --git a/chrome/content/zotero/tools/csledit.js b/chrome/content/zotero/tools/csledit.js
index 16ad2097f4..fc575d8997 100644
--- a/chrome/content/zotero/tools/csledit.js
+++ b/chrome/content/zotero/tools/csledit.js
@@ -234,7 +234,6 @@ var Zotero_CSL_Editor = new function () {
 			this.updateIframe(Zotero.getString('styles.editor.warning.renderError') + '<div>' + e + '</div>', 'error');
 			throw e;
 		}
-		styleEngine.free();
 	};
 
 	this.generateBibliographyDebounced = Zotero.Utilities.debounce(this.generateBibliography, 250);
diff --git a/chrome/content/zotero/tools/cslpreview.js b/chrome/content/zotero/tools/cslpreview.js
index a448830c6f..532ca2dd9b 100644
--- a/chrome/content/zotero/tools/cslpreview.js
+++ b/chrome/content/zotero/tools/cslpreview.js
@@ -47,14 +47,8 @@ var Zotero_CSL_Preview = new function () {
 			this.updateIframe(Zotero.getString('styles.editor.warning.noItems'), 'warning');
 			return;
 		}
-		var progressWin = new Zotero.ProgressWindow();
-		// XXX needs its own string really!
-		progressWin.changeHeadline(Zotero.getString("pane.items.menu.createBib.multiple"));
-		var icon = 'chrome://zotero/skin/treeitem-attachment-file.png';
-		progressWin.addLines(document.title, icon);
-		progressWin.show();
-		progressWin.startCloseTimer();
-		// Give progress window time to appear
+		this.updateIframe(Zotero.ftl.formatValueSync('stylePreview-generating'));
+		// Let the message paint before generation blocks the main thread
 		setTimeout(() => {
 			var d = new Date();
 			var styles = Zotero.Styles.getVisible();
@@ -116,8 +110,6 @@ var Zotero_CSL_Preview = new function () {
 			bibliography = Zotero.Cite.makeFormattedBibliography(styleEngine, "html");
 		}
 		
-		styleEngine.free();
-		
 		return '<p>' + citations + '</p>' + bibliography;
 	};
 
diff --git a/chrome/content/zotero/update/update-header.js b/chrome/content/zotero/update/update-header.js
index 0082d32977..6f39f30eb4 100644
--- a/chrome/content/zotero/update/update-header.js
+++ b/chrome/content/zotero/update/update-header.js
@@ -28,8 +28,11 @@
 		static get observedAttributes() { return ['label']; }
 		
 		attributeChangedCallback(name, oldVal, newVal) {
-			if (name == "label" && newVal != oldVal) {
-				this.querySelector('h2').textContent = newVal;
+			// Can run before the content has been rendered, in which case
+			// connectedCallback() sets the label
+			let label = this.querySelector('h2');
+			if (label && name == "label" && newVal != oldVal) {
+				label.textContent = newVal;
 			}
 		}
 	}
diff --git a/chrome/content/zotero/update/updates.js b/chrome/content/zotero/update/updates.js
index be5dff3a03..40a0d0dba0 100644
--- a/chrome/content/zotero/update/updates.js
+++ b/chrome/content/zotero/update/updates.js
@@ -352,6 +352,36 @@ var gUpdates = {
 	 */
 	sourceEvent: SRCEVT_FOREGROUND,
 
+	/**
+	 * Helper function for onLoad
+	 * Adds the extra1 and extra2 buttons to the wizard's button box, since the
+	 * platform wizard only provides the back, next, finish, and cancel buttons,
+	 * and dispatches an event of the same name on the current page when one of
+	 * them is clicked
+	 */
+	_addExtraButtons() {
+		var buttons = this.wiz.shadowRoot.querySelector("wizard-buttons");
+		var buttonBox = buttons.querySelector(
+			".wizard-buttons-btm, .wizard-buttons-box-2"
+		);
+		// Insert extra2 first so that extra1 ends up leftmost
+		for (let dlgType of ["extra2", "extra1"]) {
+			let button = document.createXULElement("button");
+			button.className = "wizard-button";
+			button.setAttribute("dlgtype", dlgType);
+			button.hidden = true;
+			button.addEventListener("command", () => {
+				let page = this.wiz.currentPage;
+				if (page) {
+					page.dispatchEvent(
+						new CustomEvent(dlgType, { bubbles: true, cancelable: true })
+					);
+				}
+			});
+			buttonBox.prepend(button);
+		}
+	},
+
 	/**
 	 * Helper function for onLoad
 	 * Saves default button label & accesskey for use by _setButton
@@ -383,6 +413,8 @@ var gUpdates = {
 			}
 		}
 
+		this._addExtraButtons();
+
 		// Cache the standard button labels in case we need to restore them
 		this._cacheButtonStrings("next");
 		this._cacheButtonStrings("finish");
@@ -941,7 +973,11 @@ var gDownloadingPage = {
 			if (activeUpdate.state == STATE_PENDING
 					|| activeUpdate.state == STATE_PENDING_ELEVATE
 					|| activeUpdate.state == STATE_PENDING_SERVICE) {
-				if (!activeUpdate.getProperty("stagingFailed")) {
+				// Wait for the update if it's currently being staged. If staging
+				// isn't in progress -- because the installation directory isn't
+				// writable or staging is disabled -- the update is already ready to
+				// install.
+				if (gAUS.currentState == Ci.nsIApplicationUpdateService.STATE_STAGING) {
 					gUpdates.setButtons("hideButton", null, null, false);
 					gUpdates.wiz.getButton("extra1").focus();
 
@@ -972,18 +1008,15 @@ var gDownloadingPage = {
 			gUpdates.update.QueryInterface(Ci.nsIWritablePropertyBag);
 			gUpdates.update.setProperty("foregroundDownload", "true");
 
-			let state = gAUS.downloadUpdate(gUpdates.update, false);
-			if (state == "failed") {
-				// We've tried as hard as we could to download a valid update -
-				// we fell back from a partial patch to a complete patch and even
-				// then we couldn't validate. Show a validation error with instructions
-				// on how to manually update.
+			// Add this UI as a listener for active downloads
+			gAUS.addDownloadListener(this);
+
+			let result = await gAUS.downloadUpdate(gUpdates.update);
+			if (result != Ci.nsIApplicationUpdateService.DOWNLOAD_SUCCESS) {
 				this.cleanUp();
 				gUpdates.wiz.goTo("errors");
 				return;
 			}
-			// Add this UI as a listener for active downloads
-			gAUS.addDownloadListener(this);
 
 			if (activeUpdate) {
 				this._downloadProgress.removeAttribute("value");
@@ -1096,7 +1129,7 @@ var gDownloadingPage = {
 			"gDownloadingPage",
 			"onHide - continuing download in background at full speed"
 		);
-		gAUS.downloadUpdate(gUpdates.update, false);
+		gAUS.downloadUpdate(gUpdates.update);
 		gUpdates.wiz.cancel();
 	},
 
@@ -1104,8 +1137,6 @@ var gDownloadingPage = {
 	 * When the data transfer begins
 	 * @param	 request
 	 *					The nsIRequest object for the transfer
-	 * @param	 context
-	 *					Additional data
 	 */
 	onStartRequest(request) {
 		this._downloadProgress.removeAttribute("value");
@@ -1116,14 +1147,12 @@ var gDownloadingPage = {
 	 * When new data has been downloaded
 	 * @param	 request
 	 *					The nsIRequest object for the transfer
-	 * @param	 context
-	 *					Additional data
 	 * @param	 progress
 	 *					The current number of bytes transferred
 	 * @param	 maxProgress
 	 *					The total number of bytes that must be transferred
 	 */
-	onProgress(request, context, progress, maxProgress) {
+	onProgress(request, progress, maxProgress) {
 		let status = this._updateDownloadStatus(progress, maxProgress);
 		var currentProgress = Math.round(100 * (progress / maxProgress));
 
@@ -1154,14 +1183,12 @@ var gDownloadingPage = {
 	 * When we have new status text
 	 * @param	 request
 	 *					The nsIRequest object for the transfer
-	 * @param	 context
-	 *					Additional data
 	 * @param	 status
 	 *					A status code
 	 * @param	 statusText
 	 *					Human readable version of |status|
 	 */
-	onStatus(request, context, status, statusText) {
+	onStatus(request, status, statusText) {
 		this._setStatus(statusText);
 	},
 
@@ -1169,8 +1196,6 @@ var gDownloadingPage = {
 	 * When data transfer ceases
 	 * @param	 request
 	 *					The nsIRequest object for the transfer
-	 * @param	 context
-	 *					Additional data
 	 * @param	 status
 	 *					Status code containing the reason for the cessation.
 	 */
@@ -1393,11 +1418,11 @@ var gFinishedPage = {
 			let moreElevated = document.getElementById(
 				"finishedBackgroundMoreElevated"
 			);
-			moreElevated.setAttribute("hidden", "false");
+			moreElevated.removeAttribute("hidden");
 			let moreElevatedLink = document.getElementById(
 				"finishedBackgroundMoreElevatedLink"
 			);
-			moreElevatedLink.setAttribute("hidden", "false");
+			moreElevatedLink.removeAttribute("hidden");
 			let moreElevatedLinkLabel = document.getElementById(
 				"finishedBackgroundMoreElevatedLinkLabel"
 			);
@@ -1406,7 +1431,7 @@ var gFinishedPage = {
 			);
 			moreElevatedLinkLabel.value = manualURL;
 			moreElevatedLinkLabel.setAttribute("url", manualURL);
-			moreElevatedLinkLabel.setAttribute("hidden", "false");
+			moreElevatedLinkLabel.removeAttribute("hidden");
 		}
 	},
 
diff --git a/chrome/content/zotero/xpcom/annotations.js b/chrome/content/zotero/xpcom/annotations.js
index 330c8f74aa..7a50b11fe5 100644
--- a/chrome/content/zotero/xpcom/annotations.js
+++ b/chrome/content/zotero/xpcom/annotations.js
@@ -35,8 +35,23 @@ Zotero.Annotations = new function () {
 	Zotero.defineProperty(this, 'ANNOTATION_TYPE_UNDERLINE', { value: 5 });
 	Zotero.defineProperty(this, 'ANNOTATION_TYPE_TEXT', { value: 6 });
 
-	Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: '#ffd400' });
-	
+	// The annotation color palette, as [l10n key, hex] pairs.
+	// Keep in sync with the reader's ANNOTATION_COLORS (reader/src/common/defines.js)
+	Zotero.defineProperty(this, 'COLORS', {
+		value: [
+			['general-yellow', '#ffd400'],
+			['general-red', '#ff6666'],
+			['general-green', '#5fb236'],
+			['general-blue', '#2ea8e5'],
+			['general-purple', '#a28ae5'],
+			['general-magenta', '#e56eee'],
+			['general-orange', '#f19837'],
+			['general-gray', '#aaaaaa']
+		]
+	});
+
+	Zotero.defineProperty(this, 'DEFAULT_COLOR', { value: this.COLORS[0][1] });
+
 	Zotero.defineProperty(this, 'PROPS', {
 		value: ['type', 'authorName', 'text', 'comment', 'color', 'pageLabel', 'sortIndex', 'position'],
 		writable: false
@@ -328,6 +343,23 @@ Zotero.Annotations = new function () {
 		return splitAnnotations;
 	};
 
+	/**
+	 * Return the distinct authors of annotations in a library, for the Annotation Author
+	 * search condition's value menu
+	 *
+	 * @param {Integer} libraryID
+	 * @return {Promise<Object[]>} - Array of { userID, name }
+	 */
+	this.getAllAuthors = async function (libraryID) {
+		let sql = "SELECT DISTINCT u.userID AS userID, u.name AS name FROM users u "
+			+ "JOIN groupItems gi ON (gi.createdByUserID = u.userID) "
+			+ "JOIN itemAnnotations ia ON (ia.itemID = gi.itemID) "
+			+ "JOIN items i ON (i.itemID = ia.itemID) "
+			+ "WHERE i.libraryID=?";
+		let rows = await Zotero.DB.queryAsync(sql, libraryID);
+		return rows.map(row => ({ userID: row.userID, name: row.name }));
+	};
+
 	/**
 	 * Split annotations
 	 *
diff --git a/chrome/content/zotero/xpcom/attachments.js b/chrome/content/zotero/xpcom/attachments.js
index 54e3939706..b2bff76ba1 100644
--- a/chrome/content/zotero/xpcom/attachments.js
+++ b/chrome/content/zotero/xpcom/attachments.js
@@ -25,6 +25,11 @@
 
 Zotero.Attachments = new function () {
 	const { HiddenBrowser } = ChromeUtils.importESModule("chrome://zotero/content/HiddenBrowser.mjs");
+	let lazy = {};
+	ChromeUtils.defineESModuleGetters(lazy, {
+		generateHTMLFromTemplate: "chrome://zotero/content/modules/templates.mjs",
+		isTemplateValid: "chrome://zotero/content/modules/templates.mjs",
+	});
 	
 	// Keep in sync with Zotero.Schema.integrityCheck() and this.linkModeToName()
 	this.LINK_MODE_IMPORTED_FILE = 0;
@@ -1241,7 +1246,7 @@ Zotero.Attachments = new function () {
 	this.canFindFileForItem = function (item) {
 		return item.isRegularItem()
 			&& !item.isFeedItem
-			&& (!!item.getField('DOI') || !!item.getField('url') || !!item.getExtraField('DOI'))
+			&& (!!item.getField('DOI') || !!item.getField('url') || !!item.getExtraField('DOI') || !!item.getField('PMCID'))
 			&& this.FIND_AVAILABLE_FILE_TYPES.every(type => item.numFileAttachmentsWithContentType(type) == 0);
 	};
 
@@ -1276,6 +1281,11 @@ Zotero.Attachments = new function () {
 		var resolvers = [];
 		var doi = item.getField('DOI') || item.getExtraField('DOI');
 		doi = Zotero.Utilities.cleanDOI(doi);
+		var pmcid = item.getField('PMCID');
+		if (pmcid) {
+			let matches = pmcid.match(/\bPMC\d+\b/i);
+			pmcid = matches && matches[0].toUpperCase();
+		}
 		
 		if (useDOI && doi) {
 			doi = Zotero.Utilities.cleanDOI(doi);
@@ -1313,7 +1323,16 @@ Zotero.Attachments = new function () {
 				});
 			});
 		}
-		
+
+		// The open-access lookup often supplies a PMC URL of its own, in which
+		// case this one is skipped as an already-tried redirect target
+		if (useOA && pmcid) {
+			resolvers.push({
+				pageURL: `https://pmc.ncbi.nlm.nih.gov/articles/${pmcid}/`,
+				accessMethod: 'oa'
+			});
+		}
+
 		if (useCustom && doi) {
 			let customResolvers;
 			try {
@@ -2274,15 +2293,45 @@ Zotero.Attachments = new function () {
 	}
 	
 	
+	// Shared so validation, rendering and the settings dialog all judge the same string
+	this.normalizeRenameTemplate = function (formatString) {
+		return formatString.replace(/\r?\n|\r/g, "").trim();
+	};
+
+	/**
+	 * Resolve a library's rename template from synced settings, validating it and falling back to
+	 * the default so an invalid (e.g. synced) template never reaches the engine. Callers that rename
+	 * many items should resolve once and pass the result as `formatString` to getFileBaseNameFromItem().
+	 *
+	 * @param {Number} libraryID
+	 * @returns {String} A valid rename template
+	 */
+	this.getAttachmentRenameTemplate = function (libraryID) {
+		const { DEFAULT_ATTACHMENT_RENAME_TEMPLATE } = ChromeUtils.importESModule("chrome://zotero/content/renameFiles.mjs");
+		let formatString = Zotero.SyncedSettings.get(libraryID, 'attachmentRenameTemplate') ?? DEFAULT_ATTACHMENT_RENAME_TEMPLATE;
+		let normalized = typeof formatString === 'string' ? this.normalizeRenameTemplate(formatString) : '';
+		if (!normalized) {
+			formatString = DEFAULT_ATTACHMENT_RENAME_TEMPLATE;
+		}
+		else if (!lazy.isTemplateValid(normalized)) {
+			Zotero.warn(`Attachment rename template "${formatString}" is invalid; falling back to the default template`);
+			formatString = DEFAULT_ATTACHMENT_RENAME_TEMPLATE;
+		}
+		return formatString;
+	};
+
 	/*
 	 * Returns a formatted string to use as the basename of an attachment
 	 * based on the metadata of the specified item and a format string
 	 *
-	 * (Optional) |formatString| specifies the format string -- otherwise
-	 * the 'attachmentRenameTemplate' synced setting for the user's library is used
+	 * Without a formatString, the 'attachmentRenameTemplate' synced setting
+	 * for the item's library is used, falling back to the default template
 	 *
 	 * @param {Zotero.Item} item
-	 * @param {String} formatString
+	 * @param {Object} [options]
+	 * @param {String} [options.formatString] - Format string, assumed valid; if omitted, the library's rename template is resolved and validated
+	 * @param {String} [options.attachmentTitle] - Value for the {{ attachmentTitle }} placeholder
+	 * @returns {String}
 	 */
 	this.getFileBaseNameFromItem = function (item, options = {}) {
 		if (!(item instanceof Zotero.Item)) {
@@ -2297,16 +2346,14 @@ Zotero.Attachments = new function () {
 		}
 
 		let { formatString = null, attachmentTitle = '' } = options;
-
 		if (!formatString) {
-			const { DEFAULT_ATTACHMENT_RENAME_TEMPLATE } = ChromeUtils.importESModule("chrome://zotero/content/renameFiles.mjs");
-			formatString = Zotero.SyncedSettings.get(item.libraryID, 'attachmentRenameTemplate') ?? DEFAULT_ATTACHMENT_RENAME_TEMPLATE;
+			formatString = this.getAttachmentRenameTemplate(item.libraryID);
 		}
 
 		let chunks = [];
 		let protectedLiterals = new Set();
 
-		formatString = formatString.replace(/\r?\n|\r/g, "").trim();
+		formatString = this.normalizeRenameTemplate(formatString);
 
 		const getSlicedCreatorsOfType = (creatorType, slice) => {
 			let creatorTypeIDs;
@@ -2536,7 +2583,7 @@ Zotero.Attachments = new function () {
 		// Final name is generated twice. In the first pass we collect all affixed values and determine protected literals.
 		// This is done in order to remove repeated suffixes, except if these appear in the value or the format string itself.
 		// See "should suppress suffixes where they would create a repeat character" test for edge cases.
-		let formatted = Zotero.Utilities.Internal.generateHTMLFromTemplate(formatString, vars);
+		let formatted = lazy.generateHTMLFromTemplate(formatString, vars);
 		
 		let replacePairs = new Map();
 		for (let chunk of chunks) {
@@ -2559,7 +2606,7 @@ Zotero.Attachments = new function () {
 			);
 		}
 
-		formatted = Zotero.Utilities.Internal.generateHTMLFromTemplate(formatString, vars);
+		formatted = lazy.generateHTMLFromTemplate(formatString, vars);
 		if (replacePairs.size > 0) {
 			formatted = formatted.replace(
 				new RegExp(`(${Array.from(replacePairs.keys()).map(replace => `(?<!\\\\)${replace}(?!//)`).join('|')})`, 'g'),
diff --git a/chrome/content/zotero/xpcom/browserRequest.js b/chrome/content/zotero/xpcom/browserRequest.js
index 047e4a8bb9..fcd3b70afb 100644
--- a/chrome/content/zotero/xpcom/browserRequest.js
+++ b/chrome/content/zotero/xpcom/browserRequest.js
@@ -50,6 +50,11 @@ Zotero.BrowserRequest = {
 			successCookie: { host: 'search.worldcat.org', name: 'turnstile_passed' },
 			detectBlock: (status, body) => status === 403 && /turnstile_required/.test(body)
 		},
+		{
+			// Proof-of-work challenge, so nothing for the user to solve
+			match: '://pmc.ncbi.nlm.nih.gov',
+			captchaLocator: null
+		},
 	],
 	
 	PLAIN_UA_HOSTS: [
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index d74ab3df59..ef68dd30ee 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -695,7 +695,16 @@ Zotero.Cite.System.prototype = {
 				lang = 'sr-Latn-RS';
 				break;
 		}
-		return Zotero.Cite.Locale.get(lang);
+		var xml = Zotero.Cite.Locale.get(lang);
+		if (!xml) {
+			// Use the closest available locale (e.g., 'sr-Cyrl-RS' for 'sr-RS',
+			// which doesn't have its own CSL locale)
+			let fallback = Zotero.Styles.resolveLocale(lang);
+			if (fallback && fallback != lang) {
+				xml = Zotero.Cite.Locale.get(fallback);
+			}
+		}
+		return xml;
 	}
 };
 
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 033978a589..b75c53dd60 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -4079,8 +4079,11 @@ CSL.Engine.prototype.setStyleAttributes = function () {
     attributes = this.cslXml.attributes(this.cslXml.dataObj);
     for (attrname in attributes) {
         if (attributes.hasOwnProperty(attrname)) {
-            // attr = attributes[key];
-            CSL.Attributes[attrname].call(dummy, this, attributes[attrname]);
+            if (CSL.Attributes[attrname]) {
+                CSL.Attributes[attrname].call(dummy, this, attributes[attrname]);
+            } else {
+                CSL.debug("warning: undefined attribute \"" + attrname + "\" in style");
+            }
         }
     }
 };
@@ -6981,9 +6984,13 @@ CSL.Engine.prototype.previewCitationCluster = function (citation, citationsPre,
 	if (citation.citationID) {
 		delete citation.citationID;
 	}
-    var ret = this.processCitationCluster(citation, citationsPre, citationsPost, CSL.PREVIEW);
-
-    this.setOutputFormat(oldMode);
+    // Restore the output format even if the preview fails
+    var ret;
+    try {
+        ret = this.processCitationCluster(citation, citationsPre, citationsPost, CSL.PREVIEW);
+    } finally {
+        this.setOutputFormat(oldMode);
+    }
     return ret[1];
 };
 
@@ -7699,53 +7706,55 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
             ret = this.process_CitationCluster.call(this, citation.sortedItems, citation);
         } catch (e) {
             CSL.error("Error running CSL processor for preview: "+e);
-        }
-            
-        //SNIP-START
-        if (this.debug) {
-            CSL.debug("****** end run processor *********");
-            CSL.debug("****** start state restore *********");
-        }
-        //SNIP-END
-        // Wind out anything related to new items added for the preview.
-        // This means (1) names, (2) disambig state for affected items,
-        // (3) keys registered in the ambigs pool arrays, and (4) registry
-        // items.
-        //
+        } finally {
+            // Restore state even if an error occurred above
 
-        // restore sliced citations
-        this.registry.citationreg.citationByIndex = oldCitationList;
-        this.registry.citationreg.citationById = {};
-        for (var i = 0, ilen = oldCitationList.length; i < ilen; i += 1) {
-            this.registry.citationreg.citationById[oldCitationList[i].citationID] = oldCitationList[i];
-        }
-
-        //SNIP-START
-        if (this.debug) {
-            CSL.debug("****** start final update *********");
-        }
-        //SNIP-END
-        var oldItemIds = [];
-        for (var i = 0, ilen = oldItemList.length; i < ilen; i += 1) {
-            oldItemIds.push("" + oldItemList[i].id);
-        }
-        this.updateItems(oldItemIds, null, null, true);
-        //SNIP-START
-        if (this.debug) {
-            CSL.debug("****** end final update *********");
-        }
-        //SNIP-END
-        // Roll back disambig states
-        for (var key in oldAmbigs) {
-            if (oldAmbigs.hasOwnProperty(key)) {
-                this.registry.registry[key].disambig = oldAmbigs[key];
+            //SNIP-START
+            if (this.debug) {
+                CSL.debug("****** end run processor *********");
+                CSL.debug("****** start state restore *********");
             }
+            //SNIP-END
+            // Wind out anything related to new items added for the preview.
+            // This means (1) names, (2) disambig state for affected items,
+            // (3) keys registered in the ambigs pool arrays, and (4) registry
+            // items.
+            //
+
+            // restore sliced citations
+            this.registry.citationreg.citationByIndex = oldCitationList;
+            this.registry.citationreg.citationById = {};
+            for (var i = 0, ilen = oldCitationList.length; i < ilen; i += 1) {
+                this.registry.citationreg.citationById[oldCitationList[i].citationID] = oldCitationList[i];
+            }
+
+            //SNIP-START
+            if (this.debug) {
+                CSL.debug("****** start final update *********");
+            }
+            //SNIP-END
+            var oldItemIds = [];
+            for (var i = 0, ilen = oldItemList.length; i < ilen; i += 1) {
+                oldItemIds.push("" + oldItemList[i].id);
+            }
+            this.updateItems(oldItemIds, null, null, true);
+            //SNIP-START
+            if (this.debug) {
+                CSL.debug("****** end final update *********");
+            }
+            //SNIP-END
+            // Roll back disambig states
+            for (var key in oldAmbigs) {
+                if (oldAmbigs.hasOwnProperty(key)) {
+                    this.registry.registry[key].disambig = oldAmbigs[key];
+                }
+            }
+            //SNIP-START
+            if (this.debug) {
+                CSL.debug("****** end state restore *********");
+            }
+            //SNIP-END
         }
-        //SNIP-START
-        if (this.debug) {
-            CSL.debug("****** end state restore *********");
-        }
-        //SNIP-END
     } else {
         // Rerun cites that have moved across citations or had a change
         // in their number of subsequent references, so that disambiguate
diff --git a/chrome/content/zotero/xpcom/citeprocRsBridge.js b/chrome/content/zotero/xpcom/citeprocRsBridge.js
deleted file mode 100644
index ca4a79fba7..0000000000
--- a/chrome/content/zotero/xpcom/citeprocRsBridge.js
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-	***** BEGIN LICENSE BLOCK *****
-	
-	Copyright © 2019 Center for History and New Media
-					George Mason University, Fairfax, Virginia, USA
-					http://zotero.org
-	
-	This file is part of Zotero.
-	
-	Zotero is free software: you can redistribute it and/or modify
-	it under the terms of the GNU Affero General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	Zotero is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU Affero General Public License for more details.
-
-	You should have received a copy of the GNU Affero General Public License
-	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-	
-	***** END LICENSE BLOCK *****
-*/
-
-(function() {
-
-const additionalCSLProperties = ['locator', 'label', 'suppress-author', 'author-only', 'prefix', 'suffix'];
-
-/**
- * Bridging code which allows to use citeproc-js and citeproc-rs almost interchangeably
- * without big alterations to existing Zotero code
- */
-Zotero.CiteprocRs = {
-	init: async function () {
-		if (Zotero.CiteprocRs.deferred) {
-			return Zotero.CiteprocRs.deferred.promise;
-		}
-		Zotero.CiteprocRs.deferred = Zotero.Promise.defer();
-		Zotero.debug("require('citeproc_rs_wasm')");
-		// This is kind of nasty:
-		// Due to Zotero being based on an old Firefox platform we are unable to use
-		// the commonJS modules generated by citeproc_rs because they use too
-		// advanced features.
-		// Cormac has decided to provide a custom build just for Zotero
-		// where citeproc_rs_wasm_include.js attaches some classes to Zotero.CiteprocRs.
-		// This works fine until we call resetDB() in the test runner (or any other time we
-		// could call ZoteroContext.reinit(). A usual require() call returns exported symbols
-		// from some Gecko script cache. Unfortunately that means that the necessary citeproc
-		// classes do not get reattached to the Zotero object and the Citeproc Wasm driver breaks
-		// when trying to create its own objects (e.g. Zotero.CiteprocRs.WasmResult).
-		// If we try to load citeproc_rs_wasm_include as a subscript we get errors about
-		// let WasmResult; lines, i.e. a redeclaration of a symbol.
-		// So we have to load this script and provide it a custom context with just a
-		// Zotero symbol so that things don't break. Obviously this isn't optimal.
-		// This might break with an upgrade to a higher Firefox version, but perhaps then we'll
-		// be able to load the normal citeproc-rs CommonJS build.
-		Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
-			.getService(Components.interfaces.mozIJSSubScriptLoader)
-			.loadSubScript('resource://zotero/citeproc_rs_wasm_include.js',
-				{ Zotero });
-		// require('citeproc_rs_wasm_include');
-		const CiteprocRs = require('citeproc_rs_wasm');
-		// Initialize the wasm code
-		Zotero.debug("Loading citeproc-rs wasm binary");
-		const xhr = await Zotero.HTTP.request('GET', 'resource://zotero/citeproc_rs_wasm_bg.wasm', {
-			responseType: "arraybuffer"
-		});
-		Zotero.debug("Initializing the CiteprocRs wasm driver");
-		await CiteprocRs(xhr.response);
-		Zotero.debug("CiteprocRs driver initialized successfully");
-		this.Driver = CiteprocRs.Driver;
-		Zotero.CiteprocRs.deferred.resolve();
-	},
-	
-	Engine: class {
-		constructor(system, style, styleXML, locale, format, overrideLocale=false) {
-			this._styleXML = styleXML;
-			this._overrideLocale = overrideLocale;
-			
-			this.locale = locale;
-
-			this._format = format;
-			this._resetDriver();
-
-			this.styleID = style.styleID;
-			this.hasBibliography = style._hasBibliography;
-			this.sys = system;
-			this.opt = { sort_citations: true };
-		}
-		
-		free(ignoreErrors=false) {
-			try {
-				Zotero.debug('CiteprocRs: free Driver', 5);
-				this._driver.free();
-			}
-			catch (e) {
-				if (ignoreErrors) return;
-				throw e;
-			}
-		}
-		
-		_resetDriver() {
-			if (this._driver) {
-				Zotero.debug('CiteprocRs: free Driver', 5);
-				this._driver.free();
-			}
-			Zotero.debug('CiteprocRs: new Driver', 5);
-			let options = {
-				style: this._styleXML,
-				format: this._format,
-				fetcher: { fetchLocale: this._fetchLocale.bind(this) },
-			}
-			if (this._overrideLocale) {
-				options.localeOverride = this.locale;
-			}
-			this._driver = new Zotero.CiteprocRs.Driver(options);
-		}
-		
-		async _fetchLocale(lang) {
-			return Zotero.Cite.System.prototype.retrieveLocale(lang);
-		}
-		
-		setOutputFormat(format) {
-			if (format == 'text') format = 'plain';
-			if (this._format != format) {
-				this._format = format;
-				this._driver.setOutputFormat(format);
-			}
-		}
-		
-		_insertCitationReferences(citation) {
-			let cites = [];
-			for (const citationItem of citation.citationItems) {
-				let citeprocItem = this.sys.retrieveItem(citationItem.id);
-				citeprocItem.id = `${citeprocItem.id}`;
-				Zotero.debug(`CiteprocRs: insertReference ${JSON.stringify(citeprocItem)}`, 5);
-				this._driver.insertReference(citeprocItem);
-				let cite = { id: `${citeprocItem.id}`, locator: undefined, locators: undefined };
-				additionalCSLProperties.forEach((key) => {
-					if (!citationItem[key]) return;
-					switch (key) {
-						case 'suppress-author':
-							cite['mode'] = "SuppressAuthor";
-							break;
-						case 'author-only':
-							cite['mode'] = "AuthorOnly";
-							break;
-						default:
-							cite[key] = citationItem[key];
-					}
-				});
-				cites.push(cite);
-			}
-			return cites;
-		}
-
-		_getClusterOrder(citations) {
-			let clusters = [];
-			for (let [citationID, noteIndex] of citations) {
-				let cluster = { id: citationID };
-				noteIndex = typeof noteIndex == "string" ? parseInt(noteIndex) : noteIndex;
-				if (noteIndex) {
-					cluster.note = noteIndex;
-				}
-				clusters.push(cluster);
-			}
-			return clusters;
-		}
-
-		previewCitationCluster(citation, citationsPre, citationsPost, outputFormat) {
-			if (!citation.citationID) citation.citationID = Zotero.Utilities.randomString(10);
-			
-			let cites = this._insertCitationReferences(citation);
-			let cluster = { cites };
-			
-			let thisClusterOrder = {};
-			let noteIndex = citation.properties.noteIndex;
-			noteIndex = typeof noteIndex == "string" ? parseInt(noteIndex) : noteIndex;
-			if (noteIndex) {
-				thisClusterOrder.note = noteIndex;
-			}
-			let allClusterOrder = this._getClusterOrder(citationsPre.concat(citationsPost));
-			allClusterOrder.splice(citationsPre.length, 0, thisClusterOrder);
-			
-			Zotero.debug(`CiteprocRs: previewCluster ${JSON.stringify([cluster, allClusterOrder, outputFormat])}`, 5);
-			return this._driver.previewCluster(cluster, allClusterOrder, outputFormat);
-		}
-		
-		// This is an undocumented citeproc-js endpoint that used to be used by Zotero
-		// when generating citations for clipboard or export.
-		appendCitationCluster(citation) {
-			this.insertCluster(citation);
-			Zotero.debug(`CiteprocRs: builtCluster ${citation.citationID}`, 5);
-			return this._driver.builtCluster(citation.citationID);
-		}
-		
-		insertCluster(citation) {
-			let cluster = { id: citation.citationID };
-			cluster.cites = this._insertCitationReferences(citation);
-
-			Zotero.debug(`CiteprocRs: insertCluster ${JSON.stringify(cluster)}`, 5);
-			this._driver.insertCluster(cluster);
-			return cluster;
-		}
-	
-		setClusterOrder(citations) {
-			let clusters = this._getClusterOrder(citations);
-			Zotero.debug(`CiteprocRs: setClusterOrder ${JSON.stringify(clusters)}`, 5);
-			this._driver.setClusterOrder(clusters);
-		}
-		
-		getBatchedUpdates() {
-			Zotero.debug(`CiteprocRs: batchedUpdates`, 5);
-			return this._driver.batchedUpdates();
-		}
-		
-		rebuildProcessorState(citations, format, uncited) {
-			this._format = format;
-			this._resetDriver();
-			for (let citation of citations) {
-				this.insertCluster(citation);
-			}
-			this.setClusterOrder(citations.map(
-				citation => [citation.citationID, citation.properties.noteIndex]));
-			this.updateUncitedItems(uncited);
-		}
-		
-		updateUncitedItems(itemIDs) {
-			let referenceIDs = [];
-			for (let id of itemIDs) {
-				let citeprocItem = this.sys.retrieveItem(id);
-				citeprocItem.id = `${citeprocItem.id}`;
-				referenceIDs.push(citeprocItem.id);
-				Zotero.debug(`CiteprocRs: insertReference ${JSON.stringify(citeprocItem)}`, 5);
-				this._driver.insertReference(citeprocItem);
-			}
-			Zotero.debug(`CiteprocRs: includeUncitedItems ${JSON.stringify(referenceIDs)}`);
-			this._driver.includeUncited({ Specific: referenceIDs });
-		}
-		
-		updateItems(itemIDs) {
-			Zotero.debug('CiteprocRstoJs: updateItems [forwarding to updateUncitedItems()]');
-			return this.updateUncitedItems(itemIDs);
-		}
-		
-		makeBibliography() {
-			Zotero.debug(`CiteprocRs: bibliographyMeta`, 5);
-			
-			// Converting from the wrongly documented citeproc-rs return format
-			// to the poorly named citeproc-js format. Sigh.
-			let bibliographyMeta = this._driver.bibliographyMeta();
-			bibliographyMeta = Object.assign(bibliographyMeta, {
-				maxoffset: bibliographyMeta.maxOffset,
-				linespacing: bibliographyMeta.lineSpacing,
-				entryspacing: bibliographyMeta.entrySpacing,
-				hangingindent: bibliographyMeta.hangingIndent,
-				bibstart: bibliographyMeta.formatMeta && bibliographyMeta.formatMeta.markupPre,
-				bibend: bibliographyMeta.formatMeta && bibliographyMeta.formatMeta.markupPost,
-			});
-			bibliographyMeta['second-field-align'] = bibliographyMeta.secondFieldAlign;
-			
-			Zotero.debug(`CiteprocRs: makeBibliography`, 5);
-			const bibliographyEntries = this._driver.makeBibliography();
-			// Crazy citeproc-js behavior here
-			const entry_ids = bibliographyEntries.map(entry => [entry.id]);
-			let strings;
-			if (this._format == 'html') {
-				strings = bibliographyEntries.map(entry => `<div class="csl-entry">${entry.value}</div>`);
-			}
-			else if (this._format == 'plain') {
-				strings = bibliographyEntries.map(entry => `${entry.value}\n`);
-			}
-			else {
-				strings = bibliographyEntries.map(entry => entry.value);
-			}
-			return [
-				Object.assign({ entry_ids }, bibliographyMeta),
-				strings
-			];
-		}
-	},
-};
-
-})();
diff --git a/chrome/content/zotero/xpcom/collectionTreeRow.js b/chrome/content/zotero/xpcom/collectionTreeRow.js
index 38ded96839..62e39fc7d1 100644
--- a/chrome/content/zotero/xpcom/collectionTreeRow.js
+++ b/chrome/content/zotero/xpcom/collectionTreeRow.js
@@ -324,7 +324,12 @@ Zotero.CollectionTreeRow.prototype.getTrashedCollections = async function () {
 };
 
 
-Zotero.CollectionTreeRow.prototype.getItems = async function () {
+/**
+ * @param {Object} [options]
+ * @param {Boolean} [options.unfiltered=false] - If true, ignore quicksearch, tag, and
+ *     advanced search filters
+ */
+Zotero.CollectionTreeRow.prototype.getItems = async function (options = {}) {
 	switch (this.type) {
 		// Fake results if this is a shared library
 		case 'share':
@@ -334,7 +339,7 @@ Zotero.CollectionTreeRow.prototype.getItems = async function () {
 			return this.ref.getItems();
 	}
 	
-	var ids = await this.getSearchResults();
+	var ids = await this.getSearchResults(false, { unfiltered: options.unfiltered });
 	
 	// Filter out items that exist in the items table (where search results come from) but that haven't
 	// yet been registered. This helps prevent unloaded-data crashes when switching collections while
@@ -353,7 +358,22 @@ Zotero.CollectionTreeRow.prototype.getItems = async function () {
 	return Zotero.Items.getAsync(ids);
 };
 
-Zotero.CollectionTreeRow.prototype.getSearchResults = async function (asTempTable) {
+/**
+ * @param {Boolean} [asTempTable=false]
+ * @param {Object} [options]
+ * @param {Boolean} [options.unfiltered=false] - If true, ignore quicksearch, tag, and
+ *     advanced search filters and bypass the cache
+ */
+Zotero.CollectionTreeRow.prototype.getSearchResults = async function (asTempTable, options = {}) {
+	if (options.unfiltered) {
+		let s = await this.getSearchObject({ unfiltered: true });
+		let ids = await s.search();
+		if (asTempTable) {
+			return Zotero.Search.idsToTempTable(ids);
+		}
+		return ids;
+	}
+	
 	if (!this._cachedResults) {
 		let s = await this.getSearchObject();
 		try {
@@ -378,9 +398,13 @@ Zotero.CollectionTreeRow.prototype.getSearchResults = async function (asTempTabl
  * Returns the search object for the currently display
  *
  * This accounts for the collection, saved search, quicksearch, tags, etc.
+ *
+ * @param {Object} [options]
+ * @param {Boolean} [options.unfiltered=false] - If true, ignore quicksearch, tag, and
+ *     advanced search filters and bypass the cache
  */
-Zotero.CollectionTreeRow.prototype.getSearchObject = async function () {
-	if (this._cachedSearch) {
+Zotero.CollectionTreeRow.prototype.getSearchObject = async function (options = {}) {
+	if (!options.unfiltered && this._cachedSearch) {
 		return this._cachedSearch;
 	}
 	
@@ -403,18 +427,20 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = async function () {
 	}
 	else if (this.isDuplicates()) {
 		s = await this.ref.getSearchObject();
-		let tmpTable;
-		for (let id in s.conditions) {
-			let c = s.conditions[id];
-			if (c.condition == 'tempTable') {
-				tmpTable = c.value;
-				break;
+		if (!options.unfiltered) {
+			let tmpTable;
+			for (let id in s.conditions) {
+				let c = s.conditions[id];
+				if (c.condition == 'tempTable') {
+					tmpTable = c.value;
+					break;
+				}
 			}
+			// Called by ItemTreeView::unregister()
+			this.onUnload = async function () {
+				await Zotero.DB.queryAsync(`DROP TABLE IF EXISTS ${tmpTable}`, false, { noCache: true });
+			};
 		}
-		// Called by ItemTreeView::unregister()
-		this.onUnload = async function () {
-			await Zotero.DB.queryAsync(`DROP TABLE IF EXISTS ${tmpTable}`, false, { noCache: true });
-		};
 	}
 	else {
 		s = new Zotero.Search();
@@ -464,20 +490,48 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = async function () {
 	}
 	s2.setScope(s, includeScopeChildren);
 	
-	if (this.searchText) {
-		let cond = 'quicksearch-'
-			+ (this.searchMode || Zotero.Prefs.get('search.quicksearch-mode'));
-		s2.addCondition(cond, 'contains', this.searchText);
-	}
+	if (!options.unfiltered) {
+		// Add Quick Search unless advanced search is enabled
+		if (this.searchText && !this.advancedSearch) {
+			let cond = 'quicksearch-'
+				+ (this.searchMode || Zotero.Prefs.get('search.quicksearch-mode'));
+			s2.addCondition(cond, 'contains', this.searchText);
+		}
 	
-	if (this.tags){
-		for (let tag of this.tags) {
-			s2.addCondition('tag', 'is', tag);
+		if (this.tags) {
+			for (let tag of this.tags) {
+				s2.addCondition('tag', 'is', tag);
+			}
 		}
 	}
 	
-	this._cachedSearch = s2;
-	return s2;
+	let s3;
+	if (!options.unfiltered && this.advancedSearch) {
+		if (this.advancedSearch.libraryID === null) {
+			// A library-less search (Feeds pseudo-library) can't be clone()d
+			s3 = new Zotero.Search();
+			s3.fromJSON(this.advancedSearch.toJSON());
+		}
+		else {
+			s3 = this.advancedSearch.clone();
+		}
+		// In the trash, the scope (s2) returns only deleted items, so the
+		// advanced search itself has to include deleted items in order to match
+		// them. Outside the trash, deleted items are excluded by default, the
+		// same as for a quick search. Special condition -- unaffected by joinMode.
+		if (this.isTrash()) {
+			s3.addCondition('includeDeleted', 'true');
+		}
+		s3.setScope(s2, includeScopeChildren);
+	}
+	else {
+		s3 = s2;
+	}
+	
+	if (!options.unfiltered) {
+		this._cachedSearch = s3;
+	}
+	return s3;
 };
 
 Zotero.CollectionTreeRow.prototype.getChildTags = function () {
@@ -507,6 +561,40 @@ Zotero.CollectionTreeRow.prototype.getTags = async function (types, tagIDs) {
 };
 
 
+/**
+ * Returns all the tags used by items across multiple rows' views
+ *
+ * Combines the rows' search results into a single temporary table and runs one tag
+ * query, rather than creating a temp table and running a separate query per row.
+ *
+ * @param {Zotero.CollectionTreeRow[]} rows
+ * @param {Number[]} [types]
+ * @param {Number[]} [tagIDs]
+ * @return {Promise<Object[]>}
+ */
+Zotero.CollectionTreeRow.getTagsAcrossRows = async function (rows, types, tagIDs) {
+	// share/bucket/feeds rows never contribute tags (see getTags())
+	var tagRows = rows.filter(row => !['share', 'bucket', 'feeds'].includes(row.type));
+	if (!tagRows.length) {
+		return [];
+	}
+	// Combine the rows' search results into a single set of item IDs
+	var itemIDs = new Set();
+	for (let ids of await Promise.all(tagRows.map(row => row.getSearchResults(false)))) {
+		for (let id of ids) {
+			itemIDs.add(id);
+		}
+	}
+	var tmpTable = await Zotero.Search.idsToTempTable([...itemIDs]);
+	try {
+		return await Zotero.Tags.getAllWithin({ tmpTable, types, tagIDs });
+	}
+	finally {
+		await Zotero.DB.queryAsync(`DROP TABLE IF EXISTS ${tmpTable}`, false, { noCache: true });
+	}
+};
+
+
 /**
  * Clear the per-instance search cache. Call this at the start of a refresh cycle
  * or when search/tag filters change, so the next getSearchResults()/getSearchObject()
@@ -537,6 +625,29 @@ Zotero.CollectionTreeRow.prototype.setSearch = function (searchText, mode = null
 	return true;
 }
 
+Zotero.CollectionTreeRow.prototype.setAdvancedSearch = function (advancedSearch) {
+	// Clearing an already-clear filter is a no-op. A passed search is always
+	// applied, even if it's the same object, since its conditions may have been
+	// edited in place.
+	if (!advancedSearch && !this.advancedSearch) {
+		return false;
+	}
+	this.clearCache();
+	if (!advancedSearch) {
+		this.advancedSearch = undefined;
+	}
+	else if (this.ref.libraryID === undefined) {
+		// Feeds pseudo-library -- leave the library unset so that the search
+		// spans all feed libraries
+		this.advancedSearch = new Zotero.Search();
+		this.advancedSearch.fromJSON(advancedSearch.toJSON());
+	}
+	else {
+		this.advancedSearch = advancedSearch.clone(this.ref.libraryID);
+	}
+	return true;
+};
+
 Zotero.CollectionTreeRow.prototype.setTags = function (tags) {
 	let oldTags = this.tags instanceof Set ? this.tags : new Set(this.tags || []);
 	let newTags = tags instanceof Set ? new Set(tags) : new Set(tags || []);
@@ -570,8 +681,8 @@ Zotero.CollectionTreeRow.prototype.isSearchMode = function () {
 			return true;
 	}
 	
-	// Quicksearch
-	if (this.searchText != '') {
+	// Search filters
+	if (this.advancedSearch || this.searchText != '') {
 		return true;
 	}
 	
diff --git a/chrome/content/zotero/xpcom/data/collection.js b/chrome/content/zotero/xpcom/data/collection.js
index 2c7b4f9f2b..ae650b1bd7 100644
--- a/chrome/content/zotero/xpcom/data/collection.js
+++ b/chrome/content/zotero/xpcom/data/collection.js
@@ -67,6 +67,10 @@ Zotero.defineProperty(Zotero.Collection.prototype, 'version', {
 	get: function () { return this._get('version'); },
 	set: function (val) { return this._set('version', val); }
 });
+Zotero.defineProperty(Zotero.Collection.prototype, 'clientVersion', {
+	get: function() { return this._get('clientVersion'); },
+	set: function(val) { return this._set('clientVersion', val); }
+});
 Zotero.defineProperty(Zotero.Collection.prototype, 'synced', {
 	get: function () { return this._get('synced'); },
 	set: function (val) { return this._set('synced', val); }
@@ -136,6 +140,7 @@ Zotero.Collection.prototype.loadFromRow = function (row) {
 		
 		// Integer or 0
 		case 'version':
+		case 'clientVersion':
 			val = val ? parseInt(val) : 0;
 			break;
 		
@@ -386,6 +391,7 @@ Zotero.Collection.prototype._finalizeSave = async function (env) {
 };
 
 
+
 /**
  * @param {Number} itemID
  * @return {Promise}
@@ -450,6 +456,8 @@ Zotero.Collection.prototype.removeItem = function (itemID, options = {}) {
  * Does not require a separate save()
  */
 Zotero.Collection.prototype.removeItems = async function (itemIDs, options = {}) {
+	options.skipDateModifiedUpdate = true;
+	
 	if (!itemIDs || !itemIDs.length) {
 		return;
 	}
@@ -467,10 +475,7 @@ Zotero.Collection.prototype.removeItems = async function (itemIDs, options = {})
 		
 		let item = await this.ChildObjects.getAsync(itemID);
 		item.removeFromCollection(this.id);
-		await item.save({
-			skipDateModifiedUpdate: true,
-			skipEditCheck: options.skipEditCheck
-		})
+		await item.save(options);
 	}
 };
 
@@ -616,6 +621,18 @@ Zotero.Collection.prototype.trash = async function (env) {
 				if (env.options && env.options.skipDeleteLog) {
 					env.notifierData[c.id].skipDeleteLog = true;
 				}
+				// Record undo data for descendent collections
+				if (Zotero.UndoHistory && !c.deleted) {
+					Zotero.UndoHistory.stageChange({
+						objectType: 'collection',
+						id: c.id,
+						libraryID: c.libraryID,
+						key: c.key,
+						fields: {
+							deleted: { old: false, new: true }
+						}
+					});
+				}
 			}
 		}
 		// Descendent items
diff --git a/chrome/content/zotero/xpcom/data/collections.js b/chrome/content/zotero/xpcom/data/collections.js
index e38e29527d..d1af865b47 100644
--- a/chrome/content/zotero/xpcom/data/collections.js
+++ b/chrome/content/zotero/xpcom/data/collections.js
@@ -38,6 +38,7 @@ Zotero.Collections = function () {
 		libraryID: "O.libraryID",
 		key: "O.key",
 		version: "O.version",
+		clientVersion: "O.clientVersion",
 		synced: "O.synced",
 		
 		deleted: "DC.collectionID IS NOT NULL AS deleted",
@@ -159,6 +160,67 @@ Zotero.Collections = function () {
 	}
 	
 	
+	/**
+	 * The number of collections tracked in the recently used list for each library
+	 */
+	this.MAX_RECENT = 20;
+	
+	/**
+	 * The number of collections tracked in the recently used list across all libraries
+	 */
+	this.MAX_RECENT_TOTAL = 100;
+	
+	
+	// Collection ids, most recent first, for the current session only
+	var _recent = [];
+	
+	
+	/**
+	 * Get the collections the user has most recently viewed or added items to, most recent first
+	 *
+	 * @param {Integer} [libraryID] - Limit to collections in a given library
+	 * @return {Zotero.Collection[]}
+	 */
+	this.getRecent = function (libraryID) {
+		var collections = [];
+		for (let id of _recent) {
+			// A collection can be deleted or trashed after it's added to the list
+			let collection = this.get(id);
+			if (!collection || collection.deleted) {
+				continue;
+			}
+			if (libraryID === undefined || collection.libraryID == libraryID) {
+				collections.push(collection);
+			}
+		}
+		return collections;
+	};
+	
+	
+	/**
+	 * Move a collection to the front of the recently used list
+	 *
+	 * @param {Zotero.Collection} collection
+	 */
+	this.addToRecent = function (collection) {
+		_recent = _recent.filter(id => id != collection.id);
+		_recent.unshift(collection.id);
+		// Drop collections that have been deleted, along with everything from a library that
+		// has been removed, and trim each library separately, so that heavy use of one doesn't
+		// push another's collections off the end of the list
+		var counts = new Map();
+		_recent = _recent.filter((id) => {
+			let collection = this.get(id);
+			if (!collection) {
+				return false;
+			}
+			let count = (counts.get(collection.libraryID) || 0) + 1;
+			counts.set(collection.libraryID, count);
+			return count <= this.MAX_RECENT;
+		}).slice(0, this.MAX_RECENT_TOTAL);
+	};
+	
+	
 	this._loadChildCollections = async function (libraryID, ids, idSQL) {
 		var sql = "SELECT C1.collectionID, C2.collectionID AS childCollectionID "
 			+ "FROM collections C1 LEFT JOIN collections C2 ON (C1.collectionID=C2.parentCollectionID) "
diff --git a/chrome/content/zotero/xpcom/data/creators.js b/chrome/content/zotero/xpcom/data/creators.js
index 8a51281c53..69792e5c11 100644
--- a/chrome/content/zotero/xpcom/data/creators.js
+++ b/chrome/content/zotero/xpcom/data/creators.js
@@ -109,10 +109,19 @@ Zotero.Creators = new function () {
 		);
 		if (!id && create) {
 			id = Zotero.ID.get('creators');
-			let sql = "INSERT INTO creators (creatorID, firstName, lastName, fieldMode) "
-				+ "VALUES (?, ?, ?, ?)";
+			let sql = "INSERT INTO creators "
+				+ "(creatorID, firstName, lastName, fieldMode, firstNameNormalized, lastNameNormalized) "
+				+ "VALUES (?, ?, ?, ?, ?, ?)";
 			await Zotero.DB.queryAsync(
-				sql, [id, data.firstName, data.lastName, data.fieldMode]
+				sql,
+				[
+					id,
+					data.firstName,
+					data.lastName,
+					data.fieldMode,
+					Zotero.Utilities.Internal.normalizeForSearchStorage(data.firstName),
+					Zotero.Utilities.Internal.normalizeForSearchStorage(data.lastName)
+				]
 			);
 			_cache[id] = data;
 		}
diff --git a/chrome/content/zotero/xpcom/data/dataObject.js b/chrome/content/zotero/xpcom/data/dataObject.js
index b59ba142cb..5b92ea0bec 100644
--- a/chrome/content/zotero/xpcom/data/dataObject.js
+++ b/chrome/content/zotero/xpcom/data/dataObject.js
@@ -50,6 +50,7 @@ Zotero.DataObject = function () {
 	this._dateAdded = null;
 	this._dateModified = null;
 	this._version = null;
+	this._clientVersion = null;
 	this._synced = null;
 	this._identified = false;
 	this._parentID = null;
@@ -884,6 +885,96 @@ Zotero.DataObject.prototype._markForReload = function (dataType) {
 }
 
 
+Zotero.DataObject.UNDO_SKIP_FIELDS = new Set(['version', 'synced', 'clientDateModified', 'dateModified']);
+
+/**
+ * Build a change record for UndoHistory from the current pending changes.
+ * Called during save() before _saveData() clears change tracking.
+ *
+ * @return {Object|null} - ChangeRecord or null if nothing undoable
+ */
+Zotero.DataObject.prototype._getUndoData = function () {
+	let skipFields = Zotero.DataObject.UNDO_SKIP_FIELDS;
+	let fields = {};
+
+	// Fields tracked via _previousData (old-style: old value stored)
+	for (let field of Object.keys(this._previousData)) {
+		if (skipFields.has(field)) continue;
+		// Skip non-scalar fields like relations
+		if (typeof this._previousData[field] === 'object' && this._previousData[field] !== null) {
+			continue;
+		}
+		fields[field] = {
+			old: this._previousData[field],
+			new: this['_' + field]
+		};
+	}
+
+	// Fields tracked via _changedData (new-style: new value stored)
+	for (let field of Object.keys(this._changedData)) {
+		if (skipFields.has(field)) continue;
+		if (field === 'deleted') {
+			fields[field] = {
+				old: this._deleted,
+				new: this._changedData[field]
+			};
+		}
+	}
+
+	if (!Object.keys(fields).length) return null;
+
+	return {
+		objectType: this._objectType,
+		id: this._id,
+		libraryID: this._libraryID,
+		key: this._key,
+		fields
+	};
+};
+
+
+/**
+ * Whether the object still holds the values captured in an undo snapshot for
+ * the given side -- the read-and-compare counterpart of _getUndoData(). Used by
+ * Zotero.UndoHistory to avoid replaying a snapshot over an external change.
+ *
+ * @param {Object} fields -- a change record's `fields` map (field -> { old, new })
+ * @param {String} side -- 'new' (undo) or 'old' (redo)
+ * @return {Boolean} -- true if every field still matches the recorded value
+ */
+Zotero.DataObject.prototype.matchesUndoSnapshot = function (fields, side) {
+	for (let field of Object.keys(fields)) {
+		if (!this._undoFieldMatches(field, fields[field][side])) {
+			return false;
+		}
+	}
+	return true;
+};
+
+
+/**
+ * Whether a single field still holds a recorded undo value. Overridden by
+ * Zotero.Item for item-specific fields; the base handles the primary scalar
+ * fields shared by all data objects.
+ *
+ * @param {String} field
+ * @param {*} recorded -- the recorded value for the side being checked
+ * @return {Boolean}
+ */
+Zotero.DataObject.prototype._undoFieldMatches = function (field, recorded) {
+	if (field === 'deleted') {
+		return this._deleted === recorded;
+	}
+	if (field === 'name') {
+		return this._name === recorded;
+	}
+	if (field === 'parentKey') {
+		return this._parentKey === recorded;
+	}
+	return this['_' + field] === recorded;
+};
+
+
 /**
  * @param {String} [op='edit'] - Operation to check; if not provided, check edit privileges for
  *     library
@@ -907,6 +998,11 @@ Zotero.DataObject.prototype.isEditable = function (_op = 'edit') {
  * @param {Boolean} [options.skipNotifier] - Don't trigger Zotero.Notifier events
  * @param {Boolean} [options.skipSelect] - Don't select object automatically in trees
  * @param {Boolean} [options.skipSyncedUpdate] - Don't automatically set 'synced' to false
+ * @param {String} [options.undoAction] - Fluent message ID for the undo entry's action label
+ *                                        (e.g. 'undo-action-edit-creator'); without this the save
+ *                                        is captured but discarded at commit
+ * @param {Object} [options.undoActionArgs] - Fluent message arguments for the action label
+ *                                            (e.g. { count: 3 })
  * @return {Promise<Integer|Boolean>}  Promise for itemID of new item,
  *                                     TRUE on item update, or FALSE if item was unchanged
  */
@@ -934,17 +1030,17 @@ Zotero.DataObject.prototype.save = async function (options = {}) {
 		].forEach(x => env.options[x] = true);
 	}
 	
-	var proceed = await this._initSave(env);
-	if (!proceed) return false;
-	
-	if (env.isNew) {
-		Zotero.debug('Saving data for new ' + this._objectType + ' to database', 4);
-	}
-	else {
-		Zotero.debug('Updating database with new ' + this._objectType + ' data', 4);
-	}
-	
 	try {
+		var proceed = await this._initSave(env);
+		if (!proceed) return false;
+		
+		if (env.isNew) {
+			Zotero.debug('Saving data for new ' + this._objectType + ' to database', 4);
+		}
+		else {
+			Zotero.debug('Updating database with new ' + this._objectType + ' data', 4);
+		}
+		
 		if (Zotero.DataObject.prototype._finalizeSave == this._finalizeSave) {
 			throw new Error("_finalizeSave not implemented for Zotero." + this._ObjectType);
 		}
@@ -969,7 +1065,17 @@ Zotero.DataObject.prototype.save = async function (options = {}) {
 				env.notifierData.changed[field] = this['_' + field];
 			}
 		}
-		
+
+		// Capture undo data before _saveData clears change tracking.
+		// Capture is unconditional for non-isNew saves; whether it lands on the
+		// undo stack depends on a stageAction() call within the same transaction.
+		if (Zotero.UndoHistory && !env.isNew) {
+			env.undoData = this._getUndoData();
+			if (env.undoData) {
+				env.undoData.skipDateModified = !!env.options.skipDateModifiedUpdate;
+			}
+		}
+
 		// Create transaction
 		let result
 		if (env.options.tx) {
@@ -977,6 +1083,12 @@ Zotero.DataObject.prototype.save = async function (options = {}) {
 				Zotero.DataObject.prototype._saveData.call(this, env);
 				await this._saveData(env);
 				await Zotero.DataObject.prototype._finalizeSave.call(this, env);
+				if (env.undoData) {
+					Zotero.UndoHistory.stageChange(env.undoData);
+					if (env.options.undoAction) {
+						Zotero.UndoHistory.stageAction(env.options.undoAction, env.options.undoActionArgs);
+					}
+				}
 				return this._finalizeSave(env);
 			}.bind(this), env.transactionOptions);
 		}
@@ -987,6 +1099,12 @@ Zotero.DataObject.prototype.save = async function (options = {}) {
 			await this._saveData(env);
 			await Zotero.DataObject.prototype._finalizeSave.call(this, env);
 			result = this._finalizeSave(env);
+			if (env.undoData) {
+				Zotero.UndoHistory.stageChange(env.undoData);
+				if (env.options.undoAction) {
+					Zotero.UndoHistory.stageAction(env.options.undoAction, env.options.undoActionArgs);
+				}
+			}
 		}
 		this._postSave(env);
 		return result;
@@ -1179,6 +1297,13 @@ Zotero.DataObject.prototype._finalizeSave = async function (env) {
 	else if (env.skipCache) {
 		Zotero.logError("skipCache is only for new objects");
 	}
+
+	let libraryClientVersion = await this.library.incrementClientVersion();
+	await Zotero.DB.queryAsync(
+		`UPDATE ${this.ObjectsClass.table} SET clientVersion = ? WHERE ${this.ObjectsClass.idColumn}=?`,
+		[libraryClientVersion, this.id]
+	);
+	this._clientVersion = libraryClientVersion;
 };
 
 
@@ -1337,6 +1462,8 @@ Zotero.DataObject.prototype._initErase = function (env) {
 };
 
 Zotero.DataObject.prototype._finalizeErase = async function (env) {
+	await this.library.incrementClientVersion();
+	
 	// Delete versions from sync cache
 	if (this._objectType != 'feedItem') {
 		await Zotero.Sync.Data.Local.deleteCacheObjectVersions(
@@ -1365,10 +1492,15 @@ Zotero.DataObject.prototype._finalizeErase = async function (env) {
 
 
 Zotero.DataObject.prototype.toResponseJSON = function (options = {}) {
+	// Default to showing synced properties, since that's what the API does, and this function
+	// is generally used to emulate the API
+	options.syncedStorageProperties ??= true;
+	options.syncedVersionProperty ??= true;
+
 	let uri = Zotero.URI.getObjectURI(this);
 	var json = {
 		key: this.key,
-		version: this.version,
+		version: options.syncedVersionProperty ? this.version : this.clientVersion,
 		library: this.library.toResponseJSON({ ...options, includeGroupDetails: false }),
 		links: {
 			self: {
@@ -1383,6 +1515,9 @@ Zotero.DataObject.prototype.toResponseJSON = function (options = {}) {
 		meta: {},
 		data: this.toJSON(options)
 	};
+	// Keep the data block's version consistent with the top-level version (toJSON() reports
+	// the synced version, which differs from clientVersion when syncedVersionProperty is false)
+	json.data.version = json.version;
 	if (options.version) {
 		json.version = json.data.version = options.version;
 	}
diff --git a/chrome/content/zotero/xpcom/data/dataObjectUtilities.js b/chrome/content/zotero/xpcom/data/dataObjectUtilities.js
index 028a062a54..22568b7803 100644
--- a/chrome/content/zotero/xpcom/data/dataObjectUtilities.js
+++ b/chrome/content/zotero/xpcom/data/dataObjectUtilities.js
@@ -440,35 +440,31 @@ Zotero.DataObjectUtilities = {
 		return changeset;
 	},
 	
-	_conditionsDiff: function (data1, data2 = {}) {
-		var changeset = [];
-		outer:
-		for (let i = 0; i < data1.length; i++) {
-			for (let j = 0; j < data2.length; j++) {
-				if (Zotero.SearchConditions.equals(data1[i], data2[j])) {
-					continue outer;
-				}
+	/**
+	 * Conditions are an ordered list -- with condition groups, the position of conditions and
+	 * the pairing of group markers (groupStart/groupEnd) are load-bearing -- so diff them as a
+	 * single unit, like creators, rather than as an unordered member set. A member-style diff
+	 * during a sync merge could reorder conditions or add/drop indistinguishable group markers,
+	 * corrupting the structure.
+	 */
+	_conditionsDiff: function (data1, data2 = []) {
+		if (!data2 || !data2.length) {
+			if (!data1 || !data1.length) {
+				return [];
 			}
-			changeset.push({
+			return [{
 				field: "conditions",
-				op: "member-remove",
-				value: data1[i]
-			});
+				op: "delete"
+			}];
 		}
-		outer:
-		for (let i = 0; i < data2.length; i++) {
-			for (let j = 0; j < data1.length; j++) {
-				if (Zotero.SearchConditions.equals(data2[i], data1[j])) {
-					continue outer;
-				}
-			}
-			changeset.push({
+		if (this._conditionsChanged(data1, data2)) {
+			return [{
 				field: "conditions",
-				op: "member-add",
-				value: data2[i]
-			});
+				op: "modify",
+				value: data2
+			}];
 		}
-		return changeset;
+		return [];
 	},
 	
 	_htmlDiff: function (field, html1, html2 = "") {
@@ -624,12 +620,10 @@ Zotero.DataObjectUtilities = {
 						throw new Error("Unimplemented");
 						break;
 					
-					case 'conditions':
 					case 'tags':
 						let found = false;
-						let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
 						for (let i = 0; i < json[c.field].length; i++) {
-							if (f.equals(json[c.field][i], c.value)) {
+							if (Zotero.Tags.equals(json[c.field][i], c.value)) {
 								found = true;
 								break;
 							}
@@ -657,11 +651,9 @@ Zotero.DataObjectUtilities = {
 						throw new Error("Unimplemented");
 						break;
 					
-					case 'conditions':
 					case 'tags':
-						let f = c.field == 'conditions' ? Zotero.SearchConditions : Zotero.Tags;
 						for (let i = 0; i < json[c.field].length; i++) {
-							if (f.equals(json[c.field][i], c.value)) {
+							if (Zotero.Tags.equals(json[c.field][i], c.value)) {
 								json[c.field].splice(i, 1);
 								break;
 							}
diff --git a/chrome/content/zotero/xpcom/data/group.js b/chrome/content/zotero/xpcom/data/group.js
index c5d824030a..a3119b0e2a 100644
--- a/chrome/content/zotero/xpcom/data/group.js
+++ b/chrome/content/zotero/xpcom/data/group.js
@@ -244,6 +244,9 @@ Zotero.Group.prototype.toResponseJSON = function (options = {}) {
 		let uri = Zotero.URI.getGroupURI(this);
 		return {
 			id: this.id,
+			// Group metadata isn't locally writable, so group responses always report the
+			// synced group version -- unlike group.clientVersion, which is inherited from
+			// Zotero.Library and tracks the group library's contents
 			version: this.version,
 			links: {
 				self: {
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 99669a0931..c80df3c129 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -128,8 +128,8 @@ Zotero.defineProperty(Zotero.Item.prototype, 'itemID', {
 	enumerable: false
 });
 
-for (let name of ['libraryID', 'key', 'dateAdded', 'dateModified', 'version', 'synced',
-		'createdByUserID', 'lastModifiedByUserID']) {
+for (let name of ['libraryID', 'key', 'dateAdded', 'dateModified', 'version', 'clientVersion',
+		'synced', 'createdByUserID', 'lastModifiedByUserID']) {
 	let prop = '_' + name;
 	Zotero.defineProperty(Zotero.Item.prototype, name, {
 		get: function () { return this[prop]; },
@@ -375,6 +375,7 @@ Zotero.Item.prototype._parseRowData = function (row) {
 			
 			// Integer or 0
 			case 'version':
+			case 'clientVersion':
 				val = val ? parseInt(val) : 0;
 				break;
 			
@@ -425,6 +426,16 @@ Zotero.Item.prototype._finalizeLoadFromRow = function (row) {
 }
 
 
+Zotero.Item.prototype._clearChanged = function (dataType) {
+	Zotero.DataObject.prototype._clearChanged.call(this, dataType);
+	// setType stores the old type under the 'itemType' alias, which the base
+	// primaryData clearing misses (it matches 'itemTypeID'), so clear it here
+	if (!dataType || dataType === 'primaryData') {
+		delete this._previousData.itemType;
+	}
+}
+
+
 /*
  * Set or change the item's type
  */
@@ -880,6 +891,217 @@ Zotero.Item.prototype.setField = function (field, value, loadIn) {
 	return true;
 }
 
+/**
+ * Override to correctly resolve item data fields via _itemData[fieldID]
+ */
+Zotero.Item.prototype._getUndoData = function () {
+	let skipFields = Zotero.DataObject.UNDO_SKIP_FIELDS;
+	let fields = {};
+
+	// Fields tracked via _previousData
+	for (let field of Object.keys(this._previousData)) {
+		if (skipFields.has(field)) continue;
+		// 'itemType' is a derived name, not directly settable -- handled below as itemTypeID
+		if (field === 'itemType') continue;
+		// Collections are an array but need explicit undo tracking
+		if (field === 'collections') {
+			fields[field] = {
+				old: this._previousData[field],
+				new: this._collections
+			};
+			continue;
+		}
+		if (field === 'note') {
+			fields[field] = {
+				old: this._previousData[field],
+				new: this._noteText
+			};
+			continue;
+		}
+		if (field === 'relations') {
+			fields[field] = {
+				old: this._previousData[field],
+				new: this._relations.map(r => [...r])
+			};
+			continue;
+		}
+		if (typeof this._previousData[field] === 'object' && this._previousData[field] !== null) {
+			continue;
+		}
+
+		let fieldID = Zotero.ItemFields.getID(field);
+		if (fieldID) {
+			// Item data field -- new value is in _itemData.
+			// After a type change, lost fields are no longer in _itemData.
+			let newValue = this._itemData[fieldID];
+			fields[field] = {
+				old: this._previousData[field],
+				new: newValue !== undefined ? newValue : false
+			};
+		}
+		else {
+			// Primary data field -- new value is on the instance property
+			fields[field] = {
+				old: this._previousData[field],
+				new: this['_' + field]
+			};
+		}
+	}
+
+	// Detect item type change and store with numeric IDs
+	if (this._changed.primaryData && this._changed.primaryData.itemTypeID
+			&& this._previousData.itemType) {
+		fields.itemTypeID = {
+			old: Zotero.ItemTypes.getID(this._previousData.itemType),
+			new: this._itemTypeID
+		};
+	}
+
+	// Fields tracked via _changedData (e.g. deleted, tags)
+	for (let field of Object.keys(this._changedData)) {
+		if (skipFields.has(field)) continue;
+		if (field === 'deleted') {
+			fields[field] = {
+				old: this._deleted,
+				new: this._changedData[field]
+			};
+		}
+		else if (field === 'tags') {
+			fields[field] = {
+				old: this._tags,
+				new: this._changedData[field]
+			};
+		}
+	}
+
+	// Creators tracked via _changed.creators
+	if (this._changed.creators) {
+		// Old creators were saved in _previousData.creators by _markFieldChange
+		let oldCreators = this._previousData.creators || {};
+		let newCreators = {};
+		for (let i = 0; i < this._creators.length; i++) {
+			newCreators[i] = Object.assign({}, this._creators[i]);
+		}
+		fields.creators = {
+			old: oldCreators,
+			new: newCreators
+		};
+	}
+
+	if (!Object.keys(fields).length) return null;
+
+	return {
+		objectType: this._objectType,
+		id: this._id,
+		libraryID: this._libraryID,
+		key: this._key,
+		fields
+	};
+};
+
+
+/**
+ * @see Zotero.DataObject.prototype._undoFieldMatches
+ *
+ * Mirrors how _getUndoData() (above) captures each item field, and reuses the
+ * canonical change-detection helpers so the staleness check and save-time
+ * change detection stay in agreement.
+ */
+Zotero.Item.prototype._undoFieldMatches = function (field, recorded) {
+	switch (field) {
+		case 'collections':
+			return !Zotero.DataObjectUtilities._collectionsChanged(this._collections, recorded);
+
+		case 'tags':
+			if (!Array.isArray(recorded)) {
+				return this._tags === recorded;
+			}
+			return !Zotero.DataObjectUtilities._tagsChanged(this._tags, recorded);
+
+		case 'relations':
+			return this._undoRelationsMatch(recorded);
+
+		case 'creators':
+			return this._undoCreatorsMatch(recorded);
+
+		case 'note':
+			return this._noteText === recorded;
+
+		case 'itemTypeID':
+			return this._itemTypeID === recorded;
+	}
+
+	let fieldID = Zotero.ItemFields.getID(field);
+	if (fieldID) {
+		return this._undoItemDataMatches(fieldID, recorded);
+	}
+	// Primary scalar field (e.g. dateAdded) -- defer to the base implementation
+	return Zotero.DataObject.prototype._undoFieldMatches.call(this, field, recorded);
+};
+
+
+/**
+ * Compare a recorded item-data value against the live one. An empty field reads
+ * back as false, null, undefined, or '' depending on the path, so treat all of
+ * those as equal -- like setField()'s own change check -- to avoid mistaking an
+ * unchanged value for an external edit.
+ *
+ * @param {Integer} fieldID
+ * @param {*} recorded
+ * @return {Boolean}
+ */
+Zotero.Item.prototype._undoItemDataMatches = function (fieldID, recorded) {
+	let current = this._itemData ? this._itemData[fieldID] : undefined;
+	let emptyCurrent = current === undefined || current === null || current === false || current === '';
+	let emptyRecorded = recorded === undefined || recorded === null || recorded === false || recorded === '';
+	if (emptyCurrent || emptyRecorded) {
+		return emptyCurrent === emptyRecorded;
+	}
+	return current === recorded;
+};
+
+
+/**
+ * Index-keyed creator comparison (reordering counts as a change), against the
+ * { index -> creatorData } shape _getUndoData() records.
+ *
+ * @param {Object} recorded
+ * @return {Boolean}
+ */
+Zotero.Item.prototype._undoCreatorsMatch = function (recorded) {
+	recorded = recorded || {};
+	if (this._creators.length !== Object.keys(recorded).length) {
+		return false;
+	}
+	for (let i = 0; i < this._creators.length; i++) {
+		if (!Zotero.Creators.equals(this._creators[i], recorded[i])) {
+			return false;
+		}
+	}
+	return true;
+};
+
+
+/**
+ * Order-independent comparison of the flat [predicate, object] pair arrays
+ * _getUndoData() records for relations.
+ *
+ * @param {Array} recorded
+ * @return {Boolean}
+ */
+Zotero.Item.prototype._undoRelationsMatch = function (recorded) {
+	if (!Array.isArray(recorded)) {
+		return false;
+	}
+	let current = this._relations.map(r => [...r]);
+	if (current.length !== recorded.length) {
+		return false;
+	}
+	let key = pair => pair[0] + "\t" + pair[1];
+	return Zotero.Utilities.arrayEquals(current.map(key).sort(), recorded.map(key).sort());
+};
+
+
 /*
  * Get the title for an item for display in the interface
  *
@@ -1524,7 +1746,7 @@ Zotero.Item.prototype._saveData = async function (env) {
 		let del = [];
 		
 		let valueSQL = "SELECT valueID FROM itemDataValues WHERE value=?";
-		let insertValueSQL = "INSERT INTO itemDataValues VALUES (?,?)";
+		let insertValueSQL = "INSERT INTO itemDataValues (valueID, value, valueNormalized) VALUES (?,?,?)";
 		let replaceSQL = "REPLACE INTO itemData VALUES (?,?,?)";
 		
 		for (let fieldID in this._changed.itemData) {
@@ -1540,12 +1762,21 @@ Zotero.Item.prototype._saveData = async function (env) {
 			if (Zotero.ItemFields.getID('accessDate') == fieldID
 					&& (this.getField(fieldID)) == 'CURRENT_TIMESTAMP') {
 				value = Zotero.DB.transactionDateTime;
+				// The undo snapshot captured the unresolved sentinel as this
+				// field's 'new' value. Replace it with the timestamp we're
+				// actually writing so staleness detection can compare against
+				// the stored value once the item reloads it
+				if (env.undoData && env.undoData.fields.accessDate
+						&& env.undoData.fields.accessDate.new === 'CURRENT_TIMESTAMP') {
+					env.undoData.fields.accessDate.new = value;
+				}
 			}
 			
 			let valueID = await Zotero.DB.valueQueryAsync(valueSQL, [value], { debug: true })
 			if (!valueID) {
 				valueID = Zotero.ID.get('itemDataValues');
-				await Zotero.DB.queryAsync(insertValueSQL, [valueID, value], { debug: false });
+				let valueNormalized = Zotero.Utilities.Internal.normalizeForSearchStorage(value);
+				await Zotero.DB.queryAsync(insertValueSQL, [valueID, value, valueNormalized], { debug: false });
 			}
 			
 			await Zotero.DB.queryAsync(replaceSQL, [itemID, fieldID, valueID], { debug: false });
@@ -1918,7 +2149,12 @@ Zotero.Item.prototype._saveData = async function (env) {
 			params.unshift(itemID);
 		}
 		await Zotero.DB.queryAsync(sql, params);
-		
+
+		// Flag the note as edited since its last full-text index update rather than re-indexing it
+		// on every auto-save while typing. The background queue re-indexes it, and searches match
+		// the flagged note from its cached text in the meantime.
+		await Zotero.FullText.flagNoteStale(itemID, noteText);
+
 		if (parentItemID) {
 			reloadParentChildItems[parentItemID] = true;
 		}
@@ -2037,8 +2273,8 @@ Zotero.Item.prototype._saveData = async function (env) {
 		let isExternal = this._getLatestField('annotationIsExternal');
 		
 		let sql = "REPLACE INTO itemAnnotations "
-			+ "(itemID, parentItemID, type, authorName, text, comment, color, pageLabel, sortIndex, position, isExternal) "
-			+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+			+ "(itemID, parentItemID, type, authorName, text, textNormalized, comment, commentNormalized, color, pageLabel, sortIndex, position, isExternal) "
+			+ "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 		await Zotero.DB.queryAsync(
 			sql,
 			[
@@ -2047,7 +2283,9 @@ Zotero.Item.prototype._saveData = async function (env) {
 				typeID,
 				authorName || null,
 				text || null,
+				Zotero.Utilities.Internal.normalizeForSearchStorage(text),
 				comment || null,
+				Zotero.Utilities.Internal.normalizeForSearchStorage(comment),
 				color || Zotero.Annotations.DEFAULT_COLOR,
 				pageLabel || null,
 				sortIndex,
@@ -2637,6 +2875,22 @@ Zotero.Item.prototype.getFile = function () {
 }
 
 
+/**
+ * Check whether a stored file's filename contains a directory path -- a forward slash (never
+ * valid in a filename) or a Windows absolute path (drive-letter or UNC prefix). Bare
+ * backslashes are technically valid on Linux/macOS and present in existing filenames (e.g.,
+ * LaTeX in titles), so they're allowed here.
+ *
+ * @param {String} filename
+ * @return {Boolean}
+ */
+function filenameContainsPath(filename) {
+	return filename.includes('/')
+		|| /^[a-zA-Z]:[\\/]/.test(filename)
+		|| filename.startsWith('\\\\');
+}
+
+
 /**
  * Get the absolute file path for the attachment
  *
@@ -2676,6 +2930,13 @@ Zotero.Item.prototype.getFilePath = function () {
 		// Strip "storage:"
 		path = path.substr(8);
 		
+		// A stored file's path is just a filename, so a directory path means it's invalid
+		if (filenameContainsPath(path)) {
+			Zotero.logError("Invalid stored-file attachment filename '" + path + "'");
+			this._updateAttachmentStates(false);
+			return false;
+		}
+		
 		// Ignore .zotero* files that were relinked before we started blocking them
 		if (path.startsWith(".zotero")) {
 			Zotero.debug("Ignoring attachment file " + path, 2);
@@ -2770,6 +3031,13 @@ Zotero.Item.prototype.getFilePathAsync = async function () {
 		// Strip "storage:"
 		path = path.substr(8);
 		
+		// A stored file's path is just a filename, so a directory path means it's invalid
+		if (filenameContainsPath(path)) {
+			Zotero.logError("Invalid stored-file attachment filename '" + path + "'");
+			this._updateAttachmentStates(false);
+			return false;
+		}
+		
 		// Ignore .zotero* files that were relinked before we started blocking them
 		if (path.startsWith(".zotero")) {
 			Zotero.debug("Ignoring attachment file " + path, 2);
@@ -3346,6 +3614,13 @@ Zotero.defineProperty(Zotero.Item.prototype, 'attachmentFilename', {
 		if (prefixedPath) {
 			return prefixedPath[1].split('/').pop();
 		}
+		// Some ancient libraries have relative paths ('../.../foo.pdf') with no 'storage:' prefix,
+		// which fall through to PathUtils.filename() and throw NS_ERROR_FILE_UNRECOGNIZED_PATH, so
+		// resolve stored-file leaves as strings regardless of prefix. PathUtils.filename() below is
+		// for linked files, whose paths are genuine absolute paths.
+		if (this.isStoredFileAttachment()) {
+			return path.split(/[/\\]/).pop();
+		}
 		return PathUtils.filename(path);
 	},
 	set: function (val) {
@@ -3426,6 +3701,10 @@ Zotero.defineProperty(Zotero.Item.prototype, 'attachmentPath', {
 				}
 				val = 'storage:' + PathUtils.filename(val);
 			}
+			// getValidFileName() should be used elsewhere to strip backslashes
+			if (filenameContainsPath(val.substr(8))) {
+				throw new Error(`Stored-file filename cannot contain a directory path -- got '${val}'`);
+			}
 		}
 		
 		if (val == this.attachmentPath) {
@@ -3903,7 +4182,7 @@ Zotero.defineProperty(Zotero.Item.prototype, 'attachmentText', {
 			let cacheFile = Zotero.Fulltext.getItemCacheFile(this);
 			if (!cacheFile.exists() || !(await Zotero.FullText.isFullyIndexed(this))) {
 				// Use processor cache file if it exists
-				let processorCacheFile = Zotero.FullText.getItemProcessorCacheFile(this).path;
+				let processorCacheFile = Zotero.FullText.getSyncedContentCacheFile(this).path;
 				if (await OS.File.exists(processorCacheFile)) {
 					let json = await Zotero.File.getContentsAsync(processorCacheFile);
 					let data = JSON.parse(json);
@@ -5349,6 +5628,10 @@ Zotero.Item.prototype._eraseData = async function (env) {
 		await Zotero.Fulltext.clearItemWords(this.id);
 		//Zotero.Fulltext.clearItemContent(this.id);
 	}
+	// Clear the note content index (notes and attachments can both have itemNotes rows)
+	if (this.isNote() || this.isAttachment()) {
+		await Zotero.FullText.clearNoteIndex(this.id);
+	}
 	
 	await Zotero.DB.queryAsync('DELETE FROM items WHERE itemID=?', this.id);
 	
@@ -5869,12 +6152,6 @@ Zotero.Item.prototype.toJSON = function (options = {}) {
 
 
 Zotero.Item.prototype.toResponseJSON = function (options = {}) {
-	// Default to showing synced storage properties, since that's what the API does, and this function
-	// is generally used to emulate the API
-	if (options.syncedStorageProperties === undefined) {
-		options.syncedStorageProperties = true;
-	}
-	
 	var json = this.constructor._super.prototype.toResponseJSON.call(this, options);
 	
 	// creatorSummary
@@ -5905,6 +6182,15 @@ Zotero.Item.prototype.toResponseJSON = function (options = {}) {
 		};
 	}
 	
+	// When the caller wants the current storage properties from the file on disk
+	// (syncedStorageProperties: false), they're only available asynchronously, so add null
+	// placeholders here to keep their place in the JSON and let toResponseJSONAsync() fill
+	// them in
+	if (this.isStoredFileAttachment() && !options.skipStorageProperties && !options.syncedStorageProperties) {
+		json.data.mtime = null;
+		json.data.md5 = null;
+	}
+	
 	return json;
 };
 
@@ -5941,6 +6227,12 @@ Zotero.Item.prototype.toResponseJSONAsync = async function (options = {}) {
 	else if (this.isImportedAttachment()) {
 		json.links.enclosure.length = await getFileSize(this);
 	}
+	
+	if (this.isStoredFileAttachment() && !options.skipStorageProperties) {
+		json.data.mtime = await this.attachmentModificationTime ?? null;
+		json.data.md5 = await this.attachmentHash ?? null;
+	}
+	
 	return json;
 };
 
@@ -5975,6 +6267,7 @@ Zotero.Item.prototype.migrateExtraFields = function () {
 	};
 	
 	try {
+		// Keep in sync with the pre-migration check in Zotero.Schema.migrateExtraFields()
 		var { itemType, fields, creators, extra } = Zotero.Utilities.Internal.extractExtraFields(
 			originalExtra,
 			this,
diff --git a/chrome/content/zotero/xpcom/data/itemFields.js b/chrome/content/zotero/xpcom/data/itemFields.js
index d1951793af..a9e16e1675 100644
--- a/chrome/content/zotero/xpcom/data/itemFields.js
+++ b/chrome/content/zotero/xpcom/data/itemFields.js
@@ -190,11 +190,16 @@ Zotero.ItemFields = new function () {
 	this.isDate = function (field) {
 		var fieldID = this.getID(field);
 		var fieldName = this.getName(field);
-		if (Zotero.ItemFields.isFieldOfBase(fieldID, 'date')) {
-			return true;
-		}
 		if (Zotero.Schema.globalSchemaMeta.fields[fieldName]) {
-			return Zotero.Schema.globalSchemaMeta.fields[fieldName].type == 'date'
+			return Zotero.Schema.globalSchemaMeta.fields[fieldName].type == 'date';
+		}
+		// A type-specific field has the type of the base field it maps to
+		for (let baseFieldID in _typeFieldIDsByBase) {
+			if (_typeFieldIDsByBase[baseFieldID].includes(fieldID)) {
+				let baseName = this.getName(parseInt(baseFieldID));
+				let baseMeta = Zotero.Schema.globalSchemaMeta.fields[baseName];
+				return !!baseMeta && baseMeta.type == 'date';
+			}
 		}
 		return false;
 	};
diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js
index 0f869f7bbc..dd35b89a53 100644
--- a/chrome/content/zotero/xpcom/data/items.js
+++ b/chrome/content/zotero/xpcom/data/items.js
@@ -48,6 +48,7 @@ Zotero.Items = function () {
 				libraryID: "O.libraryID",
 				key: "O.key",
 				version: "O.version",
+				clientVersion: "O.clientVersion",
 				synced: "O.synced",
 				
 				createdByUserID: "createdByUserID",
@@ -142,43 +143,50 @@ Zotero.Items = function () {
 	this._lastReadCutoffs = new Map(); // libraryID -> cutoff timestamp
 	
 	/**
-	 * Get items with recently read attachments in a library.
+	 * Get the Recently Read cutoff timestamp for a library.
 	 *
-	 * "Recently read" means read within two weeks of the most recently read
-	 * attachment in the library (cutoff fixed within each session).
+	 * Recently Read matches items read within two weeks of the most recently
+	 * read attachment in the library. The cutoff is frozen for subsequent
+	 * calls, so reading something new doesn't cause old items to vanish within a
+	 * session.
 	 *
 	 * @param {Integer} libraryID
-	 * @return {Promise<Integer[]>} Item IDs (parent items, or standalone attachments)
+	 * @return {Promise<Integer>} Cutoff timestamp in seconds (0 if nothing read)
 	 */
-	this.getLastRead = async function (libraryID) {
+	this._getLastReadCutoff = async function (libraryID) {
 		let twoWeeksInSeconds = 14 * 24 * 60 * 60;
 
-		// Freeze the cutoff on first load so that reading something new
-		// doesn't cause old items to vanish mid-session
-		let cutoff;
 		if (this._lastReadCutoffs.has(libraryID)) {
-			cutoff = this._lastReadCutoffs.get(libraryID);
-		}
-		else {
-			let maxSQL = "SELECT MAX(IA.lastRead) FROM itemAttachments IA "
-				+ "JOIN items I ON (I.itemID = IA.itemID) "
-				+ "WHERE I.libraryID = ? "
-				+ "AND IA.lastRead IS NOT NULL "
-				+ "AND IA.itemID NOT IN (SELECT itemID FROM deletedItems) "
-				+ "AND COALESCE(IA.parentItemID, IA.itemID) NOT IN (SELECT itemID FROM deletedItems)";
-			let maxLastRead = await Zotero.DB.valueQueryAsync(maxSQL, [libraryID]);
-			if (maxLastRead) {
-				cutoff = maxLastRead - twoWeeksInSeconds;
-				this._lastReadCutoffs.set(libraryID, cutoff);
-			}
-			else {
-				// No items with lastRead.
-				// Don't persist this - we want to calculate a new cutoff if items come in later.
-				cutoff = 0;
-			}
+			return this._lastReadCutoffs.get(libraryID);
 		}
 
-		let sql = "SELECT DISTINCT COALESCE(IA.parentItemID, IA.itemID) "
+		let maxSQL = "SELECT MAX(IA.lastRead) FROM itemAttachments IA "
+			+ "JOIN items I ON (I.itemID = IA.itemID) "
+			+ "WHERE I.libraryID = ? "
+			+ "AND IA.lastRead IS NOT NULL "
+			+ "AND IA.itemID NOT IN (SELECT itemID FROM deletedItems) "
+			+ "AND COALESCE(IA.parentItemID, IA.itemID) NOT IN (SELECT itemID FROM deletedItems)";
+		let maxLastRead = await Zotero.DB.valueQueryAsync(maxSQL, [libraryID]);
+		if (maxLastRead) {
+			let cutoff = maxLastRead - twoWeeksInSeconds;
+			this._lastReadCutoffs.set(libraryID, cutoff);
+			return cutoff;
+		}
+		// No items with lastRead.
+		// Don't persist this - we want to calculate a new cutoff if items come in later.
+		return 0;
+	};
+
+	/**
+	 * Run the Recently Read query for a library, selecting the given column.
+	 *
+	 * @param {Integer} libraryID
+	 * @param {String} selectExpr Column expression to select (e.g., "IA.itemID")
+	 * @return {Promise<Integer[]>}
+	 */
+	this._queryLastRead = async function (libraryID, selectExpr) {
+		let cutoff = await this._getLastReadCutoff(libraryID);
+		let sql = "SELECT DISTINCT " + selectExpr + " "
 			+ "FROM itemAttachments IA "
 			+ "JOIN items I ON (I.itemID = COALESCE(IA.parentItemID, IA.itemID)) "
 			+ "WHERE IA.lastRead >= ? "
@@ -188,6 +196,60 @@ Zotero.Items = function () {
 		return Zotero.DB.columnQueryAsync(sql, [cutoff, libraryID]);
 	};
 
+	/**
+	 * Get top-level Recently Read matches in a library.
+	 *
+	 * @param {Integer} libraryID
+	 * @return {Promise<Integer[]>} Item IDs (parent items and standalone attachments)
+	 */
+	this.getLastRead = async function (libraryID) {
+		return this._queryLastRead(libraryID, "COALESCE(IA.parentItemID, IA.itemID)");
+	};
+
+	/**
+	 * Get the IDs of the attachment items that were recently read in a library.
+	 *
+	 * These are the actual items that were read, as opposed to getLastRead(),
+	 * which returns top-level items (parent items of child attachments).
+	 *
+	 * @param {Integer} libraryID
+	 * @return {Promise<Integer[]>} Attachment item IDs
+	 */
+	this.getLastReadAttachmentIDs = async function (libraryID) {
+		return this._queryLastRead(libraryID, "IA.itemID");
+	};
+
+
+	/**
+	 * Clear lastRead from all attachments in a library.
+	 *
+	 * @param {Integer} libraryID
+	 */
+	this.clearAllLastRead = async function (libraryID) {
+		let sql = "SELECT itemID FROM itemAttachments WHERE lastRead IS NOT NULL "
+			+ "AND itemID IN (SELECT itemID FROM items WHERE libraryID = ?)";
+		let ids = await Zotero.DB.columnQueryAsync(sql, [libraryID]);
+		if (!ids.length) {
+			return;
+		}
+
+		let items = await this.getAsync(ids);
+		await Zotero.Utilities.Internal.forEachChunkAsync(
+			items,
+			100,
+			async (chunk) => {
+				await Zotero.DB.executeTransaction(async () => {
+					for (let item of chunk) {
+						item.attachmentLastRead = null;
+						await item.save({ skipDateModifiedUpdate: true, skipEditCheck: true });
+					}
+				});
+			}
+		);
+
+		this._lastReadCutoffs.delete(libraryID);
+	};
+
 
 	//
 	// Bulk data loading functions
@@ -982,10 +1044,11 @@ Zotero.Items = function () {
 
 	this.trash = async function (ids) {
 		Zotero.DB.requireTransaction();
-		
+
 		var libraryIDs = new Set();
 		ids = Zotero.flattenArguments(ids);
 		var items = [];
+		var undoableCount = 0;
 		for (let id of ids) {
 			let item = this.get(id);
 			if (!item) {
@@ -993,18 +1056,35 @@ Zotero.Items = function () {
 				Zotero.Notifier.queue('trash', 'item', id);
 				continue;
 			}
-			
+
 			if (!item.isEditable()) {
 				throw new Error(item._ObjectType + " " + item.libraryKey + " is not editable");
 			}
-			
+
 			if (!Zotero.Libraries.get(item.libraryID).hasTrash) {
 				throw new Error(Zotero.Libraries.getName(item.libraryID) + " does not have a trash");
 			}
-			
+
+			// Record undo data before modifying state
+			if (Zotero.UndoHistory && !item.deleted) {
+				Zotero.UndoHistory.stageChange({
+					objectType: 'item',
+					id: item.id,
+					libraryID: item.libraryID,
+					key: item.key,
+					fields: {
+						deleted: { old: false, new: true }
+					}
+				});
+				undoableCount++;
+			}
+
 			items.push(item);
 			libraryIDs.add(item.libraryID);
 		}
+		if (Zotero.UndoHistory && undoableCount) {
+			Zotero.UndoHistory.stageAction('undo-action-trash', { count: undoableCount });
+		}
 		
 		var parentItemIDs = new Set();
 		items.forEach(item => {
diff --git a/chrome/content/zotero/xpcom/data/library.js b/chrome/content/zotero/xpcom/data/library.js
index 225a8c3264..2d4dd2af7b 100644
--- a/chrome/content/zotero/xpcom/data/library.js
+++ b/chrome/content/zotero/xpcom/data/library.js
@@ -39,6 +39,7 @@ Zotero.Library = function (params = {}) {
 	this._storageDownloadNeeded = false;
 	
 	this._lastReadItemInSession = null;
+	this._lastClientVersionIncrementTransactionID = null;
 	
 	Zotero.Utilities.Internal.assignProps(
 		this,
@@ -48,6 +49,7 @@ Zotero.Library = function (params = {}) {
 			'editable',
 			'filesEditable',
 			'libraryVersion',
+			'clientVersion',
 			'storageVersion',
 			'lastSync',
 			'archived'
@@ -71,7 +73,7 @@ Zotero.Library = function (params = {}) {
 // DB columns
 Zotero.defineProperty(Zotero.Library, '_dbColumns', {
 	value: Object.freeze([
-		'type', 'editable', 'filesEditable', 'version', 'storageVersion', 'lastSync', 'archived', 'isAdmin'
+		'type', 'editable', 'filesEditable', 'version', 'clientVersion', 'storageVersion', 'lastSync', 'archived', 'isAdmin'
 	])
 });
 
@@ -209,7 +211,7 @@ Zotero.defineProperty(Zotero.Library.prototype, 'allowsLinkedFiles', {
 
 // Create other accessors
 (function () {
-	let accessors = ['editable', 'filesEditable', 'storageVersion', 'archived', 'isAdmin'];
+	let accessors = ['editable', 'filesEditable', 'clientVersion', 'storageVersion', 'archived', 'isAdmin'];
 	for (let i=0; i<accessors.length; i++) {
 		let prop = Zotero.Library._colToProp(accessors[i]);
 		Zotero.defineProperty(Zotero.Library.prototype, accessors[i], {
@@ -299,6 +301,20 @@ Zotero.Library.prototype._set = function (prop, val) {
 			
 			break;
 		
+		case '_libraryClientVersion':
+			var newVal = Number.parseInt(val, 10);
+			if (newVal != val) {
+				throw new Error(`${prop} must be an integer (${typeof val} '${val}' given)`);
+			}
+			val = newVal;
+			
+			if (val < 0) throw new Error(prop + ' must not be less than 0');
+			
+			// Ensure that it is never decreasing
+			if (val < this._libraryClientVersion) throw new Error(prop + ' cannot decrease');
+			
+			break;
+		
 		case '_libraryStorageVersion':
 			var newVal = parseInt(val);
 			if (newVal != val) {
@@ -360,6 +376,7 @@ Zotero.Library.prototype._loadDataFromRow = function (row) {
 	this._libraryEditable = !!row._libraryEditable;
 	this._libraryFilesEditable = !!row._libraryFilesEditable;
 	this._libraryVersion = row._libraryVersion;
+	this._libraryClientVersion = row._libraryClientVersion;
 	this._libraryStorageVersion = row._libraryStorageVersion;
 	this._libraryLastSync =  row._libraryLastSync !== 0 ? new Date(row._libraryLastSync * 1000) : false;
 	this._libraryArchived = !!row._libraryArchived;
@@ -683,6 +700,13 @@ Zotero.Library.prototype._eraseData = async function (env) {
 	await Zotero.DB.queryAsync("DELETE FROM libraries WHERE libraryID=?", this.libraryID);
 	// TODO: Emit event so this doesn't have to be here
 	await Zotero.Fulltext.clearLibraryVersion(this.libraryID);
+
+	// Discard undo/redo history that references this library
+	if (Zotero.UndoHistory) {
+		Zotero.DB.addCurrentCallback('commit', function () {
+			Zotero.UndoHistory.clearForLibrary(this.libraryID);
+		}.bind(this));
+	}
 };
 
 Zotero.Library.prototype._finalizeErase = async function (env) {
@@ -747,11 +771,12 @@ Zotero.Library.prototype.hasItems = async function () {
 	if (!this.id) {
 		throw new Error("Library is not saved yet");
 	}
-	let sql = 'SELECT COUNT(*)>0 FROM items WHERE libraryID=?';
+	let sql = 'SELECT 1 FROM items WHERE libraryID=?';
 	// Don't count old <=4.0 Quick Start Guide items
 	if (this.libraryID == Zotero.Libraries.userLibraryID) {
-		sql += "AND key NOT IN ('ABCD2345', 'ABCD3456')";
+		sql += " AND key NOT IN ('ABCD2345', 'ABCD3456')";
 	}
+	sql += " LIMIT 1";
 	return !!((await Zotero.DB.valueQueryAsync(sql, this.libraryID)));
 };
 
@@ -761,3 +786,18 @@ Zotero.Library.prototype.hasItem = function (item) {
 	}
 	return item.libraryID == this.libraryID;
 }
+
+Zotero.Library.prototype.incrementClientVersion = async function () {
+	let transactionID = Zotero.DB.requireTransaction();
+	if (transactionID === this._lastClientVersionIncrementTransactionID) {
+		return this._libraryClientVersion;
+	}
+
+	let clientVersion = await Zotero.DB.valueQueryAsync(
+		"UPDATE libraries SET clientVersion = clientVersion + 1 WHERE libraryID=? RETURNING clientVersion",
+		[this.libraryID]
+	);
+	this._libraryClientVersion = clientVersion;
+	this._lastClientVersionIncrementTransactionID = transactionID;
+	return clientVersion;
+};
diff --git a/chrome/content/zotero/xpcom/data/notes.js b/chrome/content/zotero/xpcom/data/notes.js
index 409fa4cf64..092e582479 100644
--- a/chrome/content/zotero/xpcom/data/notes.js
+++ b/chrome/content/zotero/xpcom/data/notes.js
@@ -117,12 +117,9 @@ Zotero.Notes = new function () {
 		
 			if (itemID) {
 				// Create a name for this window so we can focus it later
-				//
-				// Collection is only used on new notes, so we don't need to
-				// include it in the name
 				name = 'zotero-note-' + itemID;
 			}
-			
+
 			let io = { itemID, parentItemKey, location, _initPromise: Zotero.Promise.defer() };
 			Services.ww.openWindow(
 				win,
diff --git a/chrome/content/zotero/xpcom/data/search.js b/chrome/content/zotero/xpcom/data/search.js
index d66ee0d3d9..806d592821 100644
--- a/chrome/content/zotero/xpcom/data/search.js
+++ b/chrome/content/zotero/xpcom/data/search.js
@@ -86,6 +86,10 @@ Zotero.defineProperty(Zotero.Search.prototype, 'version', {
 	get: function () { return this._get('version'); },
 	set: function (val) { return this._set('version', val); }
 });
+Zotero.defineProperty(Zotero.Search.prototype, 'clientVersion', {
+	get: function() { return this._get('clientVersion'); },
+	set: function(val) { return this._set('clientVersion', val); }
+});
 Zotero.defineProperty(Zotero.Search.prototype, 'synced', {
 	get: function () { return this._get('synced'); },
 	set: function (val) { return this._set('synced', val); }
@@ -139,6 +143,7 @@ Zotero.Search.prototype.loadFromRow = function (row) {
 		
 		// Integer or 0
 		case 'version':
+		case 'clientVersion':
 			val = val ? parseInt(val) : 0;
 			break;
 		
@@ -206,8 +211,8 @@ Zotero.Search.prototype._saveData = async function (env) {
 		
 		var i = 0;
 		var sql = "INSERT INTO savedSearchConditions "
-			+ "(savedSearchID, searchConditionID, condition, operator, value, required) "
-			+ "VALUES (?,?,?,?,?,?)";
+			+ "(savedSearchID, searchConditionID, condition, operator, value) "
+			+ "VALUES (?,?,?,?,?)";
 		for (let id in this._conditions) {
 			let condition = this._conditions[id];
 			
@@ -221,8 +226,7 @@ Zotero.Search.prototype._saveData = async function (env) {
 				i,
 				conditionString,
 				condition.operator ? condition.operator : null,
-				condition.value ? condition.value : null,
-				condition.required ? 1 : null
+				condition.value ? condition.value : null
 			];
 			await Zotero.DB.queryAsync(sql, sqlParams);
 			i++;
@@ -297,6 +301,10 @@ Zotero.Search.prototype._finalizeErase = async function (env) {
 Zotero.Search.prototype.addCondition = function (condition, operator, value, required) {
 	this._requireData('conditions');
 	
+	if (required) {
+		throw new Error("The 'required' parameter is no longer supported; use a condition group");
+	}
+
 	if (!Zotero.SearchConditions.hasOperator(condition, operator)){
 		let e = new Error("Invalid operator '" + operator + "' for condition " + condition);
 		e.name = "ZoteroInvalidDataError";
@@ -306,14 +314,16 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
 	// Shortcut to add a condition on every table -- does not return an id
 	if (condition.match(/^quicksearch/)) {
 		var parts = Zotero.SearchConditions.parseSearchString(value);
-		
+
 		for (let part of parts) {
 			if (condition == 'quicksearch-titleCreatorYearNote') {
 				this.addCondition('note', operator, part.text, false);
 				continue;
 			}
-			
-			this.addCondition('blockStart');
+
+			// Each word is an OR-group over the fields below
+			this.addCondition('groupStart', 'true', '');
+			this.addCondition('joinMode', 'any');
 
 			// Allow searching for exact object key
 			if (operator == 'contains' && Zotero.Utilities.isValidObjectKey(part.text)) {
@@ -331,25 +341,29 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
 			else {
 				this.addCondition('field', operator, part.text, false);
 				this.addCondition('tag', operator, part.text, false);
-				this.addCondition('note', operator, part.text, false);
+				// Match note content as a substring via the note index. Like
+				// full-text content below, skip unquoted terms too short for the
+				// index.
+				if (part.inQuotes || Zotero.FullText.canSearchNotes(part.text)) {
+					this.addCondition('note', operator, part.text, false);
+				}
 				this.addCondition('annotationText', operator, part.text, false);
 				this.addCondition('annotationComment', operator, part.text, false);
 			}
 			this.addCondition('creator', operator, part.text, false);
-			
-			if (condition == 'quicksearch-everything') {
-				if (part.inQuotes) {
-					this.addCondition('fulltextContent', operator, part.text, false);
-				}
-				else {
-					var splits = Zotero.Fulltext.semanticSplitter(part.text);
-					for (let split of splits) {
-						this.addCondition('fulltextWord', operator, split, false);
-					}
-				}
+
+			// Match full-text content by word prefix (case- and diacritic-insensitive)
+			// via the content index. Skip unquoted 1-2-character terms, which would
+			// prefix-match a huge share of the index on every keystroke; they're still
+			// matched against titles, tags, etc. above. Quoted terms are matched
+			// regardless of length: quoting makes the quick search wait for Enter
+			// rather than run on each keystroke.
+			if (condition == 'quicksearch-everything'
+					&& (part.inQuotes || Zotero.FullText.canSearchContent(part.text))) {
+				this.addCondition('fulltextContent', operator, part.text, false);
 			}
-			
-			this.addCondition('blockEnd');
+
+			this.addCondition('groupEnd', 'true', '');
 		}
 		
 		if (condition == 'quicksearch-titleCreatorYear') {
@@ -405,6 +419,11 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
 	let mode;
 	[condition, mode] = Zotero.SearchConditions.parseCondition(condition);
 	
+	// isEmpty/isNotEmpty take no value
+	if (operator == 'isEmpty' || operator == 'isNotEmpty') {
+		value = '';
+	}
+	
 	if (typeof value == 'string') value = value.normalize();
 	
 	this._conditions[searchConditionID] = {
@@ -412,8 +431,7 @@ Zotero.Search.prototype.addCondition = function (condition, operator, value, req
 		condition: condition,
 		mode: mode,
 		operator: operator,
-		value: value,
-		required: !!required
+		value: value
 	};
 	
 	this._sql = null;
@@ -439,12 +457,15 @@ Zotero.Search.prototype.setScope = function (searchObj, includeChildren) {
  * @param {String} condition
  * @param {String} operator
  * @param {String} value
- * @param {Boolean} [required]
  * @return {Promise}
  */
 Zotero.Search.prototype.updateCondition = function (searchConditionID, condition, operator, value, required) {
 	this._requireData('conditions');
 	
+	if (required) {
+		throw new Error("The 'required' parameter is no longer supported; use a condition group");
+	}
+	
 	if (typeof this._conditions[searchConditionID] == 'undefined'){
 		throw new Error('Invalid searchConditionID ' + searchConditionID);
 	}
@@ -464,8 +485,7 @@ Zotero.Search.prototype.updateCondition = function (searchConditionID, condition
 		condition: condition,
 		mode: mode,
 		operator: operator,
-		value: value,
-		required: !!required
+		value: value
 	};
 	
 	this._sql = null;
@@ -482,7 +502,20 @@ Zotero.Search.prototype.removeCondition = function (searchConditionID) {
 		throw new Error('Invalid searchConditionID ' + searchConditionID + ' in removeCondition()');
 	}
 	
-	delete this._conditions[searchConditionID];
+	searchConditionID = String(searchConditionID);
+	// Decrement the id of all conditions following
+	// the condition to be deleted. It ensures that
+	// all conditions remain in stict arithmetic sequence and prevents
+	// conditionIDs from colliding
+	let conditionIDs = Object.keys(this._conditions);
+	let conditionIndex = conditionIDs.indexOf(searchConditionID);
+	for (let i = conditionIndex + 1; i < conditionIDs.length; i++) {
+		let conditionID = conditionIDs[i];
+		this._conditions[conditionID - 1] = this._conditions[conditionID];
+		this._conditions[conditionID - 1].id = conditionID - 1;
+	}
+	// After all conditions are shifted, delete the last, empty one
+	delete this._conditions[this._maxSearchConditionID];
 	this._maxSearchConditionID--;
 	this._markFieldChange('conditions', this._conditions);
 	this._changed.conditions = true;
@@ -490,7 +523,7 @@ Zotero.Search.prototype.removeCondition = function (searchConditionID) {
 
 
 /*
- * Returns an array with 'condition', 'operator', 'value', 'required'
+ * Returns an array with 'condition', 'operator', 'value'
  * for the given searchConditionID
  */
 Zotero.Search.prototype.getCondition = function (searchConditionID){
@@ -513,8 +546,7 @@ Zotero.Search.prototype.getConditions = function (){
 			condition: condition.condition,
 			mode: condition.mode,
 			operator: condition.operator,
-			value: condition.value,
-			required: condition.required
+			value: condition.value
 		};
 	}
 	return conditions;
@@ -547,7 +579,9 @@ Zotero.Search.prototype.search = async function (asTempTable) {
 		this._requireData('conditions');
 	}
 	try {
-		if (!this._sql){
+		// Rebuild each run when a grouped fulltextContent is materialized into the SQL, so
+		// its matches reflect current full-text content rather than a cached set
+		if (!this._sql || this._hasEagerFullText){
 			await this._buildQuery();
 		}
 		
@@ -557,35 +591,32 @@ Zotero.Search.prototype.search = async function (asTempTable) {
 				case 'fulltextContent':
 					var fulltextContent = true;
 					break;
-				
+
 				case 'includeParentsAndChildren':
 					if (condition.operator == 'true') {
 						var includeParentsAndChildren = true;
 					}
 					break;
-				
+
 				case 'includeParents':
 					if (condition.operator == 'true') {
 						var includeParents = true;
 					}
 					break;
-				
+
 				case 'includeChildren':
 					if (condition.operator == 'true') {
 						var includeChildren = true;
 					}
 					break;
-				
-				case 'blockStart':
-					var hasQuicksearch = true;
-					break;
 			}
 		}
 		
 		// Run a subsearch to define the superset of possible results
 		if (this._scope) {
-			// If subsearch has post-search filter, run and insert ids into temp table
-			if (this._scope.hasPostSearchFilter()) {
+			// If subsearch has post-search filter or a recursive scope,
+			// run and insert ids into temp table
+			if (this._scope.hasPostSearchFilter() || this._scope._scope) {
 				var ids = await this._scope.search();
 				if (!ids) {
 					return [];
@@ -643,22 +674,25 @@ Zotero.Search.prototype.search = async function (asTempTable) {
 		//Zotero.debug(ids);
 		//Zotero.debug('Join mode: ' + this._joinMode);
 		
-		// Filter results with full-text search
+		// Filter top-level fulltextContent conditions with a full-text search (grouped
+		// ones are already in the SQL; see _buildQuery).
 		//
-		// If join mode ALL, return the (intersection of main and full-text word search)
-		// filtered by full-text content.
+		// If join mode ALL, return the intersection of the main search and full-text word
+		// search, filtered by full-text content.
 		//
-		// If join mode ANY or there's a quicksearch (which we assume fulltextContent is part of)
-		// and the main search is filtered by other conditions, return the union of the main search
-		// and (separate full-text word searches filtered by fulltext content).
+		// If join mode ANY and the main search is filtered by other conditions, return the
+		// union of the main search and (separate full-text word searches filtered by
+		// full-text content).
 		//
-		// If join mode ANY or there's a quicksearch and the main search isn't filtered, return just
-		// the union of (separate full-text word searches filtered by full-text content).
+		// If join mode ANY and the main search isn't filtered, return just the union of
+		// (separate full-text word searches filtered by full-text content).
 		var fullTextResults;
-		var joinModeAny = this._joinMode == 'any' || hasQuicksearch;
+		var joinModeAny = this._joinMode == 'any';
 		for (let condition of Object.values(this._conditions)) {
 			if (condition.condition != 'fulltextContent') continue;
-			
+			// Grouped fulltextContent is already in the SQL (materialized in _buildQuery)
+			if (this._eagerFullTextConditionIDs.has(condition.id)) continue;
+
 			if (!fullTextResults) {
 				// For join mode ANY, if we already filtered the main set, add those as results.
 				// Otherwise, start with an empty set.
@@ -667,85 +701,55 @@ Zotero.Search.prototype.search = async function (asTempTable) {
 					: [];
 			}
 			
+			// The set of items this condition decides over: in ALL mode, the remaining main-search
+			// matches; in ANY mode, items in the library not already in the results
 			let scopeIDs;
-			// Regexp mode -- don't use full-text word index
-			let numSplits;
-			if (condition.mode && condition.mode.startsWith('regexp')) {
-				// In ANY mode, include items that haven't already been found, as long as they're in
-				// the right library
-				if (joinModeAny) {
-					let tmpTable = await Zotero.Search.idsToTempTable(fullTextResults);
-					let sql = "SELECT GROUP_CONCAT(itemID) FROM items WHERE "
-						+ "itemID NOT IN (SELECT itemID FROM " + tmpTable + ")";
-					if (this.libraryID) {
-						sql += " AND libraryID=?";
-					}
-					let res = await Zotero.DB.valueQueryAsync(sql, this.libraryID, { noCache: true });
-					scopeIDs = res ? res.split(",").map(id => parseInt(id)) : [];
-					await Zotero.DB.queryAsync("DROP TABLE " + tmpTable, false, { noCache: true });
-				}
-				// In ALL mode, include remaining items from the main search
-				else {
-					scopeIDs = ids;
-				}
-			}
-			// If not regexp mode, run a new search against the full-text word index for words in
-			// this phrase
-			else {
-				//Zotero.debug('Running subsearch against full-text word index');
-				let s = new Zotero.Search();
+			if (joinModeAny) {
+				let tmpTable = await Zotero.Search.idsToTempTable(fullTextResults);
+				let sql = "SELECT GROUP_CONCAT(itemID) FROM items WHERE "
+					+ "itemID NOT IN (SELECT itemID FROM " + tmpTable + ")";
 				if (this.libraryID) {
-					s.libraryID = this.libraryID;
-				}
-				let splits = Zotero.Fulltext.semanticSplitter(condition.value);
-				for (let split of splits){
-					s.addCondition('fulltextWord', condition.operator, split);
-				}
-				// If applicable, only search for words within specified scope (e.g. collection)
-				if (this._scope) {
-					s.setScope(this._scope, true);
-				}
-				numSplits = splits.length;
-				let wordMatches = await s.search();
-				
-				//Zotero.debug("Word index matches");
-				//Zotero.debug(wordMatches);
-				
-				// In ANY mode, include hits from word index that aren't already in the results
-				if (joinModeAny) {
-					let resultsSet = new Set(fullTextResults);
-					scopeIDs = wordMatches.filter(id => !resultsSet.has(id));
-				}
-				// In ALL mode, include the intersection of hits from word index and remaining
-				// main search matches
-				else {
-					let wordIDs = new Set(wordMatches);
-					scopeIDs = ids.filter(id => wordIDs.has(id));
+					sql += " AND libraryID=?";
 				}
+				let res = await Zotero.DB.valueQueryAsync(sql, this.libraryID, { noCache: true });
+				scopeIDs = res ? res.split(",").map(id => parseInt(id)) : [];
+				await Zotero.DB.queryAsync("DROP TABLE " + tmpTable, false, { noCache: true });
 			}
-			
-			// If only one word, just use the results from the word index
-			let filteredIDs = [];
-			if (numSplits === 1) {
-				filteredIDs = scopeIDs;
+			else {
+				scopeIDs = ids;
 			}
-			// Search the full-text content
-			else if (scopeIDs.length) {
-				let found = new Set(
-					(await Zotero.Fulltext.findTextInItems(
+
+			// Find which of those items match the full-text content. Use the content index for
+			// ordinary terms, restricted to the scope up front so a multi-token term's
+			// verification scan (see findItemsWithContent) reads only in-scope candidates; fall
+			// back to scanning the cached text for regexp searches and for terms the index can't
+			// answer (findItemsWithContent returns null).
+			let contentMatches;
+			let indexMatches = (condition.mode && condition.mode.startsWith('regexp'))
+				? null
+				: await Zotero.FullText.findItemsWithContent(
+					condition.value, this.libraryID, scopeIDs
+				);
+			if (indexMatches !== null) {
+				contentMatches = new Set(indexMatches);
+			}
+			else {
+				contentMatches = new Set(
+					(await Zotero.FullText.findTextInItems(
 						scopeIDs,
 						condition.value,
 						condition.mode
 					)).map(x => x.id)
 				);
-				// Either include or exclude the results, depending on the operator
-				filteredIDs = scopeIDs.filter((id) => {
-					return found.has(id)
-						? condition.operator == 'contains'
-						: condition.operator == 'doesNotContain';
-				});
 			}
-			
+
+			// Either include or exclude the matches, depending on the operator
+			let filteredIDs = scopeIDs.filter((id) => {
+				return contentMatches.has(id)
+					? condition.operator == 'contains'
+					: condition.operator == 'doesNotContain';
+			});
+
 			//Zotero.debug("Filtered IDs:")
 			//Zotero.debug(filteredIDs);
 			
@@ -864,16 +868,22 @@ Zotero.Search.prototype.fromJSON = function (json, options = {}) {
 		this.name = json.name;
 	}
 	
-	Object.keys(this.getConditions()).forEach(id => this.removeCondition(id));
+	// Remove all conditions
+	while (Object.keys(this._conditions).length) {
+		this.removeCondition(Object.keys(this._conditions)[0]);
+	}
 	for (let i = 0; i < json.conditions.length; i++) {
 		let condition = json.conditions[i];
-		this.addCondition(
-			condition.condition,
-			condition.operator,
-			condition.value
-		);
+		// The obsolete `childNote` condition is replaced by `note` (see _loadConditions)
+		let name = condition.condition == 'childNote' ? 'note' : condition.condition;
+		this.addCondition(name, condition.operator, condition.value);
 	}
-	
+	// `childNote` returned the parent of a matching child note, so seed an item result level to
+	// roll the migrated `note` up to it (see _loadConditions)
+	if (json.conditions.some(c => c.condition == 'childNote')) {
+		this.addCondition('resultLevel', 'item');
+	}
+
 	if (json.deleted || this.deleted) {
 		this.deleted = !!json.deleted;
 	}
@@ -953,38 +963,115 @@ Zotero.Search.idsToTempTable = async function (ids, { idColumn = 'itemID' } = {}
 };
 
 
+/**
+ * Resolve the itemIDs in this search's library/scope whose full-text content matches `value`
+ * (per `mode`). Used to materialize a fulltextContent condition that sits inside a group, so it
+ * can take part in the SQL AND/OR tree (see _buildQuery). Always returns the *matching* set; the
+ * caller applies IN/NOT IN for the contains/doesNotContain operator.
+ */
+Zotero.Search.prototype._fullTextContentMatches = async function (value, mode) {
+	// The search scope's itemIDs (e.g., a collection), resolved before matching so both the
+	// index path (including a multi-token term's verification scan) and the fallback scan are
+	// restricted to in-scope items
+	let scopeIDs = null;
+	if (this._scope) {
+		let s = new Zotero.Search();
+		if (this.libraryID !== null) {
+			s.libraryID = this.libraryID;
+		}
+		s.setScope(this._scope, true);
+		scopeIDs = await s.search();
+		if (!scopeIDs.length) {
+			return [];
+		}
+	}
+	// For ordinary terms, match via the content index
+	if (!mode || !mode.startsWith('regexp')) {
+		let indexMatches = await Zotero.FullText.findItemsWithContent(
+			value, this.libraryID, scopeIDs
+		);
+		if (indexMatches !== null) {
+			return indexMatches;
+		}
+	}
+	// Regexp, or a term the index can't answer -- scan the cached text of every item in the
+	// library/scope
+	if (!scopeIDs) {
+		let s = new Zotero.Search();
+		if (this.libraryID !== null) {
+			s.libraryID = this.libraryID;
+		}
+		scopeIDs = await s.search();
+		if (!scopeIDs.length) {
+			return [];
+		}
+	}
+	let found = await Zotero.FullText.findTextInItems(scopeIDs, value, mode);
+	return found.map(x => x.id);
+};
+
+
 /*
  * Build the SQL query for the search
  */
 Zotero.Search.prototype._buildQuery = async function () {
 	this._requireData('conditions');
-	
+
+	// fulltextContent conditions nested inside a group are materialized into the SQL tree
+	// below (a plain itemID IN/NOT IN predicate) so they combine like any other condition.
+	// Track them so search()'s post-filter skips them, and so the query is rebuilt each run
+	// (full-text then reflects current content, as the post-filter does for top-level ones).
+	this._eagerFullTextConditionIDs = new Set();
+	this._hasEagerFullText = false;
+
 	var sql = 'SELECT itemID FROM items';
 	
 	var sqlParams = [];
-	// Separate ANY conditions for 'required' condition support
-	var anySQL = '';
-	var anySQLParams = [];
-	
+
 	var conditions = [];
-	
+
 	let lastCondition;
+	// Group nesting depth as the conditions are processed, so a fulltextContent inside a
+	// group can be told apart from a top-level one
+	let loopDepth = 0;
 	let conditionsToProcess = Object.values(this._conditions);
-	
-	// Process joinMode first, since other conditions may depend on it
+
+	// The search's top-level join mode, used by the full-text result merging in
+	// search(). Per-group join modes (including nested groups) are resolved from the
+	// 'joinMode' markers when the condition tree is assembled below, so the joinMode
+	// conditions are left in the stream rather than spliced out here. Only the
+	// top-level joinMode counts here, so skip any nested inside a group.
 	this._joinMode = 'all';
-	var joinModeIndex = conditionsToProcess.findIndex(cond => cond.condition == "joinMode");
-	if (joinModeIndex > -1) {
-		this._joinMode = conditionsToProcess.splice(joinModeIndex, 1)[0].operator;
+	// The result level the whole search returns. A top-level 'resultLevel' condition sets it;
+	// the default 'any' keeps the existing mixed-level behavior (no mapping, no
+	// level constraint on the result set).
+	let resultLevel = 'any';
+	let groupDepth = 0;
+	let foundJoinMode = false;
+	for (let cond of conditionsToProcess) {
+		if (cond.condition == 'groupStart') {
+			groupDepth++;
+		}
+		else if (cond.condition == 'groupEnd') {
+			groupDepth--;
+		}
+		else if (groupDepth == 0 && cond.condition == 'joinMode' && !foundJoinMode) {
+			this._joinMode = cond.operator;
+			foundJoinMode = true;
+		}
+		else if (groupDepth == 0 && cond.condition == 'resultLevel') {
+			resultLevel = cond.operator;
+		}
 	}
 	
-	for (let condition of conditionsToProcess) {
+	// Index-based so anyField can splice its expansion in place (see below)
+	for (let conditionIndex = 0; conditionIndex < conditionsToProcess.length; conditionIndex++) {
+		let condition = conditionsToProcess[conditionIndex];
 		let name = condition.condition;
 		let conditionData = Zotero.SearchConditions.get(name);
 		
-		// Has a table (or 'savedSearch', which doesn't have a table but isn't special)
-		// TEMP: Or 'tag', which needs to match annotation parents
-		if (conditionData.table || name == 'savedSearch' || name == 'tempTable' || name == 'tag') {
+		// Has a table (or 'savedSearch'/'tempTable', which don't have a table but aren't special)
+		if (conditionData.table || name == 'savedSearch' || name == 'tempTable') {
 			// For conditions with an inline filter using 'is'/'isNot', combine with last condition
 			// if the same
 			if (lastCondition
@@ -1005,11 +1092,13 @@ Zotero.Search.prototype._buildQuery = async function () {
 				alias: conditionData.name != name ? name : false,
 				table: conditionData.table,
 				field: conditionData.field,
+				normalizedField: conditionData.normalizedField,
 				operator: condition.operator,
 				value: condition.value,
 				flags: conditionData.flags,
-				required: condition.required,
-				inlineFilter: conditionData.inlineFilter
+				inlineFilter: conditionData.inlineFilter,
+				// Item level(s) this condition matches at, for cross-level mapping
+				level: Zotero.Search._conditionLevel(name, conditionData)
 			};
 			conditions.push(lastCondition);
 			
@@ -1065,56 +1154,115 @@ Zotero.Search.prototype._buildQuery = async function () {
 					continue;
 				
 				case 'fulltextContent':
-					// Handled in Search.search()
-					continue;
-				
-				// For quicksearch block markers
-				case 'blockStart':
-					conditions.push({name:'blockStart'});
-					continue;
-				case 'blockEnd':
-					conditions.push({name:'blockEnd'});
-					continue;
-				
-				case 'anyField':
-					// We expand this condition to the same underlying set of conditions as 'quicksearch-fields'
-					// (although we don't detect keys or split into quoted and unquoted segments). 'quicksearch-fields'
-					// is expanded in addCondition(), but we can't do that with this condition because we don't want
-					// to save the conditions it expands to in the search object
-					if (this._joinMode == 'all') {
-						// If joinMode is 'any', do not wrap conditions in quickSearch block so that
-						// they become just a series of OR statements. Otherwise, "Any Field" will
-						// conflict with all other conditions (if multiple conditions are present).
-						conditionsToProcess.push({ condition: 'blockStart' });
-					}
-					conditionsToProcess.push({
-						condition: 'field',
-						operator: condition.operator,
-						value: condition.value,
-						required: false
-					});
-					conditionsToProcess.push({
-						condition: 'tag',
-						operator: condition.operator,
-						value: condition.value,
-						required: false
-					});
-					conditionsToProcess.push({
-						condition: 'note',
-						operator: condition.operator,
-						value: condition.value,
-						required: false
-					});
-					conditionsToProcess.push({
-						condition: 'creator',
-						operator: condition.operator,
-						value: condition.value,
-						required: false
-					});
-					if (this._joinMode == 'all') {
-						conditionsToProcess.push({ condition: 'blockEnd' });
+					// A fulltextContent inside a group -- or at the top level when a result
+					// level is set -- becomes an itemID predicate so it joins the SQL AND/OR
+					// tree and can be mapped to that level (full-text is indexed per
+					// attachment). A plain top-level one with no result level is left for the
+					// post-filter in search().
+					if (loopDepth > 0 || resultLevel != 'any') {
+						this._eagerFullTextConditionIDs.add(condition.id);
+						this._hasEagerFullText = true;
+						// Match via the index as a subquery -- no per-match itemID list to
+						// build or parse. Regexp searches, multi-token phrases (whose index
+						// matches are only candidates for a verification scan), and terms the
+						// index can't answer are materialized into an itemID list instead.
+						let subquery = (condition.mode && condition.mode.startsWith('regexp'))
+							? null
+							: Zotero.FullText.getContentSearchSQL(condition.value);
+						let predicate = {
+							name: '_fulltextContentPredicate',
+							operator: condition.operator,
+							// Full-text content is indexed per attachment, so matches are at
+							// the attachment level for cross-level mapping
+							level: 'attachment'
+						};
+						if (subquery) {
+							predicate.subquery = subquery;
+						}
+						else {
+							predicate.matchIDs = await this._fullTextContentMatches(
+								condition.value, condition.mode
+							);
+						}
+						conditions.push(predicate);
+						this._hasPrimaryConditions = true;
 					}
 					continue;
+
+				// Group markers, passed through to the condition tree assembled after the
+				// main loop. Reset lastCondition so inline-filter merging doesn't combine
+				// conditions across a group boundary.
+				case 'joinMode':
+					lastCondition = null;
+					conditions.push({ name: 'joinMode', operator: condition.operator });
+					continue;
+				case 'resultLevel':
+					lastCondition = null;
+					conditions.push({ name: 'resultLevel', operator: condition.operator });
+					continue;
+				case 'groupStart':
+					lastCondition = null;
+					loopDepth++;
+					conditions.push({ name: 'groupStart' });
+					continue;
+				case 'groupEnd':
+					lastCondition = null;
+					loopDepth--;
+					conditions.push({ name: 'groupEnd' });
+					continue;
+				
+				case 'anyField': {
+					// Expand to the same field set as 'quicksearch-fields' (without key
+					// detection or quoted/unquoted splitting). Done here rather than in
+					// addCondition() so the expansion isn't saved in the search object.
+					// Splice it in right after this condition so it's processed at the same
+					// nesting depth -- "Any Field" inside a group stays in that group.
+					// For positive operators this is an OR-group ("matches in any one of
+					// these fields"). For negative operators it must be an AND-group: "the
+					// value appears in none of these fields" holds only when every field
+					// fails to match (De Morgan), and an OR-group would match trivially for
+					// any item missing one of the fields.
+					let op = condition.operator;
+					let val = condition.value;
+					let joinMode = op == 'isNot' || op == 'doesNotContain' ? 'all' : 'any';
+					conditionsToProcess.splice(conditionIndex + 1, 0,
+						{ condition: 'groupStart', operator: 'true', value: '' },
+						{ condition: 'joinMode', operator: joinMode },
+						{ condition: 'field', operator: op, value: val },
+						{ condition: 'tag', operator: op, value: val },
+						{ condition: 'note', operator: op, value: val },
+						{ condition: 'annotationText', operator: op, value: val },
+						{ condition: 'annotationComment', operator: op, value: val },
+						{ condition: 'creator', operator: op, value: val },
+						{ condition: 'groupEnd', operator: 'true', value: '' }
+					);
+					continue;
+				}
+				
+				case 'titleCreatorYear': {
+					// Expand to the same field set as 'quicksearch-titleCreatorYear' (without
+					// key detection or the top-level-only restriction, which the result level
+					// now handles). Spliced in after this condition like 'anyField' above.
+					// An OR-group for positive operators; an AND-group for negative ones, so
+					// "does not contain"/"is not" matches only when the value is absent from
+					// every field (see 'anyField' above).
+					let op = condition.operator;
+					let val = condition.value;
+					let joinMode = op == 'isNot' || op == 'doesNotContain' ? 'all' : 'any';
+					conditionsToProcess.splice(conditionIndex + 1, 0,
+						{ condition: 'groupStart', operator: 'true', value: '' },
+						{ condition: 'joinMode', operator: joinMode },
+						{ condition: 'title', operator: op, value: val },
+						{ condition: 'publicationTitle', operator: op, value: val },
+						{ condition: 'shortTitle', operator: op, value: val },
+						{ condition: 'court', operator: op, value: val },
+						{ condition: 'year', operator: op, value: val },
+						{ condition: 'citationKey', operator: op, value: val },
+						{ condition: 'creator', operator: op, value: val },
+						{ condition: 'groupEnd', operator: 'true', value: '' }
+					);
+					continue;
+				}
 			}
 			
 			throw new Error('Unhandled special condition ' + name);
@@ -1189,11 +1337,72 @@ Zotero.Search.prototype._buildQuery = async function () {
 		sql += " AND (itemID IN (SELECT itemID FROM items WHERE libraryID=?))";
 		sqlParams.push(this.libraryID);
 	}
-	
+
+	// Result level: constrain the result set to one item level. The default
+	// ('any') leaves the mixed-level result unchanged.
+	switch (resultLevel) {
+		case 'item':
+			// Top-level items only (exclude child attachments/notes and annotations)
+			sql += " AND (itemID NOT IN (SELECT itemID FROM itemAttachments WHERE parentItemID IS NOT NULL) "
+				+ "AND itemID NOT IN (SELECT itemID FROM itemNotes WHERE parentItemID IS NOT NULL) "
+				+ "AND itemID NOT IN (SELECT itemID FROM itemAnnotations))";
+			break;
+		case 'attachment':
+			sql += " AND (itemID IN (SELECT itemID FROM itemAttachments))";
+			break;
+		case 'note':
+			sql += " AND (itemID IN (SELECT itemID FROM itemNotes))";
+			break;
+		case 'annotation':
+			sql += " AND (itemID IN (SELECT itemID FROM itemAnnotations))";
+			break;
+	}
+
 	if (this._hasPrimaryConditions) {
-		sql += " AND ";
-		
+		// Each condition produces a self-contained "itemID [NOT] IN (...)" predicate.
+		// Markers and predicates are collected here in document order, then assembled
+		// into a (possibly nested) tree of AND/OR groups below.
+		let builtConditions = [];
+
 		for (let condition of Object.values(conditions)){
+				// Group markers and per-group join modes are handled when the tree is
+				// assembled, not as SQL predicates
+				if (condition.name == 'groupStart') {
+					builtConditions.push({ marker: 'groupStart' });
+					continue;
+				}
+				if (condition.name == 'groupEnd') {
+					builtConditions.push({ marker: 'groupEnd' });
+					continue;
+				}
+				if (condition.name == 'joinMode') {
+					builtConditions.push({ marker: 'joinMode', operator: condition.operator });
+					continue;
+				}
+				if (condition.name == 'resultLevel') {
+					builtConditions.push({ marker: 'resultLevel', operator: condition.operator });
+					continue;
+				}
+				// A grouped fulltextContent turned into an itemID predicate (above): a direct
+				// index subquery when possible, otherwise a materialized itemID list
+				if (condition.name == '_fulltextContentPredicate') {
+					let op = condition.operator == 'doesNotContain' ? 'NOT IN' : 'IN';
+					let sql, params = [];
+					if (condition.subquery) {
+						sql = 'itemID ' + op + ' (' + condition.subquery.sql + ')';
+						params = condition.subquery.params;
+					}
+					else if (!condition.matchIDs.length) {
+						// No matches: 'contains' matches nothing, 'doesNotContain' matches all
+						sql = condition.operator == 'doesNotContain' ? '1' : '0';
+					}
+					else {
+						sql = 'itemID ' + op + ' (' + condition.matchIDs.join(',') + ')';
+					}
+					builtConditions.push({ sql, params, level: condition.level });
+					continue;
+				}
+
 				var skipOperators = false;
 				var openParens = 0;
 				var condSQL = '';
@@ -1206,7 +1415,7 @@ Zotero.Search.prototype._buildQuery = async function () {
 				// Special table handling
 				//
 				if (condition.table) {
-					let negationOperators = ['isNot', 'doesNotContain'];
+					let negationOperators = ['isNot', 'doesNotContain', 'isEmpty'];
 					let isNegationOperator = negationOperators.includes(condition.operator);
 					
 					condSelectSQL += 'itemID '
@@ -1215,29 +1424,22 @@ Zotero.Search.prototype._buildQuery = async function () {
 					}
 					condSelectSQL += 'IN (';
 					selectOpenParens = 1;
-					
-					// TEMP: Don't match annotations for negation operators, since it would result in
-					// all parent attachments being returned
-					if (isNegationOperator) {
-						condSelectSQL += "SELECT itemID FROM items WHERE itemTypeID="
+
+					// A negation matches every item that lacks the value, but only one item level
+					// is a plausible match: a non-annotation condition (item metadata, tags) would
+					// otherwise return nearly every annotation, and an annotation condition (text,
+					// color, etc.) would return nearly every non-annotation. Exclude the wrong
+					// level. When a result level is set, the result-level constraint already
+					// restricts to that level (and the cross-level mapping handles negation), so
+					// this only applies to the default path.
+					if (isNegationOperator && resultLevel == 'any') {
+						condSelectSQL += "SELECT itemID FROM items WHERE itemTypeID"
+							+ (condition.level == 'annotation' ? "!=" : "=")
 							+ Zotero.ItemTypes.getID('annotation') + " UNION ";
 					}
-					
-					switch (condition.name) {
-						case 'tag':
-							condSQL += "SELECT itemID FROM itemTags "
-								+ "LEFT JOIN itemAnnotations IAnT USING (itemID) WHERE (";
-							break;
-						
-						case 'annotationText':
-						case 'annotationComment':
-							condSQL += `SELECT itemID FROM ${condition.table} WHERE (`
-							break;
-							
-						default:
-							condSQL += `SELECT itemID FROM ${condition.table} WHERE (`;
-					}
-					
+
+					condSQL += `SELECT itemID FROM ${condition.table} WHERE (`;
+
 					openParens = 1;
 				}
 				
@@ -1424,12 +1626,63 @@ Zotero.Search.prototype._buildQuery = async function () {
 						}
 						skipOperators = true;
 						break;
+
+					case 'attachmentStorageType': {
+						let linkModes;
+						switch (condition.value) {
+							case 'storedFile':
+								linkModes = [
+									Zotero.Attachments.LINK_MODE_IMPORTED_FILE,
+									Zotero.Attachments.LINK_MODE_IMPORTED_URL
+								];
+								break;
+
+							case 'linkedFile':
+								linkModes = [
+									Zotero.Attachments.LINK_MODE_LINKED_FILE
+								];
+								break;
+
+							case 'webLink':
+								linkModes = [
+									Zotero.Attachments.LINK_MODE_LINKED_URL
+								];
+								break;
+
+							default:
+								throw ("Invalid attachmentStorageType '" + condition.value
+									+ "' specified in search.js");
+						}
+						condSQL += `linkMode IN (${linkModes.map(() => '?').join(', ')})`;
+						condSQLParams.push(...linkModes);
+						skipOperators = true;
+						break;
+					}
 					
 					case 'tag':
 						condSQL += "tagID IN (SELECT tagID FROM tags WHERE ";
 						openParens++;
 						break;
 					
+					// Only regular items can have child notes/attachments, so don't match
+					// other rows, which would all have a count of 0
+					case 'numNotes':
+					case 'numAttachments':
+						condSQL += "itemTypeID NOT IN ("
+							+ ['note', 'attachment', 'annotation']
+								.map(t => Zotero.ItemTypes.getID(t)).join(', ')
+							+ ") AND ";
+						break;
+					
+					// Annotations belong to an attachment (the row itself) or to a regular
+					// item's attachments, so don't match rows that can't have them
+					case 'numAnnotations':
+						condSQL += "itemTypeID NOT IN ("
+							+ ['note', 'annotation']
+								.map(t => Zotero.ItemTypes.getID(t)).join(', ')
+							+ ") AND ";
+						break;
+					
 					case 'creator':
 					case 'lastName':
 						condSQL += "creatorID IN (SELECT creatorID FROM creators WHERE ";
@@ -1445,39 +1698,56 @@ Zotero.Search.prototype._buildQuery = async function () {
 						break;
 					}
 					
-					case 'childNote':
-						condSQL += "itemID IN (SELECT parentItemID FROM "
-							+ "itemNotes WHERE ";
+					// The annotation's creator lives in groupItems, so restrict the annotation
+					// FROM above to items created by the given user
+					case 'annotationAuthor':
+						condSQL += "itemID IN (SELECT itemID FROM groupItems WHERE ";
 						openParens++;
 						break;
-					
-					case 'fulltextWord':
-						condSQL += "wordID IN (SELECT wordID FROM fulltextWords "
-							+ "WHERE ";
-						openParens++;
+
+					// Match note text content via the note FTS index (case- and
+					// diacritic-insensitive) when it can answer the term; otherwise fall
+					// through to the LIKE scan of the note HTML
+					case 'note': {
+						if (typeof condition.value == 'string'
+								&& ['contains', 'doesNotContain'].includes(condition.operator)) {
+							let noteMatch = await Zotero.FullText.getNoteContentSQL(condition.value);
+							if (noteMatch) {
+								condSQL += noteMatch.sql;
+								condSQLParams.push(...noteMatch.params);
+								skipOperators = true;
+							}
+						}
 						break;
-					
+					}
+
 					case 'tempTable':
 						condSQL += "itemID IN (SELECT id FROM " + condition.value + ")";
 						skipOperators = true;
 						break;
-						
-					// For quicksearch blocks
-					case 'blockStart':
-					case 'blockEnd':
-						skipOperators = true;
-						break;
 				}
 				
 				if (!skipOperators) {
+					// isEmpty/isNotEmpty match any row with a value -- the IN/NOT IN structure
+					// above does the real work -- so use an always-true predicate in place of a
+					// value comparison
+					if (condition.operator == 'isEmpty' || condition.operator == 'isNotEmpty') {
+						condSQL += '1';
+					}
+					
 					// Special handling for date fields
 					//
 					// Note: We assume full datetimes are already UTC and don't
 					// need to be handled specially
-					if ((condition.name == 'dateAdded'
+					//
+					// Text operators on a date field compare the stored value
+					// like any other field, so they skip this
+					else if ((condition.name == 'dateAdded'
 							|| condition.name == 'dateModified'
 							|| condition.name == 'lastRead'
 							|| condition.name == 'datefield')
+							&& ['is', 'isNot', 'isBefore', 'isAfter', 'isInTheLast']
+								.includes(condition.operator)
 							&& !Zotero.Date.isSQLDateTime(condition.value)) {
 						
 						// TODO: document these flags
@@ -1579,9 +1849,11 @@ Zotero.Search.prototype._buildQuery = async function () {
 										break;
 									
 									case 'isBefore':
+										// A date without a sortable year is stored
+										// as 0000-..., which isn't before anything
 										condSQL += '<?';
-										condSQL += ' AND ' + condition['field'] +
-											">'0000-00-00'";
+										condSQL += ' AND SUBSTR(' + condition['field']
+											+ ", 1, 10)>'0000-00-00'";
 										break;
 										
 									case 'isAfter':
@@ -1621,6 +1893,17 @@ Zotero.Search.prototype._buildQuery = async function () {
 					
 					// Non-date fields
 					else {
+						// For text conditions, match against the normalized shadow column
+						// with a normalized search term, so that e.g. "seance" matches
+						// "séance" and vice versa
+						var useNormalized = condition.normalizedField
+							&& typeof condition.value == 'string'
+							&& ['contains', 'doesNotContain', 'beginsWith', 'is', 'isNot']
+								.includes(condition.operator);
+						var searchValue = useNormalized
+							? Zotero.Utilities.Internal.normalizeForSearch(condition.value)
+							: condition.value;
+						
 						switch (condition.operator) {
 							// Cast strings as integers for < and > comparisons,
 							// at least until 
@@ -1638,7 +1921,7 @@ Zotero.Search.prototype._buildQuery = async function () {
 								break;
 								
 							default:
-								condSQL += condition['field'];
+								condSQL += useNormalized ? condition.normalizedField : condition['field'];
 						}
 						
 						switch (condition['operator']){
@@ -1650,10 +1933,10 @@ Zotero.Search.prototype._buildQuery = async function () {
 								if (condition['flags'] &&
 										condition['flags']['leftbound'] &&
 										Zotero.Prefs.get('search.useLeftBound')) {
-									condSQLParams.push(condition['value'] + '%');
+									condSQLParams.push(searchValue + '%');
 								}
 								else {
-									condSQLParams.push('%' + condition['value'] + '%');
+									condSQLParams.push('%' + searchValue + '%');
 								}
 								break;
 								
@@ -1693,15 +1976,18 @@ Zotero.Search.prototype._buildQuery = async function () {
 										break;
 									}
 									else {
-										condSQL += '=?';
+										// Searching is case-insensitive
+										// everywhere else, so an exact match is
+										// too
+										condSQL += '=? COLLATE NOCASE';
 									}
-									condSQLParams.push(condition['value']);
+									condSQLParams.push(searchValue);
 								}
 								break;
 							
 							case 'beginsWith':
 								condSQL += ' LIKE ?';
-								condSQLParams.push(condition['value'] + '%');
+								condSQLParams.push(searchValue + '%');
 								break;
 							
 							case 'isLessThan':
@@ -1771,64 +2057,454 @@ Zotero.Search.prototype._buildQuery = async function () {
 					condSQL += ')';
 				}
 				
-				// Little hack to support multiple quicksearch words
-				if (condition['name'] == 'blockStart') {
-					var inQS = true;
-					var qsSQL = '';
-					var qsParams = [];
-					continue;
-				}
-				else if (condition['name'] == 'blockEnd') {
-					inQS = false;
-					// Strip ' OR ' from last condition
-					qsSQL = qsSQL.substring(0, qsSQL.length-4);
-					
-					// Add to existing quicksearch words
-					if (!quicksearchSQLSet) {
-						var quicksearchSQLSet = [];
-						var quicksearchParamsSet = [];
-					}
-					quicksearchSQLSet.push(qsSQL);
-					quicksearchParamsSet.push(qsParams);
-				}
-				else if (inQS) {
-					qsSQL += condSQL + ' OR ';
-					qsParams = qsParams.concat(condSQLParams);
-				}
-				// Keep non-required conditions separate if in ANY mode
-				else if (!condition.required && this._joinMode == 'any') {
-					anySQL += condSQL + ' OR ';
-					anySQLParams = anySQLParams.concat(condSQLParams);
-				}
-				else {
-					condSQL += ' AND ';
-					sql += condSQL;
-					sqlParams = sqlParams.concat(condSQLParams);
-				}
+				builtConditions.push({
+					sql: condSQL,
+					params: condSQLParams,
+					level: condition.level || 'item',
+					negate: condition.operator == 'isNot' || condition.operator == 'doesNotContain'
+						|| condition.operator == 'isEmpty'
+				});
 		}
-		
-		// Add on ANY conditions
-		if (anySQL){
-			sql += '(' + anySQL;
-			sqlParams = sqlParams.concat(anySQLParams);
-			sql = sql.substring(0, sql.length-4); // remove last ' OR '
-			sql += ')';
-		}
-		else {
-			sql = sql.substring(0, sql.length-5); // remove last ' AND '
-		}
-		
-		// Add on quicksearch conditions
-		if (quicksearchSQLSet) {
-			sql = "SELECT itemID FROM items WHERE itemID IN (" + sql + ") "
-				+ "AND ((" + quicksearchSQLSet.join(') AND (') + "))";
-			
-			for (var k=0; k<quicksearchParamsSet.length; k++) {
-				sqlParams = sqlParams.concat(quicksearchParamsSet[k]);
-			}
+
+		// Combine the collected predicates and group markers into a single predicate
+		// (see Zotero.Search.combineConditions)
+		let combined = Zotero.Search.combineConditions(builtConditions, resultLevel);
+		if (combined.sql) {
+			sql += " AND " + combined.sql;
+			sqlParams = sqlParams.concat(combined.params);
 		}
 	}
 	
 	this._sql = sql;
 	this._sqlParams = sqlParams.length ? sqlParams : false;
 };
+
+
+/**
+ * Combine an ordered list of built condition predicates and group markers into a single SQL
+ * predicate.
+ *
+ * Each item in `builtConditions` is either a predicate { sql, params } or a group
+ * marker { marker: 'groupStart' | 'groupEnd' | 'joinMode', operator }. groupStart/groupEnd
+ * delimit nested groups and a 'joinMode' marker sets its enclosing group's mode.
+ *
+ * For example, conditions built as
+ *
+ *   search.addCondition('joinMode', 'all');
+ *   search.addCondition('title', 'contains', 'foo');
+ *   search.addCondition('groupStart', 'true', '');
+ *   search.addCondition('joinMode', 'any');
+ *   search.addCondition('tag', 'is', 'x');
+ *   search.addCondition('tag', 'is', 'y');
+ *   search.addCondition('groupEnd', 'true', '');
+ *
+ * combine to "title contains 'foo' AND (tag is 'x' OR tag is 'y')". The 'true' operator on the
+ * group markers is an unused placeholder -- they carry no value, but a condition's operator
+ * can't be empty.
+ *
+ * In 'all' mode a group's children are ANDed; in 'any' mode they're ORed.
+ *
+ * A group may also carry a 'resultLevel' marker (a level: 'item'/'attachment'/'note'/'annotation'),
+ * placed inside the group like 'joinMode'. When the result level is a descendant level of the
+ * enclosing row, the group's conditions are matched against descendants and mapped up to
+ * the parent (see Zotero.Search.mapPredicate) -- e.g., "the item has an annotation
+ * matching these conditions".
+ *
+ * @param {Object[]} builtConditions
+ * @param {String} [rootLevel='any'] - The result level the whole search returns ('any' leaves
+ *     the mixed-level default unchanged; otherwise each condition is mapped to this level)
+ * @return {{ sql: String, params: Array }} Combined predicate (sql is '' if nothing to combine)
+ */
+Zotero.Search.combineConditions = function (builtConditions, rootLevel = 'any') {
+	let root = { children: [] };
+	let groupStack = [root];
+	for (let item of builtConditions) {
+		let group = groupStack[groupStack.length - 1];
+		if (item.marker == 'groupStart') {
+			let child = { children: [] };
+			group.children.push(child);
+			groupStack.push(child);
+		}
+		else if (item.marker == 'groupEnd') {
+			// Ignore an unbalanced end marker rather than popping the root
+			if (groupStack.length > 1) {
+				groupStack.pop();
+			}
+		}
+		else if (item.marker == 'joinMode') {
+			// First one wins, matching _buildQuery()
+			if (!group.joinMode) {
+				group.joinMode = item.operator;
+			}
+		}
+		else if (item.marker == 'resultLevel') {
+			group.level = item.operator;
+		}
+		else {
+			group.children.push(item);
+		}
+	}
+
+	// Reduce a group node to a single { sql, params } predicate. parentLevel is the level the
+	// enclosing row is at; the root is a top-level item.
+	let combineGroup = (node, parentLevel) => {
+		// The level this group's children are matched at -- its own result level if set, otherwise
+		// the enclosing level
+		let level = node.level || parentLevel;
+		let requiredParts = [];
+		let requiredParams = [];
+		let optionalParts = [];
+		let optionalParams = [];
+		for (let child of node.children) {
+			let result = child.children ? combineGroup(child, level) : child;
+			if (!result.sql) {
+				continue;
+			}
+			// A leaf condition's predicate selects itemIDs at its own natural level; if that
+			// differs from this group's level, map it to that level so the group's
+			// children combine at a single level. Nested groups are already mapped to
+			// their own level by the combineGroup() call above.
+			let childSQL = result.sql;
+			if (!child.children) {
+				childSQL = Zotero.Search.mapPredicate(childSQL, result.level || 'item', level, result.negate);
+			}
+			// When mapping reduces a predicate to a constant ('0'/'1' -- e.g., a condition
+			// whose level can't reach the result level), its placeholders are gone, so drop its params
+			let childParams = (childSQL === '0' || childSQL === '1') ? [] : result.params;
+			// Unset joinMode means the default 'all'
+			if (node.joinMode != 'any') {
+				requiredParts.push(childSQL);
+				requiredParams = requiredParams.concat(childParams);
+			}
+			else {
+				optionalParts.push(childSQL);
+				optionalParams = optionalParams.concat(childParams);
+			}
+		}
+		let parts = [];
+		let params = [];
+		if (requiredParts.length) {
+			parts.push(requiredParts.join(' AND '));
+			params = params.concat(requiredParams);
+		}
+		if (optionalParts.length) {
+			parts.push(optionalParts.length > 1
+				? '(' + optionalParts.join(' OR ') + ')'
+				: optionalParts[0]);
+			params = params.concat(optionalParams);
+		}
+		if (!parts.length) {
+			return { sql: '', params: [] };
+		}
+		let sql = parts.length > 1 ? '(' + parts.join(' AND ') + ')' : parts[0];
+		// Map this group to the enclosing row's level. A 'any' enclosing level (the
+		// mixed-level default) has no row level of its own, so a descendant group with a result level
+		// anchors to the top-level item ("the item has a descendant match").
+		let target = parentLevel == 'any' ? 'item' : parentLevel;
+		if (node.level && node.level != 'any' && node.level != target) {
+			sql = Zotero.Search.mapPredicate(sql, node.level, target);
+		}
+		return {
+			sql,
+			// Mapping to a constant drops the placeholders, so drop the params too
+			params: (sql === '0' || sql === '1') ? [] : params
+		};
+	};
+
+	return combineGroup(root, rootLevel);
+};
+
+
+// The item hierarchy used for cross-level mapping: each child level maps to its parent
+// level via (itemID -> parentItemID) in the given table. 'item' is the top level.
+Zotero.Search._levelParent = {
+	annotation: 'attachment',
+	attachment: 'item',
+	note: 'item'
+};
+Zotero.Search._levelChildTable = {
+	annotation: 'itemAnnotations',
+	attachment: 'itemAttachments',
+	note: 'itemNotes'
+};
+// Attachments and notes can be top-level (parentItemID NULL); annotations always have a parent
+Zotero.Search._levelCanBeStandalone = {
+	annotation: false,
+	attachment: true,
+	note: true
+};
+
+/**
+ * Whether `anc` is an ancestor level of `desc` in the item hierarchy (e.g., 'item' is an
+ * ancestor of 'annotation'; 'attachment' is an ancestor of 'annotation'; 'note' and
+ * 'annotation' are unrelated).
+ */
+Zotero.Search._isAncestorLevel = function (anc, desc) {
+	let l = desc;
+	while (l != 'item') {
+		l = Zotero.Search._levelParent[l];
+		if (!l) {
+			return false;
+		}
+		if (l == anc) {
+			return true;
+		}
+	}
+	return false;
+};
+
+/**
+ * The number of parent hops between two levels in either direction, or null if they're on
+ * unrelated branches (e.g., note and annotation).
+ */
+Zotero.Search._levelDistance = function (a, b) {
+	let l = a;
+	let d = 0;
+	while (l && l != b) {
+		l = Zotero.Search._levelParent[l];
+		d++;
+	}
+	if (l == b) {
+		return d;
+	}
+	l = b;
+	d = 0;
+	while (l && l != a) {
+		l = Zotero.Search._levelParent[l];
+		d++;
+	}
+	return l == a ? d : null;
+};
+
+/**
+ * Given the levels a condition matches at, return the one closest (fewest hops) to `toLevel`,
+ * or null if none is related to it. Used to map a multi-level field from a single level.
+ */
+Zotero.Search._closestRelatedLevel = function (levels, toLevel) {
+	let best = null;
+	let bestDist = Infinity;
+	for (let level of levels) {
+		if (level == 'any') {
+			continue;
+		}
+		let d = Zotero.Search._levelDistance(level, toLevel);
+		if (d !== null && d < bestDist) {
+			best = level;
+			bestDist = d;
+		}
+	}
+	return best;
+};
+
+/**
+ * The item level(s) a condition matches at, for cross-level mapping. A condition
+ * definition can set `level` explicitly; otherwise it defaults to the top-level item, except
+ * for the few itemData fields that attachments also have (title, url, accessDate per the
+ * schema), which match at either the item or the attachment level.
+ *
+ * A condition that stands in for a whole set of fields -- the generic 'field' condition that
+ * 'Any Field' expands to -- is matched against every field in the set, so it matches wherever
+ * any one of them lives.
+ */
+Zotero.Search._conditionLevel = function (name, conditionData) {
+	if (conditionData.level) {
+		return conditionData.level;
+	}
+	if (conditionData.table == 'itemData') {
+		let fields = (name == conditionData.name ? conditionData.aliases : null) || [name];
+		let attachmentTypeID = Zotero.ItemTypes.getID('attachment');
+		let onAttachment = fields.some((field) => {
+			let fieldID = Zotero.ItemFields.getID(field);
+			return fieldID && Zotero.ItemFields.isValidForType(fieldID, attachmentTypeID);
+		});
+		if (onAttachment) {
+			return ['item', 'attachment'];
+		}
+	}
+	return 'item';
+};
+
+/**
+ * Rewrite a predicate that selects itemIDs at `fromLevel` so it instead constrains itemIDs at
+ * `toLevel`, mapping through the item hierarchy:
+ *
+ *   - `toLevel` of 'any', or `toLevel` is one of the levels the condition matches at -- the
+ *     condition natively selects rows at the result level, so it's returned unchanged (the
+ *     result-level FROM filters to the right rows). This is how a multi-level field like title
+ *     matches item titles at the item level and attachment titles at the attachment level.
+ *   - `fromLevel` 'any' (level-agnostic, e.g., tag) -- the match rolls UP to the result level:
+ *     a `toLevel` item matches if it or any descendant carries it. Up only -- a parent's tag
+ *     isn't the child's. Skipped for a negated match (rolling up "isn't tagged" is ambiguous).
+ *   - `toLevel` an ancestor of `fromLevel` -- "the row has a descendant matching" (map up)
+ *   - `toLevel` a descendant of `fromLevel` -- "the row's ancestor matches" (map down)
+ *   - unrelated branches (e.g., note vs annotation) -- nothing can satisfy both, so '0'
+ *
+ * @param {String} sql - A predicate in terms of the `fromLevel` itemID
+ * @param {String|String[]} fromLevel - The level(s) the predicate selects ('item'/'attachment'/
+ *     'note'/'annotation'/'any'); an array for a field that exists at more than one level
+ * @param {String} toLevel - The level to constrain instead
+ * @param {Boolean} [negated] - Whether the predicate is a negation (isNot/doesNotContain/isEmpty); a
+ *     negated level-agnostic match is left at its own level rather than rolled up
+ * @return {String} A predicate in terms of the `toLevel` itemID
+ */
+Zotero.Search.mapPredicate = function (sql, fromLevel, toLevel, negated = false) {
+	if (toLevel == 'any') {
+		return sql;
+	}
+
+	// A condition may match at more than one level (e.g., an itemData field like title, which
+	// exists on both top-level items and attachments), so normalize to an array
+	let fromLevels = Array.isArray(fromLevel) ? fromLevel : [fromLevel];
+
+	if (fromLevels.length == 1 && fromLevels[0] == 'any') {
+		// Level-agnostic (e.g., tag): roll a positive match up to the result level; leave a
+		// negation at its carrying level (see above)
+		return negated ? sql : Zotero.Search._rollUpAnyToLevel(sql, toLevel);
+	}
+
+	// The condition already selects rows at the result level (it natively matches there), so
+	// the result-level FROM filters to the right rows -- no mapping needed
+	if (fromLevels.includes(toLevel)) {
+		return sql;
+	}
+
+	// Otherwise map from the one level in the set closest to the result level -- a
+	// descendant match up or an ancestor match down. Referencing the predicate's SQL exactly
+	// once keeps its bound parameters from being duplicated, so map from a single level.
+	let from = Zotero.Search._closestRelatedLevel(fromLevels, toLevel);
+	if (!from) {
+		// No level in the set is related to the result level (e.g., note vs annotation)
+		return '0';
+	}
+
+	// itemIDs at `from` matching the predicate
+	let matches = `SELECT itemID FROM items WHERE ${sql}`;
+
+	// Walk a child level up to its parent: SELECT the parentItemID of matching child rows.
+	// A standalone-capable level (attachment/note) can be a top-level item itself, so map a
+	// standalone row (no parent) to its own itemID rather than dropping it, matching the
+	// level-agnostic roll-up in _rollUpAnyToLevel.
+	let mapUp = (inner, from, to) => {
+		let l = from;
+		let s = inner;
+		while (l != to) {
+			let table = Zotero.Search._levelChildTable[l];
+			let select = Zotero.Search._levelCanBeStandalone[l]
+				? 'COALESCE(parentItemID, itemID)' : 'parentItemID';
+			s = `SELECT ${select} FROM ${table} WHERE itemID IN (${s})`;
+			l = Zotero.Search._levelParent[l];
+			if (!l) {
+				return null;
+			}
+		}
+		return s;
+	};
+
+	// Walk an ancestor level down to a descendant: SELECT the child rows whose parent matches,
+	// repeated for each step from `from` down to `to`
+	let mapDown = (inner, from, to) => {
+		let path = [];
+		let l = to;
+		while (l != from) {
+			path.push(l);
+			l = Zotero.Search._levelParent[l];
+			if (!l) {
+				return null;
+			}
+		}
+		let s = inner;
+		for (let i = path.length - 1; i >= 0; i--) {
+			let table = Zotero.Search._levelChildTable[path[i]];
+			s = `SELECT itemID FROM ${table} WHERE parentItemID IN (${s})`;
+		}
+		return s;
+	};
+
+	// A multi-level field (e.g. title, which exists on both the top-level item and an attachment)
+	// targeting a descendant should match if *any* of those ancestor levels has the value -- an
+	// annotation matches when its parent attachment OR its top-level item has the title (and a
+	// snapshot's URL stays matchable at the attachment level). Map down from each such ancestor
+	// and union them, testing the predicate once (a single `anc IN (...)`) so its bound parameters
+	// aren't duplicated. A negation keeps the single-level behavior below.
+	let ancestorLevels = fromLevels.filter(
+		l => l != 'any' && Zotero.Search._isAncestorLevel(l, toLevel));
+	if (!negated && ancestorLevels.length > 1) {
+		// (toLevel itemID, ancestor itemID) pairs, walking from toLevel up to `anc`. A standalone
+		// attachment/note has no parent, so it stands in as its own top-level item (COALESCE).
+		let pairsTo = (anc) => {
+			let levels = [];
+			let l = toLevel;
+			while (l != anc) {
+				levels.push(l);
+				l = Zotero.Search._levelParent[l];
+			}
+			let aliases = levels.map((_, i) => 't' + i);
+			let fromSQL = `${Zotero.Search._levelChildTable[levels[0]]} ${aliases[0]}`;
+			for (let i = 1; i < levels.length; i++) {
+				fromSQL += ` JOIN ${Zotero.Search._levelChildTable[levels[i]]} ${aliases[i]}`
+					+ ` ON ${aliases[i]}.itemID = ${aliases[i - 1]}.parentItemID`;
+			}
+			let last = aliases[aliases.length - 1];
+			let lastLevel = levels[levels.length - 1];
+			let ancExpr = Zotero.Search._levelCanBeStandalone[lastLevel]
+				? `COALESCE(${last}.parentItemID, ${last}.itemID)`
+				: `${last}.parentItemID`;
+			return `SELECT ${aliases[0]}.itemID AS itemID, ${ancExpr} AS anc FROM ${fromSQL}`;
+		};
+		let union = ancestorLevels.map(pairsTo).join(' UNION ALL ');
+		return `itemID IN (SELECT itemID FROM (${union}) WHERE anc IN (${matches}))`;
+	}
+
+	let mapped = Zotero.Search._isAncestorLevel(toLevel, from)
+		? mapUp(matches, from, toLevel)
+		: mapDown(matches, from, toLevel);
+	if (mapped === null) {
+		return '0';
+	}
+	return `itemID IN (${mapped})`;
+};
+
+
+/**
+ * Roll a level-agnostic predicate (e.g., tag) up to a result level: select `toLevel` items
+ * that themselves -- or any descendant -- match. Up only (an ancestor's match doesn't count).
+ *
+ * The predicate's own SQL is referenced exactly once (inside a subquery) so its bound
+ * parameters aren't duplicated.
+ *
+ * @param {String} sql - A predicate in terms of an itemID at any level
+ * @param {String} toLevel - 'item' / 'attachment' / 'note' / 'annotation'
+ * @return {String} A predicate in terms of the `toLevel` itemID
+ */
+Zotero.Search._rollUpAnyToLevel = function (sql, toLevel) {
+	let matches = `SELECT itemID FROM items WHERE ${sql}`;
+	switch (toLevel) {
+		// No descendants below these, so only a match at the level itself counts
+		case 'annotation':
+			return `itemID IN (SELECT itemID FROM itemAnnotations WHERE itemID IN (${matches}))`;
+		case 'note':
+			return `itemID IN (SELECT itemID FROM itemNotes WHERE itemID IN (${matches}))`;
+		// An attachment matches if it, or one of its annotations, matches
+		case 'attachment':
+			return "itemID IN ("
+				+ "SELECT COALESCE(att.itemID, annot.parentItemID) "
+				+ `FROM (${matches}) m `
+				+ "LEFT JOIN itemAttachments att ON att.itemID = m.itemID "
+				+ "LEFT JOIN itemAnnotations annot ON annot.itemID = m.itemID "
+				+ "WHERE att.itemID IS NOT NULL OR annot.itemID IS NOT NULL)";
+		// A top-level item matches if it, or any descendant (attachment, note, or an
+		// annotation of an attachment), matches
+		case 'item':
+		default:
+			// For an annotation, prefer its attachment's parent, but fall back to the
+			// attachment itself (annot.parentItemID) when the attachment is standalone
+			return "itemID IN ("
+				+ "SELECT COALESCE(aAtt.parentItemID, annot.parentItemID, att.parentItemID, note.parentItemID, m.itemID) "
+				+ `FROM (${matches}) m `
+				+ "LEFT JOIN itemAttachments att ON att.itemID = m.itemID AND att.parentItemID IS NOT NULL "
+				+ "LEFT JOIN itemNotes note ON note.itemID = m.itemID AND note.parentItemID IS NOT NULL "
+				+ "LEFT JOIN itemAnnotations annot ON annot.itemID = m.itemID "
+				+ "LEFT JOIN itemAttachments aAtt ON aAtt.itemID = annot.parentItemID"
+				+ ")";
+	}
+};
diff --git a/chrome/content/zotero/xpcom/data/searchConditions.js b/chrome/content/zotero/xpcom/data/searchConditions.js
index abab69709a..c7365d7b79 100644
--- a/chrome/content/zotero/xpcom/data/searchConditions.js
+++ b/chrome/content/zotero/xpcom/data/searchConditions.js
@@ -52,6 +52,8 @@ Zotero.SearchConditions = new function () {
 		isBefore: true,
 		isAfter: true,
 		isInTheLast: true,
+		isEmpty: true,
+		isNotEmpty: true,
 		
 		// Special
 		any: true,
@@ -229,17 +231,41 @@ Zotero.SearchConditions = new function () {
 				noLoad: true
 			},
 			
-			// Quicksearch block markers
+			// Condition group markers. groupStart/groupEnd delimit a nested group of
+			// conditions; the group's join mode is a separate 'joinMode' condition placed
+			// inside the group, exactly as at the top level. Unlike the quicksearch block
+			// markers above, these are saved with the search, so they're not noLoad. The
+			// operator is an unused placeholder, since the sync server rejects an empty one.
 			{
-				name: 'blockStart',
-				noLoad: true
+				name: 'groupStart',
+				operators: {
+					true: true
+				}
 			},
-			
+
 			{
-				name: 'blockEnd',
-				noLoad: true
+				name: 'groupEnd',
+				operators: {
+					true: true
+				}
 			},
-			
+
+			// Optional level a group's conditions are evaluated at, placed inside the group
+			// like 'joinMode'. When a group's result level is a descendant level of the surrounding
+			// row (e.g., 'annotation' within a top-level item search), the group's conditions
+			// are matched against descendants and the match is mapped up to the parent --
+			// i.e., "the item has a descendant match for these conditions". The level
+			// rides in the operator, as with 'joinMode'. Saved with the search, so not noLoad.
+			{
+				name: 'resultLevel',
+				operators: {
+					item: true,
+					attachment: true,
+					note: true,
+					annotation: true
+				}
+			},
+
 			// Shortcuts for adding collections and searches by id
 			{
 				name: 'collectionID',
@@ -282,7 +308,7 @@ Zotero.SearchConditions = new function () {
 					is: true,
 					isNot: true
 				},
-				special: true
+				special: false
 			},
 			
 			{
@@ -321,7 +347,8 @@ Zotero.SearchConditions = new function () {
 					isInTheLast: true
 				},
 				table: 'itemAttachments',
-				field: 'lastRead'
+				field: 'lastRead',
+				level: 'attachment'
 			},
 
 			// Deprecated
@@ -353,7 +380,20 @@ Zotero.SearchConditions = new function () {
 					isNot: true
 				},
 				table: 'itemAttachments',
-				field: 'fileTypeID'
+				field: 'fileTypeID',
+				// Matches attachment items; see 'level' handling in search.js
+				level: 'attachment'
+			},
+
+			{
+				name: 'attachmentStorageType',
+				operators: {
+					is: true,
+					isNot: true
+				},
+				table: 'itemAttachments',
+				field: 'linkMode',
+				level: 'attachment'
 			},
 			
 			{
@@ -376,7 +416,90 @@ Zotero.SearchConditions = new function () {
 					doesNotContain: true
 				},
 				table: 'itemTags',
-				field: 'name'
+				field: 'name',
+				normalizedField: 'COALESCE(nameNormalized, name)',
+				// Tags apply to items at any level, so a tag match is never mapped
+				level: 'any'
+			},
+			
+			{
+				name: 'numTags',
+				operators: {
+					is: true,
+					isNot: true,
+					isLessThan: true,
+					isGreaterThan: true
+				},
+				table: 'items',
+				field: '(SELECT COUNT(*) FROM itemTags WHERE itemTags.itemID=items.itemID)',
+				// Every item level has its own tag count, so the condition matches natively
+				// at each level rather than rolling a match up to the result level
+				level: ['item', 'attachment', 'note', 'annotation'],
+				inlineFilter: function (val) {
+					return /^[0-9]+$/.test(val) ? val : false;
+				}
+			},
+			
+			// Non-trashed child notes of a regular item (restricted to regular items in
+			// search.js, since other rows can't have child notes)
+			{
+				name: 'numNotes',
+				operators: {
+					is: true,
+					isNot: true,
+					isLessThan: true,
+					isGreaterThan: true
+				},
+				table: 'items',
+				field: '(SELECT COUNT(*) FROM itemNotes WHERE parentItemID=items.itemID '
+					+ 'AND itemID NOT IN (SELECT itemID FROM deletedItems))',
+				level: 'item',
+				inlineFilter: function (val) {
+					return /^[0-9]+$/.test(val) ? val : false;
+				}
+			},
+			
+			// Non-trashed child attachments of a regular item (restricted to regular items
+			// in search.js)
+			{
+				name: 'numAttachments',
+				operators: {
+					is: true,
+					isNot: true,
+					isLessThan: true,
+					isGreaterThan: true
+				},
+				table: 'items',
+				field: '(SELECT COUNT(*) FROM itemAttachments WHERE parentItemID=items.itemID '
+					+ 'AND itemID NOT IN (SELECT itemID FROM deletedItems))',
+				level: 'item',
+				inlineFilter: function (val) {
+					return /^[0-9]+$/.test(val) ? val : false;
+				}
+			},
+			
+			// Non-trashed annotations on the row's own attachment or on a regular item's
+			// non-trashed attachments (restricted to those levels in search.js)
+			{
+				name: 'numAnnotations',
+				operators: {
+					is: true,
+					isNot: true,
+					isLessThan: true,
+					isGreaterThan: true
+				},
+				table: 'items',
+				field: '(SELECT COUNT(*) FROM itemAnnotations WHERE parentItemID IN '
+					+ '(SELECT itemID FROM itemAttachments WHERE '
+						+ '(itemID=items.itemID OR parentItemID=items.itemID) '
+						+ 'AND itemID NOT IN (SELECT itemID FROM deletedItems)) '
+					+ 'AND itemID NOT IN (SELECT itemID FROM deletedItems))',
+				// The count is native to attachments (their own annotations) and regular
+				// items (annotations on their attachments), so no cross-level mapping
+				level: ['item', 'attachment'],
+				inlineFilter: function (val) {
+					return /^[0-9]+$/.test(val) ? val : false;
+				}
 			},
 			
 			{
@@ -388,31 +511,24 @@ Zotero.SearchConditions = new function () {
 				table: 'itemNotes',
 				// Exclude note prefix and suffix
 				field: `SUBSTR(note, ${1 + Zotero.Notes.notePrefix.length}, `
-					+ `LENGTH(note) - ${Zotero.Notes.notePrefix.length + Zotero.Notes.noteSuffix.length})`
+					+ `LENGTH(note) - ${Zotero.Notes.notePrefix.length + Zotero.Notes.noteSuffix.length})`,
+				level: 'note'
 			},
-			
-			{
-				name: 'childNote',
-				operators: {
-					contains: true,
-					doesNotContain: true
-				},
-				table: 'items',
-				// Exclude note prefix and suffix
-				field: `SUBSTR(note, ${1 + Zotero.Notes.notePrefix.length}, `
-					+ `LENGTH(note) - ${Zotero.Notes.notePrefix.length + Zotero.Notes.noteSuffix.length})`
-			},
-			
+
 			{
 				name: 'creator',
 				operators: {
 					is: true,
 					isNot: true,
 					contains: true,
-					doesNotContain: true
+					doesNotContain: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemCreators',
-				field: "TRIM(firstName || ' ' || lastName)"
+				field: "TRIM(firstName || ' ' || lastName)",
+				normalizedField: "TRIM(COALESCE(firstNameNormalized, firstName) || ' ' "
+					+ "|| COALESCE(lastNameNormalized, lastName))"
 			},
 			
 			{
@@ -425,6 +541,7 @@ Zotero.SearchConditions = new function () {
 				},
 				table: 'itemCreators',
 				field: 'lastName',
+				normalizedField: 'COALESCE(lastNameNormalized, lastName)',
 				special: true
 			},
 			
@@ -434,10 +551,14 @@ Zotero.SearchConditions = new function () {
 					is: true,
 					isNot: true,
 					contains: true,
-					doesNotContain: true
+					doesNotContain: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemCreators',
-				field: "TRIM(firstName || ' ' || lastName)"
+				field: "TRIM(firstName || ' ' || lastName)",
+				normalizedField: "TRIM(COALESCE(firstNameNormalized, firstName) || ' ' "
+					+ "|| COALESCE(lastNameNormalized, lastName))"
 			},
 			
 			{
@@ -446,10 +567,14 @@ Zotero.SearchConditions = new function () {
 					is: true,
 					isNot: true,
 					contains: true,
-					doesNotContain: true
+					doesNotContain: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemCreators',
-				field: "TRIM(firstName || ' ' || lastName)"
+				field: "TRIM(firstName || ' ' || lastName)",
+				normalizedField: "TRIM(COALESCE(firstNameNormalized, firstName) || ' ' "
+					+ "|| COALESCE(lastNameNormalized, lastName))"
 			},
 			
 			{
@@ -458,10 +583,14 @@ Zotero.SearchConditions = new function () {
 					is: true,
 					isNot: true,
 					contains: true,
-					doesNotContain: true
+					doesNotContain: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemCreators',
-				field: "TRIM(firstName || ' ' || lastName)"
+				field: "TRIM(firstName || ' ' || lastName)",
+				normalizedField: "TRIM(COALESCE(firstNameNormalized, firstName) || ' ' "
+					+ "|| COALESCE(lastNameNormalized, lastName))"
 			},
 			
 			{
@@ -471,13 +600,17 @@ Zotero.SearchConditions = new function () {
 					isNot: true,
 					contains: true,
 					doesNotContain: true,
-					beginsWith: true
+					beginsWith: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemData',
 				field: 'value',
-				aliases: await Zotero.DB.columnQueryAsync("SELECT fieldName FROM fieldsCombined "
-					+ "WHERE fieldName NOT IN ('accessDate', 'date', 'pages', "
-					+ "'section','seriesNumber','issue')"),
+				normalizedField: 'COALESCE(valueNormalized, value)',
+				aliases: (await Zotero.DB.columnQueryAsync("SELECT fieldName FROM fieldsCombined "
+					+ "WHERE fieldName NOT IN ('accessDate', 'pages', "
+					+ "'section','seriesNumber','issue')"))
+					.filter(field => !Zotero.ItemFields.isDate(field)),
 				template: true // mark for special handling
 			},
 
@@ -492,7 +625,19 @@ Zotero.SearchConditions = new function () {
 				},
 				special: false
 			},
-			
+
+			{
+				name: 'titleCreatorYear',
+				operators: {
+					is: true,
+					isNot: true,
+					contains: true,
+					doesNotContain: true,
+					beginsWith: true
+				},
+				special: false
+			},
+
 			{
 				name: 'datefield',
 				operators: {
@@ -500,11 +645,18 @@ Zotero.SearchConditions = new function () {
 					isNot: true,
 					isBefore: true,
 					isAfter: true,
-					isInTheLast: true
+					isInTheLast: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemData',
 				field: 'value',
-				aliases: ['accessDate', 'date', 'dateDue', 'accepted'], // TEMP - NSF
+				aliases: (await Zotero.DB.columnQueryAsync("SELECT fieldName FROM fieldsCombined"))
+					.filter(field => Zotero.ItemFields.isDate(field))
+					// Stored as an SQL datetime rather than a multipart date, so
+					// isDate() doesn't cover it
+					.concat(['accessDate'])
+					.concat(['dateDue', 'accepted']), // TEMP - NSF
 				template: true // mark for special handling
 			},
 			
@@ -529,7 +681,9 @@ Zotero.SearchConditions = new function () {
 					contains: true,
 					doesNotContain: true,
 					isLessThan: true,
-					isGreaterThan: true
+					isGreaterThan: true,
+					isEmpty: true,
+					isNotEmpty: true
 				},
 				table: 'itemData',
 				field: 'value',
@@ -585,7 +739,9 @@ Zotero.SearchConditions = new function () {
 				},
 				table: 'itemAnnotations',
 				field: 'text',
+				normalizedField: 'COALESCE(textNormalized, text)',
 				special: false,
+				level: 'annotation'
 			},
 			
 			{
@@ -596,23 +752,49 @@ Zotero.SearchConditions = new function () {
 				},
 				table: 'itemAnnotations',
 				field: 'comment',
+				normalizedField: 'COALESCE(commentNormalized, comment)',
 				special: false,
+				level: 'annotation'
 			},
-			
+
 			{
-				name: 'fulltextWord',
+				name: 'annotationType',
 				operators: {
-					contains: true,
-					doesNotContain: true
+					is: true,
+					isNot: true
 				},
-				table: 'fulltextItemWords',
-				field: 'word',
-				flags: {
-					leftbound: true
-				},
-				special: true
+				table: 'itemAnnotations',
+				field: 'type',
+				special: false,
+				level: 'annotation'
 			},
-			
+
+			{
+				name: 'annotationColor',
+				operators: {
+					is: true,
+					isNot: true
+				},
+				table: 'itemAnnotations',
+				field: 'color',
+				special: false,
+				level: 'annotation'
+			},
+
+			// Group-library annotations only; the creator lives in groupItems, so the SQL joins
+			// to it (see search.js)
+			{
+				name: 'annotationAuthor',
+				operators: {
+					is: true,
+					isNot: true
+				},
+				table: 'itemAnnotations',
+				field: 'createdByUserID',
+				special: false,
+				level: 'annotation'
+			},
+
 			{
 				name: 'fulltextContent',
 				operators: {
@@ -732,7 +914,15 @@ Zotero.SearchConditions = new function () {
 		if (!operator && typeof _conditions[condition]['operators'] == 'undefined'){
 			return true;
 		}
-		
+
+		// Date-type item fields also accept the text operators, which compare
+		// the stored value as text, so saved searches that use them keep
+		// loading -- the operators offered in the UI are just 'operators'
+		if (_conditions[condition].name == 'datefield'
+				&& ['contains', 'doesNotContain', 'beginsWith'].includes(operator)) {
+			return true;
+		}
+
 		return !!_conditions[condition]['operators'][operator];
 	}
 	
@@ -765,16 +955,6 @@ Zotero.SearchConditions = new function () {
 	}
 	
 	
-	/**
-	 * Compare two API JSON condition objects
-	 */
-	this.equals = function (data1, data2) {
-		return data1.condition === data2.condition
-			&& data1.operator === data2.operator
-			&& data1.value === data2.value;
-	}
-	
-	
 	/*
 	 * Parses a search into words and "double-quoted phrases"
 	 *
diff --git a/chrome/content/zotero/xpcom/data/searches.js b/chrome/content/zotero/xpcom/data/searches.js
index da8795e8b5..d612e458f7 100644
--- a/chrome/content/zotero/xpcom/data/searches.js
+++ b/chrome/content/zotero/xpcom/data/searches.js
@@ -36,6 +36,7 @@ Zotero.Searches = function () {
 		libraryID: "O.libraryID",
 		key: "O.key",
 		version: "O.version",
+		clientVersion: "O.clientVersion",
 		synced: "O.synced",
 		deleted: "DS.savedSearchID IS NOT NULL AS deleted",
 	}
@@ -102,7 +103,7 @@ Zotero.Searches = function () {
 		return data1.condition === data2.condition
 			&& data1.operator === data2.operator
 			&& data1.value === data2.value;
-	},
+	};
 	
 	
 	this.getNextName = async function (libraryID, name) {
@@ -122,7 +123,7 @@ Zotero.Searches = function () {
 	
 	
 	this._loadConditions = async function (libraryID, ids, idSQL) {
-		var sql = "SELECT savedSearchID, searchConditionID, condition, operator, value, required "
+		var sql = "SELECT savedSearchID, searchConditionID, condition, operator, value "
 			+ "FROM savedSearches LEFT JOIN savedSearchConditions USING (savedSearchID) "
 			+ "WHERE libraryID=?" + idSQL
 			+ "ORDER BY savedSearchID, searchConditionID";
@@ -141,24 +142,33 @@ Zotero.Searches = function () {
 				search._maxSearchConditionID = rows[rows.length - 1].searchConditionID;
 			}
 			
+			// Track whether we migrate a `childNote` (below) so we can seed an item result level afterward
+			let migratedChildNote = false;
 			// Reindex conditions, in case they're not contiguous in the DB
 			for (let i = 0; i < rows.length; i++) {
 				let condition = rows[i];
-				
+
 				// Parse "condition[/mode]"
 				let [conditionName, mode] = Zotero.SearchConditions.parseCondition(condition.condition);
-				
+
 				// Not sure how this can happen, but prevent an error if it does
 				if (condition.value === null) {
 					condition.value = '';
 				}
-				
+
+				// Convert the obsolete childNote condition to note (see above) before validating,
+				// since it's no longer a registered condition
+				if (conditionName == 'childNote') {
+					conditionName = 'note';
+					migratedChildNote = true;
+				}
+
 				let cond = Zotero.SearchConditions.get(conditionName);
 				if (!cond || cond.noLoad) {
 					Zotero.debug("Invalid saved search condition '" + conditionName + "' -- skipping", 2);
 					continue;
 				}
-				
+
 				// Convert itemTypeID to itemType
 				//
 				// TEMP: This can be removed at some point
@@ -173,16 +183,30 @@ Zotero.Searches = function () {
 						condition.value = objKey;
 					}
 				}
-				
+
 				search._conditions[i] = {
 					id: i,
 					condition: conditionName,
 					mode: mode,
 					operator: condition.operator,
-					value: condition.value,
-					required: !!condition.required
+					value: condition.value
 				};
 			}
+			// `childNote` returned the parent of a matching child note, so seed an item result
+			// level to roll the migrated `note` up to it
+			if (migratedChildNote) {
+				let id = rows.length;
+				search._conditions[id] = {
+					id,
+					condition: 'resultLevel',
+					// No mode -- parseCondition() uses false, and toJSON() only omits the
+					// "/mode" suffix for an exact false
+					mode: false,
+					operator: 'item',
+					value: ''
+				};
+				search._maxSearchConditionID = Math.max(search._maxSearchConditionID, id);
+			}
 			search._loaded.conditions = true;
 			search._clearChanged('conditions');
 		}.bind(this);
@@ -210,8 +234,7 @@ Zotero.Searches = function () {
 						searchConditionID,
 						condition: row.getResultByIndex(2),
 						operator: row.getResultByIndex(3),
-						value: row.getResultByIndex(4),
-						required: row.getResultByIndex(5)
+						value: row.getResultByIndex(4)
 					});
 				}.bind(this)
 			}
diff --git a/chrome/content/zotero/xpcom/data/tags.js b/chrome/content/zotero/xpcom/data/tags.js
index 8003462dd5..818bbcdaab 100644
--- a/chrome/content/zotero/xpcom/data/tags.js
+++ b/chrome/content/zotero/xpcom/data/tags.js
@@ -119,8 +119,9 @@ Zotero.Tags = new function () {
 		var id = this.getID(data.tag);
 		if (!id) {
 			id = Zotero.ID.get('tags');
-			let sql = "INSERT INTO tags (tagID, name) VALUES (?, ?)";
-			await Zotero.DB.queryAsync(sql, [id, data.tag]);
+			let sql = "INSERT INTO tags (tagID, name, nameNormalized) VALUES (?, ?, ?)";
+			let nameNormalized = Zotero.Utilities.Internal.normalizeForSearchStorage(data.tag);
+			await Zotero.DB.queryAsync(sql, [id, data.tag, nameNormalized]);
 			_tagsByID.set(id, data.tag);
 			_idsByTag.set(data.tag, id);
 		}
@@ -438,15 +439,19 @@ Zotero.Tags = new function () {
 					
 					await this.purge(chunk);
 					
-					// Update internal timestamps on all items that had these tags
+					// Update internal timestamps and versions on all items that had these tags
+					var clientVersion;
+					if (itemIDs.length) {
+						clientVersion = await Zotero.Libraries.get(libraryID).incrementClientVersion();
+					}
 					await Zotero.Utilities.Internal.forEachChunkAsync(
 						Zotero.Utilities.arrayUnique(itemIDs),
-						Zotero.DB.MAX_BOUND_PARAMETERS - 1,
+						Zotero.DB.MAX_BOUND_PARAMETERS - 2,
 						async function (chunk) {
-							var sql = 'UPDATE items SET synced=0, clientDateModified=? '
+							var sql = 'UPDATE items SET synced=0, clientDateModified=?, clientVersion=? '
 								+ 'WHERE itemID IN (' + Array(chunk.length).fill('?').join(',') + ')';
 							await Zotero.DB.queryAsync(
-								sql, [Zotero.DB.transactionDateTime].concat(chunk), { noCache: true }
+								sql, [Zotero.DB.transactionDateTime, clientVersion].concat(chunk), { noCache: true }
 							);
 							
 							await Zotero.Items.reload(itemIDs, ['primaryData', 'tags'], true);
@@ -800,6 +805,10 @@ Zotero.Tags = new function () {
 		return Zotero.DB.executeTransaction(async function () {
 			// If all items already have the tag, remove it from all items
 			if (tagID && items.every(x => x.hasTag(tagName))) {
+				Zotero.UndoHistory.stageAction(
+					'undo-action-remove-tag',
+					{ count: items.length }
+				);
 				for (let item of items) {
 					if (item.removeTag(tagName)) {
 						await item.save();
@@ -809,6 +818,10 @@ Zotero.Tags = new function () {
 			}
 			// Otherwise add to all items
 			else {
+				Zotero.UndoHistory.stageAction(
+					'undo-action-add-tag',
+					{ count: items.length }
+				);
 				for (let item of items) {
 					if (item.addTag(tagName)) {
 						await item.save();
@@ -825,6 +838,10 @@ Zotero.Tags = new function () {
 	 */
 	this.removeColoredTagsFromItems = async function (items) {
 		return Zotero.DB.executeTransaction(async function () {
+			Zotero.UndoHistory.stageAction(
+				'undo-action-remove-tag',
+				{ count: items.length }
+			);
 			for (let item of items) {
 				let colors = this.getColors(item.libraryID);
 				let tags = item.getTags();
@@ -847,8 +864,10 @@ Zotero.Tags = new function () {
 	
 	// Return the first sequence of emojis from a string
 	this.extractEmojiForItemsList = function (str) {
-		// Either match RGI_Emoji (which includes country flags) or any character followed by the Variation Selector-16
-		let re = /(?:(?:\p{RGI_Emoji}|[\p{Extended_Pictographic}--[©®™]])(?!\uFE0F)|.\uFE0F)+/gv;
+		// Either match RGI_Emoji (which includes country flags), a pictographic symbol (see
+		// Zotero.Utilities.Internal.containsEmoji()), or any character followed by the Variation
+		// Selector-16
+		let re = /(?:(?:\p{RGI_Emoji}|[[\p{Extended_Pictographic}[\p{So}&&[☀-➿\u{1F000}-\u{1FAFF}]]]--[©®™\u{1F1E6}-\u{1F1FF}]])(?!\uFE0F)|.\uFE0F)+/gv;
 		return str.match(re)?.[0] || null;
 	};
 
diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index d9f6761b25..9254340ca1 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -37,6 +37,7 @@ Zotero.DBConnection = function (dbNameOrPath) {
 	}
 	
 	this.MAX_BOUND_PARAMETERS = 999;
+	this.IDLE_OBSERVER_SECONDS = 300;
 	this.DB_CORRUPTION_STRINGS = [
 		"database disk image is malformed",
 		"2152857611"
@@ -87,13 +88,10 @@ Zotero.DBConnection = function (dbNameOrPath) {
 		this._dbPath = Zotero.DataDirectory.getDatabase(dbNameOrPath);
 		this._externalDB = false;
 	}
-	this._shutdown = false;
 	this._connection = null;
 	this._transactionID = null;
 	this._transactionDate = null;
 	this._lastTransactionDate = null;
-	this._transactionRollback = false;
-	this._transactionNestingLevel = 0;
 	this._commitCount = 0;
 	this._callbacks = {
 		begin: [],
@@ -105,8 +103,15 @@ Zotero.DBConnection = function (dbNameOrPath) {
 		}
 	};
 	this._dbIsCorrupt = null
+	// Set when SQLite opens the database read-only, which blocks every write
+	this.readOnly = false;
+	this._checkingCorruption = false;
+	this._handlingCorruption = false;
+	this._corruptionHandlers = [];
+	this._idleCallbacks = [];
 	this._onlineBackupInProgress = false;
 	this._onConnectCallbacks = [];
+	this._loadedExtensions = new Set();
 
 	this._transactionPromise = null;
 	
@@ -283,6 +288,19 @@ Zotero.DBConnection.prototype.addCallback = function (type, cb) {
 }
 
 
+/**
+ * Add a callback to run when the current transaction is committed or rolled back
+ *
+ * A rollback reverts the database but not JS state, and a transaction can contain many
+ * objects' saves (e.g., sync download batches), so one object's failure rolls back other
+ * objects' already-completed side effects. In-memory state (caches, properties of cached
+ * data objects) must therefore either be updated only in a 'commit' callback or restored
+ * to its previous state in a 'rollback' callback.
+ *
+ * @param {String} type - 'commit' or 'rollback'
+ * @param {Function} cb - Called with the transaction id after the transaction is
+ *     committed or rolled back
+ */
 Zotero.DBConnection.prototype.addCurrentCallback = function (type, cb) {
 	this.requireTransaction();
 	this._callbacks.current[type].push(cb);
@@ -304,25 +322,6 @@ Zotero.DBConnection.prototype.removeCallback = function (type, id) {
 }
 
 
-/*
- * Used on shutdown to rollback all open transactions
- *
- * TODO: update or remove
- */
-Zotero.DBConnection.prototype.rollbackAllTransactions = function () {
-	if (this.transactionInProgress()) {
-		var level = this._transactionNestingLevel;
-		this._transactionNestingLevel = 0;
-		try {
-			this.rollbackTransaction();
-		}
-		catch (e) {}
-		return level ? level : true;
-	}
-	return false;
-}
-
-
 Zotero.DBConnection.prototype.getColumns = function (table) {
 	return this.queryAsync("PRAGMA table_info(" + table + ")")
 	.then(function (rows) {
@@ -421,6 +420,10 @@ Zotero.DBConnection.prototype.getNextName = async function (libraryID, table, fi
 // });
 //
 /**
+ * In-memory state (caches, properties of cached data objects) modified within the
+ * transaction must be updated in a commit callback or restored in a rollback callback so
+ * that it doesn't reflect rolled-back changes -- see addCurrentCallback()
+ *
  * @param {Function} func - Async function containing `await Zotero.DB.queryAsync()` and similar
  * @param {Object} [options]
  * @param {Boolean} [options.disableForeignKeys] - Disable foreign key checks before the
@@ -434,6 +437,7 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
 	var resolve;
 	
 	var startedTransaction = false;
+	var committed = false;
 	var id = Zotero.Utilities.randomString();
 	
 	try {
@@ -483,6 +487,7 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
 			}
 			
 			result = await conn.executeTransaction(func);
+			committed = true;
 			this._commitCount++;
 			Zotero.debug(`Committed DB transaction ${id}`, 4);
 		}
@@ -511,15 +516,28 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
 		this._callbacks.current.rollback = [];
 		
 		// Run temporary commit callbacks
+		//
+		// The transaction is already committed, so errors in commit callbacks are logged
+		// rather than being treated as transaction failures
 		var f;
 		while (f = this._callbacks.current.commit.shift()) {
-			await Promise.resolve(f(id));
+			try {
+				await Promise.resolve(f(id));
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
 		}
 		
 		// Run commit callbacks
 		for (var i=0; i<this._callbacks.commit.length; i++) {
 			if (this._callbacks.commit[i]) {
-				await this._callbacks.commit[i](id);
+				try {
+					await this._callbacks.commit[i](id);
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
 			}
 		}
 		
@@ -529,6 +547,10 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
 		if (e instanceof Zotero.DBConnection.TimeoutError) {
 			Zotero.debug(`Timed out waiting for transaction ${id}`, 1);
 		}
+		else if (committed) {
+			Zotero.debug(`Error after committing DB transaction ${id}`, 1);
+			Zotero.debug(e.message, 1);
+		}
 		else {
 			Zotero.debug(`Rolled back DB transaction ${id}`, 1);
 			Zotero.debug(e.message, 1);
@@ -537,7 +559,25 @@ Zotero.DBConnection.prototype.executeTransaction = async function (func, options
 			this._transactionID = null;
 		}
 		
-		// Function to run once transaction has been committed but before any
+		// A corruption error from the transaction's own BEGIN or COMMIT is thrown by mozStorage
+		// instead of by one of our query methods, so it hasn't been checked yet
+		if (!e?.corruptionChecked) {
+			await this._checkException(e);
+		}
+		
+		// If the transaction was committed before the error, don't run rollback
+		// callbacks, since the data was saved
+		if (committed) {
+			e.committed = true;
+			this._callbacks.current.commit = [];
+			this._callbacks.current.rollback = [];
+			throw e;
+		}
+		
+		// Discard commit callbacks from the rolled-back transaction
+		this._callbacks.current.commit = [];
+		
+		// Function to run once transaction has been rolled back but before any
 		// permanent callbacks
 		if (options.onRollback) {
 			this._callbacks.current.rollback.push(options.onRollback);
@@ -589,6 +629,7 @@ Zotero.DBConnection.prototype.requireTransaction = function () {
 	if (!this._transactionID) {
 		throw new Error("Not in transaction");
 	}
+	return this._transactionID;
 };
 
 
@@ -692,7 +733,7 @@ Zotero.DBConnection.prototype.queryAsync = async function (sql, params, options
 		if (e.errors && e.errors[0]) {
 			var eStr = e + "";
 			eStr = eStr.indexOf("Error: ") == 0 ? eStr.substr(7): e;
-			throw new Error(eStr + ' [QUERY: ' + sql + '] '
+			let newError = new Error(eStr + ' [QUERY: ' + sql + '] '
 				+ (params
 					? '[PARAMS: '
 						+ (Array.isArray(params)
@@ -701,6 +742,8 @@ Zotero.DBConnection.prototype.queryAsync = async function (sql, params, options
 						) + '] '
 					: '')
 				+ '[ERROR: ' + e.errors[0].message + ']');
+			newError.corruptionChecked = e.corruptionChecked;
+			throw newError;
 		}
 		else {
 			throw e;
@@ -909,6 +952,23 @@ Zotero.DBConnection.prototype.observe = async function (subject, topic, data) {
 			try {
 				await this.backUpDatabase({ online: true });
 				await this.vacuum();
+				// The main vacuum covers only the main database, so let callers reclaim space in
+				// their own attached databases (e.g., the full-text index) here too
+				for (let callback of this._idleCallbacks) {
+					try {
+						await callback();
+					}
+					catch (e) {
+						Zotero.logError(e);
+					}
+				}
+				// Truncate the WAL file so that a crash or force-quit leaves behind as
+				// little stale WAL data as possible. A leftover -wal file is replayed into
+				// whatever file next occupies the database path (e.g., a backup manually
+				// copied into place), corrupting it, and an empty one is harmless.
+				if (this._connection) {
+					await this.queryAsync("PRAGMA wal_checkpoint(TRUNCATE)");
+				}
 			}
 			catch (e) {
 				Zotero.logError(e);
@@ -1071,8 +1131,57 @@ Zotero.DBConnection.prototype.integrityCheck = async function () {
 };
 
 
+/**
+ * Load a bundled SQLite extension (e.g., 'fts5') on the connection.
+ *
+ * Mozilla's mozStorage doesn't compile FTS in by default and disables generic extension loading,
+ * but it does allow loading specific bundled extensions by name. The module is registered per
+ * connection, so call this once: the extension is remembered and re-loaded automatically when the
+ * connection is reopened (e.g., after a vacuum()), before onConnect() callbacks run, so callers
+ * don't have to reload it themselves.
+ */
+Zotero.DBConnection.prototype.loadExtension = async function (name) {
+	var conn = await this._getConnectionAsync();
+	var result = conn._connectionData._dbConn.loadExtension(name);
+	// Remember it so it can be re-loaded on the next reconnect
+	this._loadedExtensions.add(name);
+	return result;
+};
+
+
 Zotero.DBConnection.prototype.isCorruptionError = function (e) {
-	return this.DB_CORRUPTION_STRINGS.some(x => e.message.includes(x));
+	return this.DB_CORRUPTION_STRINGS.some(x => e.message?.includes(x))
+		// Opening a corrupted or non-database file can throw with this nsresult and no
+		// matching message text
+		|| e.result == Cr.NS_ERROR_FILE_CORRUPTED;
+};
+
+
+/**
+ * Check for SQLite's read-only-database error
+ */
+Zotero.DBConnection.prototype.isReadOnlyError = function (e) {
+	return !!e.message?.includes('attempt to write a readonly database');
+};
+
+
+/**
+ * Register a callback to run when a corruption error occurs but the main database checks out,
+ * meaning an attached database (e.g., the rebuildable full-text index) is corrupt. The callback
+ * can rebuild it. Run deferred, after the failing operation unwinds.
+ */
+Zotero.DBConnection.prototype.addCorruptionHandler = function (handler) {
+	this._corruptionHandlers.push(handler);
+};
+
+
+/**
+ * Register a callback to run during the database's idle maintenance, after the periodic backup and
+ * vacuum. Lets code with its own attached database do maintenance (e.g., vacuuming) on the same
+ * idle trigger.
+ */
+Zotero.DBConnection.prototype.onIdle = function (callback) {
+	this._idleCallbacks.push(callback);
 };
 
 
@@ -1099,20 +1208,33 @@ Zotero.DBConnection.prototype.closeDatabase = async function (permanent) {
 		// Checkpoint WAL before closing so all data is in the main file
 		// and -wal file is truncated. Use _connection.execute() directly
 		// to avoid deadlocking with _offlineBackupPromise in queryAsync.
-		try {
-			Zotero.debug("PRAGMA wal_checkpoint(TRUNCATE)");
-			await this._connection.execute("PRAGMA wal_checkpoint(TRUNCATE)");
+		//
+		// Skip this if the database is flagged as corrupt, since checkpointing would write
+		// potentially bad WAL data into the database file, which might be a valid file that a
+		// stale WAL file is being incorrectly replayed into.
+		if (!this._dbIsCorrupt) {
+			try {
+				Zotero.debug("PRAGMA wal_checkpoint(TRUNCATE)");
+				await this._connection.execute("PRAGMA wal_checkpoint(TRUNCATE)");
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
 		}
-		catch (e) {
-			Zotero.logError(e);
-		}
-
+		
 		this.closed = true;
 		await this._connection.close();
 		this._connection = undefined;
 		this._connection = permanent ? false : null;
 		Zotero.debug("Database closed");
 	}
+	
+	if (permanent && this._idleObserverRegistered) {
+		this._idleObserverRegistered = false;
+		Components.classes["@mozilla.org/widget/useridleservice;1"]
+			.getService(Components.interfaces.nsIUserIdleService)
+			.removeIdleObserver(this, this.IDLE_OBSERVER_SECONDS);
+	}
 };
 
 
@@ -1146,7 +1268,7 @@ Zotero.DBConnection.prototype.backupDatabase = async function (_suffix, _force)
  *     for zotero.sqlite.123.bak)
  * @param {Boolean} [options.online] - Perform an online incremental backup without closing connection
  */
-Zotero.DBConnection.prototype.backUpDatabase = async function ({ force, suffix, online }) {
+Zotero.DBConnection.prototype.backUpDatabase = async function ({ force, suffix, online } = {}) {
 	if (this.skipBackup || this._externalDB || Zotero.skipLoading) {
 		this._debug("Skipping backup of database '" + this._dbName + "'", 1);
 		return false;
@@ -1193,6 +1315,18 @@ Zotero.DBConnection.prototype.backUpDatabase = async function ({ force, suffix,
 		online = false;
 	}
 
+	// On Linux, use an offline backup on a network filesystem. The online backup API writes
+	// the backup file through SQLite's default VFS, whose locking can hang there -- its lock
+	// upgrades conflict with the SMB byte-range lock mapping on CIFS mounts. Check the
+	// directory rather than the database file, which could be a symlink to another volume,
+	// since the directory is where the backup files are written.
+	if (online && Zotero.isLinux
+			&& ['cifs', 'smb', 'smb2', 'nfs'].includes(
+				Zotero.File.getFileSystemInfo(PathUtils.parent(this._dbPath))?.fsType
+			)) {
+		online = false;
+	}
+
 	var resolveOfflineBackupPromise;
 	var success = false;
 	if (online) {
@@ -1220,7 +1354,10 @@ Zotero.DBConnection.prototype.backUpDatabase = async function ({ force, suffix,
 			if (await OS.File.exists(backupFile)) {
 				let currentDBTime = (await OS.File.stat(file)).lastModificationDate;
 				let lastBackupTime = (await OS.File.stat(backupFile)).lastModificationDate;
-				if (currentDBTime == lastBackupTime) {
+				// In WAL mode the database file's mtime advances only when the WAL is
+				// checkpointed, so changes still in the WAL leave it matching the backup
+				if (currentDBTime.getTime() == lastBackupTime.getTime()
+						&& !(await this._hasWALContents(file))) {
 					Zotero.debug("Database '" + this._dbName + "' hasn't changed -- skipping backup");
 					return false;
 				}
@@ -1330,10 +1467,29 @@ Zotero.DBConnection.prototype.backUpDatabase = async function ({ force, suffix,
 		}
 		
 		await OS.File.move(tmpFile, backupFile);
+		
+		// A copy preserves the database file's mtime, and the backup interval is measured from
+		// the backup file's mtime, so a forced backup of a long-idle database could be rotated
+		// out a day early. Date forced backups from the backup itself so that they last a full
+		// rotation period.
+		if (force && !suffix) {
+			await IOUtils.setModificationTime(backupFile);
+		}
+		
 		Zotero.debug("Backed up to " + PathUtils.filename(backupFile));
 		success = true;
 		return true;
 	}
+	catch (e) {
+		// Backups are best-effort, so if anything goes wrong dealing
+		// with them -- e.g., an offline backup file on a network drive
+		// that can't be accessed, which fails with ERROR_FILE_OFFLINE
+		// (https://forums.zotero.org/discussion/132201/) -- log the
+		// error and skip the backup rather than letting it block a
+		// schema upgrade or startup.
+		Zotero.logError(e);
+		return false;
+	}
 	finally {
 		if (online) {
 			this._onlineBackupInProgress = false;
@@ -1388,21 +1544,74 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function () {
 		throw new Error("Database permanently closed; not re-opening");
 	}
 	
+	// Opening is asynchronous, so callers arriving while it's under way share the same attempt
+	if (!this._openPromise) {
+		this._openPromise = this._openConnectionAsync()
+			.finally(() => {
+				this._openPromise = null;
+			});
+	}
+	return this._openPromise;
+};
+
+
+Zotero.DBConnection.prototype._openConnectionAsync = async function () {
 	this._debug("Asynchronously opening database '" + this._dbName + "'");
 	Zotero.debug(this._dbPath);
 	
+	this.readOnly = false;
+	
 	// Get the storage service
 	var store = Services.storage;
 	
 	var file = this._dbPath;
 	var corruptMarker = this._dbPath + '.is.corrupt';
 	
+	var uncleanShutdown = false;
+	var useWAL = true;
+	if (!this._externalDB) {
+		// If a verified copy of the database file was saved before a restart due to stale
+		// journal files, swap it in. A failure aborts startup, since opening the database
+		// with a pending repair still on disk could let the older copy overwrite newer data
+		// at a later startup.
+		await this._applyPendingRepair();
+	
+		// A non-empty WAL file means the last session didn't close cleanly, since the WAL
+		// is truncated at shutdown
+		try {
+			uncleanShutdown = (await IOUtils.stat(file + '-wal')).size > 0;
+		}
+		catch (e) {
+			if (e.name != 'NotFoundError') {
+				throw e;
+			}
+		}
+	
+		useWAL = await this._canUseWAL(file);
+	}
+	
 	try {
 		if (await OS.File.exists(corruptMarker)) {
 			throw new Error(this.DB_CORRUPTION_STRINGS[0]);
 		}
+		// A database in WAL mode on a filesystem that can't use WAL has to be converted
+		// before it's opened, since just opening it crashes -- see _canUseWAL(). A corruption
+		// error from the conversion goes through the same recovery as one from the open.
+		if (!this._externalDB && !useWAL) {
+			await this._downgradeDatabaseFromWAL(file);
+		}
+		// On macOS, open without an exclusive lock at the OS level so the database can be opened
+		// on network filesystems (e.g., SMB shares), where acquiring the exclusive open lock
+		// fails with an I/O error. We still set locking_mode=EXCLUSIVE below, which gives us a
+		// connection-lifetime SQLite lock preventing undetected concurrent writes. See #4860.
+		//
+		// On other platforms, keep the default exclusive open, which performs all locking under
+		// a single held lock -- avoiding SQLite's lock-upgrade sequence, which fails on some
+		// network filesystems (e.g., Linux CIFS mounts) -- and keeps the WAL index in heap
+		// memory, so no -shm file is created.
 		this._connection = await Promise.resolve(this.Sqlite.openConnection({
-			path: file
+			path: file,
+			openNotExclusive: Zotero.isMac
 		}));
 	}
 	catch (e) {
@@ -1413,8 +1622,11 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function () {
 		
 		Zotero.logError(e);
 		
-		if (this.DB_CORRUPTION_STRINGS.some(x => e.message.includes(x))) {
+		if (this.isCorruptionError(e)) {
 			await this._handleCorruptionMarker();
+			// Recovery just verified or replaced the database file and removed any journal
+			// files, so the unclean-shutdown integrity check below would be redundant
+			uncleanShutdown = false;
 		}
 		else {
 			// Some other error that we don't yet know how to deal with
@@ -1430,13 +1642,27 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function () {
 			await this.queryAsync("PRAGMA main.locking_mode=NORMAL");
 		}
 
-		// Enable WAL mode for better write performance. With locking_mode=EXCLUSIVE
-		// set first, SQLite uses heap memory for the WAL index instead of shared
-		// memory, so no -shm file is created on disk.
-		await this.queryAsync("PRAGMA journal_mode=WAL");
-		// NORMAL synchronous is safe with WAL -- only risks losing the last
-		// transaction on power loss, not corruption
-		await this.queryAsync("PRAGMA synchronous=NORMAL");
+		if (useWAL) {
+			try {
+				// Enable WAL mode for better write performance
+				await this.queryAsync("PRAGMA journal_mode=WAL");
+				// NORMAL synchronous is safe with WAL -- only risks losing the last
+				// transaction on power loss, not corruption
+				await this.queryAsync("PRAGMA synchronous=NORMAL");
+			}
+			catch (e) {
+				// Setting the journal mode is the first write to the database, so it fails
+				// when the database file or its directory isn't writable. Let the connection
+				// open in whatever journal mode the database is already in, so that startup can
+				// fail with a message about permissions instead of this error, and flag it so
+				// that startup fails even if its write-access checks pass.
+				if (!this.isReadOnlyError(e)) {
+					throw e;
+				}
+				this.readOnly = true;
+				Zotero.logError(e);
+			}
+		}
 
 		// Set page cache size to 8MB
 		let pageSize = await this.valueQueryAsync("PRAGMA page_size");
@@ -1446,13 +1672,64 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function () {
 		// Enable foreign key checks
 		await this.queryAsync("PRAGMA foreign_keys=true");
 		
+		// If the last session didn't close cleanly, check database integrity, in case the WAL
+		// doesn't belong to the database file (e.g., a stale WAL from a force-quit left in
+		// place while the database file was manually replaced from a backup). A mismatched
+		// WAL can produce subtle data damage rather than outright errors, so use a full
+		// integrity check, which unlike quick_check verifies indexes against table contents.
+		if (uncleanShutdown) {
+			this._debug("Last session didn't close cleanly -- checking database integrity", 1);
+			this._showProgressText('db-checking-integrity');
+			let ok = false;
+			try {
+				ok = (await this.valueQueryAsync("PRAGMA integrity_check(1)")) == 'ok';
+			}
+			catch (e) {
+				// Only a corruption error confirms corruption -- operational errors propagate
+				if (!this.isCorruptionError(e)) {
+					throw e;
+				}
+				Zotero.logError(e);
+			}
+			if (ok) {
+				this._debug("Database integrity OK", 1);
+			}
+			else {
+				let error = new Error(this.DB_CORRUPTION_STRINGS[0]);
+				// The full check verifies index contents that quick_check skips, so don't let
+				// the attached-database quick check overrule it
+				await this._checkException(error, { mainConfirmedCorrupt: true });
+				throw error;
+			}
+		}
+		
 		// Register idle observer for DB backup
-		Zotero.Schema.schemaUpdatePromise.then(() => {
-			Zotero.debug("Initializing DB backup idle observer");
-			var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
-				.getService(Components.interfaces.nsIUserIdleService);
-			idleService.addIdleObserver(this, 300);
-		});
+		if (!this._idleObserverScheduled) {
+			this._idleObserverScheduled = true;
+			Zotero.Schema.schemaUpdatePromise.then(() => {
+				// The database can be closed permanently while this is pending
+				if (this._connection === false) {
+					return;
+				}
+				Zotero.debug("Initializing DB backup idle observer");
+				var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
+					.getService(Components.interfaces.nsIUserIdleService);
+				idleService.addIdleObserver(this, this.IDLE_OBSERVER_SECONDS);
+				this._idleObserverRegistered = true;
+			});
+		}
+	}
+
+	// Re-load any extensions loaded via loadExtension(), which are registered per connection and
+	// so don't survive a reconnect. Done before the onConnect callbacks, which may depend on them
+	// (e.g., creating FTS5 tables).
+	for (let name of this._loadedExtensions) {
+		try {
+			this._connection._connectionData._dbConn.loadExtension(name);
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
 	}
 
 	for (let callback of this._onConnectCallbacks) {
@@ -1468,16 +1745,290 @@ Zotero.DBConnection.prototype._getConnectionAsync = async function () {
 };
 
 
-Zotero.DBConnection.prototype._checkException = async function (e) {
-	if (this._externalDB || !this.isCorruptionError(e)) {
+/**
+ * Check whether the database's WAL file contains data not yet in the database file
+ *
+ * @param {String} file - Path to the database file
+ * @return {Promise<Boolean>}
+ */
+Zotero.DBConnection.prototype._hasWALContents = async function (file) {
+	try {
+		return (await IOUtils.stat(file + '-wal')).size > 0;
+	}
+	catch (e) {
+		if (e.name != 'NotFoundError') {
+			throw e;
+		}
+		return false;
+	}
+};
+
+
+/**
+ * Determine whether the database file can use WAL journal mode
+ *
+ * WAL requires SQLite's shared-memory support. On macOS, SQLite chooses its locking methods
+ * based on the filesystem containing the database, and network filesystems (e.g., SMB, NFS,
+ * WebDAV), read-only volumes, and filesystems without byte-range locking get methods without
+ * shared-memory support. Opening a WAL database with those crashes, because Mozilla's VFS
+ * wrapper hides the missing shared-memory methods from SQLite's WAL support check, so mirror
+ * SQLite's selection logic and allow WAL only when it would select methods with shared-memory
+ * support.
+ *
+ * @param {String} file - Path to the database file
+ * @return {Promise<Boolean>}
+ */
+Zotero.DBConnection.prototype._canUseWAL = async function (file) {
+	if (!Zotero.isMac) {
 		return true;
 	}
+	let info = Zotero.File.getFileSystemInfo(file);
+	if (!info) {
+		return false;
+	}
+	Zotero.debug(`Database is on ${info.fsType} filesystem`);
+	// Filesystems that SQLite maps by name to locking methods without shared-memory support,
+	// plus read-only volumes, which get no-op locking
+	if (['afpfs', 'smbfs', 'webdav', 'nfs'].includes(info.fsType) || info.readOnly) {
+		return false;
+	}
+	// For other filesystems, SQLite probes byte-range locking support and falls back to
+	// dot-file locking without shared-memory support if it's missing
+	return Zotero.File.supportsByteRangeLocks(file);
+};
+
+
+/**
+ * Convert a database in WAL mode back to a rollback journal
+ *
+ * If the WAL file is missing or empty, revert the format versions in the database header
+ * directly. Otherwise replay the WAL by converting a temporary copy of the database on
+ * local disk and swapping it in after it passes an integrity check. If the converted copy
+ * fails the check -- e.g., because the WAL is stale and doesn't belong to the database
+ * file -- but the database file is valid on its own, discard the WAL instead. The original
+ * files aren't modified until a validated replacement is in place.
+ *
+ * A WAL file next to a database whose header already has the rollback format versions --
+ * e.g., from a conversion interrupted between the swap and the WAL removal, or a database
+ * file manually restored from a backup with a stale WAL left in place -- goes through the
+ * same conversion, since SQLite applies a WAL file based on its presence alone.
+ *
+ * @param {String} file - Path to the database file
+ * @return {Promise<Boolean>} - True if the database was converted
+ */
+Zotero.DBConnection.prototype._downgradeDatabaseFromWAL = async function (file) {
+	// SQLite canonicalizes the database path, so the journal files of a symlinked database
+	// sit next to the symlink's target, and the target is what has to be converted
+	try {
+		let nsFile = Zotero.File.pathToFile(file);
+		nsFile.normalize();
+		file = nsFile.path;
+	}
+	catch (e) {
+		// Leave the path as is if it can't be resolved (e.g., the file doesn't exist)
+	}
+	
+	let header;
+	try {
+		header = await IOUtils.read(file, { maxBytes: 20 });
+	}
+	catch (e) {
+		if (e.name == 'NotFoundError') {
+			return false;
+		}
+		throw e;
+	}
+	// Bytes 18 and 19 are the write and read format versions -- 2 means WAL
+	let isWALHeader = header.length >= 20 && header[18] == 2;
+	
+	let walSize = null;
+	try {
+		walSize = (await IOUtils.stat(file + '-wal')).size;
+	}
+	catch (e) {
+		if (e.name != 'NotFoundError') {
+			throw e;
+		}
+	}
+	
+	if (!isWALHeader && walSize === null) {
+		return false;
+	}
+	
+	Zotero.debug(isWALHeader
+		? "Database is in WAL mode -- converting to rollback journal"
+		: "Database has a leftover WAL file -- applying and removing it");
+	
+	if (walSize > 0) {
+		let tempFile = PathUtils.join(
+			PathUtils.tempDir, `zotero.${Zotero.Utilities.randomString()}.sqlite`
+		);
+		let swapFile = file + '.convert-tmp';
+		try {
+			await IOUtils.copy(file, tempFile);
+			await IOUtils.copy(file + '-wal', tempFile + '-wal');
+			// Only a corruption error marks the copy as invalid -- operational errors
+			// (I/O, permissions) propagate
+			let valid = false;
+			try {
+				let conn = await this.Sqlite.openConnection({ path: tempFile });
+				try {
+					await conn.execute("PRAGMA journal_mode=DELETE");
+				}
+				finally {
+					await conn.close();
+				}
+				valid = await this._integrityCheckFile(tempFile);
+			}
+			catch (e) {
+				if (!this.isCorruptionError(e)) {
+					throw e;
+				}
+				Zotero.logError(e);
+			}
+			if (!valid) {
+				// The WAL might be stale and not belong to the database file, so check
+				// whether the database file is valid on its own, and if so discard the WAL
+				Zotero.warn("Converted database failed integrity check "
+					+ "-- checking database file without WAL");
+				await IOUtils.remove(tempFile, { ignoreAbsent: true });
+				await IOUtils.remove(tempFile + '-wal', { ignoreAbsent: true });
+				await IOUtils.copy(file, tempFile);
+				await this._revertWALHeader(tempFile);
+				try {
+					valid = await this._integrityCheckFile(tempFile);
+				}
+				catch (e) {
+					if (!this.isCorruptionError(e)) {
+						throw e;
+					}
+					Zotero.logError(e);
+				}
+				if (!valid) {
+					throw new Error(this.DB_CORRUPTION_STRINGS[0]);
+				}
+				Zotero.warn("Database file is valid without WAL -- discarding WAL");
+			}
+			// Copy next to the original before replacing it so that the swap is atomic
+			await IOUtils.copy(tempFile, swapFile);
+			await IOUtils.move(swapFile, file);
+		}
+		finally {
+			await IOUtils.remove(tempFile, { ignoreAbsent: true });
+			await IOUtils.remove(tempFile + '-wal', { ignoreAbsent: true });
+			await IOUtils.remove(swapFile, { ignoreAbsent: true });
+		}
+	}
+	else if (isWALHeader) {
+		await this._revertWALHeader(file);
+	}
+	
+	await IOUtils.remove(file + '-wal', { ignoreAbsent: true });
+	await IOUtils.remove(file + '-shm', { ignoreAbsent: true });
+	return true;
+};
+
+
+/**
+ * Set the write and read format versions in a database file's header to 1 (rollback journal)
+ */
+Zotero.DBConnection.prototype._revertWALHeader = async function (file) {
+	let stream = Components.classes["@mozilla.org/network/file-output-stream;1"]
+		.createInstance(Components.interfaces.nsIFileOutputStream);
+	// PR_WRONLY, no truncation
+	stream.init(Zotero.File.pathToFile(file), 0x02, 0o644, 0);
+	try {
+		stream.QueryInterface(Components.interfaces.nsISeekableStream)
+			.seek(Components.interfaces.nsISeekableStream.NS_SEEK_SET, 18);
+		stream.write("\x01\x01", 2);
+	}
+	finally {
+		stream.close();
+	}
+};
+
+
+/**
+ * @param {Error} e
+ * @param {Object} [options]
+ * @param {Boolean} [options.mainConfirmedCorrupt] - Skip the attached-database check because
+ *     the caller already confirmed main-database corruption (e.g., with a full integrity
+ *     check, which detects index inconsistencies that quick_check misses)
+ */
+Zotero.DBConnection.prototype._checkException = async function (e, { mainConfirmedCorrupt } = {}) {
+	// Flag the error so that it isn't checked again as it propagates
+	if (e && typeof e == 'object') {
+		e.corruptionChecked = true;
+	}
+	
+	if (this._externalDB || !this.isCorruptionError(e) || this._checkingCorruption
+			|| this._handlingCorruption) {
+		return true;
+	}
+
+	var progressToken = this._showProgressText('db-checking-integrity');
+	
+	// A "malformed" error can come from an attached database (e.g., the rebuildable full-text
+	// index) rather than the main file, so confirm the main database is actually corrupt before
+	// offering to restore it. That way a disposable attached DB's corruption doesn't trigger
+	// main-database recovery; the attaching code detects and rebuilds it instead.
+	if (!mainConfirmedCorrupt) {
+		let mainOK = false;
+		this._checkingCorruption = true;
+		try {
+			mainOK = (await this.valueQueryAsync("PRAGMA main.quick_check(1)")) == 'ok';
+		}
+		catch (checkError) {
+			Zotero.logError(checkError);
+			// A check failure other than a corruption error leaves the state of the main
+			// database unknown, so don't start destructive recovery
+			if (!this.isCorruptionError(checkError)) {
+				this._clearProgressText(progressToken);
+				return true;
+			}
+		}
+		finally {
+			this._checkingCorruption = false;
+		}
+		if (mainOK) {
+			Zotero.logError(e);
+			Zotero.debug("Corruption error but the main database passed a check -- skipping "
+				+ "main-database recovery", 1);
+			// Let owners of attached databases (e.g., the full-text index) rebuild them. Deferred
+			// so it runs after the failing operation unwinds -- a rebuild may need to DETACH,
+			// which can't run inside the transaction the error may have come from.
+			for (let handler of this._corruptionHandlers) {
+				Zotero.Promise.delay(0).then(handler).catch(err => Zotero.logError(err));
+			}
+			this._clearProgressText(progressToken);
+			return true;
+		}
+	}
+
+	// Corruption errors from other queries can keep arriving while this runs, since a pending
+	// restart or quit is asynchronous and execution continues until shutdown
+	this._handlingCorruption = true;
+	
+	// Skip backups
+	this._dbIsCorrupt = true;
+	
+	// If the database file is valid and only stale journal files are causing the corruption,
+	// save the verified copy to be swapped in at the next startup and restart
+	try {
+		if (await this._journalFilesExist() && await this._checkValidWithoutJournalFiles(true)) {
+			this._debug("Restarting to recover database from stale journal files", 1);
+			Zotero.skipLoading = true;
+			Zotero.Utilities.Internal.quit(true);
+			return false;
+		}
+	}
+	catch (e2) {
+		Zotero.logError(e2);
+	}
 	
 	const supportURL = 'https://zotero.org/support/kb/corrupted_database';
 	
 	var filename = PathUtils.filename(this._dbPath);
-	// Skip backups
-	this._dbIsCorrupt = true;
 	
 	var backupDate = null;
 	var backupTime = null;
@@ -1518,6 +2069,8 @@ Zotero.DBConnection.prototype._checkException = async function (e) {
 		Zotero.Utilities.Internal.quit(true);
 	}
 	else if (index == 1) {
+		this._handlingCorruption = false;
+		this._clearProgressText(progressToken);
 	}
 	else {
 		Zotero.launchURL(supportURL);
@@ -1529,6 +2082,382 @@ Zotero.DBConnection.prototype._checkException = async function (e) {
 };
 
 
+/**
+ * Move any -journal/-wal files along with a database file that's being moved
+ *
+ * SQLite associates journal files with a database by filename, so a stale journal left at the
+ * old path would be replayed into whatever file next occupies it (e.g., a restored backup),
+ * corrupting it. Moving the -wal file along with a .damaged file also keeps committed
+ * transactions that hadn't yet been checkpointed available for data recovery.
+ */
+Zotero.DBConnection.prototype._moveJournalFiles = async function (fromPath, toPath) {
+	for (let suffix of ['-journal', '-wal']) {
+		try {
+			if (await IOUtils.exists(fromPath + suffix)) {
+				this._debug(`Moving '${PathUtils.filename(fromPath + suffix)}' to `
+					+ `'${PathUtils.filename(toPath + suffix)}'`, 1);
+				await IOUtils.move(fromPath + suffix, toPath + suffix);
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+	}
+	// A -shm file contains no recoverable data and is rebuilt by SQLite, so just remove it
+	try {
+		await IOUtils.remove(fromPath + '-shm', { ignoreAbsent: true });
+	}
+	catch (e) {
+		Zotero.logError(e);
+	}
+};
+
+
+/**
+ * Remove any journal files (-journal/-wal/-shm) at a database path so that they aren't
+ * replayed into a database file subsequently placed there
+ *
+ * @return {Boolean} - False if a -journal or -wal file couldn't be removed
+ */
+Zotero.DBConnection.prototype._removeJournalFiles = async function (dbPath) {
+	var success = true;
+	for (let suffix of ['-journal', '-wal', '-shm']) {
+		try {
+			if (await IOUtils.exists(dbPath + suffix)) {
+				this._debug(`Removing '${PathUtils.filename(dbPath + suffix)}'`, 1);
+				await IOUtils.remove(dbPath + suffix);
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+			// A leftover -shm file on its own is harmless, so a failure to remove it
+			// shouldn't invalidate successful -journal/-wal removal
+			if (suffix != '-shm') {
+				success = false;
+			}
+		}
+	}
+	return success;
+};
+
+
+/**
+ * Check whether the database file is valid without its journal files by copying it to a
+ * temporary path, which strips the journal association, and running an integrity check on
+ * the copy
+ *
+ * A database and WAL pair that belong together and are both intact don't produce corruption
+ * errors, so a database that's valid without its WAL while the combined view is corrupt means
+ * the WAL doesn't belong to it.
+ *
+ * @param {Boolean} [keepCopy] - Keep a verified copy at <database>.repair.tmp, to be swapped
+ *     in by _applyPendingRepair() at the next startup
+ * @return {Boolean}
+ */
+Zotero.DBConnection.prototype._checkValidWithoutJournalFiles = async function (keepCopy) {
+	var file = this._dbPath;
+
+	if (!(await IOUtils.exists(file))) {
+		return false;
+	}
+
+	this._debug(`Checking whether database file '${PathUtils.filename(file)}' is valid `
+		+ `without its journal files`, 1);
+	var tmpFile = file + (keepCopy ? '.repair.tmp' : '.check.tmp');
+	var valid = false;
+	try {
+		await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+		await IOUtils.remove(tmpFile + '.verified', { ignoreAbsent: true });
+		// Remove journal files from an earlier interrupted check, which would otherwise be
+		// replayed into the new copy and invalidate the check
+		if (!(await this._removeJournalFiles(tmpFile))) {
+			throw new Error("Couldn't remove journal files of previous temporary copy");
+		}
+		await Zotero.File.copyFile(file, tmpFile);
+		valid = await this._integrityCheckFile(tmpFile);
+		// Record the verified copy's size and mtime so that _applyPendingRepair() can skip
+		// another integrity check after the restart. A crash before verification finishes
+		// leaves no record, so the copy gets checked again at startup.
+		if (valid && keepCopy) {
+			let { size, lastModified } = await IOUtils.stat(tmpFile);
+			await Zotero.File.putContentsAsync(
+				tmpFile + '.verified', JSON.stringify({ size, lastModified })
+			);
+		}
+	}
+	catch (e) {
+		// Only a corruption error marks the database file as invalid -- operational errors
+		// (I/O, permissions) propagate so that recovery is aborted rather than proceeding
+		// destructively
+		if (!this.isCorruptionError(e)) {
+			throw e;
+		}
+		Zotero.logError(e);
+	}
+	finally {
+		if (!valid || !keepCopy) {
+			try {
+				await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+				await IOUtils.remove(tmpFile + '.verified', { ignoreAbsent: true });
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+		}
+	}
+	this._debug(valid
+		? "Database file is valid without its journal files"
+		: "Database file isn't valid on its own", 1);
+	return valid;
+};
+
+
+/**
+ * Show a message on the main-window progress meter for a potentially long-running check or
+ * repair, ignoring errors (e.g., if no window exists yet)
+ *
+ * @return {Object|null} - Token for _clearProgressText()
+ */
+Zotero.DBConnection.prototype._showProgressText = function (l10nID) {
+	try {
+		return Zotero.showZoteroPaneProgressMeter(Zotero.ftl.formatValueSync(l10nID));
+	}
+	catch (e) {
+		Zotero.logError(e);
+		return null;
+	}
+};
+
+
+/**
+ * Restore the progress display shown with _showProgressText() to its previous state, leaving
+ * it alone if another operation has changed it since
+ */
+Zotero.DBConnection.prototype._clearProgressText = function (token) {
+	try {
+		Zotero.restoreZoteroPaneProgressMeter(token);
+	}
+	catch (e) {
+		Zotero.logError(e);
+	}
+};
+
+
+/**
+ * Check whether journal files that can affect database contents (-journal/-wal) exist. A
+ * stale -shm file on its own is harmless, since the WAL index is just rebuilt from the
+ * -wal file.
+ */
+Zotero.DBConnection.prototype._journalFilesExist = async function () {
+	return await IOUtils.exists(this._dbPath + '-journal')
+		|| await IOUtils.exists(this._dbPath + '-wal');
+};
+
+
+/**
+ * Run an integrity check on a database file over a separate connection
+ *
+ * @param {String} path
+ * @param {Boolean} [quick] - Run quick_check instead of a full integrity_check, skipping
+ *     verification of index contents against tables
+ * @return {Boolean}
+ */
+Zotero.DBConnection.prototype._integrityCheckFile = async function (path, quick) {
+	var connection = await this.Sqlite.openConnection({ path, openNotExclusive: Zotero.isMac });
+	var ok;
+	try {
+		try {
+			let rows = await connection.execute(
+				`PRAGMA ${quick ? 'quick_check' : 'integrity_check'}(1)`
+			);
+			ok = !!rows.length && rows[0].getResultByIndex(0) == 'ok';
+		}
+		finally {
+			await connection.close();
+		}
+	}
+	finally {
+		// Remove journal files that opening the database can leave behind, even if the check
+		// throws. Fail on a removal failure only if the check passed, so that an original
+		// corruption error isn't masked.
+		if (!(await this._removeJournalFiles(path)) && ok) {
+			throw new Error("Couldn't remove journal files left by integrity check");
+		}
+	}
+	return ok;
+};
+
+
+/**
+ * Copy a database file whose only damage is index inconsistencies -- one that fails a full
+ * integrity check but passes a quick check -- and rebuild its indexes with REINDEX, which
+ * recreates them from table contents
+ *
+ * @return {String|false} - Path of the repaired copy if it passes a full integrity check,
+ *     or false if the file can't be repaired this way (e.g., table data contains actual
+ *     UNIQUE violations, which cause REINDEX to fail)
+ */
+Zotero.DBConnection.prototype._reindexToCopy = async function (path) {
+	var tmpFile = path + '.reindex.tmp';
+	try {
+		await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+		// A leftover journal file from an earlier interrupted repair would be replayed into
+		// the new copy, so fail on it as an operational error
+		if (!(await this._removeJournalFiles(tmpFile))) {
+			throw new Error("Couldn't remove journal files of previous reindex copy");
+		}
+		await Zotero.File.copyFile(path, tmpFile);
+		this._debug(`Rebuilding indexes of '${PathUtils.filename(tmpFile)}'`, 1);
+		this._showProgressText('db-repairing');
+		let connection = await this.Sqlite.openConnection({ path: tmpFile, openNotExclusive: Zotero.isMac });
+		try {
+			try {
+				await connection.execute("REINDEX");
+			}
+			finally {
+				await connection.close();
+			}
+		}
+		finally {
+			await this._removeJournalFiles(tmpFile);
+		}
+		if (await this._integrityCheckFile(tmpFile)) {
+			return tmpFile;
+		}
+	}
+	catch (e) {
+		// Constraint and corruption errors mean the file can't be repaired this way --
+		// operational errors propagate so that recovery is aborted
+		if (!this.isCorruptionError(e) && !/constraint/i.test(e.message ?? '')) {
+			try {
+				await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+			}
+			catch (e2) {
+				Zotero.logError(e2);
+			}
+			throw e;
+		}
+		Zotero.logError(e);
+	}
+	this._debug("Indexes couldn't be rebuilt", 1);
+	try {
+		await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+	}
+	catch (e) {
+		Zotero.logError(e);
+	}
+	return false;
+};
+
+
+/**
+ * Replace the database file with a verified copy saved by _checkException() before a restart,
+ * and remove the stale journal files that caused the corruption
+ *
+ * The saved copy is swapped in at startup rather than the journal files being removed at
+ * detection time, since SQLite can checkpoint stale WAL data into the database file when the
+ * connection is closed.
+ *
+ * Also removes temporary files left behind by interrupted checks and repairs.
+ */
+Zotero.DBConnection.prototype._applyPendingRepair = async function () {
+	var file = this._dbPath;
+	var repairFile = file + '.repair.tmp';
+	var verifiedFile = repairFile + '.verified';
+	
+	// Clean up temporary files left behind by an interrupted check or repair
+	for (let tmpFile of [file + '.check.tmp', file + '.bak.reindex.tmp']) {
+		try {
+			await IOUtils.remove(tmpFile, { ignoreAbsent: true });
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		await this._removeJournalFiles(tmpFile);
+	}
+	
+	if (!(await IOUtils.exists(repairFile))) {
+		try {
+			await IOUtils.remove(verifiedFile, { ignoreAbsent: true });
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		await this._removeJournalFiles(repairFile);
+		return;
+	}
+	
+	// If the copy still matches the size and mtime recorded after verification, skip another
+	// integrity check
+	var valid = false;
+	try {
+		let { size, lastModified } = JSON.parse(
+			await Zotero.File.getContentsAsync(verifiedFile)
+		);
+		let info = await IOUtils.stat(repairFile);
+		valid = info.size === size && info.lastModified === lastModified;
+	}
+	catch (e) {}
+	// Otherwise verify the copy before replacing the database file with it
+	if (!valid) {
+		this._showProgressText('db-checking-integrity');
+		try {
+			valid = await this._integrityCheckFile(repairFile);
+		}
+		catch (e) {
+			// Only a corruption error marks the copy as invalid for removal -- operational
+			// errors (I/O, permissions) propagate so that startup is aborted and the repair
+			// file preserved
+			if (!this.isCorruptionError(e)) {
+				throw e;
+			}
+			Zotero.logError(e);
+		}
+	}
+	await IOUtils.remove(verifiedFile, { ignoreAbsent: true });
+	if (!valid) {
+		this._debug(`Removing invalid repair file '${PathUtils.filename(repairFile)}'`, 1);
+		await IOUtils.remove(repairFile, { ignoreAbsent: true });
+		return;
+	}
+	
+	this._debug(`Replacing '${PathUtils.filename(file)}' with verified copy saved before `
+		+ `restart`, 1);
+	// A journal file that can't be removed would be replayed into the repaired database, so
+	// fail instead
+	if (!(await this._removeJournalFiles(file))) {
+		throw new Error("Couldn't remove stale journal files -- not applying pending repair");
+	}
+	await IOUtils.move(repairFile, file);
+	await IOUtils.remove(file + '.is.corrupt', { ignoreAbsent: true });
+};
+
+
+/**
+ * If the database file is valid on its own and stale journal files are causing the corruption
+ * -- e.g., a -wal file left behind by a force-quit that no longer matches the database file
+ * because the latter was manually replaced from a backup -- remove the journal files so that
+ * the database file can be used as is.
+ *
+ * Also returns true for a valid database file with no journal files, which can result from an
+ * earlier recovery that was interrupted before the corruption marker was cleared, so that the
+ * file isn't needlessly replaced with an older backup.
+ *
+ * @return {Boolean} - True if the database file is valid and any journal files were removed
+ */
+Zotero.DBConnection.prototype._recoverFromStaleJournalFiles = async function () {
+	if (!(await this._checkValidWithoutJournalFiles())) {
+		return false;
+	}
+	// A journal file that can't be removed would be replayed into the database file as soon
+	// as it was opened, so fail instead
+	if (!(await this._removeJournalFiles(this._dbPath))) {
+		throw new Error("Couldn't remove stale journal files");
+	}
+	return true;
+};
+
+
 /**
  * @return {Boolean} - True if recovered, false if not
  */
@@ -1540,6 +2469,22 @@ Zotero.DBConnection.prototype._handleCorruptionMarker = async function () {
 	
 	this._debug(`Database file '${fileName}' corrupted`, 1);
 	
+	this._showProgressText('db-checking-integrity');
+	
+	// If the database file is valid and only stale journal files are causing the corruption,
+	// keep it and skip the backup restore
+	if (await this._recoverFromStaleJournalFiles()) {
+		this._connection = await Promise.resolve(this.Sqlite.openConnection({
+			path: file,
+			openNotExclusive: Zotero.isMac
+		}));
+		this._debug('Database recovered from stale journal files', 1);
+		if (await OS.File.exists(corruptMarker)) {
+			await OS.File.remove(corruptMarker);
+		}
+		return;
+	}
+	
 	// No backup file! Eek!
 	if (!(await OS.File.exists(backupFile))) {
 		this._debug("No backup file for DB '" + this._dbName + "' exists", 1);
@@ -1551,15 +2496,23 @@ Zotero.DBConnection.prototype._handleCorruptionMarker = async function () {
 			this._debug('Saving damaged DB file with .damaged extension', 1);
 			damagedFile = this._dbPath + '.damaged';
 			damagedFile = await Zotero.File.moveToUnique(file, damagedFile);
+			await this._moveJournalFiles(file, damagedFile);
 		}
 		// If it doesn't exist, assume we already showed a warning and moved it
 		else {
 			this._debug(`Database file '${fileName}' doesn't exist!`);
 		}
 		
+		// A journal file that can't be removed would be replayed into the new database, so
+		// fail instead
+		if (!(await this._removeJournalFiles(file))) {
+			throw new Error("Couldn't remove stale journal files");
+		}
+		
 		// Create new main database
 		this._connection = await Promise.resolve(this.Sqlite.openConnection({
-			path: file
+			path: file,
+			openNotExclusive: Zotero.isMac
 		}));
 		
 		if (await OS.File.exists(corruptMarker)) {
@@ -1579,24 +2532,53 @@ Zotero.DBConnection.prototype._handleCorruptionMarker = async function () {
 		return;
 	}
 	
-	// Save damaged file
-	this._debug('Saving damaged DB file with .damaged extension', 1);
+	// Save damaged file, unless it was already moved by an interrupted earlier recovery
 	var damagedFile = this._dbPath + '.damaged';
-	damagedFile = await Zotero.File.moveToUnique(file, damagedFile);
-	
-	// Test the backup file
-	try {
-		Zotero.debug("Asynchronously opening DB connection");
-		this._connection = await Promise.resolve(this.Sqlite.openConnection({
-			path: backupFile
-		}));
-		await this.closeDatabase();
+	if (await OS.File.exists(file)) {
+		this._debug('Saving damaged DB file with .damaged extension', 1);
+		damagedFile = await Zotero.File.moveToUnique(file, damagedFile);
+		await this._moveJournalFiles(file, damagedFile);
+	}
+	
+	// Check the backup file
+	var backupValid = false;
+	var restoreFile = backupFile;
+	try {
+		// Remove any stale backup journal files so that they aren't replayed into the
+		// backup when it's opened
+		if (!(await this._removeJournalFiles(backupFile))) {
+			throw new Error("Couldn't remove backup journal files");
+		}
+		this._debug(`Checking integrity of '${PathUtils.filename(backupFile)}'`, 1);
+		backupValid = await this._integrityCheckFile(backupFile);
+		// If the backup fails only the index checks that a quick check skips, rebuild the
+		// indexes on a copy and restore that instead
+		if (!backupValid && (await this._integrityCheckFile(backupFile, true))) {
+			let repairedFile = await this._reindexToCopy(backupFile);
+			if (repairedFile) {
+				restoreFile = repairedFile;
+				backupValid = true;
+			}
+		}
 	}
-	// Can't open backup either
 	catch (e) {
+		// Only a corruption error marks the backup as invalid -- operational errors
+		// propagate so that recovery can be retried
+		if (!this.isCorruptionError(e)) {
+			throw e;
+		}
+		Zotero.logError(e);
+	}
+	// Backup is corrupt too
+	if (!backupValid) {
+		if (!(await this._removeJournalFiles(file))) {
+			throw new Error("Couldn't remove stale journal files");
+		}
+		
 		// Create new main database
 		this._connection = await Promise.resolve(this.Sqlite.openConnection({
-			path: file
+			path: file,
+			openNotExclusive: Zotero.isMac
 		}));
 		
 		Zotero.alert(
@@ -1614,22 +2596,36 @@ Zotero.DBConnection.prototype._handleCorruptionMarker = async function () {
 		
 		return;
 	}
-	
-	this._connection = undefined;
-	
+
 	// Copy backup file to main DB file
 	this._debug("Restoring database '" + this._dbName + "' from backup file", 1);
 	try {
-		await Zotero.File.copyFile(backupFile, file);
+		// A journal file that can't be removed would be replayed into the restored database,
+		// so fail instead
+		if (!(await this._removeJournalFiles(file))) {
+			throw new Error("Couldn't remove stale journal files");
+		}
+		await Zotero.File.copyFile(restoreFile, file);
 	}
 	catch (e) {
 		// TODO: deal with low disk space
 		throw e;
 	}
+	finally {
+		if (restoreFile != backupFile) {
+			try {
+				await IOUtils.remove(restoreFile, { ignoreAbsent: true });
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+		}
+	}
 	
 	// Open restored database
 	this._connection = await Promise.resolve(this.Sqlite.openConnection({
-		path: file
+		path: file,
+		openNotExclusive: Zotero.isMac
 	}));
 	this._debug('Database restored', 1);
 	let backupDate = '';
diff --git a/chrome/content/zotero/xpcom/duplicates.js b/chrome/content/zotero/xpcom/duplicates.js
index 56f4812a8e..de8eaca05c 100644
--- a/chrome/content/zotero/xpcom/duplicates.js
+++ b/chrome/content/zotero/xpcom/duplicates.js
@@ -211,6 +211,8 @@ Zotero.Duplicates.prototype._findDuplicates = async function () {
 			let row = rows[i];
 			let newVal = Zotero.Utilities.cleanISBN('' + row.value);
 			if (!newVal) continue;
+			// Canonicalize to ISBN-13 so an ISBN-10 and its ISBN-13 equivalent match
+			newVal = Zotero.Utilities.toISBN13(newVal);
 			isbnCache[row.itemID] = newVal;
 			newRows.push({
 				itemID: row.itemID,
diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js
index 4d10d37834..add7e31708 100644
--- a/chrome/content/zotero/xpcom/editorInstance.js
+++ b/chrome/content/zotero/xpcom/editorInstance.js
@@ -23,9 +23,15 @@
     ***** END LICENSE BLOCK *****
 */
 
+(function () {
 var { InlineSpellChecker } = ChromeUtils.importESModule("resource://gre/modules/InlineSpellChecker.sys.mjs");
 var { FilePicker } = ChromeUtils.importESModule('chrome://zotero/content/modules/filePicker.mjs');
 
+let lazy = {};
+ChromeUtils.defineESModuleGetters(lazy, {
+	generateHTMLFromTemplate: "chrome://zotero/content/modules/templates.mjs",
+});
+
 // Note: TinyMCE is automatically doing some meaningless corrections to
 // note-editor produced HTML. Which might result to more
 // conflicts, especially in group libraries
@@ -44,9 +50,14 @@ const DOWNLOADED_IMAGE_TYPE = [
 	'image/png'
 ];
 
+// Tries at saving a note when the database is busy, each waiting out the transaction timeout
+const MAX_SAVE_ATTEMPTS = 3;
+
 class EditorInstance {
 	constructor() {
 		this.instanceID = Zotero.Utilities.randomString();
+		this._undoRedoController = null;
+		this._lastSaveID = 0;
 	}
 
 	get itemID() {
@@ -236,6 +247,7 @@ class EditorInstance {
 	}
 
 	async uninit() {
+		this._unregisterUndoRedoController();
 		this._prefObserverIDs.forEach(id => Zotero.Prefs.unregisterObserver(id));
 		if (this._citationDialogWindow) {
 			this._citationDialogWindow.close();
@@ -249,6 +261,69 @@ class EditorInstance {
 		}
 	}
 
+	_registerUndoRedoController() {
+		if (this._undoRedoController) {
+			return;
+		}
+
+		try {
+			let editorWindow = this._iframeWindow.wrappedJSObject;
+			let commands = new Map([
+				['cmd_undo', { can: 'canUndo', run: 'doUndo' }],
+				['cmd_redo', { can: 'canRedo', run: 'doRedo' }],
+			]);
+			let invoke = (command, operation) => {
+				let method = commands.get(command)?.[operation];
+				if (!method) {
+					return false;
+				}
+				try {
+					return typeof editorWindow[method] == 'function'
+						? editorWindow[method]()
+						: false;
+				}
+				catch (e) {
+					if (!Components.utils.isDeadWrapper(editorWindow)) {
+						Zotero.logError(e);
+					}
+					return false;
+				}
+			};
+			let controller = {
+				supportsCommand: command => commands.has(command),
+				isCommandEnabled: command => !!invoke(command, 'can'),
+				doCommand: command => invoke(command, 'run'),
+				onEvent() {},
+			};
+
+			this._iframeWindow.controllers.insertControllerAt(0, controller);
+			this._undoRedoController = controller;
+		}
+		catch (e) {
+			if (!Components.utils.isDeadWrapper(this._iframeWindow)) {
+				Zotero.logError(e);
+			}
+		}
+	}
+
+	_unregisterUndoRedoController() {
+		if (!this._undoRedoController) {
+			return;
+		}
+
+		try {
+			this._iframeWindow.controllers.removeController(this._undoRedoController);
+		}
+		catch (e) {
+			if (!Components.utils.isDeadWrapper(this._iframeWindow)) {
+				Zotero.logError(e);
+			}
+		}
+		finally {
+			this._undoRedoController = null;
+		}
+	}
+
 	async reinit(state = null) {
 		let currentOptions = {
 			state: state || this._state,
@@ -561,6 +636,7 @@ class EditorInstance {
 		try {
 			switch (message.action) {
 				case 'initialized': {
+					this._registerUndoRedoController();
 					this._resolveInitPromise();
 					return;
 				}
@@ -779,7 +855,7 @@ class EditorInstance {
 						// Forget the previously focused element within the iframe to avoid
 						// it receiving focus for a moment if you later tab back into the editor
 						iframe.ownerDocument.activeElement.blur();
-						Services.focus.moveFocus(iframe.ownerGlobal, iframe, Services.focus.MOVEFOCUS_BACKWARD, Services.focus.FLAG_SHOWRING);
+						Services.focus.moveFocus(iframe.documentGlobal, iframe, Services.focus.MOVEFOCUS_BACKWARD, Services.focus.FLAG_SHOWRING);
 					};
 					return;
 				}
@@ -905,11 +981,11 @@ class EditorInstance {
 						let menuitem = parentNode.ownerDocument.createXULElement('menuitem');
 						menuitem.setAttribute('value', item.name);
 						menuitem.setAttribute('label', item.label);
-						menuitem.setAttribute('disabled', !item.enabled);
+						menuitem.toggleAttribute('disabled', !item.enabled);
 						if (item.checked) {
 							menuitem.setAttribute('type', 'checkbox');
 						}
-						menuitem.setAttribute('checked', item.checked);
+						menuitem.toggleAttribute('checked', item.checked);
 						menuitem.addEventListener('command', () => {
 							if (item.name === 'insertImage') {
 								return this._iframeWindow.eval('openImageFilePicker()');
@@ -965,7 +1041,7 @@ class EditorInstance {
 		// Check Spelling
 		var menuitem = this._popup.ownerDocument.createXULElement('menuitem');
 		menuitem.setAttribute('label', Zotero.getString('spellCheck.checkSpelling'));
-		menuitem.setAttribute('checked', spellChecker.enabled);
+		menuitem.toggleAttribute('checked', spellChecker.enabled);
 		menuitem.setAttribute('type', 'checkbox');
 		menuitem.addEventListener('command', () => {
 			// Possible values: 0 - off, 1 - only multi-line, 2 - multi and single line input boxes
@@ -1068,7 +1144,9 @@ class EditorInstance {
 		}
 	}
 
-	async _save(noteData, skipDateModifiedUpdate) {
+	// saveID identifies this save among the editor's others, so that a retry can tell whether it
+	// still holds the newest content. Assigned below, once there's something to write.
+	async _save(noteData, skipDateModifiedUpdate, saveID, attempt = 1) {
 		if (!noteData) return;
 		let { state, html } = noteData;
 		if (html === undefined) return;
@@ -1086,6 +1164,13 @@ class EditorInstance {
 				Zotero.debug('Note value not available -- not saving', 2);
 				return;
 			}
+			// Claim an ID now that there's something to write. saveSync() calls through with no
+			// data whenever the editor has no unsaved changes -- including once an update has been
+			// dispatched but not yet saved -- and such a save must not make a retry waiting below
+			// look superseded.
+			if (saveID === undefined) {
+				saveID = ++this._lastSaveID;
+			}
 			// Update note
 			if (this._item) {
 				await Zotero.DB.executeTransaction(async () => {
@@ -1127,6 +1212,20 @@ class EditorInstance {
 			}
 		}
 		catch (e) {
+			// A long-running operation elsewhere (e.g., full-text index maintenance) can hold the
+			// database past the transaction wait timeout. Nothing was written, so try again rather
+			// than telling the user to restart.
+			if (e instanceof Zotero.DBConnection.TimeoutError && attempt < MAX_SAVE_ATTEMPTS) {
+				// Unless the editor has handed us newer content in the meantime, in which case
+				// this save is superseded and retrying it would undo the newer one
+				if (saveID != this._lastSaveID) {
+					Zotero.debug("Timed out saving note, but a newer save is pending -- skipping", 2);
+					return;
+				}
+				Zotero.debug("Timed out waiting for the database to save note -- retrying", 2);
+				await this._save(noteData, skipDateModifiedUpdate, saveID, attempt + 1);
+				return;
+			}
 			Zotero.logError(e);
 			Zotero.crash(true);
 			throw e;
@@ -1226,14 +1325,6 @@ class EditorInstance {
 				// Otherwise returns `undefined` which makes this function to be
 			},
 			
-			/**
-			 * Execute a callback with a preview of the given citation
-			 * @return {Promise} A promise resolved with the previewed citation string
-			 */
-			preview: async function () {
-				// Zotero.debug('CI: preview');
-			},
-
 			/**
 			 * Sort the citationItems within citation (depends on this.citation.properties.unsorted)
 			 * @return {Promise} A promise resolved with the previewed citation string
@@ -1503,7 +1594,7 @@ class EditorInstance {
 				title: Zotero.getString('reader-annotations'),
 				date: new Date().toLocaleString()
 			};
-			html = Zotero.Utilities.Internal.generateHTMLFromTemplate(Zotero.Prefs.get('annotations.noteTemplates.title'), vars);
+			html = lazy.generateHTMLFromTemplate(Zotero.Prefs.get('annotations.noteTemplates.title'), vars);
 			// New line is needed for note title parser
 			html += '\n';
 		}
@@ -1738,7 +1829,7 @@ class EditorInstanceUtilities {
 				tags: (attrs) => (annotation.tags && annotation.tags.map(tag => tag.name) || []).join(attrs.join || ' ')
 			};
 
-			let templateHTML = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
+			let templateHTML = lazy.generateHTMLFromTemplate(template, vars);
 			// Remove some spaces at the end of paragraph
 			templateHTML = templateHTML.replace(/([\s]*)(<\/p)/g, '$2');
 			// Remove multiple spaces
@@ -1898,3 +1989,4 @@ class EditorInstanceUtilities {
 
 Zotero.EditorInstance = EditorInstance;
 Zotero.EditorInstanceUtilities = new EditorInstanceUtilities();
+})();
diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index cb91492e29..41d7709138 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -102,7 +102,14 @@ Zotero.File = new function () {
 			}
 		}
 		catch (e) {
-			if (e.becauseNoSuchFile) {}
+			// A missing file, or a filename too long for the filesystem, might still have
+			// an existing parent directory, so continue below
+			if (e.becauseNoSuchFile || e.message?.includes('NS_ERROR_FILE_NAME_TOO_LONG')) {}
+			// A path that can't be parsed (e.g., a POSIX-style path on Windows) doesn't
+			// exist either
+			else if (e.message?.includes('NS_ERROR_FILE_UNRECOGNIZED_PATH')) {
+				return false;
+			}
 			else {
 				throw e;
 			}
@@ -669,10 +676,21 @@ Zotero.File = new function () {
 	this.removeIfExists = function (path) {
 		return Promise.resolve(OS.File.remove(path))
 		.then(() => true)
-		.catch(function (e) {
+		.catch(async function (e) {
 			if (e instanceof OS.File.Error && e.becauseNoSuchFile) {
 				return false;
 			}
+			// The read-only attribute on Windows prevents deletion, so clear it and try again
+			if (Zotero.isWin && e.name == 'NotAllowedError') {
+				try {
+					await IOUtils.setWindowsAttributes(path, { readOnly: false });
+					await OS.File.remove(path);
+					return true;
+				}
+				catch (e2) {
+					Zotero.debug(e2, 1);
+				}
+			}
 			Zotero.debug(path, 1);
 			throw e;
 		});
@@ -1098,33 +1116,35 @@ Zotero.File = new function () {
 	};
 	
 	
-	var _isAPFSCache = {};
+	var _fsInfoCache = {};
 
 	/**
-	 * Check if a path is on an APFS volume
+	 * Get information about the filesystem containing a path (macOS and Linux)
+	 *
+	 * statfs() is called on the path itself, following symlinks, so a symlinked file is
+	 * classified by its target's volume. The parent directory is used if the path doesn't
+	 * exist.
 	 *
 	 * @param {String} path
-	 * @return {Boolean}
+	 * @return {Object|null} - { fsType: statfs f_fstypename on macOS (e.g., 'apfs', 'smbfs')
+	 *     or a name derived from the statfs f_type magic on Linux (e.g., 'ext4', 'cifs',
+	 *     'nfs', or a hex string if unrecognized), readOnly: Boolean }, or null on other
+	 *     platforms or if the check fails
 	 */
-	this.isAPFS = function (path) {
-		if (!Zotero.isMac) return false;
+	this.getFileSystemInfo = function (path) {
+		if (!Zotero.isMac && !Zotero.isLinux) return null;
 
-		let dir = PathUtils.parent(path);
-		if (dir in _isAPFSCache) {
-			return _isAPFSCache[dir];
+		if (path in _fsInfoCache) {
+			return _fsInfoCache[path];
 		}
 
-		let result = false;
+		let result = null;
 		try {
 			let { ctypes } = ChromeUtils.importESModule(
 				"resource://gre/modules/ctypes.sys.mjs"
 			);
-			// struct statfs -- f_fstypename is a char[16] at byte offset 72
-			const STATFS_SIZE = 2168;
-			const FSTYPENAME_OFFSET = 72;
-			const FSTYPENAME_LEN = 16;
-			let buf = new ctypes.ArrayType(ctypes.uint8_t, STATFS_SIZE)();
-			let lib = ctypes.open("/usr/lib/libSystem.B.dylib");
+			let buf = new (ctypes.ArrayType(ctypes.uint8_t, 2168))();
+			let lib = ctypes.open(Zotero.isMac ? "/usr/lib/libSystem.B.dylib" : "libc.so.6");
 			try {
 				let statfs = lib.declare(
 					"statfs",
@@ -1133,13 +1153,51 @@ Zotero.File = new function () {
 					ctypes.char.ptr,
 					ctypes.voidptr_t
 				);
-				if (statfs(dir, buf.address()) === 0) {
+				if (statfs(path, buf.address()) !== 0) {
+					if (statfs(PathUtils.parent(path), buf.address()) !== 0) {
+						throw new Error("statfs() failed");
+					}
+				}
+				let readUint32 = offset => buf[offset] | (buf[offset + 1] << 8)
+					| (buf[offset + 2] << 16) | (buf[offset + 3] << 24);
+				if (Zotero.isMac) {
+					// struct statfs -- f_flags is a uint32 at byte offset 64, f_fstypename
+					// is a char[16] at byte offset 72
+					const FLAGS_OFFSET = 64;
+					const FSTYPENAME_OFFSET = 72;
+					const FSTYPENAME_LEN = 16;
+					const MNT_RDONLY = 0x1;
 					let typeName = '';
 					for (let i = FSTYPENAME_OFFSET; i < FSTYPENAME_OFFSET + FSTYPENAME_LEN; i++) {
 						if (buf[i] === 0) break;
 						typeName += String.fromCharCode(buf[i]);
 					}
-					result = typeName === 'apfs';
+					result = {
+						fsType: typeName,
+						readOnly: !!(readUint32(FLAGS_OFFSET) & MNT_RDONLY)
+					};
+				}
+				else {
+					// 64-bit struct statfs -- f_type is a word at byte offset 0 and f_flags
+					// a word at byte offset 80. Filesystem type is a magic number (see
+					// linux/magic.h) rather than a name.
+					const FLAGS_OFFSET = 80;
+					const ST_RDONLY = 0x1;
+					const FS_MAGICS = {
+						0xEF53: 'ext4',
+						0x58465342: 'xfs',
+						0x9123683E: 'btrfs',
+						0xFF534D42: 'cifs',
+						0xFE534D42: 'smb2',
+						0x517B: 'smb',
+						0x6969: 'nfs',
+						0x65735546: 'fuse'
+					};
+					let magic = readUint32(0) >>> 0;
+					result = {
+						fsType: FS_MAGICS[magic] || '0x' + magic.toString(16),
+						readOnly: !!(readUint32(FLAGS_OFFSET) & ST_RDONLY)
+					};
 				}
 			}
 			finally {
@@ -1150,7 +1208,105 @@ Zotero.File = new function () {
 			Zotero.warn("Failed to check filesystem type: " + e);
 		}
 
-		_isAPFSCache[dir] = result;
+		_fsInfoCache[path] = result;
+		return result;
+	};
+
+
+	/**
+	 * Check if a path is on an APFS volume
+	 *
+	 * @param {String} path
+	 * @return {Boolean}
+	 */
+	this.isAPFS = function (path) {
+		return this.getFileSystemInfo(path)?.fsType === 'apfs';
+	};
+
+
+	/**
+	 * Check whether the filesystem containing a path supports POSIX byte-range locks
+	 * (macOS only)
+	 *
+	 * Performs the same fcntl(F_GETLK) probe SQLite uses to choose its locking methods.
+	 * If the path doesn't exist, a temporary sibling file is probed instead.
+	 *
+	 * @param {String} path
+	 * @return {Promise<Boolean>}
+	 */
+	this.supportsByteRangeLocks = async function (path) {
+		if (!Zotero.isMac) return true;
+
+		let probePath = path;
+		let probeCreated = false;
+		if (!(await IOUtils.exists(path))) {
+			probePath = path + '.' + Zotero.Utilities.randomString() + '.lock-probe';
+			// Exclusive creation, so that an existing file is never overwritten and deleted
+			await IOUtils.write(probePath, new Uint8Array(0), { mode: 'create' });
+			probeCreated = true;
+		}
+
+		let result = false;
+		try {
+			let { ctypes } = ChromeUtils.importESModule(
+				"resource://gre/modules/ctypes.sys.mjs"
+			);
+			let lib = ctypes.open("/usr/lib/libSystem.B.dylib");
+			try {
+				// open() and fcntl() are variadic, which matters for argument passing on ARM64
+				let open = lib.declare(
+					"open", ctypes.default_abi, ctypes.int, ctypes.char.ptr, ctypes.int, "..."
+				);
+				let close = lib.declare(
+					"close", ctypes.default_abi, ctypes.int, ctypes.int
+				);
+				let fcntl = lib.declare(
+					"fcntl", ctypes.default_abi, ctypes.int, ctypes.int, ctypes.int, "..."
+				);
+				let flockType = ctypes.StructType("flock", [
+					{ l_start: ctypes.int64_t },
+					{ l_len: ctypes.int64_t },
+					{ l_pid: ctypes.int32_t },
+					{ l_type: ctypes.int16_t },
+					{ l_whence: ctypes.int16_t }
+				]);
+				const O_RDONLY = 0x0;
+				const F_GETLK = 7;
+				const F_RDLCK = 1;
+				const SEEK_SET = 0;
+				let fd = open(probePath, O_RDONLY);
+				if (fd >= 0) {
+					try {
+						let lock = new flockType();
+						lock.l_start = 0;
+						lock.l_len = 1;
+						lock.l_pid = 0;
+						lock.l_type = F_RDLCK;
+						lock.l_whence = SEEK_SET;
+						result = fcntl(fd, F_GETLK, lock.address()) != -1;
+					}
+					finally {
+						close(fd);
+					}
+				}
+			}
+			finally {
+				lib.close();
+			}
+		}
+		catch (e) {
+			Zotero.warn("Failed to check byte-range lock support: " + e);
+		}
+		finally {
+			if (probeCreated) {
+				try {
+					await IOUtils.remove(probePath, { ignoreAbsent: true });
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+			}
+		}
 		return result;
 	};
 
@@ -1261,7 +1417,7 @@ Zotero.File = new function () {
 	//
 	// @param {String} sourcePath - The file to create a symlink to
 	// @param {String} targetPath - The location of the symlink to create
-	// @return {Promise<Boolean>} - True if successfully created, false otherwise
+	// @return {Boolean} - True if successfully created, false otherwise
 	this.createSymlink = function (sourcePath, targetPath) {
 		const { ctypes } = ChromeUtils.importESModule(
 			"resource://gre/modules/ctypes.sys.mjs"
@@ -1269,7 +1425,7 @@ Zotero.File = new function () {
 		
 		try {
 			const libc = ctypes.open(
-				Services.appinfo.OS === "Darwin" ? "libSystem.B.dylib" : "libc.so"
+				Services.appinfo.OS === "Darwin" ? "libSystem.B.dylib" : "libc.so.6"
 			);
 			
 			const symlink = libc.declare(
@@ -1420,9 +1576,13 @@ Zotero.File = new function () {
 				}
 				
 				Zotero.debug("Adding ZIP entry " + entry.path);
+				// Add relative path, with forward slashes as the ZIP format requires
+				let entryName = entry.path.substr(rootPath.length + 1);
+				if (Zotero.isWin) {
+					entryName = entryName.replaceAll('\\', '/');
+				}
 				zipWriter.addEntryFile(
-					// Add relative path
-					entry.path.substr(rootPath.length + 1),
+					entryName,
 					Components.interfaces.nsIZipWriter.COMPRESSION_DEFAULT,
 					Zotero.File.pathToFile(entry.path),
 					true
@@ -1569,16 +1729,27 @@ Zotero.File = new function () {
 		if (e.name == 'NS_ERROR_FILE_ACCESS_DENIED' || e.name == 'NS_ERROR_FILE_IS_LOCKED'
 				// These show up on some Windows systems
 				|| e.name == 'NS_ERROR_FAILURE' || e.name == 'NS_ERROR_FILE_NOT_FOUND'
+				// NS_ERROR_FILE_FS_CORRUPTED (Windows ERROR_FILE_CORRUPT/ERROR_DISK_CORRUPT), which
+				// isn't in Components.results or exposed as an exception name
+				|| e.result == 0x80520016
 				// OS.File.Error
 				|| e.becauseAccessDenied || e.becauseNoSuchFile
 				// IOUtils
 				|| e.name == 'NotAllowedError'
 				|| e.name == 'ReadOnlyError'
 				|| e.name == 'NotFoundError') {
-			let checkFileWindows = Zotero.getString('file.accessError.message.windows');
-			let checkFileOther = Zotero.getString('file.accessError.message.other');
+			let checkFile;
+			if (e.result == 0x80520016) {
+				checkFile = Zotero.ftl.formatValueSync('file-access-error-fs-corrupted');
+			}
+			else if (Zotero.isWin) {
+				checkFile = Zotero.getString('file.accessError.message.windows');
+			}
+			else {
+				checkFile = Zotero.getString('file.accessError.message.other');
+			}
 			let msg = str + "\n\n"
-					+ (Zotero.isWin ? checkFileWindows : checkFileOther)
+					+ checkFile
 					+ "\n\n"
 					+ Zotero.getString('file.accessError.restart');
 			
diff --git a/chrome/content/zotero/xpcom/fileDragDataProvider.js b/chrome/content/zotero/xpcom/fileDragDataProvider.js
index 8d706192ec..7749d5728d 100644
--- a/chrome/content/zotero/xpcom/fileDragDataProvider.js
+++ b/chrome/content/zotero/xpcom/fileDragDataProvider.js
@@ -66,7 +66,8 @@ Zotero.FileDragDataProvider.prototype = {
 					continue;
 				}
 
-				if (draggedItems[i].getFile()) {
+				let path = draggedItems[i].getFilePath();
+				if (path && Zotero.File.pathToFile(path).exists()) {
 					items.push(draggedItems[i]);
 				}
 				else {
@@ -242,3 +243,103 @@ Zotero.FileDragDataProvider.prototype = {
 	}
 }
 
+
+/**
+ * Implements nsIFlavorDataProvider for a single dragged attachment file, handing drop targets a
+ * copy in the temp directory instead of the file in storage. The copy is made only when a target
+ * asks for the file, so drags within Zotero don't copy anything, and a target that moves the
+ * dropped file (e.g., File Explorer on Windows for an unmodified drag) moves the copy.
+ *
+ * A target can still be working on the copy after the drag ends -- e.g., while a replace/skip
+ * dialog is open -- and gives no signal when it's done, so a copy's directory is removed only
+ * once it's empty (the target moved the file), at the start of the next drag, or with the temp
+ * directory at shutdown.
+ *
+ * @param {String} path
+ */
+Zotero.TempFileDragDataProvider = function (path) {
+	this._path = path;
+	this._file = null;
+};
+
+Zotero.TempFileDragDataProvider._copiedSinceDragEnd = false;
+
+/**
+ * Remove directories created for copies
+ *
+ * @param {Object} [options]
+ * @param {Boolean} [options.onlyEmpty=false] - Remove only directories whose file the target has
+ *     moved away, which is safe while a target may still be using another copy
+ */
+Zotero.TempFileDragDataProvider.removeCopies = async function ({ onlyEmpty = false } = {}) {
+	let tmpDir = Zotero.getTempDirectory().path;
+	let children;
+	try {
+		children = await IOUtils.getChildren(tmpDir);
+	}
+	catch (e) {
+		Zotero.debug(e, 2);
+		return;
+	}
+	for (let dir of children) {
+		if (!/^drag(-\d+)?$/.test(PathUtils.filename(dir))) {
+			continue;
+		}
+		try {
+			if (onlyEmpty) {
+				if ((await IOUtils.getChildren(dir)).length) {
+					continue;
+				}
+				// Non-recursive, so a copy made in the meantime is never removed
+				await IOUtils.remove(dir);
+			}
+			else {
+				await IOUtils.remove(dir, { recursive: true });
+			}
+			Zotero.debug(`Removed drag copy directory ${dir}`);
+		}
+		// A target may still have a copy open
+		catch (e) {
+			Zotero.debug(e, 2);
+		}
+	}
+};
+
+/**
+ * Call when a drag that offered files through these providers ends
+ */
+Zotero.TempFileDragDataProvider.onDragEnd = function () {
+	if (!this._copiedSinceDragEnd) {
+		return;
+	}
+	this._copiedSinceDragEnd = false;
+	// An unmodified drop in File Explorer moves the copy right away, so remove the emptied
+	// directory shortly after, with a later pass for a target that took longer
+	for (let delay of [2000, 30000]) {
+		setTimeout(() => this.removeCopies({ onlyEmpty: true }), delay);
+	}
+};
+
+Zotero.TempFileDragDataProvider.prototype = {
+	QueryInterface: ChromeUtils.generateQI(["nsIFlavorDataProvider"]),
+	
+	getFlavorData(_transferable, flavor, data) {
+		if (flavor != 'application/x-moz-file') {
+			return;
+		}
+		// Targets ask for the file repeatedly during a drag, so make the copy once
+		if (!this._file) {
+			let file = Zotero.File.pathToFile(this._path);
+			// Copy into a directory of its own so that the copy keeps its filename
+			let dir = Zotero.getTempDirectory();
+			dir.append('drag');
+			dir.createUnique(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
+			Zotero.debug(`Copying ${this._path} to ${dir.path} for drag`);
+			file.copyTo(dir, null);
+			Zotero.TempFileDragDataProvider._copiedSinceDragEnd = true;
+			dir.append(file.leafName);
+			this._file = dir;
+		}
+		data.value = this._file;
+	}
+};
diff --git a/chrome/content/zotero/xpcom/fileHandlers.js b/chrome/content/zotero/xpcom/fileHandlers.js
index 5a9bc2834b..7916c712df 100644
--- a/chrome/content/zotero/xpcom/fileHandlers.js
+++ b/chrome/content/zotero/xpcom/fileHandlers.js
@@ -381,86 +381,28 @@ Zotero.FileHandlers = {
 	},
 	
 	_getSystemHandlerWin(mimeType) {
-		// Based on getPDFReader() in ZotFile (GPL)
-		// https://github.com/jlegewie/zotfile/blob/a6c9e02e17b60cbc1f9bb4062486548d9ef583e3/chrome/content/zotfile/utils.js
-
-		var wrk = Components.classes["@mozilla.org/windows-registry-key;1"]
-			.createInstance(Components.interfaces.nsIWindowsRegKey);
-		// Get handler
-		var extension = Zotero.MIME.getPrimaryExtension(mimeType);
-		var tryKeys = [
-			{
-				root: wrk.ROOT_KEY_CURRENT_USER,
-				path: `Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\.${extension}\\UserChoice`,
-				value: 'Progid'
-			},
-			{
-				root: wrk.ROOT_KEY_CLASSES_ROOT,
-				path: `.${extension}`,
-				value: ''
-			}
-		];
-		var progId;
-		for (let key of tryKeys) {
-			try {
-				wrk.open(key.root, key.path, wrk.ACCESS_READ);
-				progId = wrk.readStringValue(key.value);
-				if (progId) {
-					break;
-				}
-			}
-			catch (e) {}
+		// Resolve the default handler via the OS shell, which reflects the
+		// user's effective choice regardless of where Windows stores it
+		var executable;
+		try {
+			let extension = Zotero.MIME.getPrimaryExtension(mimeType);
+			let mimeService = Cc["@mozilla.org/mime;1"].getService(Ci.nsIMIMEService);
+			let mimeInfo = mimeService.getFromTypeAndExtension(mimeType, extension);
+			executable = mimeInfo.defaultExecutable;
 		}
-
-		if (!progId) {
-			wrk.close();
+		catch (e) {
+			Zotero.debug("Couldn't get default executable for " + mimeType, 2);
+			Zotero.debug(e, 2);
 			return false;
 		}
-
-		// Get version specific handler, if it exists
-		try {
-			wrk.open(
-				wrk.ROOT_KEY_CLASSES_ROOT,
-				progId + '\\CurVer',
-				wrk.ACCESS_READ
-			);
-			progId = wrk.readStringValue('') || progId;
-		}
-		catch (e) {}
-
-		// Get command
-		var success = false;
-		tryKeys = [
-			progId + '\\shell\\Read\\command',
-			progId + '\\shell\\Open\\command'
-		];
-		for (let key of tryKeys) {
-			try {
-				wrk.open(
-					wrk.ROOT_KEY_CLASSES_ROOT,
-					key,
-					wrk.ACCESS_READ
-				);
-				success = true;
-				break;
-			}
-			catch (e) {}
-		}
-
-		if (!success) {
-			wrk.close();
+		// A Microsoft Store app resolves to its DelegateExecute COM server
+		// (a DLL), which can't be launched directly -- return false so that
+		// the file is opened with the system default via ShellExecute
+		if (!executable.path.toLowerCase().endsWith('.exe')) {
+			Zotero.debug(`Default handler ${executable.path} isn't directly launchable`);
 			return false;
 		}
-
-		try {
-			var command = wrk.readStringValue('').match(/^(?:".+?"|[^"]\S+)/);
-		}
-		catch (e) {}
-
-		wrk.close();
-
-		if (!command) return false;
-		return command[0].replace(/"/g, '');
+		return executable.path;
 	},
 	
 	_getSystemHandlerPOSIX(mimeType) {
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
index 4fcefe2b61..ca981b95fd 100644
--- a/chrome/content/zotero/xpcom/fulltext.js
+++ b/chrome/content/zotero/xpcom/fulltext.js
@@ -39,7 +39,18 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	this.SYNC_STATE_MISSING = 4;
 	
 	const _processorCacheFile = '.zotero-ft-unprocessed';
-	
+
+	// Schema version of the attached index database (fulltext.sqlite), covering the attachment
+	// content and note tables. The tables are only created when this is bumped (setUpContentDB()
+	// drops and recreates everything), so any schema change -- a new table or a changed FTS5
+	// table definition, including its tokenizer -- needs a bump.
+	const _indexDBVersion = 2;
+	// Version of the index format. Bump to force a rebuild of the index from the cached text
+	// (e.g., after a normalization change) -- items recorded at a lower version in
+	// fulltextIndexState/fulltextNoteIndexState reenter the queue and are re-indexed at startup,
+	// like the initial migration.
+	const _contentIndexVersion = 1;
+
 	const kWbClassSpace =            0;
 	const kWbClassAlphaLetter =      1;
 	const kWbClassPunct =            2;
@@ -55,20 +66,232 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	
 	var _idleObserverIsRegistered = false;
 	var _idleObserverDelay = 30;
-	var _processorTimeoutID = null;
-	var _processorBlacklist = {};
+	// Shorter idle threshold (seconds) for the index drain than the sync content processor's, so
+	// indexing ramps back up a few seconds after the user pauses rather than waiting a full 30
+	var _drainIdleDelay = 3;
+	// Items indexed since the last optimize, and how many are worth one. FTS5 merges the segments
+	// left by ordinary incremental writes on its own, so an optimize only pays for itself after a
+	// burst large enough to leave many behind, such as the drain after an upgrade.
+	var _indexedSinceOptimize = 0;
+	const OPTIMIZE_THRESHOLD = 1000;
+	// Pages of index data to merge per statement. The page budget is what keeps a merge short, so
+	// the size of the index doesn't determine how long the database is held.
+	const MERGE_PAGES = 64;
+	// Statements one pass can run, and passes that can end at that cap before the merge is
+	// abandoned. A capped pass leaves its work for the next one; the run cap keeps that from
+	// repeating forever if the index never reports itself merged.
+	const MAX_MERGE_STEPS = 1000;
+	const MAX_MERGE_RUNS = 5;
+	var _cappedMergeRuns = 0;
+	// Index tables with a merge underway, which the next statement continues rather than restarts
+	var _mergingTables = new Set();
+	var _syncContentTimeoutID = null;
+	var _queueDrainTimerID = null;
+	// Combined queue count after the background drain's previous run, for detecting a stuck queue
+	var _queueDrainPreviousRemaining = Infinity;
+	var _queueDrainStalledRuns = 0;
+	var _indexingInProgress = false;
+	// Ordered itemID cursors for the queue processors, so each drain advances through the source
+	// tables once rather than rescanning already-indexed rows from the start on every batch. Reset
+	// to 0 when a pass reaches the end, to pick up anything re-queued below the cursor.
+	var _attachmentIndexQueueCursor = 0;
+	var _attachmentExtractionQueueCursor = 0;
+	var _noteIndexQueueCursor = 0;
+	// Flush a content batch to the index once it reaches this many characters, so peak memory stays
+	// bounded by the budget rather than by item size (each up to fulltext.textMaxLength)
+	const _maxContentBatchChars = 2000000;
+	var _processingSyncedContent = false;
+	var _noteIndexReady = false;
+	// Normalized plain text of notes edited since their last index update (version 0), so a search
+	// run before the background queue re-indexes them matches with the same normalized, plain-text
+	// semantics as the index rather than a raw scan of the note HTML. Keyed by itemID; entries are
+	// added when a note is flagged stale and dropped once it's re-indexed or no longer stale.
+	var _staleNoteText = new Map();
+	var _reindexLimitTimeoutIDs = {};
+	var _syncContentBlacklist = {};
 	var _upgradeCheck = true;
 	var _syncLibraryVersion = 0;
 	
 	this.init = async function () {
-		let setUpIndexingDB = async () => {
-			await Zotero.DB.queryAsync("ATTACH ':memory:' AS 'indexing'");
-			await Zotero.DB.queryAsync('CREATE TABLE indexing.fulltextWords (word NOT NULL)');
+		// Set up the full-text content index: contentless FTS5 tables in a separate
+		// attached database (fulltext.sqlite), used for content searching. It's a local,
+		// rebuildable index kept out of zotero.sqlite (so it doesn't bloat the main DB or its
+		// backups), versioned independently via PRAGMA user_version. The original extracted text
+		// still lives in the .zotero-ft-cache files, so the content tables store only the index
+		// built from the normalized text. Notes, which have no cache file, also store their
+		// normalized plain text (see noteText below), so short and mixed-script note searches have
+		// something to scan.
+		//
+		// FTS5 is a bundled SQLite extension. It's loaded once here; DBConnection re-loads it
+		// automatically after a reconnect (before this callback runs), so it's available for the
+		// FTS5 tables below.
+		await Zotero.DB.loadExtension('fts5');
+		let setUpContentDB = async () => {
+			let path = Zotero.DataDirectory.getDatabase('fulltext');
+			await Zotero.DB.queryAsync("ATTACH DATABASE ? AS ftindex", [path]);
+			// The index is keyed by local itemID, which is reassigned whenever zotero.sqlite is
+			// recreated (e.g., deleted and re-synced from the server). An index built against a
+			// different database instance would map its rows to the wrong items, so it has to be
+			// discarded and rebuilt rather than reused. Detect that by comparing the localUserKey
+			// the index was stamped with against the current one. The extracted text still lives in
+			// the .zotero-ft-cache files, so the background queue repopulates the index.
+			let localUserKey = Zotero.Users.getLocalUserKey();
+			let version = await Zotero.DB.valueQueryAsync("PRAGMA ftindex.user_version");
+			let indexedUserKey = version >= _indexDBVersion
+				? await Zotero.DB.valueQueryAsync(
+					"SELECT value FROM ftindex.fulltextIndexMeta WHERE key='localUserKey'")
+				: false;
+			if (version < _indexDBVersion || indexedUserKey != localUserKey) {
+				// Drop any existing tables so a stale or mismatched index is rebuilt from scratch
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextContent");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextContentCJK");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextNotes");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextNotesCJK");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextIndexState");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextNoteIndexState");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.noteText");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS ftindex.fulltextIndexMeta");
+				// Non-CJK scripts: word index over the normalized text. Searches match words by
+				// prefix (see getWordMatchClause); multi-token terms match adjacent tokens as
+				// phrase candidates, which relies on the token positions the default detail=full
+				// setting stores.
+				await Zotero.DB.queryAsync(
+					"CREATE VIRTUAL TABLE ftindex.fulltextContent USING fts5("
+					+ "text, tokenize='unicode61', content='', contentless_delete=1)"
+				);
+				// CJK: overlapping 2-grams of CJK runs only, space-separated, indexed with the
+				// ascii tokenizer (which leaves multibyte characters intact and splits on the
+				// spaces). The word tokenizer treats a CJK run as a single token, so the
+				// 1-2-character queries common in CJK go here instead.
+				await Zotero.DB.queryAsync(
+					"CREATE VIRTUAL TABLE ftindex.fulltextContentCJK USING fts5("
+					+ "text, tokenize='ascii', content='', contentless_delete=1)"
+				);
+				// Note content (text extracted from the note HTML). Kept in separate tables
+				// because contentless FTS5 tables can't be filtered by an extra column, so
+				// attachment content and notes couldn't be told apart in one table. Notes use a
+				// trigram index -- note searches match arbitrary substrings, and notes are small
+				// enough that the larger trigram index is cheap.
+				await Zotero.DB.queryAsync(
+					"CREATE VIRTUAL TABLE ftindex.fulltextNotes USING fts5("
+					+ "text, tokenize='trigram', content='', contentless_delete=1)"
+				);
+				await Zotero.DB.queryAsync(
+					"CREATE VIRTUAL TABLE ftindex.fulltextNotesCJK USING fts5("
+					+ "text, tokenize='ascii', content='', contentless_delete=1)"
+				);
+				// Records which items are in the content index and at what format version. The
+				// contentless FTS5 tables can't be queried for this, so this side table makes the
+				// queue (items not yet indexed at the current version) a countable,
+				// resumable query.
+				await Zotero.DB.queryAsync(
+					"CREATE TABLE ftindex.fulltextIndexState (\n"
+					+ "    itemID INTEGER PRIMARY KEY,\n"
+					+ "    version INT NOT NULL\n"
+					+ ")"
+				);
+				// Same, for notes. version 0 marks a note edited since its last index update
+				// ("stale"): note saves just set this flag instead of re-indexing the whole note on
+				// every auto-save, and searches match stale notes in memory while the background
+				// queue catches up.
+				await Zotero.DB.queryAsync(
+					"CREATE TABLE ftindex.fulltextNoteIndexState (\n"
+					+ "    itemID INTEGER PRIMARY KEY,\n"
+					+ "    version INT NOT NULL\n"
+					+ ")"
+				);
+				// A search looks up the stale (version 0) notes on every query, so index them
+				// separately. The partial index stays tiny -- only the currently-stale notes --
+				// so the lookup doesn't scan the full table.
+				await Zotero.DB.queryAsync(
+					"CREATE INDEX ftindex.fulltextNoteIndexState_stale "
+					+ "ON fulltextNoteIndexState(itemID) WHERE version=0"
+				);
+				// Notes are small, so (unlike attachment content) their normalized plain text is also
+				// stored, so short and mixed-script note searches -- which the trigram/CJK indexes
+				// can't answer -- can scan it with a LIKE instead of matching nothing
+				await Zotero.DB.queryAsync(
+					"CREATE TABLE ftindex.noteText (\n"
+					+ "    itemID INTEGER PRIMARY KEY,\n"
+					+ "    text TEXT\n"
+					+ ")"
+				);
+				// Index metadata, including the localUserKey the index was built against (above)
+				await Zotero.DB.queryAsync(
+					"CREATE TABLE ftindex.fulltextIndexMeta (\n"
+					+ "    key TEXT PRIMARY KEY,\n"
+					+ "    value NOT NULL\n"
+					+ ")"
+				);
+				await Zotero.DB.queryAsync(
+					"REPLACE INTO ftindex.fulltextIndexMeta (key, value) VALUES ('localUserKey', ?)",
+					[localUserKey]
+				);
+				await Zotero.DB.queryAsync("PRAGMA ftindex.user_version = " + _indexDBVersion);
+				// The rebuilt note index has to be backfilled before searches can rely on it, and
+				// any in-memory stale-note text no longer applies to a freshly attached database
+				_noteIndexReady = false;
+				_staleNoteText.clear();
+			}
 		};
-		await setUpIndexingDB();
-		// ATTACHed databases don't survive a connection reopen (e.g., after vacuum), so
-		// re-run the setup on every reconnect
-		Zotero.DB.onConnect(setUpIndexingDB);
+		// Rebuild the index if its file is found corrupt. A malformed page can surface from any
+		// query -- setup, a search, or the background queue -- so recovery is driven by the
+		// corruption handler: drop the file and recreate it (it's derived, so the queue repopulates
+		// it from the cache files). DBConnection confirms the main
+		// database is intact before calling this, so a disposable index failure never triggers
+		// main-database recovery.
+		let rebuildingContentDB = false;
+		let rebuildContentDB = async () => {
+			if (rebuildingContentDB) {
+				return;
+			}
+			rebuildingContentDB = true;
+			try {
+				Zotero.debug("Rebuilding corrupt full-text index", 1);
+				let path = Zotero.DataDirectory.getDatabase('fulltext');
+				// Detach before touching the file. If this fails (e.g., a transaction is in
+				// progress), stop rather than delete a still-attached database or reattach under a
+				// name that's still in use -- the index stays as it was, and a later corruption
+				// error or the next startup retries.
+				await Zotero.DB.queryAsync("DETACH DATABASE ftindex");
+				// Best-effort removal; if it fails, setUpContentDB reattaches the old file and a
+				// later corruption error retries, rather than leaving ftindex detached
+				try {
+					await IOUtils.remove(path, { ignoreAbsent: true });
+					await IOUtils.remove(path + "-wal", { ignoreAbsent: true });
+					await IOUtils.remove(path + "-shm", { ignoreAbsent: true });
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+				await setUpContentDB();
+				this.registerQueueDrainObserver();
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+			finally {
+				rebuildingContentDB = false;
+			}
+		};
+		Zotero.DB.addCorruptionHandler(rebuildContentDB);
+		// A corrupt index throws when first read here; the handler rebuilds it (deferred, after this
+		// unwinds). Any non-corruption error is unexpected.
+		try {
+			await setUpContentDB();
+		}
+		catch (e) {
+			if (!Zotero.DB.isCorruptionError(e)) {
+				throw e;
+			}
+			Zotero.logError(e);
+		}
+		// An ATTACHed database doesn't survive a connection reopen (e.g., after vacuum), so re-run
+		// the setup on every reconnect
+		Zotero.DB.onConnect(setUpContentDB);
+		// The main-database vacuum doesn't reach the attached index, so reclaim its space during the
+		// same idle maintenance
+		Zotero.DB.onIdle(() => this.vacuumContentIndex());
 
 		let pdfConverterFileName = "pdftotext";
 		let pdfInfoFileName = "pdfinfo";
@@ -102,28 +325,59 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		Zotero.uiReadyPromise.then(async () => {
 			await Zotero.Promise.delay(30000);
 			
-			this.registerContentProcessor();
-			Zotero.addShutdownListener(this.unregisterContentProcessor.bind(this));
+			this.registerSyncContentProcessor();
+			Zotero.addShutdownListener(this.unregisterSyncContentProcessor.bind(this));
 			
 			// Start/stop content processor with full-text content syncing pref
 			Zotero.Prefs.registerObserver('sync.fulltext.enabled', (enabled) => {
 				if (enabled) {
-					this.registerContentProcessor();
+					this.registerSyncContentProcessor();
 				}
 				else {
-					this.unregisterContentProcessor();
+					this.unregisterSyncContentProcessor();
 				}
 			});
+
+			// When a full-text limit is raised, re-extract just the items it affects rather than
+			// forcing a full rebuild (which would re-upload everything). Debounced and reading the
+			// settled value, so adjusting the limit -- or typing it in digit by digit -- only acts
+			// once it stops changing; bumping it up and back down doesn't trigger re-extraction.
+			// Gated in tests, which toggle these prefs without wanting indexing side effects.
+			if (!Zotero.test) {
+				let scheduleReindex = (type, pref) => {
+					if (_reindexLimitTimeoutIDs[type]) {
+						clearTimeout(_reindexLimitTimeoutIDs[type]);
+					}
+					_reindexLimitTimeoutIDs[type] = setTimeout(() => {
+						_reindexLimitTimeoutIDs[type] = null;
+						this.reindexTruncated(type, Zotero.Prefs.get(pref))
+							.catch(e => Zotero.logError(e));
+					}, 5000);
+				};
+				Zotero.Prefs.registerObserver('fulltext.textMaxLength', () => {
+					scheduleReindex('chars', 'fulltext.textMaxLength');
+				});
+				Zotero.Prefs.registerObserver('fulltext.pdfMaxPages', () => {
+					scheduleReindex('pages', 'fulltext.pdfMaxPages');
+				});
+			}
 			
 			// Stop content processor during syncs
 			Zotero.Notifier.registerObserver(
 				{
 					notify: function (event, type, ids, extraData) {
 						if (event == 'start') {
-							this.unregisterContentProcessor();
+							this.unregisterSyncContentProcessor();
 						}
 						else if (event == 'stop') {
-							this.registerContentProcessor();
+							this.registerSyncContentProcessor();
+							// Index any content the sync just delivered right away, rather than
+							// waiting for the idle observer -- the user may want to search it, and
+							// in on-demand file-download mode it's their only searchable source.
+							// Not awaited; runs in the background.
+							if (!Zotero.test) {
+								this.processSyncedContentNow();
+							}
 						}
 					}.bind(this)
 				},
@@ -131,6 +385,15 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 				'fulltext'
 			);
 		});
+
+		// Bring the content index up to date for items full-text indexed before the index existed
+		// (or before a format-version bump), then index any never-before-indexed attachments on
+		// idle. Independent of full-text content syncing -- it indexes local text.
+		Zotero.uiReadyPromise.then(async () => {
+			await Zotero.Promise.delay(5000);
+			Zotero.addShutdownListener(this.unregisterQueueDrainObserver.bind(this));
+			await this.startQueueDrain();
+		});
 	};
 	
 	
@@ -237,25 +500,16 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	
 	
 	/**
-	 * Index multiple words at once
+	 * Record an item's full-text indexing stats (indexed/total chars and pages, sync state) in
+	 * fulltextItems
 	 *
 	 * @requireTransaction
 	 * @param {Number} itemID
-	 * @param {Array<string>} words
 	 * @return {Promise}
 	 */
-	var indexWords = async function (itemID, words, stats, version, synced) {
+	var setFulltextItem = async function (itemID, stats, version, synced) {
 		Zotero.DB.requireTransaction();
-		let chunk;
-		await Zotero.DB.queryAsync("DELETE FROM indexing.fulltextWords");
-		while (words.length > 0) {
-			chunk = words.splice(0, 100);
-			await Zotero.DB.queryAsync('INSERT INTO indexing.fulltextWords (word) ' + chunk.map(x => 'SELECT ?').join(' UNION '), chunk);
-		}
-		await Zotero.DB.queryAsync('INSERT OR IGNORE INTO fulltextWords (word) SELECT word FROM indexing.fulltextWords');
-		await Zotero.DB.queryAsync('DELETE FROM fulltextItemWords WHERE itemID = ?', [itemID]);
-		await Zotero.DB.queryAsync('INSERT OR IGNORE INTO fulltextItemWords (wordID, itemID) SELECT wordID, ? FROM fulltextWords JOIN indexing.fulltextWords USING(word)', [itemID]);
-		
+
 		var cols = ['itemID', 'version', 'synced'];
 		var params = [
 			itemID,
@@ -271,8 +525,6 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		var sql = `REPLACE INTO fulltextItems (${cols.join(', ')}) `
 			+ `VALUES (${cols.map(_ => '?').join(', ')})`;
 		await Zotero.DB.queryAsync(sql, params);
-		
-		await Zotero.DB.queryAsync("DELETE FROM indexing.fulltextWords");
 	};
 	
 	
@@ -284,28 +536,25 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			throw new Error("itemID not provided");
 		}
 		
-		var words = this.semanticSplitter(text);
-		
 		while (Zotero.DB.inTransaction()) {
 			await Zotero.DB.waitForTransaction('indexString()');
 		}
-		
+
 		await Zotero.DB.executeTransaction(async function () {
-			this.clearItemWords(itemID, true);
-			await indexWords(itemID, words, stats, version, synced);
-			
-			/*
-			var sql = "REPLACE INTO fulltextContent (itemID, textContent) VALUES (?,?)";
-			Zotero.DB.query(sql, [itemID, {string:text}]);
-			*/
-			
+			await this.clearItemWords(itemID, true);
+			await setFulltextItem(itemID, stats, version, synced);
+
+			// Index the extracted text for content searching (FTS5 word + CJK 2-gram tables,
+			// plus the index-state row). The original text stays in the .zotero-ft-cache file.
+			await setContentIndex(itemID, text);
+
 			Zotero.Notifier.queue('index', 'item', itemID);
 			Zotero.Notifier.queue('refresh', 'item', itemID);
 		}.bind(this));
 		
 		// If there's a processor cache file, delete it (whether or not we just used it)
 		var item = await Zotero.Items.getAsync(itemID);
-		var cacheFile = this.getItemProcessorCacheFile(item);
+		var cacheFile = this.getSyncedContentCacheFile(item);
 		if (cacheFile.exists()) {
 			cacheFile.remove(false);
 		}
@@ -378,15 +627,22 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		}
 		var item = await Zotero.Items.getAsync(itemID);
 		var linkMode = item.attachmentLinkMode;
-		// If file is stored outside of Zotero, create a directory for the item
-		// in the storage directory and save the cache file there
-		if (linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE) {
-			var parentDirPath = await Zotero.Attachments.createDirectoryForItem(item);
-		}
-		else {
-			var parentDirPath = PathUtils.parent(filePath);
-		}
+		// If the file is stored outside of Zotero, the cache file is saved in
+		// the item's storage directory
+		var parentDirPath = linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE
+			? Zotero.Attachments.getStorageDirectory(item).path
+			: PathUtils.parent(filePath);
 		var cacheFilePath = OS.Path.join(parentDirPath, this.fulltextCacheFile);
+		if (linkMode == Zotero.Attachments.LINK_MODE_LINKED_FILE) {
+			// Create only if missing -- don't use createDirectoryForItem(),
+			// which deletes and recreates the directory and would destroy
+			// other files stored there (e.g., the SDT cache)
+			await Zotero.File.createDirectoryIfMissingAsync(parentDirPath);
+			// Remove any previous cache file, which createDirectoryForItem()
+			// did implicitly, so that a failed re-extraction below can't
+			// leave a replaced file's old text in place
+			await IOUtils.remove(cacheFilePath, { ignoreAbsent: true });
+		}
 		try {
 			var {
 				text,
@@ -489,9 +745,9 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			let itemID = item.id;
 			
 			// If there's a processor cache file from syncing, use it
-			let processorCacheFile = this.getItemProcessorCacheFile(item).path;
+			let processorCacheFile = this.getSyncedContentCacheFile(item).path;
 			if (await OS.File.exists(processorCacheFile)) {
-				let indexed = await Zotero.Fulltext.indexFromProcessorCache(itemID);
+				let indexed = await Zotero.Fulltext.indexSyncedContent(itemID);
 				if (indexed) {
 					continue;
 				}
@@ -831,7 +1087,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		var itemID = item.id;
 		var currentVersion = await this.getItemVersion(itemID)
 		
-		var processorCacheFile = this.getItemProcessorCacheFile(item).path; // .zotero-ft-unprocessed
+		var processorCacheFile = this.getSyncedContentCacheFile(item).path; // .zotero-ft-unprocessed
 		var itemCacheFile = this.getItemCacheFile(item).path; // .zotero-ft-cache
 		
 		// If a storage directory doesn't exist, create it
@@ -876,14 +1132,14 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			);
 		}
 		
-		this.registerContentProcessor();
+		this.registerSyncContentProcessor();
 	};
 	
 	
 	/**
 	 * Start the idle observer for the background content processor
 	 */
-	this.registerContentProcessor = function () {
+	this.registerSyncContentProcessor = function () {
 		// Don't start idle observer during tests
 		if (Zotero.test) return;
 		if (!Zotero.Prefs.get('sync.fulltext.enabled')) return;
@@ -892,33 +1148,33 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			Zotero.debug("Starting full-text content processor");
 			var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
 					.getService(Components.interfaces.nsIUserIdleService);
-			idleService.addIdleObserver(this.idleObserver, _idleObserverDelay);
+			idleService.addIdleObserver(this._syncContentIdleObserver, _idleObserverDelay);
 			_idleObserverIsRegistered = true;
 		}
 	}
 	
 	
-	this.unregisterContentProcessor = function () {
+	this.unregisterSyncContentProcessor = function () {
 		if (_idleObserverIsRegistered) {
 			Zotero.debug("Unregistering full-text content processor idle observer");
 			var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
 				.getService(Components.interfaces.nsIUserIdleService);
-			idleService.removeIdleObserver(this.idleObserver, _idleObserverDelay);
+			idleService.removeIdleObserver(this._syncContentIdleObserver, _idleObserverDelay);
 			_idleObserverIsRegistered = false;
 		}
 		
-		this.stopContentProcessor();
+		this.stopSyncContentProcessor();
 	}
 	
 	
 	/**
 	 * Stop the idle observer and a running timer, if there is one
 	 */
-	this.stopContentProcessor = function () {
+	this.stopSyncContentProcessor = function () {
 		Zotero.debug("Stopping full-text content processor");
-		if (_processorTimeoutID) {
-			clearTimeout(_processorTimeoutID);
-			_processorTimeoutID = null;
+		if (_syncContentTimeoutID) {
+			clearTimeout(_syncContentTimeoutID);
+			_syncContentTimeoutID = null;
 		}
 	}
 	
@@ -931,7 +1187,12 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	 *                                  to find unprocessed content
 	 * @return {Boolean}  TRUE if there's more content to process; FALSE otherwise
 	 */
-	this.processUnprocessedContent = async function (itemIDs) {
+	this.processSyncedContent = async function (itemIDs) {
+		// Defer to a prompt post-sync burst if one is running, so the two don't process the same
+		// items concurrently
+		if (!itemIDs && _processingSyncedContent) {
+			return;
+		}
 		// Idle observer can take a little while to trigger and may not cancel the setTimeout()
 		// in time, so check idle time directly
 		var idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
@@ -948,7 +1209,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		
 		var origLen = itemIDs.length;
 		itemIDs = itemIDs.filter(function (id) {
-			return !(id in _processorBlacklist);
+			return !(id in _syncContentBlacklist);
 		});
 		if (itemIDs.length < origLen) {
 			let skipped = (origLen - itemIDs.length);
@@ -959,7 +1220,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		// If there's no more unprocessed content, stop the idle observer
 		if (!itemIDs.length) {
 			Zotero.debug("No unprocessed full-text content found");
-			this.unregisterContentProcessor();
+			this.unregisterSyncContentProcessor();
 			return;
 		}
 		
@@ -968,7 +1229,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		
 		Zotero.debug("Processing full-text content for item " + item.libraryKey);
 		
-		await Zotero.Fulltext.indexFromProcessorCache(itemID);
+		await Zotero.Fulltext.indexSyncedContent(itemID);
 		
 		if (!itemIDs.length || idleService.idleTime < _idleObserverDelay * 1000) {
 			return;
@@ -977,31 +1238,842 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		// If there are remaining items, call self again after a short delay. The delay allows
 		// for processing to be interrupted if the user returns from idle. At least on macOS,
 		// when Zotero is in the background this can be throttled to 10 seconds.
-		_processorTimeoutID = setTimeout(() => this.processUnprocessedContent(itemIDs), 200);
+		_syncContentTimeoutID = setTimeout(() => this.processSyncedContent(itemIDs), 200);
 	};
-	
-	this.idleObserver = {
+
+
+	/**
+	 * Process sync-delivered full-text content (marked SYNC_STATE_TO_PROCESS) into the index right
+	 * away, without waiting for the idle observer. Called when a sync finishes, since the user may
+	 * want to search the content they just synced -- and in on-demand file-download mode synced
+	 * content is their only searchable source. Yields between items so it doesn't block the UI, and
+	 * stops if another sync starts.
+	 *
+	 * @return {Promise}
+	 */
+	this.processSyncedContentNow = async function () {
+		// One drain at a time; the idle observer defers to this while it's running
+		if (_processingSyncedContent) {
+			return;
+		}
+		_processingSyncedContent = true;
+		try {
+			let sql = "SELECT itemID FROM fulltextItems WHERE synced=" + this.SYNC_STATE_TO_PROCESS;
+			let itemIDs = (await Zotero.DB.columnQueryAsync(sql))
+				.filter(id => !(id in _syncContentBlacklist));
+			if (itemIDs.length) {
+				Zotero.debug("Processing " + itemIDs.length + " "
+					+ Zotero.Utilities.pluralize(itemIDs.length, 'item') + " of synced full-text content");
+			}
+			for (let itemID of itemIDs) {
+				// A new sync started -- leave the rest to it and the idle observer
+				if (Zotero.Sync.Runner.syncInProgress) {
+					break;
+				}
+				await this.indexSyncedContent(itemID);
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		finally {
+			_processingSyncedContent = false;
+		}
+	};
+
+	this._syncContentIdleObserver = {
 		observe: function (subject, topic, data) {
 			// On idle, start the background processor
 			if (topic == 'idle') {
-				this.processUnprocessedContent();
+				this.processSyncedContent();
 			}
 			// When back from idle, stop the processor (but keep the idle observer registered)
 			else if (topic == 'active') {
-				this.stopContentProcessor();
+				this.stopSyncContentProcessor();
 			}
 		}.bind(this)
 	};
-	
+
+
+	//
+	// Content index queue
+	//
+	// Builds the content FTS5 indexes from the cached text of items that were full-text indexed
+	// before the index existed (or before a format-version bump). The work list is a query against
+	// fulltextIndexState, so progress is countable and resumable across restarts. New indexing goes
+	// through indexString(), which keeps the index current; this only drains the queue.
+	//
+
+	/**
+	 * Number of full-text-indexed items not yet in the content index at the current version
+	 * (i.e., the size of the content index queue). Suitable for showing indexing progress.
+	 *
+	 * @return {Promise<Integer>}
+	 */
+	this.getAttachmentIndexQueueCount = async function () {
+		return Zotero.DB.valueQueryAsync(
+			"SELECT COUNT(*) FROM fulltextItems FI "
+			+ "LEFT JOIN ftindex.fulltextIndexState S USING (itemID) "
+			+ "WHERE S.itemID IS NULL OR S.version<?",
+			[_contentIndexVersion]
+		);
+	};
+
+
+	/**
+	 * Process the content index queue, reading each item's cached text and indexing it.
+	 *
+	 * @param {Object} [options]
+	 * @param {Integer} [options.maxTime] - Stop after roughly this many ms (for a bounded startup
+	 *     burst); omit to drain the whole queue
+	 * @param {Boolean} [options.checkIdle] - Stop as soon as the user is no longer idle (for the
+	 *     idle-driven drain)
+	 * @return {Promise<Integer>} The number of items processed
+	 */
+	this.processAttachmentIndexQueue = async function ({ maxTime = null, checkIdle = false, onProgress = null } = {}) {
+		// Only one drain at a time -- the startup burst, the idle observer, and the prefs pane can
+		// all call this (and the unindexed-items pass below), and concurrent runs would process the
+		// same items or pile on the load
+		if (_indexingInProgress) {
+			return 0;
+		}
+		_indexingInProgress = true;
+		let start = Date.now();
+		let processed = 0;
+		try {
+			while (true) {
+				// Don't compete with syncing -- especially full-text content downloads, which would
+				// otherwise race with re-extraction here. Resume on a later idle once sync is done.
+				if (Zotero.Sync.Runner.syncInProgress) {
+					return processed;
+				}
+				if (checkIdle && !_canDrainIndex()) {
+					return processed;
+				}
+				let itemIDs = await Zotero.DB.columnQueryAsync(
+					"SELECT FI.itemID FROM fulltextItems FI "
+					+ "LEFT JOIN ftindex.fulltextIndexState S USING (itemID) "
+					+ "WHERE (S.itemID IS NULL OR S.version<?) AND FI.itemID>? "
+					+ "ORDER BY FI.itemID LIMIT 50",
+					[_contentIndexVersion, _attachmentIndexQueueCursor]
+				);
+				if (!itemIDs.length) {
+					// Nothing left above the cursor; restart from the beginning to catch anything
+					// re-queued below it, and stop only when a full pass finds nothing
+					if (_attachmentIndexQueueCursor) {
+						_attachmentIndexQueueCursor = 0;
+						continue;
+					}
+					Zotero.debug("No queued full-text content to index");
+					return processed;
+				}
+				Zotero.debug("Indexing " + itemIDs.length + " "
+					+ Zotero.Utilities.pluralize(itemIDs.length, 'item') + " into the full-text content index");
+				// Read text and write it in batched transactions, but cap each batch at a
+				// character budget so peak memory doesn't scale with item size
+				let batch = [];
+				let batchChars = 0;
+				let flushBatch = async () => {
+					if (!batch.length) {
+						return;
+					}
+					await Zotero.DB.executeTransaction(async function () {
+						for (let [itemID, text] of batch) {
+							await setContentIndex(itemID, text);
+						}
+					});
+					processed += batch.length;
+					batch = [];
+					batchChars = 0;
+				};
+				for (let i = 0; i < itemIDs.length; i++) {
+					// Stop between items once the time budget is used up, so a chunk of large
+					// documents can't tie up the main thread for far longer than maxTime. The
+					// cursor doesn't advance, but items already flushed are excluded from the
+					// next queue query by their index-state version.
+					if (i > 0 && maxTime && (Date.now() - start) >= maxTime) {
+						await flushBatch();
+						return processed;
+					}
+					let itemID = itemIDs[i];
+					let text = await _readContentForIndex(itemID);
+					// null -> re-extracted from the file by indexItems(), which already wrote it
+					if (text === null) {
+						processed++;
+						continue;
+					}
+					batch.push([itemID, text]);
+					batchChars += text.length;
+					if (batchChars >= _maxContentBatchChars) {
+						await flushBatch();
+					}
+				}
+				await flushBatch();
+				// The whole batch is indexed now (re-extracted or written above), so advance past it
+				_attachmentIndexQueueCursor = itemIDs[itemIDs.length - 1];
+				if (onProgress) {
+					onProgress(processed);
+				}
+				if (maxTime && (Date.now() - start) >= maxTime) {
+					return processed;
+				}
+			}
+		}
+		finally {
+			_indexedSinceOptimize += processed;
+			_indexingInProgress = false;
+		}
+	};
+
+
+	// Query for indexable attachments with no fulltextItems row yet -- the work list for
+	// processAttachmentExtractionQueue and the pending count. Skips types whose extraction is currently turned
+	// off, so they neither loop nor count as pending: a textMaxLength of 0 disables all indexing
+	// (returns null), and a pdfMaxPages of 0 disables PDFs. They become eligible again if the limit
+	// is raised.
+	function _attachmentExtractionSQL(select) {
+		if (!Zotero.Prefs.get('fulltext.textMaxLength')) {
+			return null;
+		}
+		// The text types use a LIKE, which the DB layer requires be a bound parameter, so 'text/%' is
+		// passed by callers rather than inlined alongside the other content types here
+		let types = Zotero.Prefs.get('fulltext.pdfMaxPages') > 0
+			? "contentType IN ('application/pdf', 'application/epub+zip') OR contentType LIKE ?"
+			: "contentType = 'application/epub+zip' OR contentType LIKE ?";
+		return "SELECT " + select + " FROM itemAttachments "
+			+ "WHERE linkMode != " + Zotero.Attachments.LINK_MODE_LINKED_URL + " "
+			+ "AND (" + types + ") "
+			+ "AND itemID NOT IN (SELECT itemID FROM fulltextItems)";
+	}
+
+
+	// Record an attachment as having no indexable content: an empty fulltextItems row (marked
+	// missing) plus an empty content-index entry, so it leaves both the unindexed queue and the
+	// content index queue.
+	async function recordMissingContent(itemID) {
+		await Zotero.DB.executeTransaction(async function () {
+			await Zotero.DB.queryAsync(
+				"INSERT OR IGNORE INTO fulltextItems (itemID, version, synced) VALUES (?, 0, ?)",
+				[itemID, Zotero.FullText.SYNC_STATE_MISSING]
+			);
+			await setContentIndex(itemID, '');
+		});
+	}
+
+
+	/**
+	 * Number of indexable attachments with no full-text content yet (no fulltextItems row). These
+	 * are extracted (or marked missing) by processAttachmentExtractionQueue() on the same triggers as the
+	 * content index queue.
+	 *
+	 * @return {Promise<Integer>}
+	 */
+	this.getAttachmentExtractionQueueCount = async function () {
+		let sql = _attachmentExtractionSQL("COUNT(*)");
+		if (!sql) {
+			return 0;
+		}
+		return Zotero.DB.valueQueryAsync(sql, ['text/%']);
+	};
+
+
+	/**
+	 * Index attachments that have no full-text content yet: extract any with a local file, and
+	 * record those with no local file (and therefore no cache) as missing, so they leave the queue
+	 * and are left for full-text content or file sync to fill in. Runs alongside the content index
+	 * queue, on the same startup/idle/prefs-pane triggers.
+	 *
+	 * @param {Object} [options]
+	 * @param {Integer} [options.maxTime] - Stop after roughly this many ms
+	 * @param {Boolean} [options.checkIdle] - Stop as soon as the user is no longer idle
+	 * @return {Promise<Integer>} The number of items processed
+	 */
+	this.processAttachmentExtractionQueue = async function ({ maxTime = null, checkIdle = false } = {}) {
+		if (_indexingInProgress) {
+			return 0;
+		}
+		_indexingInProgress = true;
+		let start = Date.now();
+		let processed = 0;
+		try {
+			let sql = _attachmentExtractionSQL("itemID");
+			// Indexing is turned off entirely (textMaxLength is 0) -- nothing to extract
+			if (!sql) {
+				return processed;
+			}
+			while (true) {
+				if (Zotero.Sync.Runner.syncInProgress) {
+					return processed;
+				}
+				let itemIDs = await Zotero.DB.columnQueryAsync(
+					sql + " AND itemID>? ORDER BY itemID LIMIT 50", ['text/%', _attachmentExtractionQueueCursor]
+				);
+				if (!itemIDs.length) {
+					// Nothing left above the cursor; restart from the beginning to catch anything
+					// newly unindexed below it
+					if (_attachmentExtractionQueueCursor) {
+						_attachmentExtractionQueueCursor = 0;
+						continue;
+					}
+					Zotero.debug("No attachments awaiting full-text extraction");
+					return processed;
+				}
+				Zotero.debug("Extracting full-text content for " + itemIDs.length + " "
+					+ Zotero.Utilities.pluralize(itemIDs.length, 'attachment'));
+				for (let itemID of itemIDs) {
+					if (checkIdle && !_canDrainIndex()) {
+						return processed;
+					}
+					let item = await Zotero.Items.getAsync(itemID);
+					if (await item.getFilePathAsync()) {
+						await this.indexItems([itemID], { ignoreErrors: true });
+						// indexItems() writes nothing when there's no text to index -- an unreadable
+						// file, a scanned PDF with no text, or an extraction error. Record an empty
+						// entry so the item leaves the queue instead of being retried every pass; it
+						// can be reindexed from its context menu or once its file changes.
+						if (!(await Zotero.DB.valueQueryAsync(
+								"SELECT 1 FROM fulltextItems WHERE itemID=?", itemID))) {
+							await recordMissingContent(itemID);
+						}
+					}
+					else {
+						// No local file -- and so no cache -- so there's nothing to index. Record it
+						// as missing (with an empty index entry, so it leaves both queues); full-text
+						// content or file sync will fill it in later.
+						await recordMissingContent(itemID);
+					}
+					processed++;
+					// Advance per item, not per batch, since this loop can return mid-batch
+					_attachmentExtractionQueueCursor = itemID;
+					if (maxTime && (Date.now() - start) >= maxTime) {
+						return processed;
+					}
+				}
+			}
+		}
+		finally {
+			_indexedSinceOptimize += processed;
+			_indexingInProgress = false;
+		}
+	};
+
+
+	/**
+	 * Index an item into the content tables for the queue, recording it in fulltextIndexState.
+	 * Normally this reads the item's already-extracted cache file (cheap). If the cache file is
+	 * missing but the attachment file is present, it re-extracts from the file instead, which
+	 * writes the cache and indexes the content. With no text available at all, the item is still
+	 * recorded (with no content) so it leaves the queue; it'll be re-indexed normally if its text
+	 * later arrives.
+	 */
+	// Read an item's already-extracted text for the content index, so the caller can write a
+	// batch of items in one transaction. Returns the text to index (possibly ''), or null if the
+	// item was re-extracted here (indexItems() already wrote it, so there's nothing to batch).
+	async function _readContentForIndex(itemID) {
+		try {
+			let item = await Zotero.Items.getAsync(itemID);
+			if (item && item.isAttachment()) {
+				let maxLength = Zotero.Prefs.get('fulltext.textMaxLength');
+				let mimeType = item.attachmentContentType;
+				// PDFs/EPUBs/HTML keep their extracted text in the cache file; plain-text types are
+				// read from the file itself -- same sources findTextInItems() uses
+				if (Zotero.FullText.isCachedMIMEType(mimeType)) {
+					let cacheFile = Zotero.FullText.getItemCacheFile(item).path;
+					if (await OS.File.exists(cacheFile)) {
+						return await Zotero.File.getContentsAsync(cacheFile, 'utf-8', maxLength);
+					}
+					else if (await item.getFilePathAsync()) {
+						// Re-extract from the file; indexItems() writes the cache and indexes it
+						await Zotero.FullText.indexItems([itemID]);
+						// indexItems() also resolves when extraction produces no text (e.g., a
+						// scanned PDF). Only report that it wrote the index if the state row
+						// confirms it; otherwise let the caller record an empty entry so the item
+						// leaves the queue instead of being re-extracted on every pass.
+						let version = await Zotero.DB.valueQueryAsync(
+							"SELECT version FROM ftindex.fulltextIndexState WHERE itemID=?", itemID
+						);
+						return version == _contentIndexVersion ? null : '';
+					}
+				}
+				else if (Zotero.MIME.isTextType(mimeType)) {
+					let path = await item.getFilePathAsync();
+					if (path) {
+						return await Zotero.File.getContentsAsync(path, item.attachmentCharset, maxLength);
+					}
+				}
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		return '';
+	}
+
+
+	/**
+	 * Number of notes not yet in the note index at the current version, including notes marked
+	 * stale by an edit (version 0). Like the content index queue, this is countable and resumable.
+	 *
+	 * @return {Promise<Integer>}
+	 */
+	this.getNoteIndexQueueCount = async function () {
+		return Zotero.DB.valueQueryAsync(
+			"SELECT COUNT(*) FROM itemNotes N "
+			+ "LEFT JOIN ftindex.fulltextNoteIndexState S USING (itemID) "
+			+ "WHERE S.itemID IS NULL OR S.version<?",
+			[_contentIndexVersion]
+		);
+	};
+
+
+	/**
+	 * Process the note index queue, indexing the text content of notes that aren't in the note
+	 * index yet or were edited since their last index update. Note saves only mark the note stale
+	 * (so a note isn't re-indexed on every auto-save while typing); this does the actual indexing.
+	 *
+	 * @param {Object} [options]
+	 * @param {Integer} [options.maxTime] - Stop after roughly this many ms
+	 * @param {Boolean} [options.checkIdle] - Stop as soon as the user is no longer idle
+	 * @return {Promise<Integer>} The number of notes processed
+	 */
+	this.processNoteIndexQueue = async function ({ maxTime = null, checkIdle = false, onProgress = null } = {}) {
+		if (_indexingInProgress) {
+			return 0;
+		}
+		_indexingInProgress = true;
+		let start = Date.now();
+		let processed = 0;
+		try {
+			while (true) {
+				if (Zotero.Sync.Runner.syncInProgress) {
+					return processed;
+				}
+				if (checkIdle && !_canDrainIndex()) {
+					return processed;
+				}
+				let itemIDs = await Zotero.DB.columnQueryAsync(
+					"SELECT N.itemID FROM itemNotes N "
+					+ "LEFT JOIN ftindex.fulltextNoteIndexState S USING (itemID) "
+					+ "WHERE (S.itemID IS NULL OR S.version<?) AND N.itemID>? "
+					+ "ORDER BY N.itemID LIMIT 50",
+					[_contentIndexVersion, _noteIndexQueueCursor]
+				);
+				if (!itemIDs.length) {
+					// Nothing left above the cursor; restart from the beginning to catch anything
+					// re-queued below it (e.g., a note edited during the drain)
+					if (_noteIndexQueueCursor) {
+						_noteIndexQueueCursor = 0;
+						continue;
+					}
+					Zotero.debug("No queued notes to index");
+					return processed;
+				}
+				Zotero.debug("Indexing " + itemIDs.length + " "
+					+ Zotero.Utilities.pluralize(itemIDs.length, 'note'));
+				let parserUtils = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
+				// Read and index each note in one transaction, so a note save can't land between
+				// reading its text and marking it indexed at the current version
+				await Zotero.DB.executeTransaction(async function () {
+					let rows = await Zotero.DB.queryAsync(
+						"SELECT itemID, note FROM itemNotes WHERE itemID IN (" + itemIDs.join(',') + ")"
+					);
+					let noteByID = new Map(rows.map(row => [row.itemID, row.note]));
+					for (let itemID of itemIDs) {
+						// Not in itemNotes anymore -- deleted since it was queued
+						if (!noteByID.has(itemID)) {
+							await Zotero.FullText.clearNoteIndex(itemID);
+							continue;
+						}
+						let note = noteByID.get(itemID);
+						// Index the text content, not the HTML, so markup doesn't match searches.
+						// Block boundaries become line breaks, so words don't join across paragraphs.
+						let text = note
+							? parserUtils.convertToPlainText(note, Ci.nsIDocumentEncoder.OutputRaw, 0)
+							: '';
+						await setNoteIndex(itemID, text);
+					}
+				});
+				processed += itemIDs.length;
+				_noteIndexQueueCursor = itemIDs[itemIDs.length - 1];
+				if (onProgress) {
+					onProgress(processed);
+				}
+				if (maxTime && (Date.now() - start) >= maxTime) {
+					return processed;
+				}
+			}
+		}
+		finally {
+			_indexedSinceOptimize += processed;
+			_indexingInProgress = false;
+		}
+	};
+
+
+	function _isUserIdle() {
+		let idleService = Components.classes["@mozilla.org/widget/useridleservice;1"]
+			.getService(Components.interfaces.nsIUserIdleService);
+		return idleService.idleTime >= _drainIdleDelay * 1000;
+	}
+
+
+	function _isZoteroActive() {
+		// Whether the user is currently interacting with a Zotero window, so the DB may be serving
+		// their actions. document.hasFocus() is true only when a Zotero window is the focused window
+		// of the foreground app, so this is false whenever Zotero is in the background.
+		for (let win of Zotero.getMainWindows()) {
+			if (win.document && win.document.hasFocus()) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	function _canDrainIndex() {
+		// Background indexing competes with the user's own queries only through the shared DB
+		// connection, so the goal is just to not add latency to their actions: index when Zotero is
+		// in the background (their input is going elsewhere) or when it's focused but they've gone
+		// idle. Sync is handled separately, in the drain loops.
+		return !_isZoteroActive() || _isUserIdle();
+	}
+
+
+	/**
+	 * Bring the content index up to date after an upgrade by draining the already-extracted text
+	 * and note content into the search index, then hand any never-before-indexed attachments to the
+	 * idle observer.
+	 */
+	this.startQueueDrain = async function () {
+		if (Zotero.test) return;
+		let progressWin;
+		let itemProgress;
+		let startTime = Date.now();
+		try {
+			// Restore content search after an upgrade by draining the queues of already-extracted
+			// text and note content into the search index. Run this to completion proactively --
+			// not gated on idle like the background work below -- because until it finishes content
+			// search is incomplete. Pause for syncs so it doesn't compete with full-text content
+			// downloads.
+			let queueCount = async () => {
+				return (await this.getAttachmentIndexQueueCount()) + (await this.getNoteIndexQueueCount());
+			};
+			let total = await queueCount();
+			// Items drained so far, tracked across processor calls so the bar can advance after each
+			// batch within a call rather than only once per loop iteration
+			let done = 0;
+			let updateProgress = (n) => {
+				if (itemProgress && total > 0) {
+					itemProgress.setProgress(Math.min(100, Math.round(n / total * 100)));
+				}
+			};
+			// Queue count after the previous pass, for detecting a stuck queue (items that count
+			// as queued but that the processors can't index and remove)
+			let previousRemaining = Infinity;
+			let stalledPasses = 0;
+			let stalled = false;
+			while (true) {
+				if (Zotero.Sync.Runner.syncInProgress) {
+					await Zotero.Promise.delay(5000);
+					continue;
+				}
+				let remaining = await queueCount();
+				if (remaining == 0) {
+					break;
+				}
+				if (remaining < previousRemaining) {
+					stalledPasses = 0;
+				}
+				// A pass can make no progress legitimately (e.g., if a sync started partway
+				// through it), so give up only after several stalled passes in a row
+				else if (++stalledPasses >= 3) {
+					Zotero.logError("Full-text index queues aren't draining -- stopping with "
+						+ remaining + " " + Zotero.Utilities.pluralize(remaining, 'item') + " queued");
+					stalled = true;
+					break;
+				}
+				else {
+					// If another caller holds _indexingInProgress, the processors return
+					// immediately, so wait before the next pass rather than burning through the
+					// stall limit in milliseconds
+					await Zotero.Promise.delay(1000);
+				}
+				previousRemaining = remaining;
+				// Run at full speed while the user isn't actively using Zotero (idle or in another
+				// app), but yield between slices when they are, so the migration doesn't tie up the
+				// shared connection and main thread. It still always runs to completion.
+				if (!_canDrainIndex()) {
+					await Zotero.Promise.delay(250);
+				}
+				// Show a progress window once it's clear this will take a moment, tracking
+				// progress as the queue drains
+				if (!progressWin && Date.now() - startTime > 1500) {
+					progressWin = new Zotero.ProgressWindow({ closeOnClick: false });
+					progressWin.changeHeadline(
+						Zotero.getString('fulltext-indexing-progress-title')
+					);
+					itemProgress = new progressWin.ItemProgress(
+						'journalArticle',
+						Zotero.getString('fulltext-indexing-progress-message')
+					);
+					progressWin.show();
+				}
+				updateProgress(done);
+				let base = done;
+				done = base + await this.processAttachmentIndexQueue(
+					{ maxTime: 1000, onProgress: n => updateProgress(base + n) }
+				);
+				base = done;
+				done = base + await this.processNoteIndexQueue(
+					{ maxTime: 1000, onProgress: n => updateProgress(base + n) }
+				);
+			}
+			if (itemProgress) {
+				if (stalled) {
+					itemProgress.setError();
+				}
+				else {
+					itemProgress.setProgress(100);
+				}
+			}
+			// Reclaim the space freed by a rebuild (e.g., an index-format change dropping the old
+			// tables), which can be most of the file; the freelist gate makes this a no-op on
+			// ordinary startups
+			await this.vacuumContentIndex();
+			if (total > 0) {
+				Zotero.debug("Indexed " + done + " " + Zotero.Utilities.pluralize(done, 'item')
+					+ " for search in " + (Date.now() - startTime) + " ms");
+			}
+			if (progressWin) {
+				progressWin.startCloseTimer(3000);
+			}
+			// Index never-before-indexed attachments (e.g., added while indexing was off) gently in
+			// the background -- they were never searchable, so unlike the migration above they can
+			// wait for idle. If the queues stalled, don't start the background drain, which would
+			// spin on the same stuck items. The observer also runs the optimize left pending by
+			// what this drain indexed.
+			if (!stalled
+					&& (_indexedSinceOptimize >= OPTIMIZE_THRESHOLD
+						|| (await queueCount()) > 0
+						|| (await this.getAttachmentExtractionQueueCount()) > 0)) {
+				this.registerQueueDrainObserver();
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+			if (itemProgress) {
+				itemProgress.setError();
+			}
+		}
+	};
+
+
+	/**
+	 * Merge the content index's FTS5 segments for faster queries. A large drain inserts a burst of
+	 * rows that FTS5 leaves as many segments for searches to merge on the fly, and its own
+	 * incremental merging lags behind. The extracted text lives in the cache files regardless, so a
+	 * failure here is harmless.
+	 *
+	 * Each 'merge' is bounded to a set number of pages, so no statement holds the shared database
+	 * long enough to keep other queries waiting.
+	 *
+	 * Runs only once enough items have been indexed to be worth it. Pass force to run it regardless
+	 * (e.g., from tests). A pass that runs out of steps leaves the indexed count standing so that
+	 * the caller can run another to finish the merge.
+	 *
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.force] - Optimize even if little has been indexed
+	 * @return {Promise<Boolean>} - Whether a pass ran
+	 */
+	this.optimizeContentIndex = async function ({ force = false } = {}) {
+		if (!force && _indexedSinceOptimize < OPTIMIZE_THRESHOLD) {
+			return false;
+		}
+		Zotero.debug("Optimizing full-text content index");
+		let t = new Date();
+		let steps = 0;
+		let capped = false;
+		try {
+			let tables = [_contentTables, _noteTables].flatMap(({ main, cjk }) => [main, cjk]);
+			for (let table of tables) {
+				// The first merge of a table takes a negative page count, which gathers its
+				// segments onto one level and disregards usermerge so that all of them merge. The
+				// rest take a positive one, which continues that merge instead of restarting it
+				// when indexing adds a segment partway through.
+				let pages = _mergingTables.has(table) ? MERGE_PAGES : -MERGE_PAGES;
+				while (true) {
+					if (steps++ >= MAX_MERGE_STEPS) {
+						capped = true;
+						break;
+					}
+					let before = await Zotero.DB.valueQueryAsync("SELECT total_changes()");
+					await Zotero.DB.queryAsync(
+						`INSERT INTO ftindex.${table}(${table}, rank) `
+							+ `VALUES('merge', ${pages})`
+					);
+					let after = await Zotero.DB.valueQueryAsync("SELECT total_changes()");
+					// Fewer than two changes means the merge found nothing to do, which is the
+					// only way it reports that the table is fully merged
+					if (after - before < 2) {
+						_mergingTables.delete(table);
+						break;
+					}
+					_mergingTables.add(table);
+					pages = MERGE_PAGES;
+				}
+				if (capped) {
+					break;
+				}
+			}
+			Zotero.debug("Optimized full-text content index in " + steps + " "
+				+ Zotero.Utilities.pluralize(steps, 'step') + ", " + (new Date() - t) + " ms");
+		}
+		catch (e) {
+			// Merging is only an optimization, so don't retry a failure -- leave it to the next
+			// burst of indexing
+			Zotero.logError(e);
+			capped = false;
+		}
+		if (capped && ++_cappedMergeRuns < MAX_MERGE_RUNS) {
+			Zotero.debug("Full-text content index is partly merged -- continuing on the next pass");
+			return true;
+		}
+		if (capped) {
+			Zotero.logError("Giving up on merging the full-text content index after "
+				+ _cappedMergeRuns + " passes");
+			// Start clean rather than continuing a merge nothing is driving anymore
+			_mergingTables.clear();
+		}
+		_cappedMergeRuns = 0;
+		_indexedSinceOptimize = 0;
+		return true;
+	};
+
+
+	/**
+	 * Reclaim disk space in the content index. The FTS5 tables reuse freed pages but never return
+	 * them to the OS, so a large drop in indexed content (e.g., adding and then deleting many
+	 * items) can leave fulltext.sqlite much bigger than its contents. The main database vacuum
+	 * covers only the main database, so the attached content index is vacuumed here. Like that
+	 * vacuum, this is gated on the freelist threshold, which makes it self-throttling: a vacuum
+	 * empties the freelist, so it won't run again until content drops substantially. Called after
+	 * the startup queue drain and from the idle maintenance pass; pass force to skip the checks
+	 * (e.g., from tests).
+	 *
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.force] - Skip the freelist and disk-space checks
+	 * @return {Promise<Boolean>} - Whether the index was vacuumed
+	 */
+	this.vacuumContentIndex = async function ({ force = false } = {}) {
+		if (!force) {
+			let freelistCount = await Zotero.DB.valueQueryAsync("PRAGMA ftindex.freelist_count");
+			let pageCount = await Zotero.DB.valueQueryAsync("PRAGMA ftindex.page_count");
+			let threshold = Zotero.Prefs.get('vacuum.freelistThreshold') || 10;
+			if (!(pageCount > 0) || (freelistCount / pageCount * 100) < threshold) {
+				return false;
+			}
+			// In-place VACUUM needs temporary space roughly the size of the database
+			let path = Zotero.DataDirectory.getDatabase('fulltext');
+			let size = (await IOUtils.stat(path)).size;
+			if (Zotero.File.pathToFile(path).diskSpaceAvailable < size) {
+				Zotero.debug("Not enough disk space to vacuum full-text content index -- skipping");
+				return false;
+			}
+		}
+		Zotero.debug("Vacuuming full-text content index");
+		let t = new Date();
+		await Zotero.DB.queryAsync("VACUUM ftindex");
+		Zotero.debug("Vacuumed full-text content index in " + (new Date() - t) + " ms");
+		return true;
+	};
+
+
+	this.registerQueueDrainObserver = function () {
+		if (Zotero.test) return;
+		if (_queueDrainTimerID) {
+			return;
+		}
+		Zotero.debug("Starting full-text content index queue processor");
+		_queueDrainPreviousRemaining = Infinity;
+		_queueDrainStalledRuns = 0;
+		_scheduleQueueDrain(_drainIdleDelay * 1000);
+	};
+
+
+	this.unregisterQueueDrainObserver = function () {
+		if (_queueDrainTimerID) {
+			clearTimeout(_queueDrainTimerID);
+			_queueDrainTimerID = null;
+		}
+	};
+
+
+	// Drain the content, unindexed-item, and note queues in the background on a self-rescheduling
+	// timer. Unlike an OS idle observer, this keeps making progress while Zotero is in the
+	// background and the user works in other apps, and it backs off the moment they return to
+	// Zotero.
+	function _scheduleQueueDrain(delay) {
+		_queueDrainTimerID = setTimeout(async () => {
+			_queueDrainTimerID = null;
+			let self = Zotero.FullText;
+			try {
+				if (!_canDrainIndex() || Zotero.Sync.Runner.syncInProgress) {
+					_scheduleQueueDrain(_drainIdleDelay * 1000);
+					return;
+				}
+				let remaining = (await self.getAttachmentIndexQueueCount())
+					+ (await self.getAttachmentExtractionQueueCount())
+					+ (await self.getNoteIndexQueueCount());
+				if (remaining == 0) {
+					// Drained -- compact the index and stop. A pass that ran out of steps leaves
+					// the indexed count standing, so keep going until the merge is finished.
+					await self.optimizeContentIndex();
+					if (_indexedSinceOptimize >= OPTIMIZE_THRESHOLD) {
+						_scheduleQueueDrain(_drainIdleDelay * 1000);
+					}
+					return;
+				}
+				if (remaining < _queueDrainPreviousRemaining) {
+					_queueDrainStalledRuns = 0;
+				}
+				// Like an error below, stop if the queues aren't shrinking, so items the
+				// processors can't drain don't keep this running forever. The drain starts
+				// again on the next trigger.
+				else if (++_queueDrainStalledRuns >= 3) {
+					Zotero.logError("Full-text index queues aren't draining -- stopping background "
+						+ "processing with " + remaining + " "
+						+ Zotero.Utilities.pluralize(remaining, 'item') + " queued");
+					return;
+				}
+				_queueDrainPreviousRemaining = remaining;
+				Zotero.debug("Processing full-text index queues in the background ("
+					+ (_isZoteroActive() ? "focused but idle" : "not focused") + ")");
+				await self.processAttachmentIndexQueue({ maxTime: 1000, checkIdle: true });
+				await self.processAttachmentExtractionQueue({ maxTime: 1000, checkIdle: true });
+				await self.processNoteIndexQueue({ maxTime: 1000, checkIdle: true });
+				// Back off after a run that made no progress, so contention (e.g., another
+				// caller holding _indexingInProgress) can clear before the next check
+				_scheduleQueueDrain(_queueDrainStalledRuns ? _drainIdleDelay * 1000 : 250);
+			}
+			catch (e) {
+				// Stop on error instead of retrying, so a persistent failure (e.g., a full disk)
+				// doesn't spin. The drain starts again on the next trigger, such as a restart or a
+				// newly queued item.
+				Zotero.logError(e);
+			}
+		}, delay);
+	}
+
+
 	
 	/**
 	 * @param {Number} itemID
 	 * @return {Promise<Boolean>}
 	 */
-	this.indexFromProcessorCache = async function (itemID) {
+	this.indexSyncedContent = async function (itemID) {
 		try {
 			var item = await Zotero.Items.getAsync(itemID);
-			var cacheFile = this.getItemProcessorCacheFile(item).path;
+			var cacheFile = this.getSyncedContentCacheFile(item).path;
 			if (!((await OS.File.exists(cacheFile))))  {
 				Zotero.debug("Full-text content processor cache file doesn't exist for item " + itemID);
 				await Zotero.DB.queryAsync(
@@ -1086,24 +2158,34 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 				}
 				if (matches){
 					Zotero.debug("Text found");
-					return content.substr(matches.index, 50);
+					return true;
 				}
-				
+
 				break;
-			
+
 			default:
-				// Case-insensitive
-				searchText = searchText.toLowerCase();
-				content = content.toLowerCase();
-				
-				var pos = content.indexOf(searchText);
-				if (pos!=-1){
+				// Case- and diacritic-insensitive, to match the content index
+				// (findItemsWithContent). Whitespace and hyphen runs are collapsed to single
+				// spaces on both sides (normalizeForSearch folds dash variants to '-'), so the
+				// separators between a phrase's words match flexibly -- extraction layout and
+				// compound styling ("decision-making" vs. "decision making") vary them -- while
+				// other punctuation has to match literally.
+				searchText = Zotero.Utilities.Internal.normalizeForSearch(searchText)
+					.replace(/[\s-]+/g, ' ');
+				// A query with nothing left after separator collapsing (e.g., "--") would match
+				// the whitespace in nearly every document, so it matches nothing instead
+				if (!searchText.trim()) {
+					return false;
+				}
+				content = Zotero.Utilities.Internal.normalizeForSearch(content)
+					.replace(/[\s-]+/g, ' ');
+				if (content.includes(searchText)){
 					Zotero.debug('Text found');
-					return content.substr(pos, 50);
+					return true;
 				}
 		}
-		
-		return -1;
+
+		return false;
 	}
 	
 	/**
@@ -1120,9 +2202,484 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	 *  - Slashes in regex are optional
 	 *  - Add 'Binary' to the mode to search all files, not just text files
 	 *
-	 * @return {Promise<Array<Object>>} A promise for an array of match objects, with 'id' containing
-	 *                                  an itemID and 'match' containing a string snippet
+	 * @return {Promise<Array<Object>>} A promise for an array of objects with an 'id' property
+	 *                                  containing the itemID of each matching item
 	 */
+	// CJK scripts (Han/Hiragana/Katakana/Hangul) -- indexed as 2-grams, since CJK queries are
+	// commonly 1-2 characters and the word tokenizer treats a CJK run as a single token
+	const _cjkCharRE = /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]/u;
+	const _cjkRunRE = /[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+/gu;
+	// Word tokens as the unicode61 tokenizer produces them from the normalized text: runs of
+	// letters and digits, with everything else a separator
+	const _wordTokenRE = /[\p{L}\p{N}]+/gu;
+
+	/**
+	 * Build a space-separated list of overlapping 2-grams of the CJK runs in `text`, for the
+	 * ascii-tokenized CJK index. Only CJK characters are bigrammed -- everything else is handled
+	 * by the word index -- so non-CJK text produces an empty string.
+	 *
+	 * @param {String} text - Normalized text (via normalizeForSearch)
+	 * @return {String}
+	 */
+	function getCJKBigrams(text) {
+		if (!text) {
+			return '';
+		}
+		let bigrams = [];
+		for (let match of text.matchAll(_cjkRunRE)) {
+			let run = match[0];
+			for (let i = 0; i < run.length - 1; i++) {
+				bigrams.push(run.substr(i, 2));
+			}
+		}
+		return bigrams.join(' ');
+	}
+
+
+	/**
+	 * Whether a normalized term contains letters or digits outside its CJK runs. The clause
+	 * builders route such mixed-script terms identically: the CJK index would drop the non-CJK
+	 * words, so they return null and the term is matched by a literal scan instead.
+	 */
+	function hasNonCJKWordChars(normalized) {
+		return /[\p{L}\p{N}]/u.test(normalized.replace(_cjkRunRE, ''));
+	}
+
+
+	// The FTS5 table sets, each a main text table (a word index for attachment content, a trigram
+	// index for notes), a CJK 2-gram table, and an index-state side table
+	const _contentTables = {
+		main: 'fulltextContent',
+		cjk: 'fulltextContentCJK',
+		state: 'fulltextIndexState'
+	};
+	const _noteTables = {
+		main: 'fulltextNotes',
+		cjk: 'fulltextNotesCJK',
+		state: 'fulltextNoteIndexState',
+		// Notes also store their normalized plain text (see setUpContentDB), for the short- and
+		// mixed-script-term LIKE fallback; attachment content has no equivalent
+		text: 'noteText'
+	};
+
+
+	/**
+	 * Index an item's text into the given FTS5 tables and record it in the corresponding
+	 * index-state table at the current version. Replaces any existing entries for the item. `text`
+	 * may be empty (e.g., no cache file), in which case the item is simply recorded as indexed
+	 * with no content.
+	 *
+	 * Must be called within a transaction.
+	 */
+	async function setIndexEntries(itemID, text, tables) {
+		await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.main} WHERE rowid=?`, itemID);
+		await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.cjk} WHERE rowid=?`, itemID);
+		if (tables.text) {
+			await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.text} WHERE itemID=?`, itemID);
+		}
+		if (text) {
+			// Skip logging the params, which includes the full text
+			let normalized = Zotero.Utilities.Internal.normalizeForSearch(text) || '';
+			await Zotero.DB.queryAsync(
+				`INSERT INTO ftindex.${tables.main} (rowid, text) VALUES (?, ?)`,
+				[itemID, normalized],
+				{ debugParams: false }
+			);
+			let cjk = getCJKBigrams(normalized);
+			if (cjk) {
+				await Zotero.DB.queryAsync(
+					`INSERT INTO ftindex.${tables.cjk} (rowid, text) VALUES (?, ?)`,
+					[itemID, cjk],
+					{ debugParams: false }
+				);
+			}
+			// Stored plain text for the LIKE fallback (notes only)
+			if (tables.text) {
+				await Zotero.DB.queryAsync(
+					`INSERT INTO ftindex.${tables.text} (itemID, text) VALUES (?, ?)`,
+					[itemID, normalized],
+					{ debugParams: false }
+				);
+			}
+		}
+		await Zotero.DB.queryAsync(
+			`REPLACE INTO ftindex.${tables.state} (itemID, version) VALUES (?, ?)`,
+			[itemID, _contentIndexVersion]
+		);
+	}
+
+	function setContentIndex(itemID, text) {
+		return setIndexEntries(itemID, text, _contentTables);
+	}
+
+	async function setNoteIndex(itemID, text) {
+		await setIndexEntries(itemID, text, _noteTables);
+		// Now indexed at the current version, so it's no longer stale
+		_staleNoteText.delete(itemID);
+	}
+
+
+	/**
+	 * Flag a note as edited since its last index update, without re-indexing it. Called on every
+	 * note save, so it must stay cheap: it writes a one-row version-0 marker (instead of rebuilding
+	 * the note's FTS entries on each auto-save) and caches the note's normalized plain text in
+	 * memory, so a search before the background queue re-indexes the note matches it with the same
+	 * normalized, plain-text semantics as the index. Kicks the queue so the note is re-indexed once
+	 * Zotero is idle.
+	 *
+	 * Must be called within a transaction.
+	 *
+	 * @param {Number} itemID
+	 * @param {String} note - The note's HTML
+	 */
+	this.flagNoteStale = async function (itemID, note) {
+		await Zotero.DB.queryAsync(
+			"REPLACE INTO ftindex.fulltextNoteIndexState (itemID, version) VALUES (?, 0)",
+			itemID
+		);
+		_staleNoteText.set(itemID, _normalizeNoteText(note));
+		this.registerQueueDrainObserver();
+	};
+
+
+	/**
+	 * Extract and normalize a note's searchable plain text from its HTML, matching what the index
+	 * stores: markup is stripped (so it isn't matched) and the text is normalized for case- and
+	 * diacritic-insensitive matching.
+	 */
+	function _normalizeNoteText(note) {
+		if (!note) {
+			return '';
+		}
+		let parserUtils = Cc["@mozilla.org/parserutils;1"].getService(Ci.nsIParserUtils);
+		let text = parserUtils.convertToPlainText(note, Ci.nsIDocumentEncoder.OutputRaw, 0);
+		return Zotero.Utilities.Internal.normalizeForSearch(text) || '';
+	}
+
+
+	/**
+	 * Remove an item's entries from the given FTS5 tables and index-state table.
+	 *
+	 * Must be called within a transaction.
+	 */
+	async function clearIndexEntries(itemID, tables) {
+		await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.main} WHERE rowid=?`, itemID);
+		await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.cjk} WHERE rowid=?`, itemID);
+		if (tables.text) {
+			await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.text} WHERE itemID=?`, itemID);
+		}
+		await Zotero.DB.queryAsync(`DELETE FROM ftindex.${tables.state} WHERE itemID=?`, itemID);
+	}
+
+	function clearContentIndex(itemID) {
+		return clearIndexEntries(itemID, _contentTables);
+	}
+
+	/**
+	 * Remove an item's entries from the note FTS5 tables and its note-index-state row, e.g., when
+	 * the item is erased (the content database can't FK-cascade to zotero.sqlite).
+	 *
+	 * Must be called within a transaction.
+	 */
+	this.clearNoteIndex = async function (itemID) {
+		await clearIndexEntries(itemID, _noteTables);
+		_staleNoteText.delete(itemID);
+	};
+
+
+	/**
+	 * Resolve a search term to the FTS5 table and MATCH expression that find it as a substring
+	 * of note content (case- and diacritic-insensitively, via normalizeForSearch): the trigram
+	 * index for non-CJK text, the 2-gram index for pure CJK. Returns null when the index can't
+	 * answer the term -- too short for the trigram index, or a mix of CJK and non-CJK that
+	 * neither index covers alone.
+	 *
+	 * @return {Object|null} { table, match } or null
+	 */
+	function getSubstringMatchClause(searchText) {
+		let normalized = Zotero.Utilities.Internal.normalizeForSearch(searchText);
+		if (!normalized) {
+			return null;
+		}
+		let hasCJK = _cjkCharRE.test(normalized);
+		let hasNonCJK = hasNonCJKWordChars(normalized);
+		// Pure CJK: match the term's 2-grams as a contiguous phrase against the CJK index
+		if (hasCJK && !hasNonCJK) {
+			let bigrams = getCJKBigrams(normalized);
+			// A single CJK character has no 2-gram
+			if (!bigrams) {
+				return null;
+			}
+			return { table: _noteTables.cjk, match: '"' + bigrams + '"' };
+		}
+		// Pure non-CJK: match the whole term as a contiguous phrase (substring) against the
+		// trigram index, which only indexes runs of 3+ characters
+		if (!hasCJK && normalized.length >= 3) {
+			return { table: _noteTables.main, match: '"' + normalized.replace(/"/g, '""') + '"' };
+		}
+		return null;
+	}
+
+
+	/**
+	 * Resolve a search term to the FTS5 table and MATCH expression that find it in attachment
+	 * content (case- and diacritic-insensitively, via normalizeForSearch): the word index for
+	 * non-CJK terms, with the final token matched as a prefix (so "archive" matches "archives",
+	 * but "ion" doesn't match "condition"), or the 2-gram index for pure CJK. Returns null when
+	 * the index can't answer the term -- no word characters, a single CJK character, or a mix of
+	 * CJK and non-CJK that neither index covers alone.
+	 *
+	 * A term of multiple tokens matches them as an adjacent phrase, but FTS5 ignores what
+	 * separates adjacent tokens ("the climate. Change is" matches "climate chang"), so the
+	 * result is only a candidate set: `verify` tells the caller to confirm the phrase against
+	 * the cached text (see findItemsWithContent). The same goes for a single-token term
+	 * containing punctuation the tokenizer discards ("c++", ".net"), which has to match
+	 * literally.
+	 *
+	 * @return {Object|null} { table, match, tokens, verify } or null
+	 */
+	function getWordMatchClause(searchText) {
+		let normalized = Zotero.Utilities.Internal.normalizeForSearch(searchText);
+		if (!normalized) {
+			return null;
+		}
+		let hasCJK = _cjkCharRE.test(normalized);
+		let hasNonCJK = hasNonCJKWordChars(normalized);
+		// Pure CJK: match the term's 2-grams as a contiguous phrase against the CJK index
+		if (hasCJK && !hasNonCJK) {
+			let bigrams = getCJKBigrams(normalized);
+			// A single CJK character has no 2-gram
+			if (!bigrams) {
+				return null;
+			}
+			return { table: _contentTables.cjk, match: '"' + bigrams + '"', verify: false };
+		}
+		if (hasCJK) {
+			return null;
+		}
+		// Non-CJK: match the term's tokens as an adjacent phrase against the word index, with
+		// the final token as a prefix
+		let tokens = normalized.match(_wordTokenRE);
+		if (!tokens) {
+			return null;
+		}
+		// Punctuation other than the interchangeable separators (whitespace/hyphens -- see
+		// findTextInString) isn't in the index but has to match literally, so its presence
+		// forces verification even for a single token (e.g., "c++", ".net")
+		let verify = tokens.length > 1 || /[^\p{L}\p{N}\s-]/u.test(normalized);
+		return {
+			table: _contentTables.main,
+			match: '"' + tokens.join(' ') + '"*',
+			tokens,
+			verify
+		};
+	}
+
+
+	/**
+	 * Whether quick search should match a term against attachment content. False for terms the
+	 * content index can't answer at all and for single words of 1-2 characters, which would
+	 * prefix-match a huge share of the index on every keystroke; those are still matched against
+	 * titles, tags, etc.
+	 *
+	 * @param {String} searchText
+	 * @return {Boolean}
+	 */
+	this.canSearchContent = function (searchText) {
+		let clause = getWordMatchClause(searchText);
+		if (!clause) {
+			return false;
+		}
+		return !clause.tokens || clause.tokens.length > 1 || clause.tokens[0].length >= 3;
+	};
+
+
+	/**
+	 * Whether a term can be matched against the note index rather than needing a fallback scan of
+	 * the stored note text. Quick search uses this to skip note matching for terms too short for the
+	 * index, avoiding a per-keystroke scan.
+	 *
+	 * @param {String} searchText
+	 * @return {Boolean}
+	 */
+	this.canSearchNotes = function (searchText) {
+		return getSubstringMatchClause(searchText) !== null;
+	};
+
+
+	/**
+	 * Resolve a search term to SQL matching it against note text content, for use inside an
+	 * itemNotes subquery by the 'note' search condition.
+	 *
+	 * Returns null only while the note backfill is still running, so the caller falls back to a raw
+	 * LIKE scan of the note HTML and notes stay searchable until the index is built. Once the index
+	 * is ready, a term too short or mixed-script for it (see getSubstringMatchClause) is matched
+	 * by scanning notes' normalized plain text instead, so those terms stay searchable without
+	 * matching markup.
+	 *
+	 * Notes edited since their last index update (marked stale by the save) still hold their
+	 * pre-edit text in the FTS tables, so they're excluded from the index match and matched instead
+	 * against their current normalized plain text held in memory -- the same semantics as the index
+	 * -- so a just-edited note matches consistently before the background queue re-indexes it.
+	 *
+	 * @param {String} searchText
+	 * @return {Promise<Object|null>} { sql, params }, or null to fall back to a raw scan
+	 */
+	this.getNoteContentSQL = async function (searchText) {
+		if (!_noteIndexReady) {
+			// Until every note has an index-state row (indexed or marked stale), the index can't
+			// be relied on, so return null and let the caller fall back to a raw scan -- markup and
+			// all -- to keep notes searchable during the one-time post-upgrade backfill
+			let pending = await Zotero.DB.valueQueryAsync(
+				"SELECT COUNT(*) FROM itemNotes N "
+				+ "LEFT JOIN ftindex.fulltextNoteIndexState S USING (itemID) "
+				+ "WHERE S.itemID IS NULL OR (S.version > 0 AND S.version < ?)",
+				[_contentIndexVersion]
+			);
+			if (pending) {
+				return null;
+			}
+			_noteIndexReady = true;
+		}
+
+		let normalizedTerm = Zotero.Utilities.Internal.normalizeForSearch(searchText);
+		if (!normalizedTerm) {
+			return { sql: '0', params: [] };
+		}
+
+		// Resolve the term to a predicate over the note index. A term the FTS index can answer uses
+		// its MATCH; a term too short or mixed-script for it -- the trigram index covers non-CJK
+		// runs of 3+ characters and the CJK index 2+ -- instead LIKEs the stored normalized
+		// plain text. Either way it matches the notes' stripped, normalized text, so markup isn't
+		// matched (e.g. "re" hitting "red" in a style attribute) and matching stays case- and
+		// diacritic-insensitive.
+		let clause = getSubstringMatchClause(searchText);
+		let indexMatch, indexParams;
+		if (clause) {
+			indexMatch = "itemID IN (SELECT rowid FROM ftindex." + clause.table
+				+ " WHERE " + clause.table + " MATCH ?)";
+			indexParams = [clause.match];
+		}
+		else {
+			indexMatch = "itemID IN (SELECT itemID FROM ftindex.noteText WHERE text LIKE ? ESCAPE '\\')";
+			indexParams = ['%' + normalizedTerm.replace(/[\\%_]/g, '\\$&') + '%'];
+		}
+
+		// Match stale notes in memory (see above). Their itemIDs are inlined below rather than
+		// re-queried in the search SQL.
+		let staleIDs = await Zotero.DB.columnQueryAsync(
+			"SELECT itemID FROM ftindex.fulltextNoteIndexState WHERE version=0"
+		);
+		let staleMatches = [];
+		if (staleIDs.length) {
+			let staleSet = new Set(staleIDs);
+			// Drop cached text for notes that are no longer stale
+			for (let id of _staleNoteText.keys()) {
+				if (!staleSet.has(id)) {
+					_staleNoteText.delete(id);
+				}
+			}
+			// Fill any cache misses (e.g., notes flagged stale in a previous session)
+			let missing = staleIDs.filter(id => !_staleNoteText.has(id));
+			if (missing.length) {
+				let rows = await Zotero.DB.queryAsync(
+					"SELECT itemID, note FROM itemNotes WHERE itemID IN (" + missing.join(',') + ")"
+				);
+				for (let row of rows) {
+					_staleNoteText.set(row.itemID, _normalizeNoteText(row.note));
+				}
+			}
+			for (let id of staleIDs) {
+				let text = _staleNoteText.get(id);
+				if (text && text.includes(normalizedTerm)) {
+					staleMatches.push(id);
+				}
+			}
+		}
+
+		let excludeStale = staleIDs.length ? "itemID NOT IN (" + staleIDs.join(',') + ") AND " : "";
+		let staleClause = staleMatches.length ? "itemID IN (" + staleMatches.join(',') + ")" : "0";
+		return {
+			sql: "((" + excludeStale + indexMatch + ") OR " + staleClause + ")",
+			params: indexParams
+		};
+	};
+
+
+	/**
+	 * Return the ids of attachment items in the given library whose full-text content matches
+	 * `searchText` (see getWordMatchClause for the matching semantics). This is the non-regexp
+	 * path for the 'fulltextContent' search condition; callers intersect the result with their
+	 * own scope/result sets.
+	 *
+	 * A term of multiple tokens is resolved in two stages: the index selects the candidates whose
+	 * tokens appear adjacent (with the final token as a prefix), and the phrase is then verified
+	 * against just those candidates' cached text, since FTS5 ignores what separates adjacent
+	 * tokens (e.g., "the climate. Change is" is an index match for "climate chang"). The
+	 * verification matches whitespace and hyphen runs in the phrase and the content against each
+	 * other (see findTextInString), while other punctuation has to match literally. Pass
+	 * `scopeIDs` when the caller already has a scope (e.g., a collection), so the verification
+	 * scan reads only in-scope candidates.
+	 *
+	 * Returns null when the term can't be answered from the index (see getWordMatchClause), so
+	 * the caller can fall back to scanning the cached text.
+	 *
+	 * @param {String} searchText
+	 * @param {Integer|null} [libraryID] - Restrict to this library, or null/undefined for all
+	 * @param {Integer[]|null} [scopeIDs] - Restrict to these items
+	 * @return {Promise<Integer[]|null>}
+	 */
+	this.findItemsWithContent = async function (searchText, libraryID, scopeIDs) {
+		let clause = getWordMatchClause(searchText);
+		if (!clause) {
+			return null;
+		}
+		let sql = "SELECT C.rowid FROM ftindex." + clause.table + " C JOIN items I ON (I.itemID = C.rowid) "
+			+ "WHERE C." + clause.table + " MATCH ?";
+		let params = [clause.match];
+		if (libraryID !== null && libraryID !== undefined) {
+			sql += " AND I.libraryID=?";
+			params.push(libraryID);
+		}
+		let ids = await Zotero.DB.columnQueryAsync(sql, params);
+		if (scopeIDs) {
+			let scopeSet = scopeIDs instanceof Set ? scopeIDs : new Set(scopeIDs);
+			ids = ids.filter(id => scopeSet.has(id));
+		}
+		if (clause.verify && ids.length) {
+			let found = await this.findTextInItems(ids, searchText);
+			ids = found.map(x => x.id);
+		}
+		return ids;
+	};
+
+
+	/**
+	 * A subquery selecting the itemIDs whose full-text content matches `searchText` via the
+	 * content index, for embedding directly in a search's SQL (e.g. `itemID IN (<subquery>)`)
+	 * rather than materializing every match into an itemID list. The caller applies the
+	 * surrounding scope and the IN/NOT IN for the operator.
+	 *
+	 * Returns null when the term can't be answered by the index alone -- either it can't be
+	 * answered from the index at all (see getWordMatchClause) or it's a multi-token phrase,
+	 * whose index matches are only candidates for a verification scan of the cached text (see
+	 * findItemsWithContent) -- so the caller falls back to materializing the matches.
+	 *
+	 * @param {String} searchText
+	 * @return {Object|null} { sql, params }
+	 */
+	this.getContentSearchSQL = function (searchText) {
+		let clause = getWordMatchClause(searchText);
+		if (!clause || clause.verify) {
+			return null;
+		}
+		return {
+			sql: "SELECT rowid FROM ftindex." + clause.table + " WHERE " + clause.table + " MATCH ?",
+			params: [clause.match]
+		};
+	};
+
+
 	this.findTextInItems = async function (items, searchText, mode) {
 		if (!searchText){
 			return [];
@@ -1173,12 +2730,8 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 				content = await Zotero.File.getContentsAsync(path, item.attachmentCharset, maxLength);
 			}
 			
-			let match = findTextInString(content, searchText, mode);
-			if (match != -1) {
-				found.push({
-					id: itemID,
-					match: match
-				});
+			if (findTextInString(content, searchText, mode)) {
+				found.push({ id: itemID });
 			}
 		}
 		
@@ -1208,14 +2761,14 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 				"UPDATE fulltextItems SET itemID=? WHERE itemID=?",
 				[toItem.id, fromItem.id]
 			);
-			await Zotero.DB.queryAsync(
-				"UPDATE fulltextItemWords SET itemID=? WHERE itemID=?",
-				[toItem.id, fromItem.id]
-			);
 		}
 		catch (e) {
 			await Zotero.DB.queryAsync("PRAGMA foreign_keys = true");
 		}
+		// The content index is keyed by rowid and can't be re-keyed in place, so drop the source
+		// item's now-orphaned entry; toItem has the moved fulltextItems row but no index entry, so
+		// the queue will re-index it from the moved cache file.
+		await clearContentIndex(fromItem.id);
 	};
 	
 	
@@ -1228,14 +2781,11 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		var sql = "SELECT rowid FROM fulltextItems WHERE itemID=? LIMIT 1";
 		var indexed = await Zotero.DB.valueQueryAsync(sql, itemID);
 		if (indexed) {
-			await Zotero.DB.queryAsync("DELETE FROM fulltextItemWords WHERE itemID=?", itemID);
 			await Zotero.DB.queryAsync("DELETE FROM fulltextItems WHERE itemID=?", itemID);
 		}
-		
-		if (indexed) {
-			Zotero.Prefs.set('purge.fulltext', true);
-		}
-		
+		// Remove the content index entries too (the content DB can't FK-cascade to zotero.sqlite)
+		await clearContentIndex(itemID);
+
 		if (!skipCacheClear) {
 			// Delete fulltext cache file if there is one
 			await clearCacheFile(itemID);
@@ -1371,7 +2921,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			if (!stats.total && !stats.indexed) {
 				let queued = false;
 				try {
-					queued = await OS.File.exists(this.getItemProcessorCacheFile(item).path);
+					queued = await OS.File.exists(this.getSyncedContentCacheFile(item).path);
 				}
 				catch (e) {
 					Zotero.logError(e);
@@ -1401,25 +2951,44 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	 * @return {Promise}
 	 */
 	this.getIndexStats = async function () {
-		var sql = "SELECT COUNT(*) FROM fulltextItems WHERE synced != ? AND "
+		// Indexed/Partial count items actually in the search index at the current version (joined to
+		// fulltextIndexState), so they reflect what's searchable rather than just extracted -- which
+		// keeps them disjoint from the backfill still in progress (remaining) and makes their sum the
+		// bar's numerator
+		var sql = "SELECT COUNT(*) FROM fulltextItems FI "
+			+ "JOIN ftindex.fulltextIndexState S USING (itemID) "
+			+ "WHERE S.version >= ? AND FI.synced != ? AND "
 			+ "((indexedPages IS NOT NULL AND indexedPages=totalPages) OR "
-			+ "(indexedChars IS NOT NULL AND indexedChars=totalChars))"
-		var indexed = await Zotero.DB.valueQueryAsync(sql, this.SYNC_STATE_MISSING);
+			+ "(indexedChars IS NOT NULL AND indexedChars=totalChars))";
+		var indexed = await Zotero.DB.valueQueryAsync(sql, [_contentIndexVersion, this.SYNC_STATE_MISSING]);
+
+		var sql = "SELECT COUNT(*) FROM fulltextItems FI "
+			+ "JOIN ftindex.fulltextIndexState S USING (itemID) "
+			+ "WHERE S.version >= ? AND "
+			+ "((indexedPages IS NOT NULL AND indexedPages<totalPages) OR "
+			+ "(indexedChars IS NOT NULL AND indexedChars<totalChars))";
+		var partial = await Zotero.DB.valueQueryAsync(sql, _contentIndexVersion);
 		
-		var sql = "SELECT COUNT(*) FROM fulltextItems WHERE "
-			+ "(indexedPages IS NOT NULL AND indexedPages<totalPages) OR "
-			+ "(indexedChars IS NOT NULL AND indexedChars<totalChars)"
-		var partial = await Zotero.DB.valueQueryAsync(sql);
-		
-		var sql = "SELECT COUNT(*) FROM itemAttachments WHERE itemID NOT IN "
-			+ "(SELECT itemID FROM fulltextItems WHERE synced != ? AND "
-			+ "(indexedPages IS NOT NULL OR indexedChars IS NOT NULL))";
-		var unindexed = await Zotero.DB.valueQueryAsync(sql, this.SYNC_STATE_MISSING);
-		
-		var sql = "SELECT COUNT(*) FROM fulltextWords";
-		var words = await Zotero.DB.valueQueryAsync(sql);
-		
-		return { indexed, partial, unindexed, words };
+		// Items with neither a local file nor full-text content (so nothing to index locally),
+		// recorded as missing -- shown as such rather than as a fixable "not indexed" count
+		var sql = "SELECT COUNT(*) FROM fulltextItems WHERE synced = ?";
+		var notAvailable = await Zotero.DB.valueQueryAsync(sql, this.SYNC_STATE_MISSING);
+
+		// Notes in the note index at the current version (excluding ones edited since their last
+		// index update, which are counted in noteQueue until they're re-indexed)
+		var sql = "SELECT COUNT(*) FROM itemNotes N "
+			+ "JOIN ftindex.fulltextNoteIndexState S USING (itemID) "
+			+ "WHERE S.version >= ?";
+		var notesIndexed = await Zotero.DB.valueQueryAsync(sql, _contentIndexVersion);
+
+		// Pending work, all auto-draining: items with extracted content not yet in the search index
+		// (remaining), indexable attachments not yet extracted (unindexedQueue), and notes not yet
+		// indexed or edited since their last index update (noteQueue)
+		var remaining = await this.getAttachmentIndexQueueCount();
+		var unindexedQueue = await this.getAttachmentExtractionQueueCount();
+		var noteQueue = await this.getNoteIndexQueueCount();
+
+		return { indexed, partial, notAvailable, notesIndexed, remaining, unindexedQueue, noteQueue };
 	};
 	
 	
@@ -1430,7 +2999,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	}
 	
 	
-	this.getItemProcessorCacheFile = function (item) {
+	this.getSyncedContentCacheFile = function (item) {
 		var cacheFile = Zotero.Attachments.getStorageDirectory(item);
 		cacheFile.append(_processorCacheFile);
 		return cacheFile;
@@ -1497,7 +3066,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		if (!unindexedOnly) {
 			for (let itemID of itemIDs) {
 				let item = await Zotero.Items.getAsync(itemID);
-				let cacheFile = this.getItemProcessorCacheFile(item).path;
+				let cacheFile = this.getSyncedContentCacheFile(item).path;
 				try {
 					await OS.File.remove(cacheFile, { ignoreAbsent: true });
 				}
@@ -1509,43 +3078,68 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 		
 		await this.indexItems(itemIDs, { ignoreErrors: true });
 	};
-	
-	
+
+
 	/**
-	 * Clears full-text word index and all full-text cache files
+	 * Re-extract items whose content was truncated by a lower full-text limit, after that limit is
+	 * raised. Only the affected items are re-indexed, so raising a limit doesn't force a blanket
+	 * rebuild-and-reupload of everything. Items truncated by the character limit and the page limit
+	 * are tracked separately, via indexedChars/totalChars and indexedPages/totalPages.
+	 *
+	 * @param {String} type - 'chars' or 'pages'
+	 * @param {Integer} newLimit - The limit's new value
+	 * @return {Promise}
+	 */
+	this.reindexTruncated = async function (type, newLimit) {
+		newLimit = parseInt(newLimit);
+		// 0 (or invalid) means "don't index", which is handled at index time -- nothing to re-extract
+		if (!(newLimit > 0)) {
+			return;
+		}
+		// Items that were truncated (more content exists than was indexed) and that the higher limit
+		// would actually extend (the old ceiling was below the new one)
+		var sql = type == 'chars'
+			? "SELECT itemID FROM fulltextItems "
+				+ "WHERE indexedChars IS NOT NULL AND indexedChars < totalChars AND indexedChars < ?"
+			: "SELECT itemID FROM fulltextItems "
+				+ "WHERE indexedPages IS NOT NULL AND indexedPages < totalPages AND indexedPages < ?";
+		var itemIDs = await Zotero.DB.columnQueryAsync(sql, [newLimit]);
+		if (!itemIDs.length) {
+			return;
+		}
+		Zotero.debug(`Re-extracting ${itemIDs.length} `
+			+ `${Zotero.Utilities.pluralize(itemIDs.length, 'item')} truncated below the new full-text `
+			+ (type == 'chars' ? 'character' : 'page') + ' limit');
+		await this.indexItems(itemIDs, { ignoreErrors: true });
+	};
+
+
+	/**
+	 * Remove content index entries for items that no longer exist. Normal deletion clears these
+	 * via clearItemWords()/clearNoteIndex(), but the content database can't FK-cascade to
+	 * zotero.sqlite, so this is a periodic safety net for items removed through a path that
+	 * bypassed Item.erase().
 	 *
 	 * @return {Promise}
 	 */
-	this.clearIndex = async function (skipLinkedURLs) {
+	this.purgeOrphanedContent = async function () {
 		await Zotero.DB.executeTransaction(async function () {
-			var sql = "DELETE FROM fulltextItems";
-			if (skipLinkedURLs) {
-				var linkSQL = "SELECT itemID FROM itemAttachments WHERE linkMode ="
-					+ Zotero.Attachments.LINK_MODE_LINKED_URL;
-				
-				sql += " WHERE itemID NOT IN (" + linkSQL + ")";
-			}
-			await Zotero.DB.queryAsync(sql);
-			
-			sql = "DELETE FROM fulltextItemWords";
-			if (skipLinkedURLs) {
-				sql += " WHERE itemID NOT IN (" + linkSQL + ")";
-			}
-			await Zotero.DB.queryAsync(sql);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent "
+				+ "WHERE rowid NOT IN (SELECT itemID FROM fulltextItems)");
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContentCJK "
+				+ "WHERE rowid NOT IN (SELECT itemID FROM fulltextItems)");
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState "
+				+ "WHERE itemID NOT IN (SELECT itemID FROM fulltextItems)");
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextNotes "
+				+ "WHERE rowid NOT IN (SELECT itemID FROM itemNotes)");
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextNotesCJK "
+				+ "WHERE rowid NOT IN (SELECT itemID FROM itemNotes)");
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextNoteIndexState "
+				+ "WHERE itemID NOT IN (SELECT itemID FROM itemNotes)");
 		});
-		
-		if (skipLinkedURLs) {
-			await this.purgeUnusedWords();
-		}
-		else {
-			await Zotero.DB.queryAsync("DELETE FROM fulltextWords");
-		}
-		
-		await clearCacheFiles();
-		await Zotero.DB.queryAsync('VACUUM');
-	}
-	
-	
+	};
+
+
 	/*
 	 * Clears cache file for an item
 	 */
@@ -1573,21 +3167,6 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	};
 	
 	
-	/*
-	 * Clear cache files for all attachments
-	 */
-	var clearCacheFiles = async function (skipLinkedURLs) {
-		var sql = "SELECT itemID FROM itemAttachments";
-		if (skipLinkedURLs) {
-			sql += " WHERE linkMode != " + Zotero.Attachments.LINK_MODE_LINKED_URL;
-		}
-		var items = await Zotero.DB.columnQueryAsync(sql);
-		for (var i=0; i<items.length; i++) {
-			await clearCacheFile(items[i]);
-		}
-	};
-	
-	
 	/*
 	function clearItemContent(itemID){
 		Zotero.DB.query("DELETE FROM fulltextContent WHERE itemID=" + itemID);
@@ -1595,22 +3174,6 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 	*/
 	
 	
-	/**
-	 * @return {Promise}
-	 */
-	this.purgeUnusedWords = async function () {
-		if (!Zotero.Prefs.get('purge.fulltext')) {
-			return;
-		}
-		
-		var sql = "DELETE FROM fulltextWords WHERE wordID NOT IN "
-					+ "(SELECT wordID FROM fulltextItemWords)";
-		await Zotero.DB.queryAsync(sql);
-		
-		Zotero.Prefs.set('purge.fulltext', false)
-	};
-	
-	
 	async function getPageData(path, contentType) {
 		const { HiddenBrowser } = ChromeUtils.importESModule("chrome://zotero/content/HiddenBrowser.mjs");
 		var blobURL;
@@ -1621,7 +3184,7 @@ Zotero.Fulltext = Zotero.FullText = new function () {
 			let arrayBuffer = await (await fetch(Zotero.File.pathToFileURI(path))).arrayBuffer();
 			let blob = new Blob([arrayBuffer], { type: contentType });
 			blobURL = URL.createObjectURL(blob);
-			browser = new HiddenBrowser({ blockRemoteResources: true });
+			browser = new HiddenBrowser({ blockRemoteResources: true, allowJavaScript: false });
 			await browser.load(blobURL);
 			pageData = await browser.getPageData(['characterSet', 'bodyText']);
 		}
diff --git a/chrome/content/zotero/xpcom/http.js b/chrome/content/zotero/xpcom/http.js
index 712394eb0f..978095c6a1 100644
--- a/chrome/content/zotero/xpcom/http.js
+++ b/chrome/content/zotero/xpcom/http.js
@@ -294,7 +294,15 @@ Zotero.HTTP = new function () {
 		if (!options.foreground) {
 			xmlhttp.mozBackgroundRequest = true;
 		}
-		xmlhttp.open(method, url, true, options.username, options.password);
+		// Necko percent-decodes credentials passed to open(), so encode them to preserve
+		// literal %HH sequences in the password
+		xmlhttp.open(
+			method,
+			url,
+			true,
+			options.username && encodeURIComponent(options.username),
+			options.password && encodeURIComponent(options.password)
+		);
 		
 		// Isolate cookies into a separate jar via userContextId
 		if (options.userContextId && xmlhttp.setOriginAttributes) {
@@ -694,7 +702,9 @@ Zotero.HTTP = new function () {
 		// Build headers
 		let headers = new Zotero.HTTP.CasePreservingHeaders(options.headers || {});
 		if (ctx.username) {
-			let encoded = btoa(ctx.username + ':' + (ctx.password || ''));
+			// Encode as UTF-8 before base64, since btoa() only accepts code points below 256
+			let bytes = new TextEncoder().encode(ctx.username + ':' + (ctx.password || ''));
+			let encoded = btoa(String.fromCharCode(...bytes));
 			headers.set('Authorization', `Basic ${encoded}`);
 		}
 		fetchOptions.headers = headers;
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index ab5235c61d..19deafdfc3 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -289,7 +289,7 @@ Zotero.Integration = new function () {
 		}
 		catch (e) {
 			if (!(e instanceof Zotero.Exception.UserCancelled)) {
-				await Zotero.Integration._handleCommandError(document, session, e);
+				await Zotero.Integration._handleCommandError(document, e);
 			}
 			else {
 				if (session) {
@@ -383,7 +383,7 @@ Zotero.Integration = new function () {
 		return false;
 	};
 	
-	this._handleCommandError = async function (document, session, e) {
+	this._handleCommandError = async function (document, e) {
 		try {
 			let supportURL = "https://www.zotero.org/support/kb/debugging_broken_documents";
 			var displayError;
@@ -445,15 +445,6 @@ Zotero.Integration = new function () {
 					Zotero.launchURL(supportURL);
 				}
 			}
-			
-			// CiteprocRsDriverError available only if citeproc-rs is enabled
-			try {
-				// If the driver panicked we cannot reuse it
-				if (e instanceof Zotero.CiteprocRs.CiteprocRsDriverError) {
-					session.style.free(true);
-					delete Zotero.Integration.sessions[session.id];
-				}
-			} catch (e) {}
 		}
 		finally {
 			Zotero.logError(e);
@@ -1170,9 +1161,7 @@ Zotero.Integration.Session.prototype.updateFromDocument = async function (forceU
 	if (forceUpdateAllCitations) {
 		this.forceUpdateAllCitations = true;
 		// See Session.restoreProcessorState() for a comment
-		if (!Zotero.Prefs.get('cite.useCiteprocRs')) {
-			this.rebuildCiteprocState = true;
-		}
+		this.rebuildCiteprocState = true;
 	}
 	await this._processFields();
 	try {
@@ -1333,13 +1322,19 @@ Zotero.Integration.Session.prototype._updateDocument = async function (forceCita
 	var indicesToUpdate = Object.keys(this.processIndices);
 	
 	// Add bibliography indices to the above indices
-	if (this.bibliography	 				// if bibliography exists
-			&& Object.keys(this.citationsByIndex).length // and doc has citations
-			&& (this.bibliographyHasChanged	// and bibliography changed
-			|| forceBibliography)) {					// or if we should generate regardless of
-														// changes
-		for (let field of this._bibliographyFields) {
-			indicesToUpdate.push(field.index);
+	if (this.bibliography) {								// if bibliography exists
+		if (!Object.keys(this.citationsByIndex).length) {	// and there are no citations
+			for (let field of this._bibliographyFields) {
+				// Remove all bibliography fields
+				this._deleteFields[field.index] = true;
+			}
+		}
+		else if (this.bibliographyHasChanged				// if bibliography changed
+			|| forceBibliography) {							// or force flag is active
+			for (let field of this._bibliographyFields) {
+				// Update all bibliography fields
+				indicesToUpdate.push(field.index);
+			}
 		}
 	}
 	
@@ -1496,7 +1491,7 @@ Zotero.Integration.Session.prototype._updateDocument = async function (forceCita
 	
 	var deleteFields = Object.keys(this._deleteFields).sort((a, b) => b - a);
 	for (let fieldIndex of deleteFields) {
-		this._fields[fieldIndex].delete();
+		await this._fields[fieldIndex].delete();
 	}
 	this.processIndices = {}
 }
@@ -1564,7 +1559,7 @@ Zotero.Integration.Session.prototype.cite = async function (field, addNote=false
 			this.updateFromDocument(FORCE_CITATIONS_FALSE).then(() => this.citationsByItemID);
 	}
 
-	var previewFn = async function (citation) {
+	var previewFn = async function (citation, format) {
 		let idx = await fieldIndexPromise;
 		await citationsByItemIDPromise;
 
@@ -1580,7 +1575,7 @@ Zotero.Integration.Session.prototype.cite = async function (field, addNote=false
 		let citationsPost = citations.slice(sliceIdx);
 		let citationID = citation.citationID;
 		try {
-			var result = this.style.previewCitationCluster(citation, citationsPre, citationsPost, "rtf");
+			var result = this.style.previewCitationCluster(citation, citationsPre, citationsPost, format || "rtf");
 		} catch(e) {
 			throw e;
 		} finally {
@@ -1811,10 +1806,11 @@ Zotero.Integration.CitationEditInterface = function (items, sortable, fieldIndex
 Zotero.Integration.CitationEditInterface.prototype = {
 	/**
 	 * Execute a callback with a preview of the given citation
+	 * @param {String} [format] Override the default output format (e.g. "html" for use in citation dialog)
 	 * @return {Promise} A promise resolved with the previewed citation string
 	 */
-	preview: function () {
-		return this.previewFn(this.citation);
+	preview: function (format) {
+		return this.previewFn(this.citation, format);
 	},
 	
 	/**
@@ -1992,9 +1988,6 @@ Zotero.Integration.Session.prototype.setData = async function (data, resetStyle)
 			await Zotero.Styles.init();
 			var getStyle = Zotero.Styles.get(data.style.styleID);
 			data.style.hasBibliography = getStyle.hasBibliography;
-			if (this.style && this.style.free) {
-				this.style.free();
-			}
 			this.style = getStyle.getCiteProc(data.style.locale, this.outputFormat, {
 				automaticJournalAbbreviations: data.prefs.automaticJournalAbbreviations,
 			});
@@ -2263,9 +2256,6 @@ Zotero.Integration.Session.prototype.getCiteprocLists = function () {
  * Updates the list of citations to be serialized to the document
  */
 Zotero.Integration.Session.prototype._updateCitations = async function () {
-	if (Zotero.Prefs.get('cite.useCiteprocRs')) {
-		return this._updateCitationsCiteprocRs();
-	}
 	Zotero.debug("Integration: Indices of new citations");
 	Zotero.debug(Object.keys(this.newIndices));
 	Zotero.debug("Integration: Indices of updated citations");
@@ -2309,51 +2299,6 @@ Zotero.Integration.Session.prototype._updateCitations = async function () {
 }
 
 
-/**
- * Updates the list of citations to be serialized to the document with citeproc-rs
- */
-Zotero.Integration.Session.prototype._updateCitationsCiteprocRs = async function () {
-	Zotero.debug("Integration: Indices of new citations");
-	Zotero.debug(Object.keys(this.newIndices));
-	Zotero.debug("Integration: Indices of updated citations");
-	Zotero.debug(Object.keys(this.updateIndices));
-
-	for (let indexList of [this.newIndices, this.updateIndices]) {
-		for (let index in indexList) {
-			if (indexList == this.newIndices) {
-				delete this.newIndices[index];
-				delete this.updateIndices[index];
-			}
-
-			var citation = this.citationsByIndex[index];
-			citation = citation.toJSON();
-
-			Zotero.debug(`Integration: citeprocRs.insertCluster(${citation.toSource()})`);
-			this.style.insertCluster(citation);
-		}
-	}
-	
-	let citationIDToIndex = {};
-	for (const key in this.citationsByIndex) {
-		citationIDToIndex[this.citationsByIndex[key].citationID] = key;
-	}
-
-	const citations = this.getCiteprocLists()[0];
-	Zotero.debug("Integration: citeprocRs.setClusterOrder()");
-	this.style.setClusterOrder(citations);
-	Zotero.debug("Integration: citeprocRs.getBatchedUpdates()");
-	const updateSummary = this.style.getBatchedUpdates();
-	Zotero.debug("Integration: got UpdateSummary from citeprocRs");
-	for (const [citationID, text] of updateSummary.clusters) {
-		const index = citationIDToIndex[citationID];
-		this.citationsByIndex[index].text = text;
-		this.processIndices[index] = true;
-	}
-
-	this.bibliographyHasChanged |= updateSummary.bibliography
-		&& Object.keys(updateSummary.bibliography.updatedEntries).length;
-}
-
 /**
  * Restores processor state from document, without requesting citation updates
  */
@@ -2372,13 +2317,11 @@ Zotero.Integration.Session.prototype.restoreProcessorState = function () {
 			citations.push(this.citationsByIndex[i]);
 		}
 	}
-	if (!Zotero.Prefs.get('cite.useCiteprocRs')) {
-		// rebuildProcessorState() doesn't reset the disambiguation cache when
-		// passed a non-empty citation list. This causes items to be disambiguated
-		// even after being modified so they're no longer ambiguous. Work around
-		// this by manually clearing the item list first.
-		this.style.updateItems([]);
-	}
+	// rebuildProcessorState() doesn't reset the disambiguation cache when
+	// passed a non-empty citation list. This causes items to be disambiguated
+	// even after being modified so they're no longer ambiguous. Work around
+	// this by manually clearing the item list first.
+	this.style.updateItems([]);
 	this.style.rebuildProcessorState(citations, this.outputFormat, uncited);
 }
 
diff --git a/chrome/content/zotero/xpcom/notifier.js b/chrome/content/zotero/xpcom/notifier.js
index 2d7af1969d..44f48b24f1 100644
--- a/chrome/content/zotero/xpcom/notifier.js
+++ b/chrome/content/zotero/xpcom/notifier.js
@@ -110,6 +110,15 @@ Zotero.Notifier = new function () {
 	};
 	
 	
+	/**
+	 * @return {String[]} - Ids of registered observers that belong to a closed window
+	 */
+	this.getLeakedObserverIDs = function () {
+		return Object.keys(_observers)
+			.filter(id => Zotero.Utilities.Internal.isObjectLeakingWindow(_observers[id].ref));
+	};
+	
+	
 	/**
 	* Trigger a notification to the appropriate observers
 	*
diff --git a/chrome/content/zotero/xpcom/osKeyStore.js b/chrome/content/zotero/xpcom/osKeyStore.js
new file mode 100644
index 0000000000..e60a575e35
--- /dev/null
+++ b/chrome/content/zotero/xpcom/osKeyStore.js
@@ -0,0 +1,227 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+
+    Copyright © 2026 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+
+    This file is part of Zotero.
+
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+    ***** END LICENSE BLOCK *****
+*/
+
+// Wrapper around Mozilla's OSKeyStore, which derives an encryption key from
+// platform-native key storage (Keychain on macOS, DPAPI on Windows, libsecret
+// on Linux). Encrypted values are returned with a versioned prefix so callers
+// can distinguish them from legacy plaintext values previously written to
+// nsILoginManager.
+
+const KEYRING_KB_URL = 'https://www.zotero.org/support/kb/linux_keyring';
+
+Zotero.OSKeyStore = {
+	_prefix: 'oskv1:',
+	_module: null,
+
+	_load: function () {
+		if (this._module === null) {
+			try {
+				let { OSKeyStore } = ChromeUtils.importESModule(
+					"resource://gre/modules/OSKeyStore.sys.mjs"
+				);
+				this._module = OSKeyStore;
+			}
+			catch (e) {
+				Zotero.logError(e);
+				this._module = false;
+			}
+		}
+		return this._module;
+	},
+
+	get available() {
+		return !!this._load();
+	},
+
+	isEncrypted: function (value) {
+		return typeof value == 'string' && value.startsWith(this._prefix);
+	},
+	
+	// Whether an error from encrypting or decrypting a credential came from the key store itself,
+	// as opposed to the login manager entry that holds the encrypted value
+	isKeyStoreError: function (e) {
+		return e instanceof Zotero.Error && !!e.keyStoreError;
+	},
+
+	// The settings window, where credentials are usually saved from, or the main window when
+	// they're saved during a sync
+	_getParentWindow: function () {
+		return Services.wm.getMostRecentWindow('zotero:pref')
+			|| Services.wm.getMostRecentWindow('navigator:browser');
+	},
+
+	get _moreInfoLabel() {
+		return Zotero.isLinux ? Zotero.getString('general-more-information') : undefined;
+	},
+
+	// Offer to store credentials unencrypted after a write to the keystore fails. The keystore
+	// can be unusable in ways the user can't fix -- most often on Linux, where the platform
+	// requires a Secret Service that some managed systems don't run.
+	//
+	// Returns true if the user agrees.
+	confirmUnencryptedFallback: function () {
+		let index = Zotero.Prompt.confirm({
+			window: this._getParentWindow(),
+			title: Zotero.getString('general-error'),
+			text: Zotero.getString('os-keystore-save-failed') + "\n\n"
+				+ Zotero.getString('os-keystore-save-unencrypted'),
+			button0: Zotero.getString('os-keystore-save-unencrypted-button'),
+			button1: Zotero.Prompt.BUTTON_TITLE_CANCEL,
+			button2: this._moreInfoLabel,
+			defaultButton: 1
+		});
+		if (index == 2) {
+			Zotero.launchURL(KEYRING_KB_URL);
+			return false;
+		}
+		return index == 0;
+	},
+
+	// Show a one-shot alert when migration of an existing legacy plaintext entry
+	// fails. The caller falls back to using the legacy value, so the user isn't
+	// blocked, but show an alert so the keychain issue can be reported and
+	// addressed before a future version drops the legacy fallback.
+	alertMigrateFailed: function () {
+		if (this._migrateAlertShown) {
+			return;
+		}
+		this._migrateAlertShown = true;
+		let win = this._getParentWindow();
+		if (!win) {
+			return;
+		}
+		let index = Zotero.Prompt.confirm({
+			window: win,
+			title: Zotero.getString('general-error'),
+			text: Zotero.getString('os-keystore-migrate-failed'),
+			button0: Zotero.Prompt.BUTTON_TITLE_OK,
+			button1: this._moreInfoLabel
+		});
+		if (index == 1) {
+			Zotero.launchURL(KEYRING_KB_URL);
+		}
+	},
+
+	// Returns whether the store can actually be used. asyncSecretAvailable() isn't enough,
+	// since a locked or inaccessible store can still report a secret.
+	_usable: async function () {
+		let mod = this._load();
+		if (!mod) {
+			return false;
+		}
+		try {
+			await mod.encrypt('test');
+		}
+		catch {
+			return false;
+		}
+		return true;
+	},
+
+	// Mozilla's OSKeyStore reports every failure as a canceled unlock prompt, whatever the
+	// cause, so probe the native store to record what actually went wrong and return an error
+	// with a message that can be shown to the user
+	_error: async function (e, stringName) {
+		let detail;
+		// Make sure the label from Mozilla's module still exists
+		let label = this._module && this._module.STORE_LABEL;
+		if (typeof label != 'string' || !label) {
+			detail = "store label unavailable";
+		}
+		else {
+			try {
+				let keyStore = Cc["@mozilla.org/security/oskeystore;1"]
+					.getService(Ci.nsIOSKeyStore);
+				detail = (await keyStore.asyncSecretAvailable(label))
+					? "secret is available"
+					: "no secret stored";
+			}
+			catch (probeError) {
+				detail = "key store unusable: " + probeError;
+			}
+		}
+		Zotero.debug(`OS key store failure (${detail}): ${e}`, 1);
+		let data = { keyStoreError: e };
+		let moreInfoLabel = this._moreInfoLabel;
+		if (moreInfoLabel) {
+			data.dialogButtonText = moreInfoLabel;
+			data.dialogButtonCallback = () => Zotero.launchURL(KEYRING_KB_URL);
+		}
+		return new Zotero.Error(Zotero.getString(stringName), 0, data);
+	},
+
+	// Returns prefixed ciphertext. Throws if OSKeyStore is unavailable so we
+	// don't silently store plaintext when a caller expects encryption.
+	encrypt: async function (plaintext) {
+		let mod = this._load();
+		if (!mod) {
+			throw await this._error(new Error("OSKeyStore unavailable"), 'os-keystore-save-failed');
+		}
+		let ciphertext;
+		try {
+			ciphertext = await mod.encrypt(plaintext);
+		}
+		catch (e) {
+			throw await this._error(e, 'os-keystore-save-failed');
+		}
+		return this._prefix + ciphertext;
+	},
+
+	// Returns the plaintext, or the input unchanged if it doesn't carry our
+	// prefix (legacy plaintext). Throws if the value is prefixed but decryption
+	// fails -- e.g. keychain locked, user canceled the unlock prompt, profile
+	// copied to a different OS user, ciphertext corrupted.
+	decrypt: async function (value) {
+		if (!this.isEncrypted(value)) {
+			return value;
+		}
+		let mod = this._load();
+		if (!mod) {
+			throw await this._error(
+				new Error("OSKeyStore unavailable but stored value is encrypted"),
+				'os-keystore-read-failed'
+			);
+		}
+		// OSKeyStore.encrypt() encodes the string as UTF-8 before encrypting, but
+		// OSKeyStore.decrypt() returns the decrypted bytes as a binary string, so
+		// decode it here
+		let binaryStr;
+		try {
+			binaryStr = await mod.decrypt(value.slice(this._prefix.length));
+		}
+		catch (e) {
+			// A read can fail because the store is unusable or because the store is working
+			// and the stored value just can't be decrypted with the current key. Those need
+			// different advice, since fixing the store won't bring the value back.
+			let stringName = (await this._usable())
+				? 'os-keystore-read-unrecoverable'
+				: 'os-keystore-read-failed';
+			throw await this._error(e, stringName);
+		}
+		return new TextDecoder().decode(
+			Uint8Array.from(binaryStr, char => char.charCodeAt(0))
+		);
+	}
+};
diff --git a/chrome/content/zotero/xpcom/pdfWorker/manager.js b/chrome/content/zotero/xpcom/pdfWorker/manager.js
index b95c5bb57f..622f015907 100644
--- a/chrome/content/zotero/xpcom/pdfWorker/manager.js
+++ b/chrome/content/zotero/xpcom/pdfWorker/manager.js
@@ -23,10 +23,16 @@
     ***** END LICENSE BLOCK *****
 */
 
-const WORKER_URL = 'chrome://zotero/content/xpcom/pdfWorker/worker.js';
-const CMAPS_URL = 'resource://zotero/reader/pdf/web/cmaps/';
-const STANDARD_FONTS_URL = 'resource://zotero/reader/pdf/web/standard_fonts/';
-const WASM_URL = 'resource://zotero/reader/pdf/web/wasm/';
+const WORKER_URL = 'resource://zotero/document-worker/worker.js';
+const ASSETS_URL = 'resource://zotero/document-worker/';
+const READER_PDF_ASSETS_URL = 'resource://zotero/reader/pdf/web/';
+
+function getAssetURL(path) {
+	if (path.startsWith('cmaps/') || path.startsWith('standard_fonts/')) {
+		return READER_PDF_ASSETS_URL + path;
+	}
+	return ASSETS_URL + path;
+}
 
 class PDFWorker {
 	constructor() {
@@ -72,75 +78,82 @@ class PDFWorker {
 		});
 	}
 
-	async _query(action, data, transfer) {
+	async _query(action, data, transfer, options = {}) {
 		return new Promise((resolve, reject) => {
 			this._lastPromiseID++;
-			this._waitingPromises[this._lastPromiseID] = { resolve, reject };
+			this._waitingPromises[this._lastPromiseID] = {
+				resolve,
+				reject,
+				onProgress: typeof options.onProgress === 'function' ? options.onProgress : null,
+			};
 			this._worker.postMessage({ id: this._lastPromiseID, action, data }, transfer);
 		});
 	}
 
+	/**
+	 * Log and rethrow a worker error wrapped with the action name and
+	 * optional context, restoring the error name (e.g., 'PasswordException')
+	 * from the worker error JSON
+	 */
+	_throwWorkerError(action, e, details = {}) {
+		let error = new Error(`Worker action '${action}' failed: ${JSON.stringify({ ...details, error: e.message })}`);
+		try {
+			error.name = JSON.parse(e.message).name;
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		Zotero.logError(error);
+		throw error;
+	}
+
 	_init() {
 		if (this._worker) return;
 		this._worker = new Worker(WORKER_URL);
 		this._worker.addEventListener('message', async (event) => {
 			let message = event.data;
-			if (message.responseID) {
-				let { resolve, reject } = this._waitingPromises[message.responseID];
-				delete this._waitingPromises[message.responseID];
-				if (message.data) {
-					resolve(message.data);
-				}
-				else {
-					reject(new Error(JSON.stringify(message.error)));
+			if ('progressID' in message) {
+				let promise = this._waitingPromises[message.progressID];
+				if (promise?.onProgress) {
+					try {
+						promise.onProgress(message.data?.progress);
+					}
+					catch {
+						// Progress reporting is best-effort and must not affect extraction.
+					}
 				}
 				return;
 			}
-			if (message.id) {
+			if ('responseID' in message) {
+				let promise = this._waitingPromises[message.responseID];
+				if (!promise) {
+					Zotero.debug(`Received response from PDF worker for unknown request ${message.responseID}`);
+					return;
+				}
+				delete this._waitingPromises[message.responseID];
+				let { resolve, reject } = promise;
+				if ('error' in message) {
+					reject(new Error(JSON.stringify(message.error)));
+				}
+				else {
+					resolve(message.data);
+				}
+				return;
+			}
+			if ('id' in message) {
 				let respData = null;
 				try {
-					if (message.action === 'FetchBuiltInCMap') {
+					if (message.action === 'FetchData') {
 						let response = await Zotero.HTTP.request(
 							'GET',
-							CMAPS_URL + message.data + '.bcmap',
-							{ responseType: 'arraybuffer' }
-						);
-						respData = {
-							isCompressed: true,
-							cMapData: new Uint8Array(response.response)
-						};
-					}
-				}
-				catch (e) {
-					Zotero.debug('Failed to fetch CMap data:');
-					Zotero.debug(e);
-				}
-				try {
-					if (message.action === 'FetchStandardFontData') {
-						let response = await Zotero.HTTP.request(
-							'GET',
-							STANDARD_FONTS_URL + message.data,
+							getAssetURL(message.data),
 							{ responseType: 'arraybuffer' }
 						);
 						respData = new Uint8Array(response.response);
 					}
 				}
 				catch (e) {
-					Zotero.debug('Failed to fetch standard font data:');
-					Zotero.debug(e);
-				}
-				try {
-					if (message.action === 'FetchWasm') {
-						let response = await Zotero.HTTP.request(
-							'GET',
-							WASM_URL + message.data,
-							{ responseType: 'arraybuffer' }
-						);
-						respData = new Uint8Array(response.response);
-					}
-				}
-				catch (e) {
-					Zotero.debug('Failed to fetch wasm data:');
+					Zotero.debug(`Failed to fetch data (${message.data}):`);
 					Zotero.debug(e);
 				}
 				try {
@@ -158,11 +171,14 @@ class PDFWorker {
 					Zotero.debug('Failed to save rendered annotation:');
 					Zotero.logError(e);
 				}
-				this._worker.postMessage({ responseID: event.data.id, data: respData });
+				this._worker.postMessage(
+					{ responseID: event.data.id, data: respData },
+					respData instanceof Uint8Array ? [respData.buffer] : []
+				);
 			}
 		});
 		this._worker.addEventListener('error', (event) => {
-			Zotero.logError(`PDF Web Worker error (${event.filename}:${event.lineno}): ${event.message}`);
+			Zotero.logError(`Document worker error (${event.filename}:${event.lineno}): ${event.message}`);
 		});
 	}
 	
@@ -229,23 +245,12 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var res = await this._query('export', {
+				var res = await this._query('pdf.writeAnnotations', {
 					buf, annotations, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'export' failed: ${JSON.stringify({
-					annotations,
-					error: e.message
-				})}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.writeAnnotations', e, { annotations });
 			}
 			
 			await IOUtils.write(path, new Uint8Array(res.buf));
@@ -331,23 +336,12 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var { imported, deleted, buf: modifiedBuf } = await this._query('import', {
+				var { imported, deleted, buf: modifiedBuf } = await this._query('pdf.importAnnotations', {
 					buf, existingAnnotations, password, transfer
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'import' failed: ${JSON.stringify({
-					existingAnnotations,
-					error: e.message
-				})}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.importAnnotations', e, { existingAnnotations });
 			}
 			
 			let ids = [];
@@ -404,17 +398,12 @@ class PDFWorker {
 			let buf = await IOUtils.read(pdfPath);
 			buf = new Uint8Array(buf).buffer;
 			try {
-				var annotations = await this._query('importCitavi', {
+				var annotations = await this._query('pdf.importCitaviAnnotations', {
 					buf, citaviAnnotations, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'importCitavi' failed: ${JSON.stringify({
-					citaviAnnotations,
-					error: e.message
-				})}`);
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.importCitaviAnnotations', e, { citaviAnnotations });
 			}
 			return annotations;
 		}, isPriority);
@@ -438,17 +427,12 @@ class PDFWorker {
 			let buf = await IOUtils.read(pdfPath);
 			buf = new Uint8Array(buf).buffer;
 			try {
-				var annotations = await this._query('importMendeley', {
+				var annotations = await this._query('pdf.importMendeleyAnnotations', {
 					buf, mendeleyAnnotations, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'importMendeley' failed: ${JSON.stringify({
-					mendeleyAnnotations,
-					error: e.message
-				})}`);
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.importMendeleyAnnotations', e, { mendeleyAnnotations });
 			}
 			return annotations;
 		}, isPriority);
@@ -507,20 +491,12 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var { buf: modifiedBuf } = await this._query('deletePages', {
+				var { buf: modifiedBuf } = await this._query('pdf.deletePages', {
 					buf, pageIndexes, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'deletePages' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.deletePages', e);
 			}
 
 			// Delete annotations from deleted pages
@@ -605,20 +581,12 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var { buf: modifiedBuf } = await this._query('rotatePages', {
+				var { buf: modifiedBuf } = await this._query('pdf.rotatePages', {
 					buf, pageIndexes, degrees, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'rotatePages' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.rotatePages', e);
 			}
 
 			await IOUtils.write(path, new Uint8Array(modifiedBuf));
@@ -657,20 +625,12 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var result = await this._query('getFulltext', {
+				var result = await this._query('pdf.getFulltext', {
 					buf, maxPages, password
 				}, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'getFullText' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.getFulltext', e);
 			}
 
 			Zotero.debug(`Extracted full text for item ${attachment.libraryKey} in ${new Date() - t} ms`);
@@ -679,6 +639,61 @@ class PDFWorker {
 		}, isPriority);
 	}
 
+	/**
+	 * Get structured document text for a PDF, EPUB, or snapshot attachment
+	 *
+	 * @param {Integer} itemID Attachment item id
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.isPriority]
+	 * @param {String} [options.password]
+	 * @param {Function} [options.onProgress]
+	 * @returns {Promise<Object|null>}
+	 */
+	async getStructuredDocumentText(itemID, { isPriority = false, password, onProgress } = {}) {
+		return this._enqueue(async () => {
+			let attachment = await Zotero.Items.getAsync(itemID);
+			if (!(attachment.isPDFAttachment()
+					|| attachment.isEPUBAttachment()
+					|| attachment.isSnapshotAttachment())) {
+				throw new Error('Item must be a PDF, EPUB, or snapshot attachment');
+			}
+
+			let path = await attachment.getFilePathAsync();
+			if (!path) {
+				return null;
+			}
+
+			let sourceHash = await attachment.attachmentHash;
+			if (!sourceHash) {
+				throw new Error('Attachment is missing an MD5 hash');
+			}
+
+			Zotero.debug(`Getting structured document text from item ${attachment.libraryKey}`);
+			let t = new Date();
+			let buf = await IOUtils.read(path);
+			buf = new Uint8Array(buf).buffer;
+
+			try {
+				var result = await this._query('getStructuredDocumentText', {
+					buf,
+					contentType: attachment.attachmentContentType,
+					password,
+					sourceHash,
+					reportProgress: typeof onProgress === 'function',
+				}, [buf], {
+					onProgress,
+				});
+			}
+			catch (e) {
+				this._throwWorkerError('getStructuredDocumentText', e);
+			}
+
+			Zotero.debug(`Extracted structured document text for item ${attachment.libraryKey} in ${new Date() - t} ms`);
+
+			return result;
+		}, !!isPriority);
+	}
+
 	/**
 	 * Get data for recognizer-server
 	 *
@@ -703,18 +718,10 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var result = await this._query('getRecognizerData', { buf, password }, [buf]);
+				var result = await this._query('pdf.getRecognizerData', { buf, password }, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'getRecognizerData' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.getRecognizerData', e);
 			}
 
 			Zotero.debug(`Extracted PDF recognizer data for item ${attachment.libraryKey} in ${new Date() - t} ms`);
@@ -759,18 +766,10 @@ class PDFWorker {
 			let { libraryID } = attachment;
 
 			try {
-				var result = await this._query('renderAnnotations', { libraryID, buf, annotations, password }, [buf]);
+				var result = await this._query('pdf.renderAnnotations', { libraryID, buf, annotations, password }, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'renderAnnotations' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.renderAnnotations', e);
 			}
 
 			Zotero.debug(`Rendered ${annotations.length} PDF annotation(s) ${attachment.libraryKey} in ${new Date() - t} ms`);
@@ -802,18 +801,10 @@ class PDFWorker {
 			buf = new Uint8Array(buf).buffer;
 
 			try {
-				var result = await this._query('hasAnnotations', { buf, password }, [buf]);
+				var result = await this._query('pdf.hasAnnotations', { buf, password }, [buf]);
 			}
 			catch (e) {
-				let error = new Error(`Worker 'hasAnnotations' failed: ${JSON.stringify({ error: e.message })}`);
-				try {
-					error.name = JSON.parse(e.message).name;
-				}
-				catch (e) {
-					Zotero.logError(e);
-				}
-				Zotero.logError(error);
-				throw error;
+				this._throwWorkerError('pdf.hasAnnotations', e);
 			}
 
 			return result.hasAnnotations;
diff --git a/chrome/content/zotero/xpcom/pluginAPI/menuManager.js b/chrome/content/zotero/xpcom/pluginAPI/menuManager.js
index 2cc9a8af9a..3e51d55cb2 100644
--- a/chrome/content/zotero/xpcom/pluginAPI/menuManager.js
+++ b/chrome/content/zotero/xpcom/pluginAPI/menuManager.js
@@ -362,7 +362,7 @@
 				return;
 			}
 			
-			// let win = popupElem.ownerGlobal;
+			// let win = popupElem.documentGlobal;
 			// let doc = popupElem.ownerDocument;
 
 			// TODO: maybe we can let plugins to load their own l10n files in onShowing,
@@ -632,8 +632,16 @@
 					_menuElem.style.setProperty("--custom-menu-icon-dark", `url(${darkIcon || icon})`);
 				},
 			};
+			// ZoteroPane's menu contexts define a collectionTreeRow property that
+			// throws when read, so copy descriptors rather than values, which would
+			// evaluate it every time a menu is built
 			let wrappedGetContext = () => {
-				return Object.assign({}, defaultContext, getContext ? getContext() : {});
+				let context = {};
+				Object.defineProperties(context, Object.getOwnPropertyDescriptors(defaultContext));
+				if (getContext) {
+					Object.defineProperties(context, Object.getOwnPropertyDescriptors(getContext()));
+				}
+				return context;
 			};
 
 			// Add hooks
@@ -761,12 +769,12 @@
 		 */
 		_computeAvailableMenuNum(popupElem) {
 			// Compute the height of current screen
-			let screenHeight = popupElem.ownerGlobal.screen.availHeight;
+			let screenHeight = popupElem.documentGlobal.screen.availHeight;
 			let maxMenuHeight = screenHeight * 0.8;
 
-			let menuCount = popupElem.querySelectorAll(`& > :is(menuitem, menu):not(.${CUSTOM_MENU_CLASS}):not([hidden=true])`).length;
+			let menuCount = popupElem.querySelectorAll(`& > :is(menuitem, menu):not(.${CUSTOM_MENU_CLASS}):not([hidden])`).length;
 			// An additional separator is added before the group
-			let separatorCount = popupElem.querySelectorAll(`& > menuseparator:not(.${CUSTOM_MENU_CLASS}):not([hidden=true])`).length + 1;
+			let separatorCount = popupElem.querySelectorAll(`& > menuseparator:not(.${CUSTOM_MENU_CLASS}):not([hidden])`).length + 1;
 
 			let menuHeight, separatorHeight, popupPadding;
 
diff --git a/chrome/content/zotero/xpcom/plugins.js b/chrome/content/zotero/xpcom/plugins.js
index 340f747c85..a2ff9d1228 100644
--- a/chrome/content/zotero/xpcom/plugins.js
+++ b/chrome/content/zotero/xpcom/plugins.js
@@ -34,7 +34,7 @@ Zotero.Plugins = new function () {
 	XPCOMUtils.defineLazyServiceGetters(lazy, {
 		aomStartup: [
 			"@mozilla.org/addons/addon-manager-startup;1",
-			"amIAddonManagerStartup",
+			Ci.amIAddonManagerStartup,
 		],
 	});
 	var scopes = new Map();
@@ -334,6 +334,151 @@ Zotero.Plugins = new function () {
 	};
 
 
+	/**
+	 * Identify the plugin, if any, whose code appears in an error's stack
+	 *
+	 * The topmost plugin frame wins, so an error thrown by Zotero code that a plugin called
+	 * is attributed to the plugin that called it.
+	 *
+	 * @param {Error|String} error - An error or a stack string
+	 * @return {Promise<Object|false>} - { id, name }, or false if no plugin frame was found
+	 */
+	this.getPluginFromError = async function (error) {
+		try {
+			var stack = typeof error == 'string' ? error : error?.stack;
+			if (!stack) {
+				return false;
+			}
+			var { addons } = await AddonManager.getActiveAddons(["extension"]);
+			if (!addons?.length) {
+				return false;
+			}
+			var roots = addons.map(addon => [addon, _archiveOrDirURI(addon.getResourceURI().spec)]);
+			for (let line of stack.split('\n')) {
+				let uri = _stackFrameURI(line);
+				if (!uri) {
+					continue;
+				}
+				uri = _resolveChromeOrResourceURI(uri);
+				if (!uri) {
+					continue;
+				}
+				uri = _archiveOrDirURI(uri);
+				for (let [addon, root] of roots) {
+					if (root && uri.startsWith(root)) {
+						return { id: addon.id, name: addon.name };
+					}
+				}
+			}
+			return false;
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return false;
+		}
+	};
+
+
+	var warnedRemovedAPICalls = new Set();
+
+	/**
+	 * Warn about a call to an API that was removed, naming the plugin that called it
+	 *
+	 * Resolving the plugin is async, so the warning is logged after this returns.
+	 *
+	 * @param {String} name - The removed API, e.g. "CollectionTree#getSelectedSearch()"
+	 * @param {String} replacement - What to use instead, e.g. "getSelectedSearches()"
+	 */
+	this.warnRemovedAPICall = function (name, replacement) {
+		let stack = new Error().stack;
+		// Warn once per call site, since a plugin may call these repeatedly (e.g., on every
+		// item list load). The frames above the caller are this method and the removed
+		// method itself, which are the same for every caller.
+		let callerFrame = stack.split("\n").find(line => !_isZoteroStackFrame(line));
+		let key = name + "\n" + (callerFrame || "");
+		if (warnedRemovedAPICalls.has(key)) {
+			return;
+		}
+		warnedRemovedAPICalls.add(key);
+		this.getPluginFromError(stack)
+			.then((plugin) => {
+				let caller = plugin ? `${plugin.name} (${plugin.id})` : "Something";
+				Zotero.warn(`${caller} called ${name}, which was removed -- use ${replacement}`);
+			})
+			.catch(e => Zotero.logError(e));
+	};
+
+
+	/**
+	 * Resolve a chrome:// or resource:// URI to the file or JAR URI it points at, since
+	 * plugins can register packages and substitutions under both
+	 *
+	 * @param {String} uri
+	 * @return {String} - The resolved URI, or an empty string if it can't be resolved
+	 */
+	function _resolveChromeOrResourceURI(uri) {
+		try {
+			if (uri.startsWith('chrome://')) {
+				return Cc["@mozilla.org/chrome/chrome-registry;1"]
+					.getService(Ci.nsIChromeRegistry)
+					.convertChromeURL(Services.io.newURI(uri))
+					.spec;
+			}
+			if (uri.startsWith('resource://')) {
+				return Services.io.getProtocolHandler("resource")
+					.QueryInterface(Ci.nsIResProtocolHandler)
+					.resolveURI(Services.io.newURI(uri));
+			}
+		}
+		catch {
+			return '';
+		}
+		return uri;
+	}
+
+
+	/**
+	 * Reduce a URI to something comparable between plugin root URIs and stack frames:
+	 * the containing archive for a jar: URI (which points inside an XPI), or the URI itself
+	 * for a plugin installed unpacked
+	 *
+	 * @param {String} uri
+	 * @return {String}
+	 */
+	function _archiveOrDirURI(uri) {
+		if (uri.startsWith('jar:')) {
+			let pos = uri.indexOf('!/');
+			return pos == -1 ? uri.substring(4) : uri.substring(4, pos);
+		}
+		return uri;
+	}
+
+
+	/**
+	 * @param {String} line - A line from an error stack
+	 * @return {Boolean} - True if the frame is Zotero's own code
+	 */
+	function _isZoteroStackFrame(line) {
+		let uri = _stackFrameURI(line);
+		// Trailing slashes matter: a plugin package can start with our own name, as
+		// chrome://zoterostyle/ does
+		return !uri
+			|| uri.startsWith("chrome://zotero/")
+			|| uri.startsWith("resource://zotero/")
+			|| uri.startsWith("resource://gre/");
+	}
+
+
+	/**
+	 * @param {String} line - A line from an error stack, "name@uri:line:column"
+	 * @return {String} - The URI, without the line and column
+	 */
+	function _stackFrameURI(line) {
+		// A function name can't contain "@", while a URI can (plugin IDs are email-like)
+		return line.slice(line.indexOf('@') + 1).replace(/:\d+(?::\d+)?$/, '');
+	}
+
+
 	this.getAllPluginIDs = async function () {
 		let addons = await AddonManager.getAddonsByTypes(["extension"]);
 		return addons.map(addon => addon.id);
diff --git a/chrome/content/zotero/xpcom/prefs.js b/chrome/content/zotero/xpcom/prefs.js
index bdbd864331..caf1fbf58e 100644
--- a/chrome/content/zotero/xpcom/prefs.js
+++ b/chrome/content/zotero/xpcom/prefs.js
@@ -422,9 +422,6 @@ Zotero.Prefs = new function () {
 				if (!win.Zotero) continue;
 				Zotero.updateQuickSearchBox(win.document);
 			}
-		}],
-		[ "cite.useCiteprocRs", function (val) {
-			val && Zotero.CiteprocRs.init();
 		}]
 	];
 	
@@ -515,6 +512,23 @@ Zotero.Prefs = new function () {
 	}
 	
 	
+	/**
+	 * @return {String[]} - Name of the observed pref for each registered observer that belongs to
+	 *     a closed window, with one entry per observer
+	 */
+	this.getLeakedObserverNames = function () {
+		var names = [];
+		for (let [name, handlers] of Object.entries(_observers)) {
+			for (let handler of handlers) {
+				if (Zotero.Utilities.Internal.isObjectLeakingWindow(handler)) {
+					names.push(name);
+				}
+			}
+		}
+		return names;
+	};
+	
+	
 	this.getVirtualCollectionState = function (type) {
 		const prefKeys = {
 			duplicates: 'duplicateLibraries',
diff --git a/chrome/content/zotero/xpcom/progressWindow.js b/chrome/content/zotero/xpcom/progressWindow.js
index 6849ac3e21..20c97a8b84 100644
--- a/chrome/content/zotero/xpcom/progressWindow.js
+++ b/chrome/content/zotero/xpcom/progressWindow.js
@@ -128,7 +128,7 @@ Zotero.ProgressWindow = function (options = {}) {
 		
 		if (_window) {
 			_progressWindow = _window.openDialog("chrome://zotero/content/progressWindow.xhtml",
-				"", "chrome,dialog=no,titlebar=no,alwaysontop=yes");
+				"", "chrome,dialog=no,titlebar=no,dependent=yes");
 			_window.addEventListener('close', () => {
 				this.close();
 			});
diff --git a/chrome/content/zotero/xpcom/quickCopy.js b/chrome/content/zotero/xpcom/quickCopy.js
index c4a17d1e0b..8d4fe86c79 100644
--- a/chrome/content/zotero/xpcom/quickCopy.js
+++ b/chrome/content/zotero/xpcom/quickCopy.js
@@ -286,16 +286,13 @@ Zotero.QuickCopy = new function () {
 				};
 				var html = csl.previewCitationCluster(citation, [], [], "html"); 
 				var text = csl.previewCitationCluster(citation, [], [], "text");
-				csl.free();
 			}
 			else {
 				var style = Zotero.Styles.get(format.id);
 				var cslEngine = style.getCiteProc(locale, 'html', { cache: true });
  				var html = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, "html");
- 				cslEngine.free();
 				cslEngine = style.getCiteProc(locale, 'text', { cache: true });
 				var text = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, "text");
-				cslEngine.free();
 			}
 			
 			return {
diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js
index b4cecf3d70..94b423e9e9 100644
--- a/chrome/content/zotero/xpcom/reader.js
+++ b/chrome/content/zotero/xpcom/reader.js
@@ -43,6 +43,9 @@ const ARRAYBUFFER_MAX_LENGTH = Services.appinfo.is64Bit
 const READ_ALOUD_ENABLED_VOICES_PATH = PathUtils.join(Zotero.Profile.dir, 'readAloudEnabledVoices.json');
 const READ_ALOUD_VOICE_DEFAULTS_PATH = PathUtils.join(Zotero.Profile.dir, 'readAloudVoiceDefaults.json');
 
+// Whether the Read Aloud audio cache has been pruned of stale versions this session
+let readAloudCachePruned = false;
+
 class ReaderInstance {
 	constructor(options) {
 		this.stateFileName = '.zotero-reader-state';
@@ -59,9 +62,11 @@ class ReaderInstance {
 			this._rejectInitPromise = reject;
 		});
 		this._isUninitialized = false;
+		this._isTabClosed = false;
 		this._customEventHandler = null;
 		this._pendingWriteStateTimeout = null;
 		this._pendingWriteStateFunction = null;
+		this._readAloudGuidancePanel = null;
 
 		this._type = this._item.attachmentReaderType;
 		if (!this._type) {
@@ -136,7 +141,10 @@ class ReaderInstance {
 				let item = Zotero.Items.getByLibraryAndKey(libraryID, key);
 				if (item && item.isEditable()) {
 					item.annotationColor = color;
-					await item.saveTx({ skipDateModifiedUpdate: true, notifierQueue });
+					await item.saveTx({
+						skipDateModifiedUpdate: true,
+						notifierQueue
+					});
 				}
 			}
 		}
@@ -252,10 +260,13 @@ class ReaderInstance {
 			autoDisableTextTool: Zotero.Prefs.get('reader.autoDisableTool.text'),
 			autoDisableImageTool: Zotero.Prefs.get('reader.autoDisableTool.image'),
 			sidebarView: Zotero.Prefs.get('reader.lastSidebarTab'),
+			popupPositions: this._getPopupPositions(),
 			enableReadAloud: true,
 			readAloudVoices: this._getReadAloudVoices(),
 			readAloudEnabledVoices: await this._getReadAloudEnabledVoices(),
 			readAloudRemoteInterface: this._getReadAloudRemoteInterface(this._iframeWindow),
+			readAloudHighlightGranularity: Zotero.Prefs.get('reader.readAloud.highlightGranularity'),
+			getSDTPack: this._createGetSDTPack(this._iframeWindow),
 			loggedIn: Zotero.Sync.Runner.enabled,
 			onOpenContextMenu: () => {
 				// Functions can only be passed over wrappedJSObject (we call back onClick for context menu items)
@@ -393,6 +404,9 @@ class ReaderInstance {
 			onChangeSidebarView: (view) => {
 				Zotero.Prefs.set('reader.lastSidebarTab', view);
 			},
+			onSetPopupPosition: (id, position) => {
+				this._setPopupPosition(id, position);
+			},
 			onFocusContextPane: () => {
 				if (this instanceof ReaderWindow || !this._window.ZoteroContextPane.focus()) {
 					this.focusFirst();
@@ -652,7 +666,9 @@ class ReaderInstance {
 			Zotero.Prefs.registerObserver('reader.autoDisableTool.note', this._handleAutoDisableToolPrefChange),
 			Zotero.Prefs.registerObserver('reader.autoDisableTool.text', this._handleAutoDisableToolPrefChange),
 			Zotero.Prefs.registerObserver('reader.autoDisableTool.image', this._handleAutoDisableToolPrefChange),
+			Zotero.Prefs.registerObserver('reader.popupPositions', this._handlePopupPositionsPrefChange),
 			Zotero.Prefs.registerObserver('reader.readAloudVoices', this._handleReadAloudVoicesPrefChange),
+			Zotero.Prefs.registerObserver('reader.readAloud.highlightGranularity', this._handleReadAloudHighlightGranularityChange),
 		];
 
 		return true;
@@ -710,6 +726,7 @@ class ReaderInstance {
 
 	async updateTitle() {
 		this._title = await this._item.getTabTitle();
+		if (this._isTabClosed) return;
 		this._setTitleValue(this._title);
 		this._internalReader?.setTitle(this._title);
 	}
@@ -723,11 +740,15 @@ class ReaderInstance {
 			}
 		}
 		if (annotations.length) {
+			// Annotations can be added before the reader finishes initializing -- e.g., when
+			// embedded annotations are imported right after opening a newly added file
+			await this._initPromise;
 			this._internalReader.setAnnotations(Components.utils.cloneInto(annotations, this._iframeWindow));
 		}
 	}
 
-	unsetAnnotations(keys) {
+	async unsetAnnotations(keys) {
+		await this._initPromise;
 		this._internalReader.unsetAnnotations(Components.utils.cloneInto(keys, this._iframeWindow));
 	}
 
@@ -1133,6 +1154,40 @@ class ReaderInstance {
 		return state;
 	}
 
+	// Returns the function passed to the reader as options.getSDTPack, which
+	// resolves with the SDT pack for the displayed attachment, generating it
+	// if necessary. The reader decides when to pull (currently at init, so
+	// the pack is ready when a feature needs it), and a reader build without
+	// SDT support never triggers extraction. The pack bytes are passed by
+	// value, so a held pack can't be affected by a later regeneration and
+	// always matches the document the reader is displaying.
+	_createGetSDTPack(targetWindow) {
+		if (!Zotero.SDT || !this.itemID || this._isTransient()) {
+			return null;
+		}
+		// Wrap the return value in a child window Promise to avoid
+		// permissions errors (as in _getReadAloudRemoteInterface()).
+		// getPack() never rejects
+		return (options = {}) => new targetWindow.Promise(async (resolve) => {
+			let contentOptions = Cu.waiveXrays(options);
+			let onProgress = typeof contentOptions.onProgress === 'function'
+				? progress => {
+					if (!Components.utils.isDeadWrapper(targetWindow)) {
+						contentOptions.onProgress(progress);
+					}
+				}
+				: null;
+			let result = await Zotero.SDT.getPack(this.itemID, {
+				isPriority: true,
+				onProgress,
+			});
+			if (Components.utils.isDeadWrapper(targetWindow)) {
+				return;
+			}
+			resolve(Cu.cloneInto(result, targetWindow));
+		});
+	}
+
 	_isTransient() {
 		return false;
 	}
@@ -1175,10 +1230,20 @@ class ReaderInstance {
 		this._internalReader.setAutoDisableImageTool(Zotero.Prefs.get('reader.autoDisableTool.image'));
 	};
 	
+	_handlePopupPositionsPrefChange = () => {
+		this._internalReader.setPopupPositions(Cu.cloneInto(this._getPopupPositions(), this._iframeWindow));
+	};
+
 	_handleReadAloudVoicesPrefChange = () => {
 		this._internalReader.setReadAloudVoices(Cu.cloneInto(this._getReadAloudVoices(), this._iframeWindow));
 	};
 
+	_handleReadAloudHighlightGranularityChange = () => {
+		this._internalReader.setReadAloudHighlightGranularity(
+			Zotero.Prefs.get('reader.readAloud.highlightGranularity')
+		);
+	};
+
 	_handleReadAloudEnabledVoicesChange = async (voices) => {
 		if (!voices) {
 			voices = await this._getReadAloudEnabledVoices();
@@ -1290,14 +1355,14 @@ class ReaderInstance {
 					else {
 						let menuitem = parentNode.ownerDocument.createXULElement('menuitem');
 						menuitem.setAttribute('label', item.label);
-						menuitem.setAttribute('disabled', item.disabled);
+						menuitem.toggleAttribute('disabled', item.disabled);
 						if (item.color) {
 							menuitem.className = 'menuitem-iconic';
 							menuitem.setAttribute('image', this._getColorIcon(item.color, item.checked));
 						}
 						else if (item.checked) {
 							menuitem.setAttribute('type', 'checkbox');
-							menuitem.setAttribute('checked', item.checked);
+							menuitem.toggleAttribute('checked', item.checked);
 						}
 						menuitem.addEventListener('command', () => item.onCommand());
 						parentNode.appendChild(menuitem);
@@ -1335,7 +1400,7 @@ class ReaderInstance {
 			return;
 		}
 
-		let iframeWindow = event.target.ownerGlobal;
+		let iframeWindow = event.target.documentGlobal;
 
 		this._window.MozXULElement.insertFTLIfNeeded("toolkit/global/textActions.ftl");
 		this._window.MozXULElement.insertFTLIfNeeded("browser/menubar.ftl");
@@ -1370,7 +1435,7 @@ class ReaderInstance {
 		menuitemSwitchTextDirection.hidden = !showSwitchTextDirection;
 		menuitemSwitchTextDirection.previousElementSibling.hidden = !showSwitchTextDirection;
 
-		let selection = event.target.ownerGlobal.getSelection();
+		let selection = event.target.documentGlobal.getSelection();
 		if (!selection || !selection.anchorNode) {
 			return;
 		}
@@ -1391,7 +1456,7 @@ class ReaderInstance {
 			// Check Spelling
 			var menuitem = popup.ownerDocument.createXULElement('menuitem');
 			menuitem.setAttribute('data-l10n-id', 'text-action-spell-check-toggle');
-			menuitem.setAttribute('checked', !!Zotero.Prefs.get('layout.spellcheckDefault', true));
+			menuitem.toggleAttribute('checked', !!Zotero.Prefs.get('layout.spellcheckDefault', true));
 			menuitem.setAttribute('type', 'checkbox');
 			menuitem.addEventListener('command', () => {
 				spellChecker.toggleEnabled();
@@ -1631,6 +1696,28 @@ class ReaderInstance {
 		}
 	}
 
+	/**
+	 * Positions of draggable reader popups, keyed by popup ID
+	 *
+	 * @returns {Object}
+	 */
+	_getPopupPositions() {
+		try {
+			let positions = JSON.parse(Zotero.Prefs.get('reader.popupPositions'));
+			return positions && typeof positions == 'object' ? positions : {};
+		}
+		catch {
+			return {};
+		}
+	}
+
+	_setPopupPosition(id, position) {
+		Zotero.Prefs.set('reader.popupPositions', JSON.stringify({
+			...this._getPopupPositions(),
+			[id]: { x: Math.round(position.x), y: Math.round(position.y) },
+		}));
+	}
+
 	_getReadAloudVoices() {
 		try {
 			return JSON.parse(Zotero.Prefs.get('reader.readAloudVoices'));
@@ -1669,19 +1756,35 @@ class ReaderInstance {
 					let client = Zotero.Sync.Runner.getAPIClient({ apiKey });
 					let result = await client.getReadAloudVoices();
 					resolve(Cu.cloneInto(result, targetWindow));
+					// Prune cache entries with outdated versions once per session,
+					// after the voices (and their current cache versions) are known
+					if (!readAloudCachePruned && result.voices) {
+						this._pruneReadAloudCache(audioCache, result.voices);
+					}
 				});
 			},
 
 			getAudio: (segment, voice) => {
 				return new targetWindow.Promise(async (resolve) => {
-					let cacheURL = 'https://read-aloud.zotero.invalid/audio?'
-						+ new URLSearchParams({ voice: voice.id, text: segment.text });
+					let cacheURL = this._getReadAloudCacheURL(segment, voice);
 					let cache;
 					try {
 						cache = await audioCache;
 						let cached = await cache.match(cacheURL);
 						if (cached) {
-							resolve(Cu.cloneInto({ audio: await cached.blob() }, targetWindow));
+							// Word-level timestamps are cached in a response header
+							// alongside the audio (see below)
+							let timestamps;
+							let timestampsHeader = cached.headers.get('X-Zotero-Timestamps');
+							if (timestampsHeader) {
+								try {
+									timestamps = JSON.parse(timestampsHeader);
+								}
+								catch (e) {
+									Zotero.logError(e);
+								}
+							}
+							resolve(Cu.cloneInto({ audio: await cached.blob(), timestamps }, targetWindow));
 							return;
 						}
 					}
@@ -1691,9 +1794,17 @@ class ReaderInstance {
 					let apiKey = segment === 'sample' ? null : await Zotero.Sync.Data.Local.getAPIKey();
 					let client = Zotero.Sync.Runner.getAPIClient({ apiKey });
 					let result = await client.getReadAloudAudio(segment, voice.id);
-					if (result.audio && cache) {
+					// Skip caching when the server forbids it (e.g., error responses
+					// returned with Cache-Control: no-store)
+					if (result.audio && cache && !result.noStore) {
 						try {
-							await cache.put(cacheURL, new Response(result.audio));
+							// Put word-level timestamps in a header so they
+							// get cached with the audio response
+							let headers = {};
+							if (result.timestamps) {
+								headers['X-Zotero-Timestamps'] = JSON.stringify(result.timestamps);
+							}
+							await cache.put(cacheURL, new Response(result.audio, { headers }));
 						}
 						catch (e) {
 							Zotero.logError(e);
@@ -1721,6 +1832,45 @@ class ReaderInstance {
 		};
 	}
 
+	// Build the local cache key for a Read Aloud audio segment. The voice's
+	// cacheVersion is included so that a server-side version bump changes the
+	// key, causing old entries to miss and the correct audio to be re-fetched.
+	_getReadAloudCacheURL(segment, voice) {
+		let params = { voice: voice.id, text: segment.text, cacheVersion: voice.cacheVersion, timestamps: 1 };
+		return 'https://read-aloud.zotero.invalid/audio?' + new URLSearchParams(params);
+	}
+
+	// Delete cached audio whose cacheVersion is no longer offered by the server,
+	// reclaiming space that key mismatches alone would leave behind. Runs once
+	// per session.
+	async _pruneReadAloudCache(audioCache, voices) {
+		readAloudCachePruned = true;
+		try {
+			let validVersions = new Set();
+			for (let configs of Object.values(voices)) {
+				if (!Array.isArray(configs)) continue;
+				for (let config of configs) {
+					validVersions.add(String(config.cacheVersion));
+				}
+			}
+			if (!validVersions.size) {
+				return;
+			}
+			let cache = await audioCache;
+			for (let request of await cache.keys()) {
+				let params = new URL(request.url).searchParams;
+				// Drop entries stored in the pre-timestamp format, plus those
+				// whose cacheVersion is no longer offered by the server
+				if (params.get('timestamps') !== '1' || !validVersions.has(params.get('cacheVersion'))) {
+					await cache.delete(request);
+				}
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+	}
+
 	async _showReadAloudGuidance() {
 		await this._internalReader._primaryView.initializedPromise;
 
@@ -1805,6 +1955,8 @@ class ReaderTab extends ReaderInstance {
 		this._contextPaneOpen = options.contextPaneOpen;
 		this._bottomPlaceholderHeight = options.bottomPlaceholderHeight;
 		this._showContextPaneToggle = true;
+		this._readAloudPlaying = false;
+		this._pointerDownWindow = null;
 		this._window = Services.wm.getMostRecentWindow('navigator:browser');
 		let existingTabID = options.tabID;
 		let select = !options.background;
@@ -1812,6 +1964,12 @@ class ReaderTab extends ReaderInstance {
 		// Otherwise, create a new tab
 		if (existingTabID) {
 			this.tabID = existingTabID;
+			let { tab } = this._window.Zotero_Tabs._getTab(existingTabID);
+			let onClose = tab.onClose;
+			tab.onClose = () => {
+				onClose?.call(tab);
+				this._handleTabClose();
+			};
 			this._tabContainer = this._window.document.getElementById(existingTabID);
 		}
 		else {
@@ -1823,6 +1981,7 @@ class ReaderTab extends ReaderInstance {
 				data: {
 					itemID: this._item.id
 				},
+				onClose: this._handleTabClose,
 				select,
 				preventJumpback: options.preventJumpback
 			});
@@ -1838,6 +1997,10 @@ class ReaderTab extends ReaderInstance {
 		this._iframe.setAttribute('src', 'resource://zotero/reader/reader.html');
 		this._tabContainer.appendChild(this._iframe);
 		this._iframe.docShell.windowDraggingAllowed = true;
+		// Derive the initial docShell activity here, because tabs opened in
+		// the background, unlike deselected tabs, don't go through a tab
+		// 'select' notification
+		this._updateDocShellActivity();
 		
 		this._popupset = this._window.document.createXULElement('popupset');
 		this._tabContainer.appendChild(this._popupset);
@@ -1889,6 +2052,14 @@ class ReaderTab extends ReaderInstance {
 		});
 	}
 
+	_handleTabClose = () => {
+		this._isTabClosed = true;
+		if (this._blockingObserver) {
+			this._blockingObserver.dispose();
+			this._blockingObserver = null;
+		}
+	};
+
 	uninit() {
 		if (this._window) {
 			this._window.removeEventListener('DOMContentLoaded', this._handleLoad);
@@ -1981,16 +2152,26 @@ class ReaderTab extends ReaderInstance {
 		}
 	}
 
+	// Keep the docShell active only while the tab has to stay responsive:
+	// when it's selected or playing Read Aloud. An inactive docShell throttles
+	// rAF and timers, and lets the reader see document.visibilityState
+	// 'hidden' and release rendered pages
+	_updateDocShellActivity() {
+		this._iframe.docShellIsActive = this._window.Zotero_Tabs.selectedID == this.tabID
+			|| this._readAloudPlaying;
+	}
+
 	_setReadAloudStatus(status) {
+		this._readAloudPlaying = status.active && !status.paused;
+		// Wake up the docShell even if this tab is in the background,
+		// so event-loop tasks run immediately. Without this, playing
+		// sometimes doesn't take effect immediately.
+		this._updateDocShellActivity();
 		if (status.active) {
 			this._hideReadAloudGuidance();
 		}
-		if (status.active && !status.paused) {
-			// Wake up the docShell even if this tab is in the background,
-			// so event-loop tasks run immediately. Without this, playing
-			// sometimes doesn't take effect immediately.
-			this._iframe.docShellIsActive = true;
-
+		this._window.Zotero_Tabs.setAudioStatus(this.tabID, status);
+		if (this._readAloudPlaying) {
 			// If this tab was unpaused, pause all others
 			for (let reader of Zotero.Reader._readers) {
 				if (reader === this) continue;
@@ -2006,7 +2187,6 @@ class ReaderTab extends ReaderInstance {
 				}
 			}
 		}
-		this._window.Zotero_Tabs.setAudioStatus(this.tabID, status);
 	}
 	
 	toggleReadAloudPaused(paused = undefined) {
@@ -2100,8 +2280,8 @@ class ReaderWindow extends ReaderInstance {
 			&& !(item.deleted || item.parentItem && item.parentItem.deleted)) {
 			let annotations = item.getAnnotations();
 			let canTransferFromPDF = annotations.find(x => x.annotationIsExternal);
-			transferFromPDFMenuitem.setAttribute('disabled', !canTransferFromPDF);
-			importFromEPUBMenuitem.setAttribute('disabled', false);
+			transferFromPDFMenuitem.toggleAttribute('disabled', !canTransferFromPDF);
+			importFromEPUBMenuitem.removeAttribute('disabled');
 		}
 		else {
 			transferFromPDFMenuitem.setAttribute('disabled', true);
@@ -2125,25 +2305,25 @@ class ReaderWindow extends ReaderInstance {
 			return;
 		}
 		if (this._type === 'pdf' || this._type === 'epub') {
-			this._window.document.getElementById('view-menuitem-no-spreads').setAttribute('checked', this._internalReader.spreadMode === 0);
-			this._window.document.getElementById('view-menuitem-odd-spreads').setAttribute('checked', this._internalReader.spreadMode === 1);
-			this._window.document.getElementById('view-menuitem-even-spreads').setAttribute('checked', this._internalReader.spreadMode === 2);
+			this._window.document.getElementById('view-menuitem-no-spreads').toggleAttribute('checked', this._internalReader.spreadMode === 0);
+			this._window.document.getElementById('view-menuitem-odd-spreads').toggleAttribute('checked', this._internalReader.spreadMode === 1);
+			this._window.document.getElementById('view-menuitem-even-spreads').toggleAttribute('checked', this._internalReader.spreadMode === 2);
 		}
 		if (this._type === 'pdf') {
-			this._window.document.getElementById('view-menuitem-vertical-scrolling').setAttribute('checked', this._internalReader.scrollMode === 0);
-			this._window.document.getElementById('view-menuitem-horizontal-scrolling').setAttribute('checked', this._internalReader.scrollMode === 1);
-			this._window.document.getElementById('view-menuitem-wrapped-scrolling').setAttribute('checked', this._internalReader.scrollMode === 2);
-			this._window.document.getElementById('view-menuitem-hand-tool').setAttribute('checked', this._internalReader.toolType === 'hand');
-			this._window.document.getElementById('view-menuitem-zoom-auto').setAttribute('checked', this._internalReader.zoomAutoEnabled);
-			this._window.document.getElementById('view-menuitem-zoom-page-width').setAttribute('checked', this._internalReader.zoomPageWidthEnabled);
-			this._window.document.getElementById('view-menuitem-zoom-page-height').setAttribute('checked', this._internalReader.zoomPageHeightEnabled);
+			this._window.document.getElementById('view-menuitem-vertical-scrolling').toggleAttribute('checked', this._internalReader.scrollMode === 0);
+			this._window.document.getElementById('view-menuitem-horizontal-scrolling').toggleAttribute('checked', this._internalReader.scrollMode === 1);
+			this._window.document.getElementById('view-menuitem-wrapped-scrolling').toggleAttribute('checked', this._internalReader.scrollMode === 2);
+			this._window.document.getElementById('view-menuitem-hand-tool').toggleAttribute('checked', this._internalReader.toolType === 'hand');
+			this._window.document.getElementById('view-menuitem-zoom-auto').toggleAttribute('checked', this._internalReader.zoomAutoEnabled);
+			this._window.document.getElementById('view-menuitem-zoom-page-width').toggleAttribute('checked', this._internalReader.zoomPageWidthEnabled);
+			this._window.document.getElementById('view-menuitem-zoom-page-height').toggleAttribute('checked', this._internalReader.zoomPageHeightEnabled);
 		}
 		else if (this._type === 'epub') {
-			this._window.document.getElementById('view-menuitem-scrolled').setAttribute('checked', this._internalReader.flowMode === 'scrolled');
-			this._window.document.getElementById('view-menuitem-paginated').setAttribute('checked', this._internalReader.flowMode === 'paginated');
+			this._window.document.getElementById('view-menuitem-scrolled').toggleAttribute('checked', this._internalReader.flowMode === 'scrolled');
+			this._window.document.getElementById('view-menuitem-paginated').toggleAttribute('checked', this._internalReader.flowMode === 'paginated');
 		}
-		this._window.document.getElementById('view-menuitem-split-vertically').setAttribute('checked', this._internalReader.splitType === 'vertical');
-		this._window.document.getElementById('view-menuitem-split-horizontally').setAttribute('checked', this._internalReader.splitType === 'horizontal');
+		this._window.document.getElementById('view-menuitem-split-vertically').toggleAttribute('checked', this._internalReader.splitType === 'vertical');
+		this._window.document.getElementById('view-menuitem-split-horizontally').toggleAttribute('checked', this._internalReader.splitType === 'horizontal');
 
 		this.onUpdateCustomMenus(event, 'view', popup);
 	}
@@ -2174,11 +2354,11 @@ class ReaderWindow extends ReaderInstance {
 		menuItemForward.setAttribute('key', 'key_forward');
 
 		if (['pdf', 'epub'].includes(this._type)) {
-			this._window.document.getElementById('go-menuitem-first-page').setAttribute('disabled', !this._internalReader.canNavigateToFirstPage);
-			this._window.document.getElementById('go-menuitem-last-page').setAttribute('disabled', !this._internalReader.canNavigateToLastPage);
+			this._window.document.getElementById('go-menuitem-first-page').toggleAttribute('disabled', !this._internalReader.canNavigateToFirstPage);
+			this._window.document.getElementById('go-menuitem-last-page').toggleAttribute('disabled', !this._internalReader.canNavigateToLastPage);
 		}
-		this._window.document.getElementById('go-menuitem-back').setAttribute('disabled', !this._internalReader.canNavigateBack);
-		this._window.document.getElementById('go-menuitem-forward').setAttribute('disabled', !this._internalReader.canNavigateForward);
+		this._window.document.getElementById('go-menuitem-back').toggleAttribute('disabled', !this._internalReader.canNavigateBack);
+		this._window.document.getElementById('go-menuitem-forward').toggleAttribute('disabled', !this._internalReader.canNavigateForward);
 
 		this.onUpdateCustomMenus(event, 'go', popup);
 	}
@@ -2630,14 +2810,13 @@ class Reader {
 			}
 			else if (event === 'select') {
 				for (let reader of this._readers) {
-					if (reader instanceof ReaderTab && reader._window.Zotero_Tabs.canUnload(reader.tabID)) {
-						reader._iframe.docShellIsActive = false;
+					if (reader instanceof ReaderTab) {
+						reader._updateDocShellActivity();
 					}
 				}
 
 				let reader = Zotero.Reader.getByTabID(ids[0]);
 				if (reader) {
-					reader._iframe.docShellIsActive = true;
 					this.triggerAnnotationsImportCheck(reader.itemID);
 				}
 			}
@@ -2742,7 +2921,9 @@ class Reader {
 		let reader;
 		// If duplicating is not allowed, and no reader instance is loaded for itemID,
 		// try to find an unloaded tab and select it. Zotero.Reader.open will then be called again
-		if (!allowDuplicate && !this._readers.find(r => r.itemID === itemID)) {
+		if (!allowDuplicate && !this._readers.find(
+			r => r.itemID === itemID && (openInWindow || !r._isTabClosed)
+		)) {
 			if (win) {
 				let existingTabID = win.Zotero_Tabs.getTabIDByItemID(itemID);
 				if (existingTabID) {
@@ -2756,7 +2937,7 @@ class Reader {
 			reader = this._readers.find(r => r.itemID === itemID && (r instanceof ReaderWindow));
 		}
 		else if (!allowDuplicate) {
-			reader = this._readers.find(r => r.itemID === itemID);
+			reader = this._readers.find(r => r.itemID === itemID && !r._isTabClosed);
 		}
 
 		if (reader) {
diff --git a/chrome/content/zotero/xpcom/retractions.js b/chrome/content/zotero/xpcom/retractions.js
index 430f2a6a35..a6de86184f 100644
--- a/chrome/content/zotero/xpcom/retractions.js
+++ b/chrome/content/zotero/xpcom/retractions.js
@@ -51,7 +51,7 @@ Zotero.Retractions = {
 		// Load mappings of keys (DOI hashes and PMIDs) to items and vice versa and register for
 		// item changes so they can be kept up to date in notify().
 		await this._cacheKeyMappings();
-		Zotero.Notifier.registerObserver(this, ['item', 'group'], 'retractions', 20);
+		Zotero.Notifier.registerObserver(this, ['item', 'group', 'sync'], 'retractions', 20);
 		
 		// Load in the cached prefix list that we check new items against
 		try {
@@ -106,6 +106,7 @@ Zotero.Retractions = {
 		this._cacheDOIPrefixLength = null;
 		this._cachePMIDPrefixLength = null;
 		this._cachePrefixList = new Set();
+		this._suppressAlerts = false;
 	},
 	
 	/**
@@ -378,6 +379,20 @@ Zotero.Retractions = {
 			return;
 		}
 		
+		if (type == 'sync') {
+			// If there's no stored user yet, this is the first sync on this computer.
+			// Suppress the retraction banner until the sync completes -- we don't want
+			// to alert on items that were already in the library before we started
+			// checking.
+			if (action == 'start' && !Zotero.Users.getCurrentUserID()) {
+				this._suppressAlerts = true;
+			}
+			else if (action == 'finish') {
+				this._suppressAlerts = false;
+			}
+			return;
+		}
+
 		// Clean up cache on group deletion
 		if (type == 'group') {
 			if (action == 'delete') {
@@ -434,8 +449,14 @@ Zotero.Retractions = {
 			}
 		}
 		else if (action == 'delete') {
+			let removedItemIDs = [];
 			for (let id of ids) {
-				await this._removeEntry(id, extraData[id].libraryID);
+				if (await this._removeEntry(id, extraData[id].libraryID)) {
+					removedItemIDs.push(id);
+				}
+			}
+			if (removedItemIDs.length) {
+				await Zotero.Notifier.trigger('refresh', 'item', removedItemIDs);
 			}
 		}
 	},
@@ -452,10 +473,16 @@ Zotero.Retractions = {
 		
 		// If no possible matches, clear retraction flag on any items that changed
 		if (!this._queuedPrefixStrings.size) {
+			let removedItemIDs = [];
 			for (let item of this._queuedItems) {
-				await this._removeEntry(item.id, item.libraryID);
+				if (await this._removeEntry(item.id, item.libraryID)) {
+					removedItemIDs.push(item.id);
+				}
 			}
 			this._queuedItems.clear();
+			if (removedItemIDs.length) {
+				await Zotero.Notifier.trigger('refresh', 'item', removedItemIDs);
+			}
 			return;
 		}
 		
@@ -480,11 +507,17 @@ Zotero.Retractions = {
 		}
 		
 		// Remove retraction status for items that were checked but didn't match
+		let removedItemIDs = [];
 		for (let item of items) {
 			if (!addedItems.includes(item.id)) {
-				await this._removeEntry(item.id, item.libraryID);
+				if (await this._removeEntry(item.id, item.libraryID)) {
+					removedItemIDs.push(item.id);
+				}
 			}
 		}
+		if (removedItemIDs.length) {
+			await Zotero.Notifier.trigger('refresh', 'item', removedItemIDs);
+		}
 	},
 	
 	updateFromServer: Zotero.serial(async function () {
@@ -492,9 +525,10 @@ Zotero.Retractions = {
 			return;
 		}
 		
-		// Download list
+		// Download list. Skip the conditional request if the cached list was saved by a
+		// different version, so that a version bump forces a full refresh of stored data.
 		var headers = {};
-		if (this._cacheETag) {
+		if (this._cacheETag && this._cacheVersion == this._version) {
 			headers["If-None-Match"] = this._cacheETag;
 		}
 		var req = await Zotero.HTTP.request(
@@ -627,25 +661,31 @@ Zotero.Retractions = {
 		}
 		
 		// Remove existing retracted items that no longer match
-		var removed = 0;
+		var removedItemIDs = [];
 		if (removeExisting) {
 			for (let itemID of this._retractedItems.keys()) {
 				if (!allItemIDs.has(itemID)) {
 					let item = await Zotero.Items.getAsync(itemID);
-					await this._removeEntry(itemID, item.libraryID);
-					removed++;
+					if (await this._removeEntry(itemID, item.libraryID)) {
+						removedItemIDs.push(itemID);
+					}
 				}
 			}
 		}
 		
 		var msg = `Found ${addedItemIDs.size} retracted `
 			+ Zotero.Utilities.pluralize(addedItemIDs.size, 'item');
-		if (removed) {
-			msg += " and removed " + removed;
+		if (removedItemIDs.length) {
+			msg += " and removed " + removedItemIDs.length;
 		}
 		Zotero.debug(msg);
 		addedItemIDs = [...addedItemIDs];
-		if (addedItemIDs.length) {
+		// Refresh the items whose retraction state changed
+		let changedItemIDs = [...addedItemIDs, ...removedItemIDs];
+		if (changedItemIDs.length) {
+			await Zotero.Notifier.trigger('refresh', 'item', changedItemIDs);
+		}
+		if (addedItemIDs.length && !this._suppressAlerts) {
 			this._showAlert(addedItemIDs); // async
 		}
 		return addedItemIDs;
@@ -871,14 +911,18 @@ Zotero.Retractions = {
 		delete o.retractionDOI;
 		delete o.retractionPMID;
 		
-		var sql = "REPLACE INTO retractedItems (itemID, data) VALUES (?, ?)";
+		// Leave the flag alone, so a hidden retraction stays hidden across refreshes
+		var sql = "INSERT INTO retractedItems (itemID, data) VALUES (?, ?) "
+			+ "ON CONFLICT(itemID) DO UPDATE SET data=excluded.data";
 		await Zotero.DB.queryAsync(sql, [itemID, JSON.stringify(o)]);
 		
 		var item = await Zotero.Items.getAsync(itemID);
 		var libraryID = item.libraryID;
 		// Check whether the retraction is already hidden by the user
 		var flag = this._retractedItems.get(itemID);
-		if (flag === undefined) {
+		// An item already known to be retracted needs no refresh
+		var isNew = flag === undefined;
+		if (isNew) {
 			this._retractedItems.set(itemID, this.FLAG_NORMAL);
 		}
 		if (!item.deleted && flag !== this.FLAG_HIDDEN) {
@@ -889,14 +933,14 @@ Zotero.Retractions = {
 			await this._updateLibraryRetractions(libraryID);
 		}
 		
-		await Zotero.Notifier.trigger('refresh', 'item', [itemID]);
+		return isNew;
 	},
 	
 	_removeEntry: async function (itemID, libraryID) {
 		this._deleteItemKeyMappings(itemID);
 		
 		if (!this._retractedItems.has(itemID)) {
-			return;
+			return false;
 		}
 		
 		await Zotero.DB.queryAsync("DELETE FROM retractedItems WHERE itemID=?", itemID);
@@ -904,7 +948,7 @@ Zotero.Retractions = {
 		this._retractedItemsByLibrary[libraryID].delete(itemID);
 		await this._updateLibraryRetractions(libraryID);
 		
-		await Zotero.Notifier.trigger('refresh', 'item', [itemID]);
+		return true;
 	},
 	
 	_removeAllEntries: async function () {
@@ -1005,108 +1049,118 @@ Zotero.Retractions = {
 	
 	// https://retractionwatch.com/retraction-watch-database-user-guide/retraction-watch-database-user-guide-appendix-b-reasons/
 	_reasonDescriptions: {
-		"Author Unresponsive": "Author(s) lack of communication after prior contact by Journal, Publisher or other original Authors",
-		"Bias Issues or Lack of Balance": "Failure to maintain objectivity in the presentation or analysis of information",
-		"Breach of Policy by Author": "A violation of the Journal, Publisher or Institutional accepted practices by the author",
-		"Breach of Policy by Third Party": "A violation of the Journal, Publisher or Institutional accepted practices by a person or company/institution not the authors",
-		"Cites Retracted Work": "A retracted item is used in citations or referencing",
-		"Civil Proceedings": "Non-criminal litigation arising from the publication of the original article or the related notice(s)",
-		"Complaints about Author": "Allegations made strictly about the author without respect to the original article",
-		"Complaints about Company/Institution": "Allegations made strictly about the author’s affiliation(s) without respect to the original article",
-		"Complaints about Third Party": "Allegations made strictly about those not the author or the author’s affiliation(s) without respect to the original article",
-		"Concerns/Issues About Authorship": "Any question, controversy or dispute over the rightful claim to authorship, excluding forged authorship",
-		"Concerns/Issues About Data": "Any question, controversy or dispute over the validity of the data",
-		"Concerns/Issues About Image": "Any question, controversy or dispute over the validity of the image",
-		"Concerns/Issues about Referencing/Attributions": "Any question, controversy or dispute over whether ideas, analyses, text or data are properly credited to the originator",
-		"Concerns/Issues About Results": "Any question, controversy or dispute over the validity of the results",
-		"Concerns/Issues about Third Party Involvement": "Any question, controversy or dispute over the rightful claim to authorship, excluding forged authorship",
-		"Conflict of Interest": "Authors having affiliations with companies, associations, or institutions that may serve to influence their belief about their findings",
-		"Contamination of Cell Lines/Tissues": "Impurities found within cell lines or tissues",
-		"Contamination of Materials (General)": "Impurities found within compounds or solutions used in experiments",
-		"Contamination of Reagents": "Impurities found within compounds or solutions used to drive experimental outcomes",
-		"Copyright Claims": "Dispute concerning right of ownership of a publication",
-		"Criminal Proceedings": "Court actions that may result in incarceration or fines arising from the publication of the original article or the related notice(s)",
-		"Date of Retraction/Other Unknown": "A lack of publishing date given on the notice – or the date on the notice is not representative of the actual notice date.  Commonly found when Publishers overwrite the original article’s HTML page with the retraction notice, without changing the publication date to reflect such.",
+		"Author Unresponsive": "The corresponding author(s) did not respond to journal/publisher requests for response, clarification, etc., about one or more concerns/issues with a publication. Retraction Watch does not apply this reason when the lack of response is only to the language or posting of a notice of correction/EOC/retraction.",
+		"Bias Issues or Lack of Balance": "Any question, controversy or dispute about balance or bias in any of the methods, analyses, results or any part of the published content. Retraction Watch entries using this reason do not state or imply, nor should users infer, any intentionality.",
+		"Breach of Policy by Author": "A journal/publisher/institution states that one or more authors violated one or more of the journal/publisher/institution’s policy(ies). Retraction Watch will use this reason when no other information about the correction/EOC/retraction is available (i.e., the notice only states that there was a breach of policy), or when the breach of policy (as an additional reason) cannot be addressed by existing reasons.",
+		"Cites Retracted Work": "Retracted content is used in citations or referencing.",
+		"Civil Proceedings": "Civil legal proceedings were instigated in response to the article and/or notice(s), or civil legal proceedings resulted in the correction/EOC/retraction/etc.",
+		"Complaints about Author": "Complaints about one or more authors in addition to concerns about the original article. Retraction Watch may also use this reason for cases in which something about one or more authors is called into question following any notice, i.e., when complaints escalate to being entirely author-based.",
+		"Complaints about Company/Institution": "Complaints about one or more companies/institutions in addition to concerns about the original article. Retraction Watch may also use this reason for cases in which something about one or more companies/institutions is called into question following any notice, i.e., when complaints escalate to being entirely company/institution-based.",
+		"Complaints about Third Party": "Complaints about one or more third parties in addition to concerns about the original article. Retraction Watch may also use this reason for cases in which something about one or more third parties is called into question following any notice, ie., when complaints escalate to being entirely third party-based.",
+		"Compromised Peer Review": "The peer review was not performed in accordance with the journal’s guidelines or ethical standards",
+		"Computer-Aided Content or Computer-Generated Content": "Contains any content that was created via a text generator, randomizing algorithm, generative AI, etc. Some examples of these tools include Mathgen, Scigen, ChatGPT.",
+		"Concerns/Issues about Animal Welfare": "Any question, controversy or dispute about any non-human test or study subject(s).",
+		"Concerns/Issues about Article": "Any question, controversy or dispute about published content, or undefined sections of it.",
+		"Concerns/Issues about Authorship/Affiliation": "Any question, controversy or dispute about authorship and/or affiliation, except for false/forged authorship or false/forged affiliation. False/forged authorship or false/forged affiliation are covered under their own reasons.",
+		"Concerns/Issues about Data": "Any question, controversy or dispute about any of the data.",
+		"Concerns/Issues about Human Subject Welfare": "Any question, controversy or dispute about any human test or study subject(s).",
+		"Concerns/Issues about Image": "Any question, controversy or dispute about one or more images, or part(s) of one or more images.",
+		"Concerns/Issues about Methods": "Any question, controversy or dispute about any of the methods.",
+		"Concerns/Issues about Peer Review": "The peer review was not performed solely through journal error, or there are problems with the peer review that are not covered under “Compromised Peer Review”.",
+		"Concerns/Issues about Referencing/Attributions": "Any question, controversy or dispute about references, citations, attributions, etc. This could include fabricated/falsified references, reference stacking, citing other work with an EOC or correction, etc.",
+		"Concerns/Issues about Results and/or Conclusions": "Any question, controversy or dispute about the results and/or conclusions.",
+		"Concerns/Issues about Third Party Involvement": "Any question, controversy or dispute about third party involvement.",
+		"Conflict of Interest": "Any question, controversy or dispute about author(s), editor(s), any third party and/or peer reviewer(s) having affiliations with companies, associations or institutions that may serve to influence how they conduct their role in any part of the research and/or publication process(es).",
+		"Contamination of Cell Lines/Tissues": "Impurities were found or suspected within cell lines or tissues.",
+		"Contamination of Materials": "Impurities were found or suspected within compounds, reagents or solutions used in experiments.",
+		"Copyright Claims": "Dispute concerning permissions or ownership of materials (equipment, cell lines, etc.), technologies, images, text, patents, etc.",
+		"Criminal Proceedings": "Criminal legal proceedings were instigated in response to the publication and/or notice(s), or criminal legal proceedings resulted in the correction/EOC/retraction/etc.",
+		"Date of Article and/or Notice Unknown": "The article and/or notice do not have clear publication dates. Retraction Watch may also use this reason when a publisher overwrites the original article’s HTML page with the notice, without changing the publication date to reflect the change.",
 		"Doing the Right Thing": "An attribution made by co-founders of Retraction Watch indicating admirable behavior by one of the involved parties",
-		"Duplication of Article": "Also known as “self-plagiarism”.  Used when an entire published item, or undefined sections of it, written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Duplication of Data": "Also known as “self-plagiarism”.  Used when the all or part of the data from an item written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Duplication of Image": "Also known as “self-plagiarism”.  Used when an image from an item written by one or all authors of the original article is repeated in the original article without appropriate citation.",
-		"Duplication of Text": "Also known as “self-plagiarism”.  Used when sections of text from an item written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Duplicate Publication through Error by Journal/Publisher": "Used when a Journal or Publisher incorrectly publishes the same article more than once. Differs from Duplication of Article, which is typically due to dual submission by the article’s authors.",
-		"Error by Journal/Publisher": "A mistake attributed to a Journal Editor or Publisher",
-		"Error by Third Party": "A mistake attributed to a person or other, who is not an author or representative of the Journal or Publisher",
-		"Error in Analyses": "A mistake made in the evaluation of the data or calculations",
-		"Error in Cell Lines/Tissues": "A mistake made in the identification of cell lines or tissues, or the choice of an incorrect cell line or tissue",
-		"Error in Data": "A mistake made in the data, either in data entry, gathering or identification",
-		"Error in Image": "A mistake made in the preparation or printing of an image",
-		"Error in Materials (General)": "A mistake made in the choice of materials in the performance of experiments (eg., reagents, mixing bowls, etc)",
-		"Error in Methods": "A mistake made in the experimental protocol, either in following the wrong protocol, or in erring during the performance of the protocol",
-		"Error in Results and/or Conclusions": "A mistake made in determining the results or establishing conclusions from an experiment or analysis",
-		"Error in Text": "A mistake made in the written portion of the item",
-		"Ethical Violations by Author": "When an author performs an action contrary to accepted standards of behavior.  Generally used only when stated as such in the notice and no other specific reason (e.g., duplication of image) is given.",
-		"Ethical Violations by Third Party": "When any person not an author performs an action contrary to accepted standards of behavior.  Generally used only when stated as such in the notice and no other specific reason (e.g., duplication of image) is given.",
+		"Duplication of Content through Error by Journal/Publisher": "Duplication of published content due to an error by the journal or publisher.",
+		"Duplication of Data": "Duplication of any of the data.",
+		"Duplication of/in Article": "Duplication of a published item, or undefined sections of it.",
+		"Duplication of/in Image": "Duplication of one or more images, or part(s) of one or more images.",
+		"Duplication of Text": "Duplication of any of the text.",
+		"EOC Lifted": "Expression of Concern has been removed or is no longer applicable. Not to be confused with an “Upgraded to Retraction”",
+		"Error by Journal/Publisher": "An error attributed to a journal/publisher.",
+		"Error by Third Party": "An error attributed to any third party.",
+		"Error in Analyses": "One or more errors in the evaluation of any of the data or in any calculation(s).",
+		"Error in Cell Lines/Tissues": "One or more errors in the choice or identification of any of the cell lines or tissues.",
+		"Error in Data": "One or more errors in any of the data.",
+		"Error in Image": "One or more errors in one or more images, or part(s) of one or more images.",
+		"Error in Materials": "One or more errors in one or more experimental materials, including reagents, mixing bowls, equipment or instrumentation.",
+		"Error in Methods": "One or more errors in the choice of and/or implementation of experimental protocol(s).",
+		"Error in Results and/or Conclusions": "One or more errors in any of the results and/or the conclusions.",
+		"Error in Text": "One or more errors in any of the text.",
+		"Ethical Violations by Author": "When a journal/publisher/institution states that one or more authors have not met the journal/publisher/institution’s standards of publishing and/or research ethics. Retraction Watch will use this reason when no other information about the correction/EOC/retraction is available (i.e., the notice only states that there was an ethical violation), or when the ethical violation (as an additional reason) cannot be addressed by existing reasons.",
+		"Ethical Violations by Company/Institution/Third Party": "When a journal/publisher/institution states that one or more company(ies)/institution(s)/third party(ies) have not met the journal/publisher/institution’s standards of publishing and/or research ethics. Retraction Watch will use this reason when no other information about the correction/EOC/retraction is available (i.e., the notice only states that there was an ethical violation), or when the ethical violation (as an additional reason) cannot be addressed by existing reasons.",
 		"Euphemisms for Duplication": "The notice does not clearly state that the authors reused ideas, text, or images from one of their previously published items without suitable citation",
-		"Euphemisms for Misconduct": "The notice does not clearly state that the reason for the notice is due to fabrication, falsification, or plagiarism by one or all the authors, despite an institutional report stating such.",
-		"Euphemisms for Plagiarism": "The notice does not clearly state that the authors reused ideas, text, or images, without suitable citation, from items published by those not the authors",
-		"Fake Peer Review": "The peer review was intentionally not performed in accordance with the journal’s guidelines or ethical standards",
-		"Falsification/Fabrication of Data": "Intentional changes to data so that it is not representative of the actual finding",
-		"Falsification/Fabrication of Image": "Intentional changes to an image so that it is not representative of the actual data",
-		"Falsification/Fabrication of Results": "Intentional changes to results so that it is not representative of the actual finding",
-		"Forged Authorship": "The fraudulent use of an author name in submitting a manuscript for publication",
-		"Hoax Paper": "Paper intentionally drafted with fraudulent data or information with the specific intent of testing a journal’s or publisher’s manuscript acceptance policies",
-		"Informed/Patient Consent – None/Withdrawn": "When the full risks and benefits from being in an experiment are not provided to and accepted by the participant, or the participant chooses to later recant their approval",
-		"Investigation by Company/Institution": "An evaluation of allegations by the affiliations of one or all of the authors",
-		"Investigation by Journal/Publisher": "An evaluation of allegations by the Journal or Publisher",
-		"Investigation by ORI": "An evaluation of allegations by the United State Office of Research Integrity",
-		"Investigation by Third Party": "An evaluation of allegations by a person, company or institution not the Authors, Journal, Publisher or ORI",
-		"Lack of Approval from Author": "Failure to obtain agreement from original author(s)",
-		"Lack of Approval from Company/Institution": "Failure to obtain agreement from original author(s)",
-		"Lack of Approval from Third Party": "Failure to obtain agreement from original author(s)",
-		"Lack of IRB/IACUC Approval": "Failure to obtain consent from the institutional ethical review board overseeing human or animal experimentation prior to initiation of study, or failure to provide proof of such",
-		"Legal Reasons/Legal Threats": "Actions taken to avoid or foster litigation",
-		"Manipulation of Images": "The changing of the presentation of an image by reversal, rotation or similar action",
-		"Manipulation of Results": "The changing of the presentation of results which may lead to conclusions not otherwise warranted",
-		"Miscommunication by Author": "Error in messaging from or to author",
-		"Miscommunication by Company/Institution": "Error in messaging from or to authors’ affiliations",
-		"Miscommunication by Journal/Publisher": "Error in messaging from or to Journal or Publisher",
-		"Miscommunication by Third Party": "Error in messaging from or to any party not the author, affiliations,  journal of publisher",
-		"Misconduct – Official Investigation/Finding": "Finding of misconduct after investigation by incorporated company, institution of governmental agency",
-		"Misconduct by Author": "Statement Journal, Publisher, Company, Institution, Governmental Agency, or Author that author committed misconduct",
-		"Misconduct by Company/Institution": "Statement Journal, Publisher, Company, Institution, or Governmental Agency that Company/Institution committed misconduct",
-		"Misconduct by Third Party": "Statement Journal, Publisher, Company, Institution, or Governmental Agency that a third party committed misconduct",
-		"No Further Action": "Generally applicable to Expressions of Concern – Statement by Editor or Publisher that",
-		"Nonpayment of Fees/Refusal to Pay": "Lack of payment of full amount due for services rendered or for rights of access",
-		"Notice – Lack of": "No Notice was published by the Journal or Publisher, and the article is removed from the publishing platform.",
-		"Notice – Limited or No Information": "A notice provides minimal information as to the cause of the notice, or the original item is watermaked as retracted or corrected without explanation",
-		"Notice – Unable to Access via current resources": "The notice is paywalled, only in print, or in some form unavailable for inspection at this time.",
-		"Objections by Author(s)": "A complaint by any of the original authors or refusal to agree actions taken by the Journal or Publisher",
-		"Objections by Company/Institution": "A complaint by any of the original authors’ affiliation(s) or refusal by same to agree actions taken by the Journal or Publisher",
-		"Objections by Third Party": "A complaint by any person, company or institution not of the original authors, or refusal by same to agree actions taken by the Journal or Publisher",
-		"Original Data not Provided": "The original data or images for the published study is no longer available or is not given to the editorial staff.",
-		"Paper Mill": "A business that creates and sells research papers where the buyer(s) claim authorship; the business is generally unacknowledged as a contributor.",
-		"Plagiarism of Article": "Used when an entire published item, or undefined sections of it, and not written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Plagiarism of Data": "Used when the all or part of the data from an item not written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Plagiarism of Image": "Used when an image from an item not written by one or all authors of the original article is repeated in the original article without appropriate citation.",
-		"Plagiarism of Text": "Used when sections of text from an item not written by one or all authors of the original article, are repeated in the original article without appropriate citation.",
-		"Publishing Ban": "A Journal or Publisher states that no manuscripts will be acceptance from one or all the authors of the original article.  It can be for a limited time, or indefinitely.",
-		"Randomly Generated Content": "Text or data that was created via a randomizing algorithm such as Mathgen or Scigen",
-		"Results Not Reproducible": "Experiments conducted, using the same materials and methods, that fail to replicate the finding of the original article",
-		"Retract and Replace": "The permanent change of an item to a non-citable status, with a subsequent republication by the same journal after substantial changes to the item",
-		"Rogue Editor": "Applies to fraudulent editor (i.e. non-existent or with false credential); applies to those lists as “Guest Editor” as well;",
-		"Sabotage of Materials": "An intentional action to surreptitiously change or contaminate experimental ingredients in order to artificially change the experimental outcome",
-		"Sabotage of Methods": "An intentional action to surreptitiously change or contaminate experimental instruments or tools in order to artificially change the experimental outcome",
-		"Salami Slicing": "The publication of several articles by using the same (small) dataset, but by breaking it into sections, with the intent of exploiting a limited data set for the production of several published works  This does not apply to large multi-group studies such as the Framingham Heart Study.",
-		"Temporary Removal": "An original article is removed from the Journal’s publishing platform for an undefined period of time, after which, if returned to the publishing platform, it appears with minimal or no substantial changes",
-		"Transfer of Copyright/Ownership": "Articles removed from a publishing platform due to change in the Copyright/Ownership of the article",
-		"Unreliable Data": "The accuracy or validity of the data is questionable",
-		"Unreliable Image": "The accuracy or validity of the image is questionable",
-		"Unreliable Results": "The accuracy or validity of the results is questionable",
-		"Updated to Correction": "A prior notice has been changed to the status of a Correction",
-		"Updated to Retraction": "A prior notice has been changed to the status of a Retraction",
-		"Upgrade/Update of Prior Notice": "Either a change to or affirmation of a prior notice",
-		Withdrawal: "The original article is removed from access on the Journal’s publishing platform.",
-		"Withdrawn (out of date)": "The article has been retracted as part of the journal’s normal process of keeping guidelines or reviews current for professional use.",
-		"Withdrawn to Publish in Different Journal": "Journal/Publisher removed an article from one journal platform to publish in a different journal platform.",
+		"Euphemisms for Misconduct": "The notice does not explicitly state that the reason for the notice is due to misconduct, despite a journal, publisher, company, institution, government agency or author explicitly stating that there was misconduct.",
+		"Euphemisms for Plagiarism": "The notice describes plagiarism of material without using the words “plagiarize(d)” or “plagiarism.”",
+		"False/Forged Affiliation": "The false/forged use of an affiliation/institutional name in the publication process.",
+		"False/Forged Authorship": "The false/forged use of one or more author names in the publication process.",
+		"Falsification/Fabrication of Data": "Falsification or fabrication of any data in order to mislead.",
+		"Falsification/Fabrication of Image": "Falsification or fabrication in/of one or more images, or part(s) of one or more images, in order to mislead.",
+		"Falsification/Fabrication of Results": "Falsification or fabrication of results in order to mislead.",
+		"Hoax Paper": "The paper was intentionally drafted with fabricated or falsified data or other content with the goal of testing a journal or publisher’s manuscript acceptance policies.",
+		"Informed/Patient Consent - None/Withdrawn": "When informed/patient consent documentation is deemed insufficient or is not available or the participant later disputes/withdraws their approval.",
+		"Investigation by Company/Institution": "An investigation by the company/institution listed as the affiliation of one or more authors.",
+		"Investigation by Journal/Publisher": "An investigation by the journal/publisher of the article.",
+		"Investigation by ORI": "An investigation by the United States Office of Research Integrity (ORI).",
+		"Investigation by Third Party": "An investigation by any third party that is not the United States Office of Research Integrity (ORI).",
+		"Lack of Approval from Author": "One or more authors did not approve one or more parts of the research or publication process(es). Retraction Watch also uses this reason if the notice mentions a lack of documentation of alleged approval.",
+		"Lack of Approval from Company/Institution": "One or more companies/institutions did not approve one or more parts of the research or publication process(es). Retraction Watch also uses this reason if the notice mentions a lack of documentation of alleged approval.",
+		"Lack of Approval from Third Party": "One or more third parties did not approve one or more parts of the research or publication process(es). Retraction Watch also uses this reason if the notice mentions a lack of documentation of alleged approval.",
+		"Lack of IRB/IACUC Approval and/or Compliance": "Failure to obtain consent from the institutional ethical review board overseeing human or animal experimentation prior to initiation of study, or failure to provide proof of such",
+		"Legal Reasons and/or Threats": "When a journal/publisher/author/third party uses the phrase “legal reasons,” documents litigation or legal threats, or mentions one or more specific laws",
+		"Manipulation of Data": "Manipulation of any data.",
+		"Manipulation of Images": "Manipulation of one or more images, or part(s) of one or more images.",
+		"Manipulation of Results": "Manipulation of any results.",
+		"Miscommunication with/by Author": "One or more authors misunderstood one or more parts of a message sent to and/or from one or more authors.",
+		"Miscommunication with/by Company/Institution": "One or more companies/institutions misunderstood one or more parts of a message sent to and/or from one or more companies/institutions.",
+		"Miscommunication with/by Journal/Publisher": "One or more journals/publishers misunderstood one or more parts of a message sent to and/or from one or more journals/publishers.",
+		"Miscommunication with/by Third Party": "One or more third parties misunderstood one or more parts of a message sent to and/or from one or more third parties.",
+		"Misconduct by Author": "Statement by journal, publisher, company, institution, government agency or author that one or more authors committed misconduct.",
+		"Misconduct by Company/Institution": "Statement by journal, publisher, company, institution, government agency or author that one or more companies/institutions committed misconduct.",
+		"Misconduct by Third Party": "Statement by journal, publisher, company, institution, government agency or author that one or more third party(ies) committed misconduct.",
+		"Misconduct - Official Investigation(s) and/or Finding(s)": "An investigation by an incorporated company, institution or government agency into misconduct allegations (founded or unfounded) and/or the finding(s) of misconduct by an incorporated company, institution or government agency.",
+		"No Further Action": "The journal or publisher has stated that no further action will be taken.",
+		"Nonpayment of Fees and/or Refusal to Pay": "Fees for services, licenses or access were not paid and/or completed, and/or there was a refusal to pay fees.",
+		"Notice - Lack of": "No notice was published by the journal or publisher.",
+		"Notice - Limited or No Information": "A notice provides minimal information as to the cause of the notice, or the original item is watermarked as retracted or corrected without explanation",
+		"Notice - Unable to Access via current resources": "The notice is paywalled by the journal/publisher, only available in print or is in some form unavailable for inspection.",
+		"Not Presented at Conference": "The paper/abstract/poster was not presented at the conference for which it was accepted.",
+		"Objections by Author(s)": "One or more authors objected to the notice or the wording of the notice.",
+		"Objections by Company/Institution": "One or more companies/institutions objected to the notice or the wording of the notice.",
+		"Objections by Third Party": "One or more third parties objected to the notice or the wording of the notice.",
+		"Original Data and/or Images not Provided and/or not Available": "The original data or images for the published study is no longer available or is not given to the editorial staff.",
+		"Paper Mill": "When a journal/publisher/institution states that a paper came from a paper mill or the paper is in a list of paper mill papers. Retraction Watch may also use this reason to reflect that Retraction Watch has identified multiple paper mill criteria applying to this paper.",
+		"Plagiarism of Data": "Plagiarism of any of the data.",
+		"Plagiarism of Image": "Plagiarism of one or more images.",
+		"Plagiarism of/in Article": "Plagiarism of a published item, or undefined sections of it.",
+		"Plagiarism of Text": "Plagiarism of any of the text.",
+		"Publishing Ban": "When a journal/publisher states that no manuscripts will be accepted from one or more authors of the original article. Bans could be for a limited time or indefinitely.",
+		Removed: "The original article is removed from access on the journal’s website or publishing platform.",
+		"Results Not Reproducible": "When repetition(s) of experiment(s), using the same materials and methods, failed to replicate the results in the original article.",
+		"Retract and Replace": "The change of an item’s status reflecting that a retracted item will be replaced with a new publication in the same journal. The journal has indicated that the replacement should be cited as the version of record.",
+		"Rogue Editor": "Used when an editor’s credentials are false/forged or when an editor subverts one or more processes under their purview. An “editor” may be an established editor affiliated with the journal or a guest editor.",
+		"Sabotage of Materials/Methods": "An intentional action by a third party, without the researchers’ knowledge or consent, to sabotage or contaminate experimental ingredients or processes in order to influence experimental outcome(s).",
+		"Salami Slicing": "The publication of several articles using the same dataset by breaking it into sections, with the intent of exploiting a limited data set for the production of several published works. This does not apply to large multi-group studies such as the Framingham Heart Study.",
+		"Taken from Dissertation/Thesis": "The duplicated or plagiarized content was taken from an academic dissertation or thesis.",
+		"Taken via Peer Review": "The duplicated or plagiarized content was taken during the peer review process.",
+		"Taken via Translation": "The duplicated or plagiarized content was created via a translation from one language to another.",
+		"Temporary Removal": "The original article is removed from the journal’s publishing platform and the notice states the removal will be for an undefined period of time.",
+		"Transfer of Copyright and/or Ownership": "A change in the copyright and/or ownership of the article or any of its content.",
+		"Unreliable Data": "Any of the data is unreliable.",
+		"Unreliable Image": "One or more images, or part(s) of one or more images, are unreliable.",
+		"Unreliable Results and/or Conclusions": "Any of the results and/or conclusions are unreliable.",
+		"Updated to Correction": "The article has a correction after this notice.",
+		"Updated to Expression of Concern": "The article has an expression of concern after this notice.",
+		"Updated to Retraction": "The article has a retraction after this notice.",
+		"Upgrade/Update of Prior Notice(s)": "At least one prior notice for the article has been upgraded or updated with this notice.",
+		"Withdrawn as Out of Date": "The article has been retracted as part of a journal’s process of keeping guidelines or reviews current for professional use.",
+		"Withdrawn to Publish in Different Journal": "The article was taken from one journal/platform or access type to be published in a different journal/platform or with a different access type.",
 	},
 	
 	_fixedResults: [
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 05ef593c52..a179f31088 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -39,14 +39,10 @@ Zotero.Schema = new function () {
 	const REPOSITORY_CHECK_INTERVAL = 86400;
 	const REPOSITORY_RETRY_INTERVAL = 3600;
 	
-	// If updating from this userdata version or later, don't show "Upgrading database…" and don't make
-	// DB backup first. This should be set to false when breaking compatibility or making major changes.
-	const minorUpdateFrom = 112;
-	
 	var _dbVersions = [];
 	var _schemaVersions = [];
 	// Update when adding _updateCompatibility() line to schema update step
-	var _maxCompatibility = 7;
+	var _maxCompatibility = 9;
 	
 	var _repositoryTimerID;
 	var _repositoryNotificationTimerID;
@@ -153,15 +149,32 @@ Zotero.Schema = new function () {
 		
 		// Check whether bundled userdata schema has been updated
 		var userdataVersion = await _getSchemaSQLVersion('userdata');
-		options.minor = minorUpdateFrom && userdata >= minorUpdateFrom;
 		
-		// If non-minor userdata upgrade, make backup of database first
-		if (userdata < userdataVersion && !options.minor) {
-			await Zotero.DB.backUpDatabase({ force: true, suffix: userdata });
+		// Notify the caller before the backup, which can also be slow for a large database
+		if (userdata < userdataVersion && options.onBeforeUpdate) {
+			await options.onBeforeUpdate();
 		}
-		// Automatic backup
-		else if (integrityCheckRequired || bundledGlobalSchemaVersionCompare === 1) {
-			await Zotero.DB.backUpDatabase({ force: true });
+		
+		// Force a backup before a userdata upgrade, an integrity check, or a global schema
+		// update, unless one was already made for the same target versions on a previous startup
+		// (i.e., a previous attempt failed partway through), so that repeated attempts can't
+		// rotate out the pre-update backup
+		if (userdata < userdataVersion
+				|| integrityCheckRequired
+				|| bundledGlobalSchemaVersionCompare === 1) {
+			let backupState = userdataVersion + '/' + bundledGlobalSchema.version;
+			let lastBackupState = await Zotero.DB.valueQueryAsync(
+				"SELECT value FROM settings WHERE setting='backup' AND key='lastSchemaUpdateState'"
+			);
+			if (backupState !== lastBackupState
+					|| !(await IOUtils.exists(Zotero.DB.path + '.bak'))) {
+				if (await Zotero.DB.backUpDatabase({ force: true })) {
+					await Zotero.DB.queryAsync(
+						"REPLACE INTO settings VALUES ('backup', 'lastSchemaUpdateState', ?)",
+						backupState
+					);
+				}
+			}
 		}
 		
 		var logLines = [];
@@ -201,7 +214,7 @@ Zotero.Schema = new function () {
 					await _updateCustomTables();
 				}
 				
-				updated = await _migrateUserDataSchema(userdata, options);
+				updated = await _migrateUserDataSchema(userdata);
 				await _updateSchema('triggers');
 				
 				// Populate combined tables for custom types and fields -- this is likely temporary
@@ -263,9 +276,14 @@ Zotero.Schema = new function () {
 			}
 		}
 		
+		// The update succeeded, so any new pending state should make a fresh forced backup
+		await Zotero.DB.queryAsync(
+			"DELETE FROM settings WHERE setting='backup' AND key='lastSchemaUpdateState'"
+		);
+		
 		if (updated) {
-			// Upgrade seems to have been a success -- delete any previous backups
-			var maxPrevious = userdata - 1;
+			// Upgrade seems to have been a success -- delete any versioned backups
+			// (zotero.sqlite.<userdata version>.bak) from upgrades in previous versions
 			var file = Zotero.File.pathToFile(Zotero.DataDirectory.dir);
 			var toDelete = [];
 			try {
@@ -276,11 +294,12 @@ Zotero.Schema = new function () {
 					if (file.isDirectory()) {
 						continue;
 					}
-					var matches = file.leafName.match(/zotero\.sqlite\.([0-9]{2,})\.bak/);
+					var matches = file.leafName.match(/^zotero\.sqlite\.([0-9]{2,})\.bak$/);
 					if (!matches) {
 						continue;
 					}
-					if (matches[1]>=28 && matches[1]<=maxPrevious) {
+					// Rotation backups (zotero.sqlite.<n>.bak) only go up to 24
+					if (matches[1] >= 28) {
 						toDelete.push(file);
 					}
 				}
@@ -294,13 +313,22 @@ Zotero.Schema = new function () {
 			}
 		}
 		
-		// Reset sync queue tries if new version
-		await _checkClientVersion();
+		var clientVersionChanged = await _handleClientVersionChange();
 		
 		// See above
 		(!Zotero.test ? Zotero.uiReadyPromise : Zotero.initializationPromise)
 		.then(() => {
 			setTimeout(async function () {
+				// Keep Safari from blocking the bundled extension after an update
+				if (clientVersionChanged) {
+					try {
+						await Zotero.Utilities.Internal.assessAppBundle();
+					}
+					catch (e) {
+						Zotero.logError(e);
+					}
+				}
+				
 				try {
 					await this.updateBundledFiles();
 					if (Zotero.Prefs.get('automaticScraperUpdates')) {
@@ -568,7 +596,40 @@ Zotero.Schema = new function () {
 			+ baseFieldMappingsValueSets.join(", "));
 		await Zotero.DB.queryAsync("INSERT INTO itemTypeCreatorTypes VALUES "
 			+ itemTypeCreatorTypesValueSets.join(", "));
-		
+
+		// Convert stored values of date-type fields to multipart dates, for
+		// values saved while a field was a text field
+		var dateFieldIDs = new Set();
+		for (let [fieldName, meta] of Object.entries(data.meta?.fields || {})) {
+			if (meta.type != 'date') {
+				continue;
+			}
+			let fieldID = postFieldIDsByName.get(fieldName);
+			if (!fieldID) {
+				continue;
+			}
+			dateFieldIDs.add(fieldID);
+			// Type-specific fields mapped to a date-type base field
+			let mappedIDs = await Zotero.DB.columnQueryAsync(
+				"SELECT DISTINCT fieldID FROM baseFieldMappings WHERE baseFieldID=?",
+				fieldID
+			);
+			for (let id of mappedIDs) {
+				dateFieldIDs.add(id);
+			}
+		}
+		if (dateFieldIDs.size) {
+			// strToMultipart() needs the month strings, which aren't loaded
+			// yet this early in startup
+			Zotero.Date.init();
+			await _updateItemDataValues(
+				[...dateFieldIDs],
+				value => (Zotero.Date.isMultipart(value)
+					? false
+					: Zotero.Date.strToMultipart(value))
+			);
+		}
+
 		// Store data in DB as compressed binary string. This lets us use a schema that matches the
 		// DB tables even if the user downgrades to a version with an earlier bundled schema file.
 		var pako = require('pako');
@@ -611,6 +672,51 @@ Zotero.Schema = new function () {
 			await Zotero.DB.queryAsync("PRAGMA foreign_keys=ON");
 		}
 	};
+
+
+	/**
+	 * Rewrite stored itemData values through a transform, reusing or creating
+	 * rows in itemDataValues
+	 *
+	 * @param {Number[]} fieldIDs - Fields whose values to rewrite
+	 * @param {Function} transform - Given a value, returns the new value, or
+	 *     false to leave the value as it is
+	 */
+	async function _updateItemDataValues(fieldIDs, transform) {
+		if (!fieldIDs.length) {
+			return;
+		}
+		var rows = await Zotero.DB.queryAsync(
+			"SELECT itemID, fieldID, value FROM itemData "
+				+ "JOIN itemDataValues USING (valueID) "
+				+ "WHERE fieldID IN (" + fieldIDs.join(", ") + ")"
+		);
+		for (let row of rows) {
+			let value = transform(row.value);
+			if (value === false || value === row.value) {
+				continue;
+			}
+			let valueID = await Zotero.DB.valueQueryAsync(
+				"SELECT valueID FROM itemDataValues WHERE value=?", value
+			);
+			if (!valueID) {
+				valueID = Zotero.ID.get('itemDataValues');
+				await Zotero.DB.queryAsync(
+					"INSERT INTO itemDataValues (valueID, value, valueNormalized) "
+						+ "VALUES (?, ?, ?)",
+					[
+						valueID,
+						value,
+						Zotero.Utilities.Internal.normalizeForSearchStorage(value)
+					]
+				);
+			}
+			await Zotero.DB.queryAsync(
+				"UPDATE itemData SET valueID=? WHERE itemID=? AND fieldID=?",
+				[valueID, row.itemID, row.fieldID]
+			);
+		}
+	}
 	
 	
 	
@@ -702,11 +808,28 @@ Zotero.Schema = new function () {
 		
 		var items = await Zotero.Items.getAsync(itemIDs);
 		
-		Zotero.debug(`${items.length} items to migrate`);
-		
 		if (items.length) {
 			await Zotero.Items.loadDataTypes(items);
 			
+			// Skip items that the migration won't actually change (e.g., items whose extracted
+			// fields aren't valid for the item type or already have values) -- keep the
+			// extractExtraFields() call in sync with Zotero.Item::migrateExtraFields()
+			items = items.filter((item) => {
+				if (!item.isEditable()) {
+					return false;
+				}
+				let originalExtra = item.getField('extra');
+				let { itemType, fields, creators, extra }
+					= Zotero.Utilities.Internal.extractExtraFields(
+						originalExtra, item, ['place', 'date']
+					);
+				return itemType || fields.size || creators.length || extra != originalExtra;
+			});
+		}
+		
+		Zotero.debug(`${items.length} items to migrate`);
+		
+		if (items.length) {
 			let progress = 0;
 			let progressMax = items.length;
 			if (onProgress) {
@@ -748,8 +871,136 @@ Zotero.Schema = new function () {
 		
 		Zotero.debug(`Migrated fields from Extra for ${items.length} items in ${new Date() - t} ms`);
 	};
-	
-	
+
+
+	/**
+	 * Populate the normalized search columns added by the userdata 126 migration
+	 *
+	 * Resumable across restarts: a cursor is persisted to the 'normalizeBackfill' setting
+	 * after each chunk, and the setting is only cleared once every table is done. New rows are
+	 * populated at insert time by the data layer, so only pre-existing rows are handled here.
+	 *
+	 * @param {Function} [onProgress] - Called with { progress, progressMax } as rows are processed
+	 */
+	this.populateNormalizedSearchColumns = async function ({ onProgress } = {}) {
+		var flag = await Zotero.DB.valueQueryAsync(
+			"SELECT value FROM settings WHERE setting='search' AND key='normalizeBackfill'"
+		);
+		if (flag === false) {
+			return;
+		}
+
+		Zotero.debug("Populating normalized search columns");
+		var startTime = new Date();
+		var normalize = Zotero.Utilities.Internal.normalizeForSearchStorage;
+
+		// Each table's primary key and the [source, target] column pairs to normalize
+		var tables = [
+			{
+				table: 'itemDataValues',
+				idColumn: 'valueID',
+				columns: [['value', 'valueNormalized']]
+			},
+			{
+				table: 'tags',
+				idColumn: 'tagID',
+				columns: [['name', 'nameNormalized']]
+			},
+			{
+				table: 'creators',
+				idColumn: 'creatorID',
+				columns: [['firstName', 'firstNameNormalized'], ['lastName', 'lastNameNormalized']]
+			},
+			{
+				table: 'itemAnnotations',
+				idColumn: 'itemID',
+				columns: [['text', 'textNormalized'], ['comment', 'commentNormalized']]
+			}
+		];
+
+		// Resume from a persisted cursor, if any
+		var startTableIndex = 0;
+		var startCursor = 0;
+		try {
+			let parsed = JSON.parse(flag);
+			if (parsed && Number.isInteger(parsed.ti)) {
+				startTableIndex = parsed.ti;
+				startCursor = parsed.id || 0;
+			}
+		}
+		catch (e) {}
+
+		const CHUNK_SIZE = 1000;
+		var progress = 0;
+		var progressMax = 0;
+		for (let { table } of tables) {
+			progressMax += await Zotero.DB.valueQueryAsync(`SELECT COUNT(*) FROM ${table}`);
+		}
+		if (onProgress) {
+			onProgress({ progress, progressMax });
+		}
+
+		for (let ti = startTableIndex; ti < tables.length; ti++) {
+			let { table, idColumn, columns } = tables[ti];
+			let sourceColumns = columns.map(c => c[0]);
+			let cursor = ti == startTableIndex ? startCursor : 0;
+
+			while (true) {
+				let rows = await Zotero.DB.queryAsync(
+					`SELECT ${idColumn}, ${sourceColumns.join(', ')} FROM ${table} `
+						+ `WHERE ${idColumn} > ? ORDER BY ${idColumn} LIMIT ?`,
+					[cursor, CHUNK_SIZE]
+				);
+				if (!rows.length) {
+					break;
+				}
+
+				await Zotero.DB.executeTransaction(async function () {
+					for (let row of rows) {
+						let sets = [];
+						let params = [];
+						for (let [source, target] of columns) {
+							let value = normalize(row[source]);
+							// Skip columns that don't need a normalized form
+							if (value !== null) {
+								sets.push(`${target}=?`);
+								params.push(value);
+							}
+						}
+						// Most rows are plain ASCII and need no update at all
+						if (sets.length) {
+							params.push(row[idColumn]);
+							// Skip logging the params, which include the full normalized value
+							await Zotero.DB.queryAsync(
+								`UPDATE ${table} SET ${sets.join(', ')} WHERE ${idColumn}=?`,
+								params,
+								{ debugParams: false }
+							);
+						}
+						cursor = row[idColumn];
+					}
+
+					// Persist the cursor in the same transaction as the updates
+					await Zotero.DB.queryAsync(
+						"REPLACE INTO settings VALUES ('search', 'normalizeBackfill', ?)",
+						JSON.stringify({ ti, id: cursor })
+					);
+				});
+
+				progress += rows.length;
+				if (onProgress) {
+					onProgress({ progress, progressMax });
+				}
+			}
+		}
+
+		await Zotero.DB.queryAsync(
+			"DELETE FROM settings WHERE setting='search' AND key='normalizeBackfill'"
+		);
+		Zotero.debug(`Populated normalized search columns in ${new Date() - startTime} ms`);
+	};
+
+
 	// https://www.zotero.org/support/nsf
 	//
 	// This is mostly temporary
@@ -1970,12 +2221,7 @@ Zotero.Schema = new function () {
 				"SELECT COUNT(*) > 0 FROM creators WHERE firstName='' AND lastName=''",
 				"DELETE FROM creators WHERE firstName='' AND lastName=''"
 			],
-			
-			// Non-attachment items in the full-text index
-			[
-				`SELECT COUNT(*) > 0 FROM fulltextItemWords WHERE itemID NOT IN (SELECT itemID FROM items WHERE itemTypeID=${attachmentID})`,
-				`DELETE FROM fulltextItemWords WHERE itemID NOT IN (SELECT itemID FROM items WHERE itemTypeID=${attachmentID})`
-			],
+
 			// Full-text items must be attachments
 			[
 				`SELECT COUNT(*) > 0 FROM fulltextItems WHERE itemID NOT IN (SELECT itemID FROM items WHERE itemTypeID=${attachmentID})`,
@@ -2307,7 +2553,12 @@ Zotero.Schema = new function () {
 	};
 	
 	
-	function _checkClientVersion() {
+	/**
+	 * Run upgrade tasks and record the current client version
+	 *
+	 * @return {Promise<Boolean>} - True if the client version changed since the last run
+	 */
+	function _handleClientVersionChange() {
 		return Zotero.DB.executeTransaction(async function () {
 			var lastVersion = await _getLastClientVersion();
 			var currentVersion = Zotero.version;
@@ -2736,21 +2987,14 @@ Zotero.Schema = new function () {
 	//
 	// If libraryID set, make sure no relations still use a local user key, and then remove on-error code in sync.js
 	
-	var _migrateUserDataSchema = async function (fromVersion, options = {}) {
+	var _migrateUserDataSchema = async function (fromVersion) {
 		var toVersion = await _getSchemaSQLVersion('userdata');
 		
 		if (fromVersion >= toVersion) {
 			return false;
 		}
 		
-		Zotero.debug('Updating user data tables from version ' + fromVersion + ' to ' + toVersion);
-		
-		if (options.onBeforeUpdate) {
-			let maybePromise = options.onBeforeUpdate({ minor: options.minor });
-			if (maybePromise && maybePromise.then) {
-				await maybePromise;
-			}
-		}
+		Zotero.debug('Migrating user data tables from version ' + fromVersion + ' to ' + toVersion);
 		
 		Zotero.DB.requireTransaction();
 		
@@ -3531,7 +3775,52 @@ Zotero.Schema = new function () {
 				await Zotero.DB.queryAsync("UPDATE groups SET version = 0");
 			}
 
-			// If breaking compatibility or doing anything dangerous, clear minorUpdateFrom
+			else if (i == 126) {
+				await _updateCompatibility(8);
+
+				await Zotero.DB.queryAsync("ALTER TABLE itemDataValues ADD COLUMN valueNormalized TEXT");
+				await Zotero.DB.queryAsync("ALTER TABLE tags ADD COLUMN nameNormalized TEXT");
+				await Zotero.DB.queryAsync("ALTER TABLE creators ADD COLUMN firstNameNormalized TEXT");
+				await Zotero.DB.queryAsync("ALTER TABLE creators ADD COLUMN lastNameNormalized TEXT");
+				await Zotero.DB.queryAsync("ALTER TABLE itemAnnotations ADD COLUMN textNormalized TEXT");
+				await Zotero.DB.queryAsync("ALTER TABLE itemAnnotations ADD COLUMN commentNormalized TEXT");
+				await Zotero.DB.queryAsync("REPLACE INTO settings VALUES ('search', 'normalizeBackfill', 1)");
+			}
+
+			else if (i == 127) {
+				await _updateCompatibility(9);
+
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS fulltextItemWords");
+				await Zotero.DB.queryAsync("DROP TABLE IF EXISTS fulltextWords");
+				Zotero.Prefs.clear('vacuum.lastTime');
+
+				await Zotero.DB.queryAsync("ALTER TABLE savedSearchConditions RENAME TO savedSearchConditionsOld");
+				await Zotero.DB.queryAsync("CREATE TABLE savedSearchConditions (\n    savedSearchID INT NOT NULL,\n    searchConditionID INT NOT NULL,\n    condition TEXT NOT NULL,\n    operator TEXT,\n    value TEXT,\n    PRIMARY KEY (savedSearchID, searchConditionID),\n    FOREIGN KEY (savedSearchID) REFERENCES savedSearches(savedSearchID) ON DELETE CASCADE\n)");
+				await Zotero.DB.queryAsync("INSERT INTO savedSearchConditions SELECT savedSearchID, searchConditionID, condition, operator, value FROM savedSearchConditionsOld");
+				await Zotero.DB.queryAsync("DROP TABLE savedSearchConditionsOld");
+			}
+
+			else if (i == 128) {
+				let rows = await Zotero.DB.queryAsync("SELECT itemID, path FROM itemAttachments WHERE linkMode IN (0, 1) AND (path LIKE ? OR path LIKE ?)", ['storage:%/%', 'storage:%\\%']);
+				for (let row of rows) {
+					let rel = row.path.substr(8);
+					if (!(rel.includes('/') || /^[a-zA-Z]:[\\/]/.test(rel) || rel.startsWith('\\\\'))) {
+						continue;
+					}
+					let filename = rel.split(/[/\\]/).pop();
+					if (!filename) {
+						continue;
+					}
+					await Zotero.DB.queryAsync("UPDATE itemAttachments SET path=? WHERE itemID=?", ['storage:' + filename, row.itemID]);
+				}
+			}
+
+			else if (i == 129) {
+				let clientVersionTables = ['items', 'collections', 'savedSearches', 'libraries'];
+				for (let table of clientVersionTables) {
+					await Zotero.DB.queryAsync(`ALTER TABLE ${table} ADD COLUMN clientVersion INT NOT NULL DEFAULT 0`);
+				}
+			}
 		}
 		
 		await _updateDBVersion('userdata', toVersion);
diff --git a/chrome/content/zotero/xpcom/sdt.js b/chrome/content/zotero/xpcom/sdt.js
new file mode 100644
index 0000000000..d2a110f5d7
--- /dev/null
+++ b/chrome/content/zotero/xpcom/sdt.js
@@ -0,0 +1,467 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+
+    Copyright © 2026 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     http://digitalscholar.org/
+
+    This file is part of Zotero.
+
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+    ***** END LICENSE BLOCK *****
+*/
+
+const SDT_CACHE_FILE_NAME = '.zotero-sdt-cache';
+const DOCUMENT_WORKER_METADATA_URL = 'resource://zotero/document-worker/metadata.json';
+
+Zotero.SDT = new function () {
+	// Per-item in-flight generation, so that concurrent getPack() calls share
+	// one extraction and two generations can never race on the same cache file
+	let _generating = new Map();
+	let _sourceHashCache = new Map();
+	// Source hash of the last password-required failure per item, so that a
+	// password-protected file isn't re-extracted until the file changes
+	let _passwordFailures = new Map();
+	let _module = null;
+	let _moduleErrorLogged = false;
+	let _documentWorkerMetadata = null;
+	let _documentWorkerMetadataErrorLogged = false;
+
+	// Load the bundled SDT module lazily, so that a missing or broken
+	// resource degrades to an 'unavailable' result instead of breaking
+	// Zotero startup. Load failures aren't cached, so a load is retried
+	// on the next call (require() itself caches successful loads)
+	function _getModule() {
+		if (!_module) {
+			try {
+				_module = require('resource://zotero/document-worker/structured-document-text.js');
+			}
+			catch (e) {
+				if (!_moduleErrorLogged) {
+					_moduleErrorLogged = true;
+					Zotero.logError(e);
+				}
+				return null;
+			}
+		}
+		return _module;
+	}
+
+	/**
+	 * Get the structured document text pack for a PDF, EPUB, or snapshot
+	 * attachment, generating and caching it if necessary. The returned bytes
+	 * are owned by the caller -- a later regeneration can't affect them.
+	 *
+	 * If the cached pack was produced by an older (but still readable)
+	 * processor version, it's returned as is and a regeneration is started in
+	 * the background, so that processor bumps don't block consumers.
+	 *
+	 * @param {Integer} itemID
+	 * @param {Object} [options]
+	 * @param {Boolean} [options.isPriority] - Put a needed extraction at the
+	 *     front of the worker queue (for user-initiated requests)
+	 * @param {Function} [options.onProgress] - Called with SDT generation
+	 *     progress from 0 to 100 when generation is needed
+	 * @returns {Promise<Object>} { ok: true, bytes: ArrayBuffer, packVersion,
+	 *     schemaMajorVersion }, or { ok: false, reason: 'unavailable' |
+	 *     'password-required' | 'failed' }
+	 */
+	this.getPack = async function (itemID, options = {}) {
+		try {
+			if (!_getModule() || !(await _getDocumentWorkerMetadata())) {
+				return { ok: false, reason: 'unavailable' };
+			}
+			let context = await _getAttachmentContext(itemID);
+			if (!context.ok) {
+				return { ok: false, reason: context.reason };
+			}
+			let cache = await _readValidCache(context, { allowStaleProcessorVersion: true });
+			if (cache.ok) {
+				if (cache.staleProcessorVersion) {
+					_generate(context, {}).catch(e => Zotero.logError(e));
+				}
+				return _makeResult(cache);
+			}
+			return await _generate(context, options);
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return { ok: false, reason: 'failed' };
+		}
+	};
+
+	/**
+	 * Ensure that a current pack is cached for an attachment, generating or
+	 * regenerating it if necessary, without returning it. For warming up the
+	 * cache (e.g., at import time), so that later getPack() calls are hits.
+	 *
+	 * Unlike getPack(), which returns a stale-processor pack immediately and
+	 * regenerates in the background, this resolves only once the cache is
+	 * fully current.
+	 *
+	 * @param {Integer} itemID
+	 * @param {Object} [options] - See getPack()
+	 * @returns {Promise<Boolean>} - Whether a current pack is cached
+	 */
+	this.ensure = async function (itemID, options = {}) {
+		try {
+			if (!_getModule() || !(await _getDocumentWorkerMetadata())) {
+				return false;
+			}
+			let context = await _getAttachmentContext(itemID);
+			if (!context.ok) {
+				return false;
+			}
+			let cache = await _readValidCache(context, {});
+			if (cache.ok) {
+				return true;
+			}
+			let result = await _generate(context, options);
+			return result.ok;
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return false;
+		}
+	};
+
+	/**
+	 * Get a parsed pack reader for in-process consumers
+	 *
+	 * @param {Integer} itemID
+	 * @param {Object} [options] - See getPack()
+	 * @returns {Promise<Object|null>}
+	 */
+	this.getReader = async function (itemID, options = {}) {
+		let result = await this.getPack(itemID, options);
+		if (!result.ok) {
+			return null;
+		}
+		return _openPack(new Uint8Array(result.bytes));
+	};
+
+	async function _readValidCache({ sourceHash, cachePath, processorType }, options) {
+		let bytes;
+		try {
+			bytes = await IOUtils.read(cachePath);
+		}
+		catch (e) {
+			if (e.name === 'NotFoundError') {
+				return { ok: false, reason: 'missing' };
+			}
+			throw e;
+		}
+		return _validateBytes(bytes, sourceHash, processorType, options);
+	}
+
+	// Validate a pack held in memory, so that the validated bytes can't be
+	// affected by concurrent file changes
+	async function _validateBytes(bytes, sourceHash, processorType, options = {}) {
+		let documentWorkerMetadata = await _getDocumentWorkerMetadata();
+		let expectedProcessorVersion = documentWorkerMetadata
+			&& documentWorkerMetadata.SDT_PROCESSOR_VERSIONS[processorType];
+		if (!expectedProcessorVersion) {
+			return { ok: false, reason: 'unavailable' };
+		}
+		try {
+			// openStructuredDocumentTextPack() validates the pack magic and
+			// version itself, so a corrupt or unsupported-pack-version cache
+			// throws here and is reported as 'invalid-cache'. The schema major
+			// version is content semantics that the module deliberately
+			// doesn't validate, so check it here
+			let reader = await _openPack(bytes);
+			let { header } = reader;
+			if (header.packVersion !== documentWorkerMetadata.SDT_PACK_VERSION
+					|| _getSchemaMajorVersion(header.schemaVersion)
+						!== _getSchemaMajorVersion(documentWorkerMetadata.SDT_SCHEMA_VERSION)) {
+				return { ok: false, reason: 'unsupported-version' };
+			}
+
+			let metadata = await reader.getMetadata();
+			if (metadata.source?.hash !== sourceHash) {
+				return { ok: false, reason: 'stale-source' };
+			}
+			if (metadata.processor?.type !== processorType) {
+				return { ok: false, reason: 'stale-processor' };
+			}
+			let staleProcessorVersion = metadata.processor?.version !== expectedProcessorVersion;
+			if (staleProcessorVersion
+					&& !(options.allowStaleProcessorVersion
+						&& _isPositiveInteger(metadata.processor?.version))) {
+				return { ok: false, reason: 'stale-processor' };
+			}
+			return { ok: true, bytes, header, staleProcessorVersion };
+		}
+		catch (e) {
+			return { ok: false, reason: 'invalid-cache', error: e };
+		}
+	}
+
+	function _makeResult({ bytes, header }) {
+		return {
+			ok: true,
+			// IOUtils.read() and the worker both produce exactly-sized buffers
+			bytes: bytes.buffer,
+			packVersion: header.packVersion,
+			schemaMajorVersion: _getSchemaMajorVersion(header.schemaVersion),
+		};
+	}
+
+	function _generate(context, options) {
+		let key = _getItemKey(context.item);
+		let generation = _generating.get(key);
+		if (generation) {
+			_addGenerationProgressListener(generation, options.onProgress);
+			return generation.promise;
+		}
+
+		generation = {
+			promise: null,
+			listeners: new Set(),
+			lastProgress: null,
+		};
+		_addGenerationProgressListener(generation, options.onProgress);
+
+		let promise = _generateUnqueued(context, options, (progress) => {
+			_reportGenerationProgress(generation, progress);
+		})
+			.finally(() => _generating.delete(key));
+		generation.promise = promise;
+		_generating.set(key, generation);
+		return promise;
+	}
+
+	function _addGenerationProgressListener(generation, onProgress) {
+		if (typeof onProgress !== 'function') {
+			return;
+		}
+		generation.listeners.add(onProgress);
+		if (generation.lastProgress !== null) {
+			_callProgressListener(onProgress, generation.lastProgress);
+		}
+	}
+
+	function _reportGenerationProgress(generation, progress) {
+		generation.lastProgress = progress;
+		for (let listener of generation.listeners) {
+			_callProgressListener(listener, progress);
+		}
+	}
+
+	function _callProgressListener(onProgress, progress) {
+		try {
+			onProgress(progress);
+		}
+		catch {
+			// Progress reporting is best-effort and must not affect extraction.
+		}
+	}
+
+	async function _generateUnqueued({ item, sourceHash, cachePath, processorType }, options, onProgress) {
+		try {
+			if (_passwordFailures.get(_getItemKey(item)) === sourceHash) {
+				return { ok: false, reason: 'password-required' };
+			}
+			let t = new Date();
+			let result = await Zotero.PDFWorker.getStructuredDocumentText(item.id, {
+				isPriority: !!options.isPriority,
+				onProgress,
+			});
+			if (!result?.buf) {
+				return { ok: false, reason: 'failed' };
+			}
+			let bytes = new Uint8Array(result.buf);
+			// Validate against the file's current hash rather than the one
+			// captured above, since the file can change while the extraction
+			// job waits in the worker queue and the worker stamps the hash it
+			// computes at processing time
+			let currentHash = await _getSourceHash(item) || sourceHash;
+			let cache = await _validateBytes(bytes, currentHash, processorType);
+			if (!cache.ok) {
+				Zotero.debug(`Generated SDT pack for item ${item.libraryKey} is unusable: ${cache.reason}`);
+				return { ok: false, reason: 'failed' };
+			}
+			// Don't use Zotero.Attachments.createDirectoryForItem() here -- it
+			// deletes and recreates the directory, which would destroy other
+			// files stored there (e.g., the full-text cache of a linked file)
+			await Zotero.File.createDirectoryIfMissingAsync(PathUtils.parent(cachePath));
+			await IOUtils.write(cachePath, bytes, { tmpPath: `${cachePath}.tmp` });
+			Zotero.debug(
+				`Generated SDT pack for item ${item.libraryKey} in ${new Date() - t} ms `
+				+ `(${bytes.byteLength} bytes)`
+			);
+			return _makeResult(cache);
+		}
+		catch (e) {
+			if (_isPasswordError(e)) {
+				_passwordFailures.set(_getItemKey(item), sourceHash);
+				return { ok: false, reason: 'password-required' };
+			}
+			Zotero.logError(e);
+			return { ok: false, reason: 'failed' };
+		}
+	}
+
+	async function _openPack(bytes) {
+		let SDT = _getModule();
+		let pako = require('pako');
+		let source = {
+			byteLength: bytes.byteLength,
+			read: async (offset, length) => bytes.buffer.slice(
+				bytes.byteOffset + offset,
+				bytes.byteOffset + offset + length
+			),
+		};
+		return SDT.openStructuredDocumentTextPack(source, {
+			inflate: b => pako.inflateRaw(b),
+		});
+	}
+
+	async function _getDocumentWorkerMetadata() {
+		if (_documentWorkerMetadata) {
+			return _documentWorkerMetadata;
+		}
+		try {
+			let metadata = JSON.parse(
+				await Zotero.File.getContentsFromURLAsync(DOCUMENT_WORKER_METADATA_URL)
+			);
+			_validateDocumentWorkerMetadata(metadata);
+			_documentWorkerMetadata = metadata;
+			return metadata;
+		}
+		catch (e) {
+			if (!_documentWorkerMetadataErrorLogged) {
+				_documentWorkerMetadataErrorLogged = true;
+				Zotero.logError(e);
+			}
+			return null;
+		}
+	}
+
+	function _validateDocumentWorkerMetadata(metadata) {
+		let SDT = _getModule();
+		if (!metadata || typeof metadata !== 'object') {
+			throw new Error('Invalid document-worker metadata');
+		}
+		if (typeof metadata.SDT_SCHEMA_VERSION !== 'string'
+				|| !_isPositiveInteger(metadata.SDT_PACK_VERSION)
+				|| !metadata.SDT_PROCESSOR_VERSIONS
+				|| typeof metadata.SDT_PROCESSOR_VERSIONS !== 'object') {
+			throw new Error('Invalid document-worker metadata');
+		}
+		for (let processorType of ['pdf', 'epub', 'snapshot']) {
+			if (!_isPositiveInteger(metadata.SDT_PROCESSOR_VERSIONS[processorType])) {
+				throw new Error('Invalid document-worker processor metadata');
+			}
+		}
+		if (!SDT
+				|| metadata.SDT_SCHEMA_VERSION !== SDT.SDT_SCHEMA_VERSION
+				|| metadata.SDT_PACK_VERSION !== SDT.SDT_PACK_VERSION) {
+			throw new Error('Document-worker metadata does not match the bundled SDT reader');
+		}
+	}
+
+	function _getCachePath(item) {
+		return PathUtils.join(Zotero.Attachments.getStorageDirectory(item).path, SDT_CACHE_FILE_NAME);
+	}
+
+	async function _getAttachmentContext(itemID) {
+		// getAsync() returns false, not null, for a nonexistent item
+		let item = await Zotero.Items.getAsync(itemID);
+		if (!item || !item.isAttachment()) {
+			return { ok: false, reason: 'unavailable' };
+		}
+		// The type checks exclude linked-URL attachments, and _getSourceHash()
+		// returns null when the attachment has no readable file
+		let processorType = _getProcessorType(item);
+		if (!processorType) {
+			return { ok: false, reason: 'unavailable' };
+		}
+		let sourceHash = await _getSourceHash(item);
+		if (!sourceHash) {
+			return { ok: false, reason: 'unavailable' };
+		}
+		return {
+			ok: true,
+			item,
+			sourceHash,
+			processorType,
+			cachePath: _getCachePath(item),
+		};
+	}
+
+	function _getProcessorType(item) {
+		if (item.isPDFAttachment()) {
+			return 'pdf';
+		}
+		if (item.isEPUBAttachment()) {
+			return 'epub';
+		}
+		if (item.isSnapshotAttachment()) {
+			return 'snapshot';
+		}
+		return null;
+	}
+
+	function _getSchemaMajorVersion(schemaVersion) {
+		return Number(String(schemaVersion).split('.')[0]);
+	}
+
+	function _getItemKey(item) {
+		return `${item.libraryID}/${item.key}`;
+	}
+
+	function _isPositiveInteger(value) {
+		return Number.isInteger(value) && value > 0;
+	}
+
+	async function _getSourceHash(item) {
+		try {
+			// attachmentHash reads and hashes the whole file, so reuse the
+			// result as long as the file's path, size, and mtime are unchanged
+			let path = await item.getFilePathAsync();
+			if (!path) {
+				return null;
+			}
+			let { size, lastModified } = await IOUtils.stat(path);
+			let cached = _sourceHashCache.get(item.id);
+			if (cached
+					&& cached.path === path
+					&& cached.size === size
+					&& cached.mtime === lastModified) {
+				return cached.hash;
+			}
+			let hash = await item.attachmentHash;
+			if (hash) {
+				_sourceHashCache.set(item.id, { path, size, mtime: lastModified, hash });
+			}
+			return hash;
+		}
+		catch (e) {
+			if (e.name !== 'NotFoundError') {
+				Zotero.logError(e);
+			}
+			return null;
+		}
+	}
+
+	function _isPasswordError(e) {
+		// Password-protected documents aren't supported, but the failure is
+		// classified as 'password-required' so that the reason can be shown
+		// to the user. (PDFWorker restores the error name from the worker
+		// error JSON.)
+		return e?.name === 'PasswordException';
+	}
+};
diff --git a/chrome/content/zotero/xpcom/searchQuery.js b/chrome/content/zotero/xpcom/searchQuery.js
new file mode 100644
index 0000000000..af7737d2f0
--- /dev/null
+++ b/chrome/content/zotero/xpcom/searchQuery.js
@@ -0,0 +1,2035 @@
+/*
+    ***** BEGIN LICENSE BLOCK *****
+
+    Copyright © 2026 Corporation for Digital Scholarship
+                     Vienna, Virginia, USA
+                     https://www.zotero.org
+
+    This file is part of Zotero.
+
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+    ***** END LICENSE BLOCK *****
+*/
+
+/**
+ * Zotero.SearchQuery -- a text form of the search conditions the Advanced
+ * Search edits, for typing searches into a search box:
+ *
+ *     by:smith after:2020 tag:"to read" crispr
+ *     creator is smith and (tag is foo or bar)
+ *
+ * A clause is a field, an operator, and a value. Clauses can be grouped with
+ * parentheses and joined with `and` or `or`, with `and` binding tighter, so
+ * `a or b and c` means `a or (b and c)`. Anything that isn't a clause is free
+ * text, returned separately for the caller to match however its search mode
+ * matches text.
+ *
+ * Parsing never fails: text that doesn't look like a clause is just text, so
+ * a DOI, a URL, or a title with a colon in it searches as typed. The same
+ * goes for anything the search itself would reject -- an unknown item type or
+ * an empty value -- since searching for the text finds too much, while a
+ * malformed condition finds nothing.
+ */
+Zotero.SearchQuery = new function () {
+	// Short names a locale can offer for a condition, each message a
+	// comma-separated list. A locale can give a condition as many as it likes;
+	// one that collides with a condition name is skipped.
+	const KEYWORDS = {
+		'search-query-keyword-creator': { condition: 'creator' },
+		'search-query-keyword-publication': { condition: 'publicationTitle' },
+		'search-query-keyword-item-type': { condition: 'itemType' },
+		'search-query-keyword-language': { condition: 'language' },
+		'search-query-keyword-abstract': { condition: 'abstractNote' },
+		'search-query-keyword-fulltext': { condition: 'fulltextContent' },
+		'search-query-keyword-date': { condition: 'date' },
+		'search-query-keyword-date-before': { condition: 'date', operator: 'isBefore' },
+		'search-query-keyword-date-after': { condition: 'date', operator: 'isAfter' },
+		'search-query-keyword-date-added': { condition: 'dateAdded' },
+		'search-query-keyword-date-modified': { condition: 'dateModified' }
+	};
+
+	// The same short names in English, which keep working in every locale so
+	// that a query written anywhere can be read anywhere. An operator here
+	// replaces the default the colon form would use, so `after:2020` means
+	// dated after 2020 rather than `date is 2020`.
+	const ALIASES = {
+		by: { condition: 'creator' },
+		'number of tags': { condition: 'numTags' },
+		'number of notes': { condition: 'numNotes' },
+		'number of attachments': { condition: 'numAttachments' },
+		'number of annotations': { condition: 'numAnnotations' },
+		'in': { condition: 'publicationTitle' },
+		publication: { condition: 'publicationTitle' },
+		journal: { condition: 'publicationTitle' },
+		year: { condition: 'date' },
+		before: { condition: 'date', operator: 'isBefore' },
+		after: { condition: 'date', operator: 'isAfter' },
+		since: { condition: 'date', operator: 'isAfter' },
+		added: { condition: 'dateAdded' },
+		modified: { condition: 'dateModified' },
+		lang: { condition: 'language' },
+		type: { condition: 'itemType' },
+		fulltext: { condition: 'fulltextContent' },
+		text: { condition: 'fulltextContent' },
+		abstract: { condition: 'abstractNote' },
+		// The only colored thing that's searchable, so `type is annotation
+		// and color is red` reads the way people write it
+		color: { condition: 'annotationColor' }
+	};
+
+	// Conditions matched against an item's children, beyond the ones whose own
+	// definition says which level they match at
+	const CHILD_FIELDS = {
+		'annotation tag': { condition: 'tag', level: 'annotation' },
+		'note tag': { condition: 'tag', level: 'note' },
+		'attachment tag': { condition: 'tag', level: 'attachment' },
+		'note text': { condition: 'note', level: 'note' },
+		'attachment title': { condition: 'title', level: 'attachment' }
+	};
+
+	// Conditions that are plumbing rather than something to type, plus those
+	// whose values are keys or ids no one can type from memory: a collection
+	// name isn't unique and a saved search's key is opaque, so those need
+	// completion that keeps the value behind the label.
+	const EXCLUDED = new Set([
+		'joinMode', 'groupStart', 'groupEnd', 'resultLevel', 'bestMatch',
+		'includeParentsAndChildren', 'includeParents', 'includeChildren',
+		'recursive', 'noChildren', 'includeDeleted', 'deleted', 'tempTable',
+		'libraryID', 'key', 'itemID', 'savedSearchID', 'collectionID', 'tagID',
+		'itemTypeID', 'fileTypeID',
+		'collection', 'savedSearch', 'annotationAuthor',
+		// Quick search modes, which exist as conditions so that opening the
+		// Advanced Search from the quick search can show what it searched
+		'titleCreatorYear', 'anyField'
+	]);
+
+	// Conditions stored as internal names, ids, or codes, keyed by the names
+	// shown in the interface, which are what a query uses. A value that isn't
+	// in the list isn't a value for that condition at all.
+	const VALUE_LOOKUPS = {
+		itemType: () => {
+			let values = {};
+			for (let type of Zotero.ItemTypes.getTypes()) {
+				values[Zotero.ItemTypes.getLocalizedString(type.name).toLowerCase()] = type.name;
+			}
+			return values;
+		},
+		annotationColor: () => {
+			let values = {};
+			for (let [l10nID, hex] of Zotero.Annotations.COLORS) {
+				values[Zotero.ftl.formatValueSync(l10nID).toLowerCase()] = hex;
+			}
+			return values;
+		},
+		annotationType: () => {
+			let values = {};
+			for (let prop of Object.keys(Zotero.Annotations)) {
+				let match = /^ANNOTATION_TYPE_(.+)$/.exec(prop);
+				if (!match) {
+					continue;
+				}
+				let name = match[1].toLowerCase();
+				values[Zotero.getString('reader-' + name + '-annotation-short').toLowerCase()]
+					= String(Zotero.Annotations[prop]);
+			}
+			return values;
+		},
+		attachmentStorageType: () => {
+			let values = {};
+			for (let type of ['storedFile', 'linkedFile', 'webLink']) {
+				values[Zotero.getString('attachment-storage-type-' + type).toLowerCase()] = type;
+			}
+			return values;
+		}
+	};
+
+	// A name condition compares against the full name, so `creator is okonkwo`
+	// would match only a creator with no first name. In a typed query that
+	// reads as "the creator is Okonkwo", so match within the name instead --
+	// the same as the quick search does.
+	const NAME_OPERATOR_OVERRIDES = { is: 'contains', isNot: 'doesNotContain' };
+
+	// A condition that matches a creator, which searching itemCreators gives
+	// away
+	function _isNameCondition(condition) {
+		return Zotero.SearchConditions.get(condition)?.table == 'itemCreators';
+	}
+
+	// Operators can be several words, matched longest first so that "is not
+	// empty" wins over "is not" and "is". A comparison also reads with an
+	// extra "is" ("year is before 2020"), which only a condition that
+	// compares takes that way -- `title is before` matches the word.
+	//
+	// These are the English forms, which keep working in every locale so that
+	// a query written anywhere can be read anywhere. Each operator can also be
+	// written the way the Advanced Search shows it, which is localized.
+	const OPERATOR_WORDS = {
+		'is': 'is',
+		'is not': 'isNot',
+		'is empty': 'isEmpty',
+		'is not empty': 'isNotEmpty',
+		'contains': 'contains',
+		'does not contain': 'doesNotContain',
+		'begins with': 'beginsWith',
+		'starts with': 'beginsWith',
+		'before': 'isBefore',
+		'is before': 'isBefore',
+		'after': 'isAfter',
+		'is after': 'isAfter',
+		'since': 'isAfter',
+		'in the last': 'isInTheLast',
+		'is in the last': 'isInTheLast',
+		'within the last': 'isInTheLast',
+		'greater than': 'isGreaterThan',
+		'is greater than': 'isGreaterThan',
+		'more than': 'isGreaterThan',
+		'is more than': 'isGreaterThan',
+		'less than': 'isLessThan',
+		'is less than': 'isLessThan',
+		'>': 'isGreaterThan',
+		'<': 'isLessThan'
+	};
+
+	// Operators that take no value
+	const UNARY = new Set(['isEmpty', 'isNotEmpty']);
+
+	// Operators that come before a condition instead of after it, reading
+	// the way they're said: `no doi`, `has doi`
+	const PREFIX_OPERATORS = { no: 'isEmpty', has: 'isNotEmpty' };
+
+	// The same as a locale says them, each message a comma-separated list
+	const PREFIX_OPERATOR_KEYWORDS = {
+		'search-query-keyword-no': 'isEmpty',
+		'search-query-keyword-has': 'isNotEmpty'
+	};
+
+	// Things an item can have some or none of, which the prefix operators
+	// test as counts: `no annotation` means no annotations at all, not an
+	// annotation with an empty field
+	const PREFIX_COUNT_CONDITIONS = {
+		annotation: 'numAnnotations',
+		annotations: 'numAnnotations',
+		note: 'numNotes',
+		notes: 'numNotes',
+		tag: 'numTags',
+		tags: 'numTags',
+		attachment: 'numAttachments',
+		attachments: 'numAttachments'
+	};
+
+	// How each prefix operator compares a count
+	const PREFIX_COUNT_COMPARISONS = {
+		isEmpty: { operator: 'is', value: '0' },
+		isNotEmpty: { operator: 'isGreaterThan', value: '0' }
+	};
+
+	// The count tests as whole phrases a locale can offer, each message a
+	// comma-separated list: where English has `no notes`, German can offer
+	// "keine notizen". The English forms above work in every locale.
+	const COUNT_PHRASE_KEYWORDS = {
+		'search-query-keyword-no-annotations':
+			{ condition: 'numAnnotations', operator: 'is', value: '0' },
+		'search-query-keyword-has-annotations':
+			{ condition: 'numAnnotations', operator: 'isGreaterThan', value: '0' },
+		'search-query-keyword-no-notes':
+			{ condition: 'numNotes', operator: 'is', value: '0' },
+		'search-query-keyword-has-notes':
+			{ condition: 'numNotes', operator: 'isGreaterThan', value: '0' },
+		'search-query-keyword-no-tags':
+			{ condition: 'numTags', operator: 'is', value: '0' },
+		'search-query-keyword-has-tags':
+			{ condition: 'numTags', operator: 'isGreaterThan', value: '0' },
+		'search-query-keyword-no-attachments':
+			{ condition: 'numAttachments', operator: 'is', value: '0' },
+		'search-query-keyword-has-attachments':
+			{ condition: 'numAttachments', operator: 'isGreaterThan', value: '0' }
+	};
+
+	const JOIN_WORDS = { and: 'all', or: 'any' };
+
+	const JOIN_KEYWORDS = {
+		'search-query-keyword-and': 'all',
+		'search-query-keyword-or': 'any'
+	};
+
+	const QUOTES = ['"', "'", '“', '‘'];
+	const CLOSING_QUOTES = { '"': '"', "'": "'", '“': '”', '‘': '’' };
+
+	// "3 days", "2 weeks" -- the value an isInTheLast condition stores, where
+	// each unit is written as the date comparison understands it. Weeks are
+	// counted in days, which is one of the units it has.
+	const DURATION_UNITS = {
+		day: 'day',
+		days: 'day',
+		week: 'week',
+		weeks: 'week',
+		month: 'month',
+		months: 'month',
+		year: 'year',
+		years: 'year'
+	};
+
+	// The same as a locale says them, each message a comma-separated list of
+	// every form someone would type
+	const DURATION_KEYWORDS = {
+		'search-query-keyword-days': 'day',
+		'search-query-keyword-weeks': 'week',
+		'search-query-keyword-months': 'month',
+		'search-query-keyword-years': 'year'
+	};
+
+	// The range operators, and whether each one excludes the range
+	const RANGE_OPERATORS = { isBetween: false, isNotBetween: true };
+
+	// An end of a range: a year, a year and month, or a full date for a date
+	// condition, a whole number for one that counts
+	const RANGE_END_RE = /^(\d{1,4})(?:-(\d{1,2})(?:-(\d{1,2}))?)?$/;
+	const COUNT_RE = /^\d+$/;
+
+	// A range written as one word: `1970..2000` anywhere, and `1970-2000` for
+	// years, which is two of them since a year is four digits and a month is
+	// at most two
+	const RANGE_DOTS_RE = /^([^.]+)\.\.([^.]+)$/;
+	const RANGE_YEARS_RE = /^(\d{4})[-\u2013\u2014](\d{4})$/;
+
+	// Punctuation between the ends, which reads the same in every locale
+	const RANGE_MARKS_RE = /^\s*(?:\.\.|[-\u2013\u2014])\s*/;
+
+	// The ways a range is written, each an example with its two ends filled
+	// in: whatever comes before the first end opens the range, whatever comes
+	// between the ends separates them, and whatever follows the second end
+	// closes it. Written this way, each form keeps its own words together, so
+	// `between 1970 and 2000` and `1970 to 2000` each read only as they're
+	// said, and `and` separates ends only where it can't be joining clauses.
+	const RANGE_FORMS = {
+		isBetween: [
+			'between 2020 and 2025',
+			'is between 2020 and 2025',
+			'from 2020 to 2025',
+			'2020 to 2025'
+		],
+		isNotBetween: [
+			'not between 2020 and 2025',
+			'is not between 2020 and 2025'
+		]
+	};
+
+	// The same as a locale says them, each message a comma-separated list
+	const RANGE_KEYWORDS = {
+		'search-query-keyword-range': 'isBetween',
+		'search-query-keyword-range-excluded': 'isNotBetween'
+	};
+
+	// An example's two ends, which are numbers in whatever digits the locale
+	// writes them in, and the words around them
+	const RANGE_FORM_RE = /^(.*?)\p{Nd}+(.*?)\p{Nd}+(.*)$/u;
+
+	// How a condition that compares reads a range: a date brackets with before
+	// and after, a count with less than and greater than. `key` orders two
+	// ends written at different granularities, and `step` gives the value just
+	// outside an end, since the comparisons are exclusive.
+	const RANGE_KINDS = {
+		date: {
+			lower: 'isAfter',
+			upper: 'isBefore',
+			key: _dateKey,
+			step: _stepDate
+		},
+		count: {
+			lower: 'isGreaterThan',
+			upper: 'isLessThan',
+			key: value => (COUNT_RE.test(value) ? parseInt(value) : null),
+			step: (value, step) => (COUNT_RE.test(value) ? String(parseInt(value) + step) : null)
+		}
+	};
+
+	var _fields = null;
+	var _operators = null;
+	var _prefixOperators = null;
+	var _joinWords = null;
+	var _durationUnits = null;
+	var _rangeForms = null;
+	var _fieldPhrases = null;
+	var _operatorPhrases = null;
+	var _durationPhrases = null;
+	var _prefixOperatorPhrases = null;
+	var _prefixCountPhrases = null;
+	var _countPhrases = null;
+	var _countPhrasePhrases = null;
+	var _prefixContextRE = null;
+	var _values = {};
+	var _valuePhrases = {};
+	var _operatorRE = null;
+
+	// The words a locale offers for something, from a message that lists them
+	// separated by commas
+	function _localizedWords(l10nID) {
+		let translated;
+		try {
+			translated = Zotero.ftl.formatValueSync(l10nID);
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+		return (translated || '').split(',')
+			.map(word => word.trim().toLowerCase().replace(/\s+/g, ' '))
+			.filter(Boolean);
+	}
+
+	// An operator as the Advanced Search shows it, which every locale
+	// translates
+	function _localizedOperator(operatorName) {
+		try {
+			// The two operators that take no value are in Fluent; the rest are
+			// still in the properties file
+			return UNARY.has(operatorName)
+				? Zotero.ftl.formatValueSync('search-operator-' + operatorName)
+				: Zotero.getString('searchOperator.' + operatorName);
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return null;
+		}
+	}
+
+	// Every operator, by the English forms above, by the way the Advanced
+	// Search shows it, and -- for a range -- by the word each form opens with
+	function _getOperators() {
+		if (_operators) {
+			return _operators;
+		}
+		_operators = { ...OPERATOR_WORDS };
+		let add = (name, operatorName) => {
+			let key = (name || '').trim().toLowerCase().replace(/\s+/g, ' ');
+			// A word that already means something else here keeps its meaning
+			if (key && !_operators[key]) {
+				_operators[key] = operatorName;
+			}
+		};
+		for (let operatorName of new Set(Object.values(OPERATOR_WORDS))) {
+			add(_localizedOperator(operatorName), operatorName);
+		}
+		for (let [opener, { operator }] of Object.entries(_getRangeForms().openers)) {
+			add(opener, operator);
+		}
+		return _operators;
+	}
+
+	function _getPrefixOperators() {
+		if (!_prefixOperators) {
+			_prefixOperators = { ...PREFIX_OPERATORS };
+			for (let [id, operatorName] of Object.entries(PREFIX_OPERATOR_KEYWORDS)) {
+				for (let word of _localizedWords(id)) {
+					if (!_prefixOperators[word]) {
+						_prefixOperators[word] = operatorName;
+					}
+				}
+			}
+		}
+		return _prefixOperators;
+	}
+
+	function _getJoinWords() {
+		if (!_joinWords) {
+			_joinWords = { ...JOIN_WORDS };
+			for (let [id, joinMode] of Object.entries(JOIN_KEYWORDS)) {
+				for (let word of _localizedWords(id)) {
+					// Clauses are joined by a single word, so a phrase can't
+					// be one
+					if (!word.includes(' ') && !_joinWords[word]) {
+						_joinWords[word] = joinMode;
+					}
+				}
+			}
+		}
+		return _joinWords;
+	}
+
+	function _getDurationUnits() {
+		if (!_durationUnits) {
+			_durationUnits = { ...DURATION_UNITS };
+			for (let [id, unit] of Object.entries(DURATION_KEYWORDS)) {
+				for (let word of _localizedWords(id)) {
+					if (!_durationUnits[word]) {
+						_durationUnits[word] = unit;
+					}
+				}
+			}
+		}
+		return _durationUnits;
+	}
+
+	// The range forms, read out of the examples they're given as: the words
+	// around each end, keyed by the word the range opens with, or listed as
+	// the forms that open with nothing and so read as a value would
+	function _getRangeForms() {
+		if (_rangeForms) {
+			return _rangeForms;
+		}
+		_rangeForms = { openers: {}, bare: [] };
+		let add = (example, operatorName) => {
+			let parts = RANGE_FORM_RE.exec(example);
+			if (!parts) {
+				// The ends are what the words are read around, so a form
+				// without them can't be read
+				Zotero.warn(`Range form '${example}' doesn't give both ends as numbers`);
+				return;
+			}
+			let [, opener, separator, trailing] = parts
+				.map(part => part.trim().toLowerCase().replace(/\s+/g, ' '));
+			// Ends with nothing between them can't be told apart
+			if (!separator) {
+				return;
+			}
+			// Not every locale puts spaces between words, so a form also reads
+			// as one word
+			let escape = words => words.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+			let form = {
+				separator,
+				trailing,
+				compactRE: new RegExp('^(.+?)' + escape(separator) + '(.+?)'
+					+ escape(trailing) + '$')
+			};
+			if (opener) {
+				if (!_rangeForms.openers[opener]) {
+					_rangeForms.openers[opener] = { operator: operatorName, forms: [] };
+				}
+				_rangeForms.openers[opener].forms.push(form);
+			}
+			// A range with nothing in front of it is written where a value
+			// goes, so it reads with whatever operator the clause has, and an
+			// excluded range has to say so
+			else if (operatorName === 'isBetween') {
+				_rangeForms.bare.push(form);
+			}
+		};
+		for (let [operatorName, examples] of Object.entries(RANGE_FORMS)) {
+			for (let example of examples) {
+				add(example, operatorName);
+			}
+		}
+		for (let [id, operatorName] of Object.entries(RANGE_KEYWORDS)) {
+			for (let example of _localizedWords(id)) {
+				add(example, operatorName);
+			}
+		}
+		return _rangeForms;
+	}
+
+	// Every condition the Advanced Search offers is typeable, by its
+	// localized name and by any alias above
+	function _getFields() {
+		if (_fields) {
+			return _fields;
+		}
+		_fields = {};
+		// Conditions by their stored name, which the tables below refer to
+		// but the syntax doesn't expose
+		let byCondition = {};
+		let add = (name, field) => {
+			let key = (name || '').toLowerCase();
+			if (key && !_fields[key]) {
+				_fields[key] = field;
+			}
+		};
+		for (let { name, localized, operators } of Zotero.SearchConditions.getStandardConditions()) {
+			if (EXCLUDED.has(name)) {
+				continue;
+			}
+			let field = {
+				condition: name,
+				operators: Object.keys(operators || { contains: true })
+			};
+			// A condition that matches at one particular level is scoped to
+			// it, so `annotation text:foo` finds items with a matching
+			// annotation. An array of levels means it matches natively at
+			// each of them.
+			let level = Zotero.SearchConditions.get(name).level;
+			if (typeof level == 'string' && !['item', 'any'].includes(level)) {
+				field.level = level;
+			}
+			byCondition[name] = field;
+			add(localized, field);
+		}
+		// Aliases win over the condition names they shadow: `type` is far more
+		// likely to mean the item type than the report/thesis Type field
+		for (let [alias, { condition, operator }] of Object.entries(ALIASES)) {
+			let field = byCondition[condition];
+			if (field) {
+				_fields[alias] = operator ? { ...field, operator } : field;
+			}
+		}
+		for (let [id, { condition, operator }] of Object.entries(KEYWORDS)) {
+			let field = byCondition[condition];
+			if (!field) {
+				continue;
+			}
+			let translated;
+			try {
+				translated = Zotero.ftl.formatValueSync(id);
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+			for (let keyword of (translated || '').split(',')) {
+				keyword = keyword.trim().toLowerCase();
+				// A keyword that collides with a condition name would shadow
+				// it, so only add ones that are free
+				if (keyword && !_fields[keyword]) {
+					_fields[keyword] = operator ? { ...field, operator } : field;
+				}
+			}
+		}
+		for (let [name, { condition, level }] of Object.entries(CHILD_FIELDS)) {
+			let base = byCondition[condition];
+			if (base) {
+				add(name, { ...base, level });
+			}
+		}
+		return _fields;
+	}
+
+	/**
+	 * Field names available for completion.
+	 *
+	 * @return {String[]}
+	 */
+	this.getFieldNames = function () {
+		return Object.keys(_getFields());
+	};
+
+	/**
+	 * The search condition a field name maps to, or false if it isn't one.
+	 *
+	 * @param {String} name
+	 * @return {Object|false}
+	 */
+	this.getField = function (name) {
+		return _getFields()[(name || '').toLowerCase()] || false;
+	};
+
+	/**
+	 * The values a condition accepts, keyed by what can be typed for each, or
+	 * null if it takes any value.
+	 *
+	 * @param {String} condition
+	 * @return {Object|null}
+	 */
+	this.getValues = function (condition) {
+		if (!VALUE_LOOKUPS[condition]) {
+			return null;
+		}
+		if (!_values[condition]) {
+			_values[condition] = VALUE_LOOKUPS[condition]();
+		}
+		return _values[condition];
+	};
+
+	/**
+	 * Completions for what's being typed at the caret: a condition name
+	 * partway through a word, or a value for a condition that takes
+	 * particular ones. Free text, dates, and numbers have nothing to offer.
+	 *
+	 * @param {String} text
+	 * @param {Number} [caret=text.length] - Offset of the caret
+	 * @return {Object|null} - { type, start, end, completions }, where type is
+	 *     'field' or 'value', start and end are the offsets the completion
+	 *     replaces, and each completion is { text, label, description }
+	 */
+	this.getCompletions = function (text, caret = text.length) {
+		// Completing partway through a word would leave its tail behind
+		if (caret < text.length && !/[\s)]/.test(text[caret])) {
+			return null;
+		}
+		let head = text.slice(0, caret);
+		let openQuote = _openQuoteAt(head);
+		let clause = _activeClause(this, head);
+		return _trailingValueCompletions(this, head, caret, openQuote)
+			|| _valueCompletions(this, clause, head, caret, openQuote)
+			|| _fieldCompletions(this, clause, head, caret, openQuote);
+	};
+
+	// Values for `type:jour`, where the condition takes particular ones
+	function _valueCompletions(self, clause, head, caret, openQuote) {
+		// A unary operator's clause is complete, so what follows isn't a value
+		if (!clause || !clause.supported || UNARY.has(clause.operatorName)) {
+			return null;
+		}
+		return _valuesFor(self, clause.field.condition, head, clause.valueStart, caret, openQuote);
+	}
+
+	// The clause whose value ends at the caret, if the name before the last
+	// colon or operator is a condition that takes that operator. The name can
+	// be several words ("publication title"), and what precedes it is text,
+	// so try the longest name that's a condition.
+	function _activeClause(self, head) {
+		let split = _valueSplit(head);
+		if (!split) {
+			return null;
+		}
+		let words = head.slice(0, split.fieldEnd).trim().split(/\s+/);
+		let field = null;
+		for (let i = 0; i < words.length && !field; i++) {
+			field = self.getField(words.slice(i).join(' '));
+		}
+		if (!field) {
+			return null;
+		}
+		let operatorName = split.operator
+			? _getOperators()[split.operator]
+			: (field.operator || _defaultOperator(field));
+		let valueStart = split.valueStart + /^\s*/.exec(head.slice(split.valueStart))[0].length;
+		return {
+			field,
+			operatorName,
+			valueStart,
+			// Whether the condition takes the operator: `type before boo`
+			// names a condition and an operator but doesn't make a clause
+			supported: _supportsOperator(field, operatorName)
+		};
+	}
+
+	// Completions for what the tokenizer already reads as a value ending at
+	// the caret -- a clause's own value (`tag:zz`) or one being typed after
+	// `or`, which repeats the field of the clause before it
+	function _trailingValueCompletions(self, head, caret, openQuote) {
+		let tokens = self.tokenize(head).filter(token => token.type !== 'space');
+		let last = tokens[tokens.length - 1];
+		if (!last) {
+			return null;
+		}
+		// A value the tokenizer already read ("tag:foo or zz")
+		if (last.type === 'value' && last.field && last.end === head.length) {
+			let field = self.getField(last.field);
+			let start = last.start + /^\s*/.exec(head.slice(last.start))[0].length;
+			return _valuesFor(self, field.condition, head, start, caret, openQuote);
+		}
+		// A value not started yet ("type:book or ")
+		if (last.type === 'join' && _getJoinWords()[last.value.toLowerCase()] === 'any'
+				&& last.end < head.length) {
+			let previous = tokens[tokens.length - 2];
+			if (previous && previous.type === 'value' && previous.field) {
+				let field = self.getField(previous.field);
+				return _valuesFor(self, field.condition, head, caret, caret, openQuote);
+			}
+			return null;
+		}
+		// A value that doesn't read as one yet ("annotation color:red or bl")
+		if (last.type === 'text' && last.end === head.length && tokens.length >= 3) {
+			let join = tokens[tokens.length - 2];
+			let previous = tokens[tokens.length - 3];
+			if (join.type === 'join' && _getJoinWords()[join.value.toLowerCase()] === 'any'
+					&& previous.type === 'value' && previous.field) {
+				let field = self.getField(previous.field);
+				return _valuesFor(self, field.condition, head, last.start, caret, openQuote);
+			}
+		}
+		return null;
+	}
+
+	// The parameters the autocomplete search takes for a condition whose values
+	// come from the library rather than a fixed list (see
+	// zotero-autocomplete.mjs), or false for one that has neither. A creator
+	// condition looks itself up, since its name is the creator type to match,
+	// and takes both one- and two-field creators.
+	function _valueLookup(condition) {
+		if (condition == 'tag') {
+			return { fieldName: 'tag' };
+		}
+		if (_isNameCondition(condition)) {
+			return { fieldName: condition, fieldMode: 2 };
+		}
+		return false;
+	}
+
+	// Completions for a condition's value being typed at `start`, replacing
+	// through the caret. An opening quote is replaced along with what it
+	// quotes, so the completion's own quoting isn't doubled; a quote opened
+	// anywhere else means the caret is inside quoted text, which is being
+	// typed, not completed.
+	function _valuesFor(self, condition, head, start, caret, openQuote) {
+		if (openQuote !== -1 && openQuote !== start) {
+			return null;
+		}
+		let typed = head.slice(start);
+		if (QUOTES.includes(typed[0])) {
+			typed = typed.slice(1);
+		}
+		let values = self.getValues(condition);
+		if (!values) {
+			// Values the library supplies, which the caller looks up (they take
+			// a query) and turns into completions. Every tag or creator in the
+			// library is a list to scroll, not a suggestion, so they need
+			// something to match.
+			let lookup = typed && _valueLookup(condition);
+			return lookup
+				? { type: 'value', lookup, prefix: typed, start, end: caret, completions: [] }
+				: null;
+		}
+		let names = Object.keys(values)
+			.filter(name => name.startsWith(typed.toLowerCase()))
+			.sort((a, b) => a.localeCompare(b));
+		// What's typed isn't any of the values, so it may be something else
+		// being typed after the clause, like a new condition name
+		if (!names.length) {
+			return null;
+		}
+		return {
+			type: 'value',
+			start,
+			end: caret,
+			completions: names.map(name => ({
+				text: _quoteIfNeeded(name),
+				label: name,
+				// A value that is a color shows itself
+				color: /^#[0-9a-f]{6}$/i.test(values[name]) ? values[name] : undefined
+			}))
+		};
+	}
+
+	// Condition names for `ta`, offered by the shortest name each one has, so
+	// that a condition appears once however many ways it can be written
+	function _fieldCompletions(self, clause, head, caret, openQuote) {
+		// Inside an unfinished quote everything is the value being typed, and
+		// a word that could be continuing an operator ("year is b...") isn't
+		// the start of a new field
+		if (openQuote !== -1 || _continuesOperator(self, head)) {
+			return null;
+		}
+		// A name can be several words ("annotation type"), so try the longest
+		// phrase before the caret first: `annotation ty` completes to
+		// `annotation type:`, not to `type:`
+		for (let word of head.matchAll(/[^\s()]+/g)) {
+			// The word where a clause's value starts is that value being
+			// typed, not a new field: `title is ta` isn't heading for `tag:`.
+			// The same goes for an operator the condition doesn't take --
+			// `type before boo` isn't heading for `book author:`.
+			if (clause && !UNARY.has(clause.operatorName) && word.index === clause.valueStart) {
+				continue;
+			}
+			// After `no` or `has`, a name alone makes a clause (`no doi`), so
+			// offer only names the operator resolves with, and without the
+			// colon
+			let prefixOperator = _prefixOperatorBefore(head.slice(0, word.index));
+			let typed = head.slice(word.index).toLowerCase();
+			let byCondition = new Map();
+			let names = self.getFieldNames();
+			if (prefixOperator) {
+				names = names.concat(Object.keys(PREFIX_COUNT_CONDITIONS)
+					.filter(name => !names.includes(name)));
+			}
+			for (let name of names) {
+				if (!name.startsWith(typed)) {
+					continue;
+				}
+				if (prefixOperator) {
+					let clause = _resolvePrefixClause(self, prefixOperator, name);
+					if (!clause) {
+						continue;
+					}
+					// A count (`no annotation`) rather than a field test
+					if (PREFIX_COUNT_CONDITIONS[name]) {
+						let best = byCondition.get(clause.condition);
+						if (!best || _isPreferredFieldName(name, best)) {
+							byCondition.set(clause.condition, name);
+						}
+						continue;
+					}
+				}
+				let field = self.getField(name);
+				let key = field.condition + '/' + (field.operator || '') + '/' + (field.level || '');
+				let best = byCondition.get(key);
+				if (!best || _isPreferredFieldName(name, best)) {
+					byCondition.set(key, name);
+				}
+			}
+			if (!byCondition.size) {
+				continue;
+			}
+			return {
+				type: 'field',
+				start: word.index,
+				end: caret,
+				completions: _sorted([...byCondition.values()]).map(name => ({
+					text: prefixOperator ? name : name + ':',
+					label: prefixOperator ? name : name + ':',
+					// A count name ('annotation') says what it means itself
+					description: prefixOperator && PREFIX_COUNT_CONDITIONS[name]
+						? undefined
+						: Zotero.SearchConditions.getLocalizedName(self.getField(name).condition)
+				}))
+			};
+		}
+		return null;
+	}
+
+	// The offset of an opening quote that hasn't been closed, or -1. A quote
+	// only opens at the start of a word, so an apostrophe inside one doesn't
+	// count.
+	function _openQuoteAt(head) {
+		let open = -1;
+		for (let i = 0; i < head.length; i++) {
+			if (open === -1) {
+				if (QUOTES.includes(head[i]) && (i === 0 || /[\s(:]/.test(head[i - 1]))) {
+					open = i;
+				}
+			}
+			else if (head[i] === CLOSING_QUOTES[head[open]]) {
+				open = -1;
+			}
+		}
+		return open;
+	}
+
+	// The prefix operator the word being completed follows, if any: in
+	// `no d` the `d` is a prefix target, not a new field
+	function _prefixOperatorBefore(head) {
+		if (!_prefixContextRE) {
+			let words = Object.keys(_getPrefixOperators())
+				.sort((a, b) => b.length - a.length)
+				.map(name => name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+				.join('|');
+			_prefixContextRE = new RegExp('(?:^|[\\s(])(' + words + ')\\s+$', 'i');
+		}
+		let match = _prefixContextRE.exec(head);
+		return match ? _getPrefixOperators()[match[1].toLowerCase()] : null;
+	}
+
+	// Whether the words at the end could be an operator still being typed
+	// after a condition name, as in `year is b` on its way to
+	// `year is before 2020`
+	function _continuesOperator(self, head) {
+		_initPhrases(self);
+		for (let word of head.matchAll(/[^\s()]+/g)) {
+			let field = _matchPhrase(head, word.index, _fieldPhrases);
+			if (!field) {
+				continue;
+			}
+			let rest = head.slice(field.end).trim()
+				.replace(/\s+/g, ' ')
+				.toLowerCase();
+			if (rest && Object.keys(_getOperators())
+					.some(name => name.length > rest.length && name.startsWith(rest))) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	// Where the value being typed starts, and where the condition naming it
+	// ends: after a colon (`tag:foo`, operator null) or after an operator
+	// (`tag is foo`). The last one in the query is the one being typed.
+	function _valueSplit(head) {
+		let split = null;
+		let colon = head.lastIndexOf(':');
+		if (colon !== -1) {
+			split = { fieldEnd: colon, valueStart: colon + 1, operator: null };
+		}
+		let pattern = _operatorPattern();
+		pattern.lastIndex = 0;
+		let match;
+		while ((match = pattern.exec(head))) {
+			let valueStart = match.index + match[0].length;
+			if (!split || valueStart > split.valueStart) {
+				split = {
+					fieldEnd: match.index,
+					valueStart,
+					operator: match[1].replace(/\s+/g, ' ').toLowerCase()
+				};
+			}
+		}
+		return split;
+	}
+
+	// Operators as they're written between a condition and its value, matched
+	// longest first so that `is not empty` doesn't read as `is`
+	function _operatorPattern() {
+		if (!_operatorRE) {
+			let operators = Object.keys(_getOperators())
+				.sort((a, b) => b.length - a.length)
+				.map(name => name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&').replace(/ /g, '\\s+'))
+				.join('|');
+			_operatorRE = new RegExp('\\s+(' + operators + ')\\s+', 'gi');
+		}
+		return _operatorRE;
+	}
+
+	// The shortest of a condition's names, counting a name and its spaced
+	// form as the same length and preferring the spaced one, so `t` offers
+	// 'type' rather than 'item type'
+	function _isPreferredFieldName(name, other) {
+		let compact = name.replace(/\s+/g, '');
+		let otherCompact = other.replace(/\s+/g, '');
+		if (compact.length !== otherCompact.length) {
+			return compact.length < otherCompact.length;
+		}
+		let spaced = name.includes(' ');
+		if (spaced !== other.includes(' ')) {
+			return spaced;
+		}
+		return name < other;
+	}
+
+	/**
+	 * A value as it has to be written in a query to read back as one value.
+	 *
+	 * @param {String} value
+	 * @return {String}
+	 */
+	this.formatValue = function (value) {
+		return _quoteIfNeeded(value);
+	};
+
+	/**
+	 * Whether the text has an opening quotation mark whose phrase hasn't
+	 * been closed yet, so what's quoted is still being typed.
+	 *
+	 * @param {String} text
+	 * @return {Boolean}
+	 */
+	this.hasOpenQuote = function (text) {
+		return _openQuoteAt(text || '') !== -1;
+	};
+
+	// A value with spaces or parentheses in it has to be quoted to read back
+	// as one value, as does one starting with a quotation mark. There are no
+	// escapes, so quote with a character the value doesn't contain.
+	function _quoteIfNeeded(value) {
+		if (!/[\s()]/.test(value) && !QUOTES.includes(value[0])) {
+			return value;
+		}
+		for (let open of QUOTES) {
+			let close = CLOSING_QUOTES[open];
+			if (!value.includes(open) && !value.includes(close)) {
+				return open + value + close;
+			}
+		}
+		// A value containing every kind of quotation mark can't be written
+		return '"' + value + '"';
+	}
+
+	function _sorted(names) {
+		return names.sort((a, b) => a.length - b.length || a.localeCompare(b));
+	}
+
+	/**
+	 * Split a query into tokens, for highlighting and completion as the user
+	 * types as well as for parse(). Every character of the input belongs to
+	 * exactly one token, so the tokens can be rendered in place.
+	 *
+	 * @param {String} text
+	 * @return {Object[]} - [{ type, value, start, end }], where type is
+	 *     'field', 'operator', 'value', 'join', 'paren', 'text', or 'space'
+	 */
+	this.tokenize = function (text) {
+		_initPhrases(this);
+		let tokens = [];
+		let pos = 0;
+		while (pos < text.length) {
+			if (/\s/.test(text[pos])) {
+				let start = pos;
+				while (pos < text.length && /\s/.test(text[pos])) {
+					pos++;
+				}
+				tokens.push({ type: 'space', value: text.slice(start, pos), start, end: pos });
+				continue;
+			}
+			if (text[pos] === '(' || text[pos] === ')') {
+				tokens.push({ type: 'paren', value: text[pos], start: pos, end: pos + 1 });
+				pos++;
+				continue;
+			}
+
+			// A field name only counts as one when a colon or an operator
+			// follows it, so "Vol 2: The Return" stays text
+			let field = _matchPhrase(text, pos, _fieldPhrases);
+			let clause = field && _readClauseTokens(this, text, pos, field);
+			if (!clause) {
+				clause = _readPrefixClause(this, text, pos);
+			}
+			if (!clause) {
+				clause = _readCountPhrase(text, pos);
+			}
+			if (clause) {
+				tokens.push(...clause.tokens);
+				pos = clause.end;
+				continue;
+			}
+
+			let { value, end, quoted } = _readWord(text, pos);
+			let isJoin = !quoted && _getJoinWords()[value.toLowerCase()];
+			// `tag is foo or bar` repeats the field of the clause the `or`
+			// directly follows, and the repeated value is read the same way
+			// the first one was
+			if (isJoin && _getJoinWords()[value.toLowerCase()] === 'any') {
+				let previous = tokens.filter(token => token.type !== 'space').pop();
+				let repeated = previous && previous.type === 'value' && previous.field
+					&& _readRepeatedValue(this, text, end, previous);
+				if (repeated) {
+					tokens.push({ type: 'join', value, start: pos, end });
+					tokens.push(repeated);
+					pos = repeated.end;
+					continue;
+				}
+			}
+			tokens.push({ type: isJoin ? 'join' : 'text', value, start: pos, end, quoted });
+			pos = end;
+		}
+		return tokens;
+	};
+
+	// The tokens for a whole clause, or null if what follows the field name
+	// doesn't make one
+	function _readClauseTokens(self, text, start, field) {
+		let definition = self.getField(field.name);
+		// A colon may be spaced away from its field ("tag : foo")
+		let afterField = field.end + /^\s*/.exec(text.slice(field.end))[0].length;
+		let operator = null;
+		if (text[afterField] === ':') {
+			operator = { name: ':', end: afterField + 1 };
+		}
+		else {
+			// The longest reading the condition supports, so `date is before
+			// 2020` compares dates while `title is before` matches a title
+			// against "before"
+			for (let match of _matchPhrases(text, afterField, _operatorPhrases)) {
+				if (_supportsOperator(definition, _getOperators()[match.name])) {
+					operator = match;
+					break;
+				}
+			}
+			// A colon after a word operator ("year before:2020") is
+			// punctuation, not part of the value
+			if (operator) {
+				let colon = /^\s*:/.exec(text.slice(operator.end));
+				if (colon) {
+					operator = { ...operator, end: operator.end + colon[0].length };
+				}
+			}
+		}
+		if (!operator) {
+			return null;
+		}
+		let operatorName = operator.name === ':'
+			? (definition.operator || _defaultOperator(definition))
+			: _getOperators()[operator.name];
+		if (!operatorName || !_supportsOperator(definition, operatorName)) {
+			return null;
+		}
+		let tokens = [
+			{
+				type: 'field',
+				value: text.slice(start, field.end),
+				name: field.name,
+				start,
+				end: field.end
+			},
+			{
+				type: 'operator',
+				value: text.slice(field.end, operator.end).trim(),
+				name: operatorName,
+				start: field.end,
+				end: operator.end
+			}
+		];
+		if (UNARY.has(operatorName)) {
+			return { tokens, end: operator.end };
+		}
+		let valueStart = operator.end + /^\s*/.exec(text.slice(operator.end))[0].length;
+		if (valueStart >= text.length) {
+			// The value is still to come, as after completing a condition name.
+			// The clause is recognized -- so it's highlighted, and it isn't text
+			// to search for -- but it has nothing to match on yet.
+			tokens[tokens.length - 1].pending = true;
+			return { tokens, end: operator.end };
+		}
+		if (/[()]/.test(text[valueStart])) {
+			return null;
+		}
+		let value = _readValue(self, text, valueStart, definition, operatorName, operator.name);
+		if (value && value.pending) {
+			// The rest of a range is still to come, so the clause is
+			// recognized but has nothing to match on yet
+			tokens[tokens.length - 1].pending = true;
+			tokens.push({
+				type: 'value',
+				value: text.slice(valueStart, value.end),
+				field: field.name,
+				operator: operatorName,
+				start: operator.end,
+				end: value.end,
+				pending: true
+			});
+			return { tokens, end: value.end };
+		}
+		if (!value || !value.value) {
+			return null;
+		}
+		let token = {
+			type: 'value',
+			value: value.value,
+			field: field.name,
+			operator: operatorName,
+			start: operator.end,
+			end: value.end,
+			quoted: value.quoted
+		};
+		if (value.range) {
+			token.range = value.range;
+			token.operatorPhrase = operator.name;
+		}
+		tokens.push(token);
+		return { tokens, end: value.end };
+	}
+
+	// A value is a word, a quoted string, a duration ("3 days"), or one of the
+	// values the condition accepts, which can run to several words
+	// ("book section")
+	function _readValue(self, text, pos, definition, operatorName, operatorPhrase) {
+		if (operatorName === 'isInTheLast') {
+			let number = /^(\d+)\s*/.exec(text.slice(pos));
+			let unit = number && _matchPhrase(text, pos + number[0].length, _durationPhrases);
+			if (!unit) {
+				return null;
+			}
+			let count = parseInt(number[1]);
+			let name = _getDurationUnits()[unit.name];
+			if (name === 'week') {
+				count *= 7;
+				name = 'day';
+			}
+			return { value: count + ' ' + name + 's', end: unit.end };
+		}
+		// A range, which only a condition that compares takes, so a hyphen or
+		// a `to` stays part of the value everywhere else
+		let range = _readRange(text, pos, definition, operatorName, operatorPhrase);
+		if (range) {
+			return range;
+		}
+		if (RANGE_OPERATORS.hasOwnProperty(operatorName)) {
+			// `between` without a range after it doesn't make a clause
+			return null;
+		}
+		let values = self.getValues(definition.condition);
+		if (values) {
+			// A condition with a fixed set of values doesn't take any other,
+			// so anything else isn't a clause at all
+			if (QUOTES.includes(text[pos])) {
+				let quoted = _readWord(text, pos);
+				let stored = values[quoted.value.toLowerCase()];
+				return stored ? { value: stored, end: quoted.end, quoted: true } : null;
+			}
+			let phrase = _matchPhrase(text, pos, _getValuePhrases(self, definition.condition));
+			return phrase ? { value: values[phrase.name], end: phrase.end } : null;
+		}
+		// An unterminated quote is an unfinished value, not a value that
+		// starts with a quotation mark
+		if (QUOTES.includes(text[pos]) && !_readWord(text, pos).quoted) {
+			return null;
+		}
+		let word = _readWord(text, pos);
+		if (word.end <= pos) {
+			return null;
+		}
+		// Conditions that filter their own values (a count has to be a number)
+		// reject anything else, so it isn't a clause
+		let filter = Zotero.SearchConditions.get(definition.condition).inlineFilter;
+		if (filter && filter(word.value) === false) {
+			return null;
+		}
+		return { value: word.value, end: word.end, quoted: word.quoted };
+	}
+
+	// The value after an `or`, read for the same field and operator as the
+	// clause the `or` follows
+	function _readRepeatedValue(self, text, pos, previous) {
+		let definition = self.getField(previous.field);
+		let valueStart = pos + /^\s*/.exec(text.slice(pos))[0].length;
+		if (valueStart >= text.length || /[()]/.test(text[valueStart])) {
+			return null;
+		}
+		// Something written as a clause of its own is one, even if it doesn't
+		// name a condition or take the value it was given -- it's text, not a
+		// value for the previous field
+		if (_looksLikeClause(text, valueStart) || _readPrefixClause(self, text, valueStart)
+				|| _readCountPhrase(text, valueStart)) {
+			return null;
+		}
+		let value = _readValue(self, text, valueStart, definition, previous.operator,
+			previous.operatorPhrase);
+		if (!value || !value.value) {
+			return null;
+		}
+		let token = {
+			type: 'value',
+			value: value.value,
+			field: previous.field,
+			operator: previous.operator,
+			start: pos,
+			end: value.end,
+			quoted: value.quoted
+		};
+		if (value.range) {
+			token.range = value.range;
+			token.operatorPhrase = previous.operatorPhrase;
+		}
+		return token;
+	}
+
+	// The clause a prefix operator and its target make: a count comparison
+	// for something countable (`no annotation` -> numAnnotations is 0), or
+	// the operator itself on a condition that takes it (`no doi` -> DOI
+	// isEmpty). Null if the target is neither.
+	function _resolvePrefixClause(self, operatorName, targetName) {
+		let count = PREFIX_COUNT_CONDITIONS[targetName];
+		if (count) {
+			let comparison = PREFIX_COUNT_COMPARISONS[operatorName];
+			return comparison ? { condition: count, ...comparison } : null;
+		}
+		let field = self.getField(targetName);
+		if (!field || !field.operators.includes(operatorName)) {
+			return null;
+		}
+		// On a child-scoped field, an empty-field test matches items that have
+		// a child with the field empty, which isn't what `no` says, so `no`
+		// doesn't apply there
+		if (field.level && operatorName === 'isEmpty') {
+			return null;
+		}
+		let clause = { condition: field.condition, operator: operatorName, value: '' };
+		if (field.level) {
+			clause.level = field.level;
+		}
+		return clause;
+	}
+
+	// `no doi` or `has annotation` -- an operator written before what it
+	// tests. A target that doesn't resolve keeps the operator word as text.
+	function _readPrefixClause(self, text, pos) {
+		let prefix = _matchPhrase(text, pos, _prefixOperatorPhrases);
+		if (!prefix || !/\s/.test(text[prefix.end] || '')) {
+			return null;
+		}
+		let operatorEnd = prefix.end;
+		let targetStart = operatorEnd + /^\s*/.exec(text.slice(operatorEnd))[0].length;
+		let target = _matchPhrase(text, targetStart, _fieldPhrases)
+			|| _matchPhrase(text, targetStart, _prefixCountPhrases);
+		if (!target) {
+			return null;
+		}
+		let clause = _resolvePrefixClause(self, _getPrefixOperators()[prefix.name], target.name);
+		if (!clause) {
+			return null;
+		}
+		// Followed by a colon or an operator, the target starts a clause of
+		// its own, and the prefix is text
+		let after = target.end + /^\s*/.exec(text.slice(target.end))[0].length;
+		if (text[after] === ':' || _matchPhrase(text, after, _operatorPhrases)) {
+			return null;
+		}
+		return {
+			tokens: [
+				{
+					type: 'operator',
+					value: text.slice(pos, operatorEnd),
+					name: clause.operator,
+					// The parser takes the whole clause from here rather than
+					// reinterpreting the target name
+					clause,
+					start: pos,
+					end: operatorEnd
+				},
+				{
+					type: 'field',
+					value: text.slice(operatorEnd, target.end),
+					name: target.name,
+					start: operatorEnd,
+					end: target.end
+				}
+			],
+			end: target.end
+		};
+	}
+
+	// A whole phrase a locale offers for a count test, read as a single token
+	// that is a clause by itself
+	function _readCountPhrase(text, pos) {
+		let phrase = _matchPhrase(text, pos, _countPhrasePhrases);
+		if (!phrase) {
+			return null;
+		}
+		return {
+			tokens: [{
+				type: 'field',
+				value: text.slice(pos, phrase.end),
+				name: phrase.name,
+				clause: { ..._countPhrases[phrase.name] },
+				start: pos,
+				end: phrase.end
+			}],
+			end: phrase.end
+		};
+	}
+
+	// Whether a field name followed by a colon or an operator starts here,
+	// whether or not it makes a usable clause
+	function _looksLikeClause(text, pos) {
+		let field = _matchPhrase(text, pos, _fieldPhrases);
+		if (!field) {
+			return false;
+		}
+		let after = field.end + /^\s*/.exec(text.slice(field.end))[0].length;
+		return text[after] === ':' || !!_matchPhrase(text, after, _operatorPhrases);
+	}
+
+	function _initPhrases(self) {
+		if (!_fieldPhrases) {
+			_fieldPhrases = _phrasesByLength(self.getFieldNames());
+			_operatorPhrases = _phrasesByLength(Object.keys(_getOperators()));
+			_prefixOperatorPhrases = _phrasesByLength(Object.keys(_getPrefixOperators()));
+			_durationPhrases = _phrasesByLength(Object.keys(_getDurationUnits()));
+			_prefixCountPhrases = _phrasesByLength(Object.keys(PREFIX_COUNT_CONDITIONS));
+			_countPhrases = {};
+			for (let [id, clause] of Object.entries(COUNT_PHRASE_KEYWORDS)) {
+				let translated;
+				try {
+					translated = Zotero.ftl.formatValueSync(id);
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+				for (let phrase of (translated || '').split(',')) {
+					phrase = phrase.trim().toLowerCase().replace(/\s+/g, ' ');
+					if (phrase && !_countPhrases[phrase]) {
+						_countPhrases[phrase] = clause;
+					}
+				}
+			}
+			_countPhrasePhrases = _phrasesByLength(Object.keys(_countPhrases));
+		}
+	}
+
+	function _getValuePhrases(self, condition) {
+		if (!_valuePhrases[condition]) {
+			_valuePhrases[condition] = _phrasesByLength(Object.keys(self.getValues(condition)));
+		}
+		return _valuePhrases[condition];
+	}
+
+	/**
+	 * Parse a query into a condition tree and the free text left over.
+	 *
+	 * @param {String} text
+	 * @return {Object} - { tree, text }, where tree is
+	 *     { joinMode, children: [...] } with children being clauses
+	 *     ({ condition, operator, value }) or nested trees, and text is the
+	 *     free text, in input order
+	 */
+	this.parse = function (text) {
+		let tokens = this.tokenize(text).filter(token => token.type !== 'space');
+		let state = { tokens, pos: 0, ranges: [], text, pending: false };
+		let group = _parseSequence(state, false);
+		// Without a clause anywhere, the whole query is text as typed
+		if (!group.children.length && !state.pending) {
+			return { tree: null, text: text.trim().replace(/\s+/g, ' ') };
+		}
+		return {
+			tree: group.children.length
+				? { joinMode: group.joinMode, children: group.children }
+				: null,
+			text: _freeText(state)
+		};
+	};
+
+	/**
+	 * Build a search from a query, or false if the query has no clauses and so
+	 * is just text to search for.
+	 *
+	 * Free text is matched the way the given quick search mode matches text, so
+	 * `by:smith crispr` filters by creator and searches the rest for "crispr"
+	 * in whatever fields the mode covers.
+	 *
+	 * @param {String} query
+	 * @param {Object} [options]
+	 * @param {Number} [options.libraryID]
+	 * @param {String} [options.mode] - A quick search mode
+	 * @return {Zotero.Search|false}
+	 */
+	this.getSearch = function (query, { libraryID, mode } = {}) {
+		let { tree, text } = this.parse(query);
+		if (!tree) {
+			return false;
+		}
+		let search = new Zotero.Search();
+		if (libraryID) {
+			search.libraryID = libraryID;
+		}
+		// The query describes items, so return items: a condition that
+		// matches on a child -- attachment content, a tag on an attachment --
+		// maps up to the item that owns it, rather than each condition
+		// filtering at whatever level it happens to match, which would give
+		// `type:book attachment content:crypto` nothing.
+		// But a child type names the rows themselves, so it sets the result
+		// level instead of being a condition: the level is the type filter,
+		// and the other conditions map to it -- `type:attachment by:smith`
+		// means Smith's attachments.
+		let resultLevel = 'item';
+		if (tree.joinMode === 'all') {
+			let pins = tree.children.filter(child => !child.children
+				&& child.condition === 'itemType' && child.operator === 'is'
+				&& ['attachment', 'note', 'annotation'].includes(child.value));
+			// Conflicting types stay conditions, and honestly match nothing
+			if (pins.length && new Set(pins.map(pin => pin.value)).size === 1) {
+				resultLevel = pins[0].value;
+				tree = { ...tree, children: tree.children.filter(child => !pins.includes(child)) };
+			}
+		}
+		search.addCondition('resultLevel', resultLevel);
+		// Free text is joined to the clauses with "all", so an "any" query
+		// becomes a group rather than something the text is OR'd into
+		this.addToSearch(search, text && tree.joinMode === 'any'
+			? { joinMode: 'all', children: [tree] }
+			: tree);
+		if (text) {
+			if (mode === 'bestMatch' && Zotero.Embeddings?.isEnabled()) {
+				search.addCondition('bestMatch', 'contains', text);
+			}
+			else {
+				let quicksearchMode = ['titleCreatorYear', 'everything'].includes(mode)
+					? mode
+					: 'fields';
+				search.addCondition('quicksearch-' + quicksearchMode, 'contains', text);
+			}
+		}
+		return search;
+	};
+
+	/**
+	 * Add a parsed query's conditions to a search.
+	 *
+	 * @param {Zotero.Search} search
+	 * @param {Object} tree - From parse()
+	 */
+	this.addToSearch = function (search, tree) {
+		if (!tree) {
+			return;
+		}
+		if (tree.joinMode && tree.joinMode !== 'all') {
+			search.addCondition('joinMode', tree.joinMode);
+		}
+		for (let child of tree.children) {
+			_addNode(search, child);
+		}
+	};
+
+	function _addNode(search, node) {
+		if (node.children) {
+			search.addCondition('groupStart', 'true', '');
+			// A group that matches at a child level is scoped to it, so all of
+			// its conditions match the same child
+			if (node.level) {
+				search.addCondition('resultLevel', node.level);
+			}
+			search.addCondition('joinMode', node.joinMode);
+			for (let child of node.children) {
+				_addNode(search, child);
+			}
+			search.addCondition('groupEnd', 'true', '');
+			return;
+		}
+		// A condition that matches at a child level is scoped to it, so the
+		// match maps up to the item the search returns
+		if (node.level) {
+			search.addCondition('groupStart', 'true', '');
+			search.addCondition('resultLevel', node.level);
+			search.addCondition(node.condition, node.operator, node.value);
+			search.addCondition('groupEnd', 'true', '');
+			return;
+		}
+		search.addCondition(node.condition, node.operator, node.value);
+	}
+
+	// Read a bare or quoted word, returning where it ends
+	function _readWord(text, pos) {
+		if (QUOTES.includes(text[pos])) {
+			let end = text.indexOf(CLOSING_QUOTES[text[pos]], pos + 1);
+			if (end !== -1) {
+				return { value: text.slice(pos + 1, end), end: end + 1, quoted: true };
+			}
+		}
+		let end = pos;
+		while (end < text.length && !/[\s()]/.test(text[end])) {
+			end++;
+		}
+		return { value: text.slice(pos, end), end, quoted: false };
+	}
+
+	function _phrasesByLength(names) {
+		return names
+			.map(name => ({ name, words: name.split(' ') }))
+			.sort((a, b) => b.words.length - a.words.length);
+	}
+
+	// Match the longest phrase from `phrases` at `pos`, allowing any run of
+	// whitespace between words. Returns { name, end } or null.
+	function _matchPhrase(text, pos, phrases) {
+		for (let phrase of phrases) {
+			let end = _matchWords(text, pos, phrase.words);
+			if (end !== -1) {
+				return { name: phrase.name, end };
+			}
+		}
+		return null;
+	}
+
+	// Every phrase that matches at `pos`, longest first
+	function _matchPhrases(text, pos, phrases) {
+		let matches = [];
+		for (let phrase of phrases) {
+			let end = _matchWords(text, pos, phrase.words);
+			if (end !== -1) {
+				matches.push({ name: phrase.name, end });
+			}
+		}
+		return matches;
+	}
+
+	function _matchWords(text, pos, words) {
+		let at = pos;
+		for (let i = 0; i < words.length; i++) {
+			if (i) {
+				let space = /^\s+/.exec(text.slice(at));
+				if (!space) {
+					return -1;
+				}
+				at += space[0].length;
+			}
+			let word = text.substr(at, words[i].length);
+			if (word.toLowerCase() !== words[i]) {
+				return -1;
+			}
+			at += word.length;
+			// The phrase has to end at a word boundary
+			if (i === words.length - 1 && at < text.length && !/[\s():]/.test(text[at])) {
+				return -1;
+			}
+		}
+		return at;
+	}
+
+	// How a field reads a range, or null for one that doesn't compare
+	function _rangeKind(field) {
+		if (field.operators.includes('isAfter') && field.operators.includes('isBefore')) {
+			return RANGE_KINDS.date;
+		}
+		if (field.operators.includes('isGreaterThan') && field.operators.includes('isLessThan')) {
+			return RANGE_KINDS.count;
+		}
+		return null;
+	}
+
+	// Whether a field takes an operator, counting the range operators, which
+	// are made out of the comparisons rather than being operators themselves
+	function _supportsOperator(field, operatorName) {
+		return RANGE_OPERATORS.hasOwnProperty(operatorName)
+			? !!_rangeKind(field)
+			: field.operators.includes(operatorName);
+	}
+
+	// A date end padded out, so that ends written at different granularities
+	// compare
+	function _dateKey(value) {
+		let parts = RANGE_END_RE.exec(value);
+		return parts
+			? Zotero.Utilities.lpad(parts[1], '0', 4)
+				+ '-' + Zotero.Utilities.lpad(parts[2] || '0', '0', 2)
+				+ '-' + Zotero.Utilities.lpad(parts[3] || '0', '0', 2)
+			: null;
+	}
+
+	// The date just outside a given one, stepped at the granularity it was
+	// written: a year by a year, a year and month by a month, a full date by
+	// a day
+	function _stepDate(value, step) {
+		let parts = RANGE_END_RE.exec(value);
+		if (!parts) {
+			return null;
+		}
+		let year = parseInt(parts[1]);
+		let month = parts[2] === undefined ? null : parseInt(parts[2]);
+		let day = parts[3] === undefined ? null : parseInt(parts[3]);
+		if ((month !== null && (month < 1 || month > 12))
+				|| (day !== null && (day < 1 || day > 31))) {
+			return null;
+		}
+		if (day !== null) {
+			let date = new Date(0);
+			date.setUTCFullYear(year, month - 1, day);
+			// A day the month doesn't have is no date at all, rather than one
+			// in the month after it
+			if (date.getUTCMonth() !== month - 1 || date.getUTCDate() !== day) {
+				return null;
+			}
+			date.setUTCDate(day + step);
+			year = date.getUTCFullYear();
+			month = date.getUTCMonth() + 1;
+			day = date.getUTCDate();
+		}
+		else if (month !== null) {
+			let months = year * 12 + month - 1 + step;
+			year = Math.floor(months / 12);
+			month = months % 12 + 1;
+		}
+		else {
+			year += step;
+		}
+		if (year < 1) {
+			return null;
+		}
+		return Zotero.Utilities.lpad(year, '0', 4)
+			+ (month === null ? '' : '-' + Zotero.Utilities.lpad(month, '0', 2))
+			+ (day === null ? '' : '-' + Zotero.Utilities.lpad(day, '0', 2));
+	}
+
+	// The two ends of a range and where it ends, or null if what's written
+	// isn't one. Both ends are kept as written, along with the values just
+	// outside them, since the comparisons a range becomes are exclusive.
+	function _readRange(text, pos, definition, operatorName, operatorPhrase) {
+		let kind = _rangeKind(definition);
+		let spelled = RANGE_OPERATORS.hasOwnProperty(operatorName);
+		if (!kind || (!spelled && !['is', 'isNot'].includes(operatorName))) {
+			return null;
+		}
+		// Only the forms the range was opened with, so that each one's words
+		// stay together
+		let forms = spelled
+			? _getRangeForms().openers[operatorPhrase]?.forms
+			: _getRangeForms().bare;
+		if (!forms) {
+			return null;
+		}
+		let first = _readWord(text, pos);
+		if (!first.value || first.quoted) {
+			return null;
+		}
+		// A range written with `between` has no other reading, so one that
+		// runs to the end of the query is still being typed
+		let unfinished = () => (spelled && kind.key(first.value) !== null
+			? { pending: true, end: text.length }
+			: null);
+		let from, to;
+		let end = first.end;
+		let compact = RANGE_DOTS_RE.exec(first.value) || RANGE_YEARS_RE.exec(first.value)
+			|| _matchCompactForm(first.value, forms);
+		if (compact) {
+			[, from, to] = compact;
+		}
+		else {
+			from = first.value;
+			let separator = _matchRangeSeparator(text, first.end, forms);
+			if (!separator) {
+				return /^\s*$/.test(text.slice(first.end)) ? unfinished() : null;
+			}
+			let second = _readWord(text, separator.end);
+			if (!second.value || second.quoted) {
+				return second.value ? null : unfinished();
+			}
+			to = second.value;
+			end = second.end;
+			// The words the form closes with, for a locale that has any
+			if (separator.trailing) {
+				let closed = _matchWords(text, end + /^\s*/.exec(text.slice(end))[0].length,
+					separator.trailing.split(' '));
+				if (closed === -1) {
+					return end === text.length ? unfinished() : null;
+				}
+				end = closed;
+			}
+		}
+		let fromKey = kind.key(from);
+		let toKey = kind.key(to);
+		let below = kind.step(from, -1);
+		let above = kind.step(to, 1);
+		// Ends that aren't values to compare, that have nothing outside them
+		// to compare against, or that don't make a range in the order they
+		// were written, so what's there is something else -- or, at the end of
+		// the query, an end still being typed
+		if (fromKey === null || toKey === null || fromKey > toKey || !below || !above) {
+			return end === text.length ? unfinished() : null;
+		}
+		return {
+			value: text.slice(pos, end).trim().replace(/\s+/g, ' '),
+			end,
+			range: { from, to, below, above }
+		};
+	}
+
+	// A whole range written as one word, the way a locale that doesn't space
+	// its words writes one
+	function _matchCompactForm(word, forms) {
+		for (let form of forms) {
+			let match = form.compactRE.exec(word);
+			if (match) {
+				return match;
+			}
+		}
+		return null;
+	}
+
+	// What separates two ends: punctuation, which reads the same in every
+	// locale, or the words of one of the forms the range was opened with
+	function _matchRangeSeparator(text, pos, forms) {
+		let marks = RANGE_MARKS_RE.exec(text.slice(pos));
+		if (marks) {
+			return { end: pos + marks[0].length, trailing: '' };
+		}
+		let space = /^\s+/.exec(text.slice(pos));
+		if (!space) {
+			return null;
+		}
+		let start = pos + space[0].length;
+		let matched = null;
+		// The longest separator wins, so one that begins another doesn't take
+		// its place
+		for (let form of forms) {
+			let end = _matchWords(text, start, form.separator.split(' '));
+			if (end !== -1 && (!matched || end > matched.end)) {
+				matched = { end, trailing: form.trailing };
+			}
+		}
+		if (!matched) {
+			return null;
+		}
+		return {
+			end: matched.end + /^\s*/.exec(text.slice(matched.end))[0].length,
+			trailing: matched.trailing
+		};
+	}
+
+	// The pair of comparisons a range becomes. They're exclusive, so each end
+	// is compared against the value just outside it: between 1970 and 2000 is
+	// after 1969 and before 2001. Excluding a range compares the ends as
+	// written, and either one matching is enough.
+	function _rangeNode(field, operatorName, range) {
+		let kind = _rangeKind(field);
+		let excluded = operatorName === 'isNot' || RANGE_OPERATORS[operatorName];
+		let children = excluded
+			? [
+				{ condition: field.condition, operator: kind.upper, value: range.from },
+				{ condition: field.condition, operator: kind.lower, value: range.to }
+			]
+			: [
+				{ condition: field.condition, operator: kind.lower, value: range.below },
+				{ condition: field.condition, operator: kind.upper, value: range.above }
+			];
+		let node = { joinMode: excluded ? 'any' : 'all', children };
+		// Both comparisons are about the same child, so the level scopes the
+		// pair rather than each of them, which would let two children each
+		// match one end
+		if (field.level) {
+			node.level = field.level;
+		}
+		return node;
+	}
+
+	function _defaultOperator(field) {
+		// A condition with a list of values to choose from, or a tag, has
+		// discrete values rather than text to match within, so `tag:foo` means
+		// the tag foo rather than tags containing "foo"
+		let discrete = field.condition == 'tag' || !!VALUE_LOOKUPS[field.condition];
+		if (discrete && field.operators.includes('is')) {
+			return 'is';
+		}
+		for (let operator of ['contains', 'is']) {
+			if (field.operators.includes(operator)) {
+				return operator;
+			}
+		}
+		return field.operators[0];
+	}
+
+	// Parse a run of clauses, groups, and join words, stopping at a closing
+	// paren when inside a group. Anything else is free text, kept as the text
+	// that was typed rather than as reassembled tokens.
+	function _parseSequence(state, inGroup) {
+		let children = [];
+		// The join word before each child, so `and` can bind tighter than `or`
+		let joins = [];
+		let closeRange = null;
+		while (state.pos < state.tokens.length) {
+			let token = state.tokens[state.pos];
+			if (token.type === 'paren' && token.value === ')') {
+				state.pos++;
+				if (inGroup) {
+					closeRange = [token.start, token.end];
+					break;
+				}
+				state.ranges.push([token.start, token.end]);
+				continue;
+			}
+			if (token.type === 'paren' && token.value === '(') {
+				state.pos++;
+				let group = _parseSequence(state, true);
+				if (group.children.length) {
+					children.push({ joinMode: group.joinMode, children: group.children });
+				}
+				else {
+					// Parentheses around no clauses are part of the text
+					state.ranges.push([token.start, token.end]);
+					if (group.closeRange) {
+						state.ranges.push(group.closeRange);
+					}
+				}
+				continue;
+			}
+			if (token.type === 'join') {
+				let joinMode = _getJoinWords()[token.value.toLowerCase()];
+				if (children.length) {
+					joins[children.length] = joinMode;
+				}
+				state.pos++;
+				// A value alone after `or` repeats the field of the clause
+				// before it (see the tokenizer), so `tag is foo or bar` means
+				// two tag conditions
+				let next = state.tokens[state.pos];
+				let previous = children[children.length - 1];
+				if (next && next.type === 'value' && previous) {
+					children.push(_clauseFromValueToken(next));
+					state.pos++;
+				}
+				continue;
+			}
+			// A clause whose value is still to come has nothing to match on, and
+			// isn't text to search for either (see _readClauseTokens())
+			if (token.type === 'field' && state.tokens[state.pos + 1]?.pending) {
+				state.pending = true;
+				state.pos += 2;
+				// The end of a range that has been typed so far
+				if (state.tokens[state.pos]?.pending) {
+					state.pos++;
+				}
+				continue;
+			}
+			let clause = _readClause(state);
+			if (clause) {
+				children.push(clause);
+				continue;
+			}
+			state.ranges.push([token.start, token.end]);
+			state.pos++;
+		}
+		return { ..._join(children, joins), closeRange };
+	}
+
+	// `and` binds tighter than `or`, as it does everywhere else, so
+	// `a or b and c` is `a or (b and c)`. Runs of and-joined children become
+	// nested groups, which the search supports.
+	function _join(children, joins) {
+		if (children.length < 2) {
+			return { joinMode: 'all', children };
+		}
+		let runs = [[children[0]]];
+		for (let i = 1; i < children.length; i++) {
+			if (joins[i] === 'any') {
+				runs.push([children[i]]);
+			}
+			else {
+				runs[runs.length - 1].push(children[i]);
+			}
+		}
+		if (runs.length === 1) {
+			return { joinMode: 'all', children };
+		}
+		return {
+			joinMode: 'any',
+			children: runs.map(run => run.length === 1
+				? run[0]
+				: { joinMode: 'all', children: run })
+		};
+	}
+
+	function _readClause(state) {
+		let token = state.tokens[state.pos];
+		if (!token) {
+			return null;
+		}
+		// A token carrying its resolved clause: a prefix operator, whose target
+		// follows it, or a count phrase that is a clause by itself (see the
+		// tokenizer)
+		if (token.clause) {
+			state.pos += token.type === 'operator' ? 2 : 1;
+			return { ...token.clause };
+		}
+		if (token.type !== 'field') {
+			return null;
+		}
+		let field = Zotero.SearchQuery.getField(token.name);
+		let operator = state.tokens[state.pos + 1].name;
+		if (NAME_OPERATOR_OVERRIDES[operator] && _isNameCondition(field.condition)) {
+			operator = NAME_OPERATOR_OVERRIDES[operator];
+		}
+		let clause = { condition: field.condition, operator, value: '' };
+		if (UNARY.has(operator)) {
+			state.pos += 2;
+		}
+		else {
+			state.pos += 3;
+			let value = state.tokens[state.pos - 1];
+			if (value.range) {
+				return _rangeNode(field, operator, value.range);
+			}
+			clause.value = value.value;
+		}
+		if (field.level) {
+			clause.level = field.level;
+		}
+		return clause;
+	}
+
+	// The clause a repeated value makes on its own, from the field and operator
+	// its token carries. The clause it repeats can be a range, which is a
+	// group rather than something to copy a value into.
+	function _clauseFromValueToken(token) {
+		let field = Zotero.SearchQuery.getField(token.field);
+		if (token.range) {
+			return _rangeNode(field, token.operator, token.range);
+		}
+		let operator = token.operator;
+		if (NAME_OPERATOR_OVERRIDES[operator] && _isNameCondition(field.condition)) {
+			operator = NAME_OPERATOR_OVERRIDES[operator];
+		}
+		let clause = { condition: field.condition, operator, value: token.value };
+		if (field.level) {
+			clause.level = field.level;
+		}
+		return clause;
+	}
+
+	// The text that was typed for everything that wasn't a clause, with runs
+	// that were adjacent in the input kept together
+	function _freeText(state) {
+		let merged = [];
+		for (let range of state.ranges.slice().sort((a, b) => a[0] - b[0])) {
+			let last = merged[merged.length - 1];
+			if (last && last[1] === range[0]) {
+				last[1] = range[1];
+			}
+			else {
+				merged.push(range.slice());
+			}
+		}
+		return merged.map(([start, end]) => state.text.slice(start, end)).join(' ');
+	}
+};
diff --git a/chrome/content/zotero/xpcom/server/server.js b/chrome/content/zotero/xpcom/server/server.js
index e7b0d5c5c5..23bfa30448 100755
--- a/chrome/content/zotero/xpcom/server/server.js
+++ b/chrome/content/zotero/xpcom/server/server.js
@@ -57,12 +57,15 @@ Zotero.Server = new function () {
 	/**
 	 * initializes a very rudimentary web server
 	 */
-	this.init = function (port) {
+	this.init = async function (port) {
 		if (serv) {
 			Zotero.debug("Already listening on port " + serv.port);
 			return;
 		}
 		
+		// Do any necessary pre-listen initialization first
+		await Zotero.Server.LocalAPI.init();
+
 		port = port || Zotero.Prefs.get('httpServer.port');
 		try {
 			serv = new HttpServer();
@@ -260,7 +263,7 @@ Zotero.Server.RequestHandler.prototype._bodyData = function () {
 		}
 	}
 	// handle envelope
-	this._processEndpoint("POST", data); // async
+	this._processEndpoint(this.requestMethod || "POST", data); // async
 }
 
 
@@ -367,16 +370,23 @@ Zotero.Server.RequestHandler.prototype.handleRequest = async function () {
 	else if (request.method == "GET") {
 		this._processEndpoint("GET", null); // async
 	}
-	else if (request.method == "POST") {
+	else if (request.method == "POST" || request.method == "PUT"
+			|| request.method == "PATCH" || request.method == "DELETE") {
 		const contentLengthRe = /^([0-9]+)$/;
-		
+		this.requestMethod = request.method;
+
 		// parse content length
 		var m = contentLengthRe.exec(this.headers['content-length']);
-		if(!m) {
+		if (!m) {
+			// DELETE is allowed to have no body
+			if (request.method == "DELETE") {
+				this._processEndpoint("DELETE", null); // async
+				return;
+			}
 			this._requestFinished(this._generateResponse(400, "text/plain", "Content-length not provided\n"));
 			return;
 		}
-		
+
 		this.bodyLength = parseInt(m[1]);
 		this._bodyData();
 	} else {
@@ -420,7 +430,8 @@ Zotero.Server.RequestHandler.prototype._processEndpoint = async function (method
 		}
 		
 		var data = null;
-		if (method === 'POST' && this.contentType) {
+		if ((method === 'POST' || method === 'PUT' || method === 'PATCH' || method === 'DELETE')
+				&& this.contentType) {
 			// check that endpoint supports contentType
 			var supportedDataTypes = endpoint.supportedDataTypes;
 			if (supportedDataTypes && supportedDataTypes != '*'
@@ -570,7 +581,7 @@ Zotero.Server.RequestHandler.prototype._decodeMultipartData = function (data) {
 	let boundary = /boundary=([^\s]*)/i.exec(this.headers['content-type']);
 	if (!boundary) {
 		Zotero.debug('Invalid boundary: ' + this.headers['content-type'], 1);
-		return this._requestFinished(this._generateResponse(400, "text/plain", "Invalid multipart/form-data provided\n"));
+		throw new Error('Invalid multipart/form-data boundary');
 	}
 	boundary = '--' + boundary[1];
 	
@@ -584,10 +595,13 @@ Zotero.Server.RequestHandler.prototype._decodeMultipartData = function (data) {
 		let windowsHeaderBoundary = field.indexOf("\r\n\r\n");
 		if (unixHeaderBoundary < windowsHeaderBoundary && unixHeaderBoundary != -1) {
 			fieldData.header = field.slice(0, unixHeaderBoundary).trim();
-			fieldData.body = field.slice(unixHeaderBoundary+2).trim();
+			// Strip only the trailing delimiter newline before the next boundary, not all
+			// surrounding whitespace -- trimming would corrupt binary bodies (e.g., a file
+			// ending in a newline byte)
+			fieldData.body = field.slice(unixHeaderBoundary+2).replace(/\n$/, '');
 		} else if (windowsHeaderBoundary != -1) {
 			fieldData.header = field.slice(0, windowsHeaderBoundary).trim();
-			fieldData.body = field.slice(windowsHeaderBoundary+4).trim();
+			fieldData.body = field.slice(windowsHeaderBoundary+4).replace(/\r\n$/, '');
 		} else {
 			// Only log first 200 characters in case the part is large
 			Zotero.debug('Malformed multipart/form-data body: ' + field.substr(0, 200), 1);
diff --git a/chrome/content/zotero/xpcom/server/server_connector.js b/chrome/content/zotero/xpcom/server/server_connector.js
index b33452bd8d..301be412a3 100644
--- a/chrome/content/zotero/xpcom/server/server_connector.js
+++ b/chrome/content/zotero/xpcom/server/server_connector.js
@@ -35,8 +35,15 @@ Zotero.Server.Connector = {
 		
 		if (zp && zp.collectionsView) {
 			if (allowReadOnly || zp.collectionsView.editable && allowFilesReadOnly || zp.collectionsView.filesEditable) {
-				library = Zotero.Libraries.get(zp.getSelectedLibraryID());
-				collection = zp.getSelectedCollection();
+				// The Connector saves to a single target, so derive both the library and the
+				// collection from the focused row. A multiple-collection selection in the pane
+				// isn't expressible here yet, and the other selected rows could otherwise
+				// contribute a collection from a different library than the focused row.
+				let treeRow = zp.collectionsView.selectedTreeRow;
+				library = treeRow?.ref?.libraryID !== undefined
+					? Zotero.Libraries.get(treeRow.ref.libraryID)
+					: null;
+				collection = treeRow && treeRow.isCollection() ? treeRow.ref : null;
 				editable = zp.collectionsView.editable;
 			}
 			// If not editable, switch to My Library if it exists and is editable
diff --git a/chrome/content/zotero/xpcom/server/server_localAPI.js b/chrome/content/zotero/xpcom/server/server_localAPI.js
index 2637d351aa..d107f62f67 100644
--- a/chrome/content/zotero/xpcom/server/server_localAPI.js
+++ b/chrome/content/zotero/xpcom/server/server_localAPI.js
@@ -1,9 +1,9 @@
 /*
 	***** BEGIN LICENSE BLOCK *****
 	
-	Copyright © 2022 Corporation for Digital Scholarship
+	Copyright © 2026 Corporation for Digital Scholarship
                      Vienna, Virginia, USA
-					http://zotero.org
+					 https://digitalscholar.org
 	
 	This file is part of Zotero.
 	
@@ -34,10 +34,34 @@ Limitations compared to api.zotero.org:
   one API version will ever be supported at a time. If a new API version is released and your
   client needs to maintain support for older versions, first query /api/ and read the
   Zotero-API-Version response header, then make requests conditionally.
-- Write access is not yet supported.
-- No authentication.
 - No access to user data for users other than the local logged-in user. Use user ID 0 or the user's
   actual API user ID (https://www.zotero.org/settings/keys).
+- Authentication works differently:
+    - Read requests (GET) require no authentication.
+    - Write requests (POST, PUT, PATCH, DELETE) must include a local API key, either using the
+      Zotero-API-Key header (recommended) or the ?key= query parameter. A 401 is returned if
+      the key is missing or unrecognized.
+
+      Local API keys are unrelated to zotero.org API keys. They are obtained by POSTing to
+      /api/local/authorize (a local-only endpoint with no web API analog) with a JSON body
+      of the form { "appName": "<caller's display name>" }. This shows a modal with three
+      buttons: "Allow" (one-time access), "Always Allow" (persistent access), and "Deny".
+      On allow, the response is of the form:
+        { "key": "<key>", "remember": <bool> }
+      When the user picks "Allow" rather than "Always Allow", the key is single-use: the first
+      write that successfully validates it consumes it. Local API consumers should always be
+      prepared to handle a 401 response by reauthenticating.
+- Every response includes a Zotero-Server-ID header: a stable ID identifying this Zotero
+  instance. Clients should cache it and pass it back via the Zotero-Server-ID request
+  header to confirm they're still talking to the same instance. Providing the request is
+  optional on read requests but **required** for writes - write requests without a
+  Zotero-Server-ID will be rejected with 428 Precondition Required. When provided, it
+  must match the current server or the request is rejected with 412 Precondition Failed.
+  
+  Clients should use Zotero-Server-ID to partition cached data, especially data object
+  versions, returned from the API. Local API versions have no relation to Web API
+  versions, nor do they have any relation to local API versions returned by other
+  Zotero instances.
 - Minimal access to metadata about groups.
 - Atom is not supported.
 - Item type/field endpoints (https://www.zotero.org/support/dev/web_api/v3/types_and_fields) will
@@ -50,6 +74,8 @@ Limitations compared to api.zotero.org:
   but it does not make any attempt to replicate implementation details that your code might rely on.
   Sort orders might differ, quicksearch results will probably differ, and JSON you get from the
   local API is never going to be exactly identical to what you would get from the web API.
+- PATCH-style partial (binary diff) uploads are not implemented; clients should fall back to a
+  full upload.
 
 That said, there are benefits:
 
@@ -65,6 +91,135 @@ That said, there are benefits:
 
 const LOCAL_API_VERSION = 3;
 
+// Maximum number of objects in a single write batch (mirrors dataserver $maxWriteItems, etc.)
+const MAX_WRITE_OBJECTS = 50;
+
+// Maximum number of keys in a multi-delete query parameter
+const MAX_DELETE_OBJECTS = 50;
+
+/**
+ * @type {Map<string, number>} token -> expiryEpochMs
+ */
+const WRITE_TOKEN_CACHE = new Map();
+const WRITE_TOKEN_CACHE_SECONDS = 12 * 60 * 60;
+
+/**
+ * In-progress file uploads.
+ * @type {Map<any, {
+ *     libraryID: number;
+ *     itemKey: string;
+ *     md5: string;
+ *     filename: string;
+ *     filesize: string;
+ *     mtime: number;
+ *     contentType: string;
+ *     charset: string | null;
+ *     uploaded: boolean;
+ *     stagedPath: string | null;
+ *     expires: number;
+ * }>}
+ */
+const PENDING_UPLOADS = new Map();
+const UPLOAD_KEY_TTL_SECONDS = 60 * 60;
+
+// Rate-limiting state for /api/local/authorize. Each entry is a timestamp (ms)
+// for a request that resulted in (or would result in) a confirmation prompt.
+// When the window holds AUTHORIZE_RATE_LIMIT_MAX entries that are all less
+// than AUTHORIZE_RATE_LIMIT_WINDOW_MS old, further requests are rejected with
+// 429 + Retry-After until the oldest entry ages out.
+const AUTHORIZE_RATE_LIMIT_MAX = 5;
+const AUTHORIZE_RATE_LIMIT_WINDOW_MS = 60 * 1000;
+
+let _localAPIKeysCache = null;
+
+function _localAPIKeysPath() {
+	return PathUtils.join(Zotero.Profile.dir, 'localAPIKeys.json');
+}
+
+async function _loadLocalAPIKeys() {
+	if (_localAPIKeysCache) return _localAPIKeysCache;
+	let path = _localAPIKeysPath();
+	try {
+		if (!(await IOUtils.exists(path))) {
+			_localAPIKeysCache = [];
+			return _localAPIKeysCache;
+		}
+		let text = await IOUtils.readUTF8(path);
+		let data = JSON.parse(text);
+		_localAPIKeysCache = Array.isArray(data.keys) ? data.keys : [];
+	}
+	catch (e) {
+		Zotero.logError(e);
+		_localAPIKeysCache = [];
+	}
+	return _localAPIKeysCache;
+}
+
+async function _saveLocalAPIKeys() {
+	if (!_localAPIKeysCache) return;
+	let path = _localAPIKeysPath();
+	let json = JSON.stringify({ keys: _localAPIKeysCache }, null, 4);
+	await IOUtils.writeUTF8(path, json);
+}
+
+/**
+ * Register a new local API key. If remember is true, the key persists and can
+ * be reused indefinitely; otherwise the next successful use will consume it.
+ *
+ * @returns {Promise<string>} The newly generated key
+ */
+async function addLocalAPIKey(appName, remember) {
+	let keys = await _loadLocalAPIKeys();
+	let key = Zotero.Utilities.randomString(32);
+	keys.push({
+		key,
+		appName: typeof appName === 'string' ? appName : '',
+		remember: !!remember,
+		createdAt: new Date().toISOString(),
+	});
+	await _saveLocalAPIKeys();
+	return key;
+}
+
+/**
+ * Look up a candidate API key. If valid, single-use keys (non-"remember") are deleted
+ * before being returned.
+ * Returns null if the key isn't registered.
+ */
+async function consumeLocalAPIKey(key) {
+	if (!key) return null;
+	let keys = await _loadLocalAPIKeys();
+	let idx = keys.findIndex(k => k.key === key);
+	if (idx === -1) return null;
+	let entry = keys[idx];
+	if (entry.remember) {
+		return entry;
+	}
+	// Mark used immediately to prevent race conditions
+	keys.splice(idx, 1);
+	await _saveLocalAPIKeys();
+	return entry;
+}
+
+let _authorizeTimestamps = [];
+
+/**
+ * Record a confirmation-requiring request and check whether the rate limit has
+ * been exceeded. Returns the number of seconds until the next slot is available
+ * when the caller should be rejected with 429, or 0 when the request may proceed.
+ */
+function checkAuthorizeRateLimit() {
+	let now = Date.now();
+	_authorizeTimestamps = _authorizeTimestamps.filter(t => now - t < AUTHORIZE_RATE_LIMIT_WINDOW_MS);
+	if (_authorizeTimestamps.length >= AUTHORIZE_RATE_LIMIT_MAX) {
+		let oldest = _authorizeTimestamps[0];
+		let waitMS = AUTHORIZE_RATE_LIMIT_WINDOW_MS - (now - oldest);
+		return Math.max(1, Math.ceil(waitMS / 1000));
+	}
+	_authorizeTimestamps.push(now);
+	return 0;
+}
+
 const exportFormats = new Map([
 	['bibtex', '9cb70025-a888-4a29-a210-93ec52da40d4'],
 	['biblatex', 'b6e39b57-8942-4d11-8259-342c46ce395f'],
@@ -86,25 +241,33 @@ const exportFormats = new Map([
  * Base class for all local API endpoints. Implements pre- and post-processing steps.
  */
 class LocalAPIEndpoint {
+	// Whether write-method requests to this endpoint must provide a Zotero-Server-ID
+	// header. Endpoints that validate a different secret can set this to false.
+	requireServerIDOnWrite = true;
+
 	async init(requestData) {
+		if (!Zotero.Prefs.get('httpServer.localAPI.enabled')) {
+			return this.makeResponse(403, 'text/plain', 'Local API is not enabled');
+		}
+		requestData.headers = new Headers(requestData.headers);
+		
+		let serverIDResponse = this._validateServerID(requestData);
+		if (serverIDResponse) {
+			return serverIDResponse;
+		}
+		
 		try {
 			return await this._initInternal(requestData);
 		}
 		catch (e) {
-			if (!(e instanceof BadRequestError)) {
-				throw e;
+			if (e instanceof HTTPError) {
+				return this.makeResponse(e.status, 'text/plain', e.message);
 			}
-			return this.makeResponse(400, 'text/plain', e.message);
+			throw e;
 		}
 	}
-	
+
 	async _initInternal(requestData) {
-		if (!Zotero.Prefs.get('httpServer.localAPI.enabled')) {
-			return this.makeResponse(403, 'text/plain', 'Local API is not enabled');
-		}
-		
-		requestData.headers = new Headers(requestData.headers);
-		
 		let apiVersion = parseInt(
 			requestData.headers.get('Zotero-API-Version')
 				|| requestData.searchParams.get('v')
@@ -145,16 +308,35 @@ class LocalAPIEndpoint {
 			await library.waitForDataLoad('item');
 		}
 		
+		let isWriteMethod = ['POST', 'PUT', 'PATCH', 'DELETE'].includes(requestData.method);
+		if (isWriteMethod) {
+			let authResponse = await this._authenticateWriteRequest(requestData);
+			if (authResponse) return authResponse;
+
+			if (!library.editable) {
+				return this.makeResponse(403, 'text/plain', 'Write access denied');
+			}
+
+			let response = await this.run(requestData);
+			if (Array.isArray(response)) {
+				return this.makeResponse(...response);
+			}
+			throw new Error("Write endpoint did not return an HTTP response array");
+		}
+
 		let response = await this.run(requestData);
 		if (response.data) {
 			let dataIsArray = Array.isArray(response.data);
-			if (dataIsArray && requestData.searchParams.has('since')) {
+			// 'since' is ignored for group lists, as in the dataserver -- per-group metadata
+			// versions don't form a valid aggregate cursor
+			if (dataIsArray && requestData.searchParams.has('since')
+					&& !(this instanceof Zotero.Server.LocalAPI.Groups)) {
 				let since = parseInt(requestData.searchParams.get('since'));
 				if (Number.isNaN(since)) {
 					return this.makeResponse(400, 'text/plain', `Invalid 'since' value '${requestData.searchParams.get('since')}'`);
 				}
 				if (since !== 0) {
-					response.data = response.data.filter(dataObject => dataObject.version > since);
+					response.data = response.data.filter(dataObject => dataObject.clientVersion > since);
 				}
 			}
 			
@@ -223,11 +405,27 @@ class LocalAPIEndpoint {
 			
 			let headers = {
 				'Total-Results': totalResults,
-				'Link': Object.entries(links).map(([rel, url]) => `<${url}>; rel="${rel}"`).join(', ')
+				Link: Object.entries(links).map(([rel, url]) => `<${url}>; rel="${rel}"`).join(', ')
 			};
-			let lastModifiedVersion = dataIsArray
-				? Zotero.Libraries.get(requestData.libraryID).libraryVersion
-				: response.data.version;
+			let lastModifiedVersion;
+			// Unlike other multi-object responses, a group list has no meaningful
+			// Last-Modified-Version: each group has its own synced metadata version, and the
+			// user library version that would otherwise be returned says nothing about
+			// group metadata
+			if (this instanceof Zotero.Server.LocalAPI.Groups) {
+				lastModifiedVersion = undefined;
+			}
+			else if (dataIsArray) {
+				lastModifiedVersion = Zotero.Libraries.get(requestData.libraryID).clientVersion;
+			}
+			// Group metadata isn't locally writable, so single-group responses report the
+			// synced group version, matching the version fields in the response body
+			else if (response.data instanceof Zotero.Group) {
+				lastModifiedVersion = response.data.version;
+			}
+			else {
+				lastModifiedVersion = response.data.clientVersion;
+			}
 			if (lastModifiedVersion !== undefined) {
 				headers['Last-Modified-Version'] = lastModifiedVersion;
 			}
@@ -352,7 +550,13 @@ class LocalAPIEndpoint {
 					return this.makeResponse(400, 'text/plain', 'Only multi-object requests can output versions');
 				}
 				contentType = 'application/json';
-				body = JSON.stringify(Object.fromEntries(dataObjectOrObjects.map(o => [o.key, o.version])), null, 4);
+				// Groups are keyed by id and report their synced metadata version, which is
+				// independent of the local content versions used for other object types
+				body = JSON.stringify(Object.fromEntries(dataObjectOrObjects.map(
+					o => (o instanceof Zotero.Group
+						? [o.id, o.version]
+						: [o.key, o.clientVersion])
+				)), null, 4);
 				break;
 			case 'json':
 			case null:
@@ -375,9 +579,9 @@ class LocalAPIEndpoint {
 	 * Make an HTTP response array with API headers.
 	 *
 	 * @param {Number} status
-	 * @param {String | Object} contentTypeOrHeaders
-	 * @param {String} body
-	 * @returns {[Number, Object, String]}
+	 * @param {string | Object} contentTypeOrHeaders
+	 * @param {string} body
+	 * @returns {number | string | object}
 	 */
 	makeResponse(status, contentTypeOrHeaders, body) {
 		if (typeof contentTypeOrHeaders == 'string') {
@@ -387,6 +591,7 @@ class LocalAPIEndpoint {
 		}
 		contentTypeOrHeaders['Zotero-API-Version'] = LOCAL_API_VERSION;
 		contentTypeOrHeaders['Zotero-Schema-Version'] = Zotero.Schema.globalSchemaVersion;
+		contentTypeOrHeaders['Zotero-Server-ID'] = Zotero.Server.LocalAPI.getServerID();
 		return [status, contentTypeOrHeaders, body];
 	}
 
@@ -402,12 +607,200 @@ class LocalAPIEndpoint {
 	run(requestData) {
 		throw new Error("run() must be implemented");
 	}
+
+	/**
+	 * Validate the caller's Zotero-Server-ID header against this server's ID.
+	 *
+	 * - When the client provides the header, it must match this server's ID, or
+	 *   the request is rejected with 412 (Precondition Failed).
+	 * - Write requests (POST, PUT, PATCH, DELETE) must provide the header, or
+	 *   they're rejected with 428 (Precondition Required). Read requests may
+	 *   omit it, as may endpoints that set requireServerIDOnWrite to false.
+	 *
+	 * Returns null when the request may proceed, or an HTTP response array when
+	 * it should be rejected.
+	 *
+	 * @param {Object} requestData
+	 */
+	_validateServerID(requestData) {
+		let provided = requestData.headers.get('Zotero-Server-ID');
+		if (!provided) {
+			if (this.requireServerIDOnWrite
+					&& ['POST', 'PUT', 'PATCH', 'DELETE'].includes(requestData.method)) {
+				return this.makeResponse(428, 'text/plain', 'Zotero-Server-ID not provided');
+			}
+			return null;
+		}
+		if (provided !== Zotero.Server.LocalAPI.getServerID()) {
+			return this.makeResponse(412, 'text/plain', 'Zotero-Server-ID does not match this server');
+		}
+		return null;
+	}
+
+	/**
+	 * Validate the caller's local API key. The key may be provided either via
+	 * the Zotero-API-Key header or the ?key= query parameter.
+	 *
+	 * Returns null when the request is authorized to proceed, or an HTTP
+	 * response array when it should be rejected. Keys are obtained by callers
+	 * via POST /api/local/authorize; single-use keys are consumed (deleted
+	 * from the persistent store) here.
+	 *
+	 * @param {Object} requestData
+	 * @returns {Promise<null | [Number, (String | Object), String]>}
+	 */
+	async _authenticateWriteRequest(requestData) {
+		let key = requestData.headers.get('Zotero-API-Key')
+			|| requestData.searchParams.get('key')
+			|| '';
+		// Also accept an "Authorization: Bearer <key>" token
+		if (!key) {
+			let authHeader = requestData.headers.get('Authorization');
+			if (authHeader) {
+				let match = /^Bearer\s+([a-zA-Z0-9]+)$/i.exec(authHeader.trim());
+				if (match) {
+					key = match[1];
+				}
+			}
+		}
+		if (!key) {
+			return [
+				401,
+				{
+					'Content-Type': 'text/plain',
+					'WWW-Authenticate': 'Zotero-API-Key realm="Zotero Local API"',
+				},
+				'API key required -- POST /api/local/authorize to obtain one'
+			];
+		}
+		let entry = await consumeLocalAPIKey(key);
+		if (!entry) {
+			return [401, 'text/plain', 'Invalid or expired API key'];
+		}
+		requestData.apiKey = entry;
+		return null;
+	}
+
+	/**
+	 * Validate the Zotero-Write-Token header (5-32 chars). If present, check that it
+	 * hasn't been used for a successful write within the last 12 hours; otherwise,
+	 * return a 412 response. The caller must invoke {@link _recordWriteToken()}
+	 * after the write succeeds.
+	 *
+	 * @param {object} requestData
+	 * @returns {string | null} The validated token, or null if not provided
+	 * @throws HTTPError on invalid or duplicate token
+	 */
+	_checkWriteToken(requestData) {
+		let token = requestData.headers.get('Zotero-Write-Token');
+		if (!token) return null;
+		if (token.length < 5 || token.length > 32) {
+			throw new HTTPError(400, "Write token must be 5-32 characters in length");
+		}
+		pruneExpired(WRITE_TOKEN_CACHE);
+		if (WRITE_TOKEN_CACHE.has(token)) {
+			throw new HTTPError(412, "Write token already used");
+		}
+		return token;
+	}
+
+	_recordWriteToken(token) {
+		if (!token) return;
+		WRITE_TOKEN_CACHE.set(token, Date.now() + WRITE_TOKEN_CACHE_SECONDS * 1000);
+	}
+
+	/**
+	 * Parse and validate If-Unmodified-Since-Version against the library's clientVersion.
+	 *
+	 * @param {Object} requestData
+	 * @param {Object} options
+	 * @param {Boolean} [options.required] If true and the header is missing, throw 428
+	 * @returns {Boolean} Whether the header was provided (and validated)
+	 * @throws HTTPError on missing/invalid/out-of-date version
+	 */
+	_checkLibraryIfUnmodifiedSinceVersion(requestData, { required = false } = {}) {
+		let header = requestData.headers.get('If-Unmodified-Since-Version');
+		if (header === null) {
+			if (required) {
+				throw new HTTPError(428, "If-Unmodified-Since-Version not provided");
+			}
+			return false;
+		}
+		let value = parseInt(header);
+		if (Number.isNaN(value) || value < 0) {
+			throw new HTTPError(400, "Invalid If-Unmodified-Since-Version value");
+		}
+		let library = Zotero.Libraries.get(requestData.libraryID);
+		if (library.clientVersion > value) {
+			throw new HTTPError(412, `Library has been modified since specified version (expected ${value}, found ${library.clientVersion})`);
+		}
+		return true;
+	}
+
+	/**
+	 * Parse a JSON body. Accepts either an already-parsed object (when content-type
+	 * was application/json) or a string. Throws HTTPError(400) on parse failure.
+	 */
+	_parseJSONBody(data) {
+		if (data === null || data === undefined || data === '') {
+			throw new HTTPError(400, "Empty request body");
+		}
+		// Reject binary bodies on JSON endpoints
+		if (data instanceof Ci.nsIInputStream) {
+			throw new HTTPError(400, "Content-Type must be application/json");
+		}
+		if (typeof data === 'object') {
+			return data;
+		}
+		try {
+			return JSON.parse(data);
+		}
+		catch (e) {
+			throw new HTTPError(400, "Invalid JSON: " + e.message);
+		}
+	}
 }
 
 const _404 = [404, 'text/plain', 'Not found'];
 
 Zotero.Server.LocalAPI = {};
 
+Zotero.Server.LocalAPI._serverID = null;
+
+/**
+ * Load this server's persistent ID from the database, generating and storing it
+ * on first use, and cache it in memory.
+ *
+ * We store this value in the settings table so it follows the database, not the
+ * profile (as it would if it were stored as a pref).
+ *
+ * @returns {Promise<string>} A 12-character server ID
+ */
+Zotero.Server.LocalAPI.init = async function () {
+	let sql = "SELECT value FROM settings WHERE setting='localAPI' AND key='serverID'";
+	let id = await Zotero.DB.valueQueryAsync(sql);
+	if (!id) {
+		id = Zotero.Utilities.randomString(12);
+		await Zotero.DB.queryAsync(
+			"REPLACE INTO settings VALUES ('localAPI', 'serverID', ?)", id
+		);
+	}
+	this._serverID = id;
+	return id;
+};
+
+/**
+ * Get this server's persistent ID. Must have been loaded via init() first.
+ *
+ * @returns {string} A 12-character server ID
+ */
+Zotero.Server.LocalAPI.getServerID = function () {
+	if (!this._serverID) {
+		throw new Error("Local API server ID has not been loaded");
+	}
+	return this._serverID;
+};
+
 Zotero.Server.LocalAPI.Root = class extends LocalAPIEndpoint {
 	supportedMethods = ['GET'];
 
@@ -417,6 +810,62 @@ Zotero.Server.LocalAPI.Root = class extends LocalAPIEndpoint {
 };
 Zotero.Server.Endpoints["/api/"] = Zotero.Server.LocalAPI.Root;
 
+/**
+ * Local-only authorization endpoint. Has no analog in the web API. Callers
+ * that receive a 401 from a write endpoint should POST here with their app
+ * name; the user is shown a dialog and can grant or deny access. On grant,
+ * the response includes a 32-character key the caller must pass on subsequent
+ * write requests via the Zotero-API-Key header (or ?key= query parameter).
+ *
+ * If the user picked "Allow" rather than "Always Allow", the returned key
+ * will be invalidated after its first successful use.
+ */
+Zotero.Server.LocalAPI.AuthorizeLocal = class extends LocalAPIEndpoint {
+	supportedMethods = ['POST'];
+	
+	supportedDataTypes = ['application/json'];
+
+	async _initInternal(requestData) {
+		let body = requestData.data;
+		if (!body
+				|| typeof body !== 'object'
+				|| Array.isArray(body)
+				|| typeof body.appName !== 'string'
+				|| !body.appName.trim()) {
+			return this.makeResponse(400, 'text/plain', 'appName is required');
+		}
+		let appName = body.appName.trim();
+
+		let retryAfter = checkAuthorizeRateLimit();
+		if (retryAfter > 0) {
+			return this.makeResponse(
+				429,
+				{
+					'Content-Type': 'text/plain',
+					'Retry-After': String(retryAfter),
+				},
+				'Too many authorization requests'
+			);
+		}
+
+		let { allow, remember } = await Zotero.Server.LocalAPI._promptForAuthorization(appName);
+		if (!allow) {
+			return this.makeResponse(
+				403,
+				'application/json',
+				JSON.stringify({ denied: true })
+			);
+		}
+
+		let key = await addLocalAPIKey(appName, remember);
+		return this.makeResponse(
+			200,
+			'application/json',
+			JSON.stringify({ key, remember: !!remember })
+		);
+	}
+};
+Zotero.Server.Endpoints["/api/local/authorize"] = Zotero.Server.LocalAPI.AuthorizeLocal;
 
 Zotero.Server.LocalAPI.Schema = class extends LocalAPIEndpoint {
 	supportedMethods = ['GET'];
@@ -523,9 +972,23 @@ Zotero.Server.Endpoints["/api/users/:userID/settings"] = Zotero.Server.LocalAPI.
 
 
 Zotero.Server.LocalAPI.Collections = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
-	
-	run({ pathname, pathParams, libraryID }) {
+	supportedMethods = ['GET', 'POST', 'DELETE'];
+
+	async run(requestData) {
+		const WRITE_PATH_RE = /^\/api\/(?:users|groups)\/[^/]+\/collections\/?$/;
+		if (requestData.method === 'POST') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return writeMultipleObjects(this, requestData, 'collection');
+		}
+		if (requestData.method === 'DELETE') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return deleteMultipleObjects(this, requestData, 'collection', 'collectionKey');
+		}
+		let { pathname, pathParams, libraryID } = requestData;
 		let top = pathname.endsWith('/top');
 		let collections = pathParams.collectionKey
 			? Zotero.Collections.getByParent(Zotero.Collections.getIDFromLibraryAndKey(libraryID, pathParams.collectionKey))
@@ -541,9 +1004,16 @@ Zotero.Server.Endpoints["/api/users/:userID/collections/:collectionKey/collectio
 Zotero.Server.Endpoints["/api/groups/:groupID/collections/:collectionKey/collections"] = Zotero.Server.LocalAPI.Collections;
 
 Zotero.Server.LocalAPI.Collection = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'PUT', 'PATCH', 'DELETE'];
 
-	run({ pathParams, libraryID }) {
+	async run(requestData) {
+		if (requestData.method === 'PUT' || requestData.method === 'PATCH') {
+			return writeSingleObject(this, requestData, 'collection', requestData.method === 'PATCH');
+		}
+		if (requestData.method === 'DELETE') {
+			return deleteSingleObject(this, requestData, 'collection');
+		}
+		let { pathParams, libraryID } = requestData;
 		let collection = Zotero.Collections.getByLibraryAndKey(libraryID, pathParams.collectionKey);
 		if (!collection) return _404;
 		return { data: collection };
@@ -577,9 +1047,26 @@ Zotero.Server.Endpoints["/api/users/:userID/groups/:groupID"] = Zotero.Server.Lo
 
 
 Zotero.Server.LocalAPI.Items = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'POST', 'DELETE'];
 
-	async run({ pathname, pathParams, searchParams, libraryID }) {
+	async run(requestData) {
+		const WRITE_PATH_RE = /^\/api\/(?:users|groups)\/[^/]+\/items\/?$/;
+		if (requestData.method === 'POST') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return writeMultipleObjects(this, requestData, 'item');
+		}
+		if (requestData.method === 'DELETE') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return deleteMultipleObjects(this, requestData, 'item', 'itemKey');
+		}
+		return this._runGet(requestData);
+	}
+
+	async _runGet({ pathname, pathParams, searchParams, libraryID }) {
 		let isTags = pathname.endsWith('/tags');
 		if (isTags) {
 			// Cut it off so other .endsWith() checks work
@@ -732,9 +1219,16 @@ Zotero.Server.Endpoints["/api/users/:userID/searches/:searchKey/items"] = Zotero
 Zotero.Server.Endpoints["/api/groups/:groupID/searches/:searchKey/items"] = Zotero.Server.LocalAPI.Items;
 
 Zotero.Server.LocalAPI.Item = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'PUT', 'PATCH', 'DELETE'];
 
-	async run({ pathParams, libraryID }) {
+	async run(requestData) {
+		if (requestData.method === 'PUT' || requestData.method === 'PATCH') {
+			return writeSingleObject(this, requestData, 'item', requestData.method === 'PATCH');
+		}
+		if (requestData.method === 'DELETE') {
+			return deleteSingleObject(this, requestData, 'item');
+		}
+		let { pathParams, libraryID } = requestData;
 		let item = await Zotero.Items.getByLibraryAndKeyAsync(libraryID, pathParams.itemKey);
 		if (!item) return _404;
 		return { data: item };
@@ -745,9 +1239,24 @@ Zotero.Server.Endpoints["/api/groups/:groupID/items/:itemKey"] = Zotero.Server.L
 
 
 Zotero.Server.LocalAPI.ItemFile = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'POST', 'PATCH'];
 
-	async run({ pathname, pathParams, libraryID }) {
+	async run(requestData) {
+		let { method, pathname, pathParams, libraryID } = requestData;
+		if (method === 'POST') {
+			if (pathname.endsWith('/view') || pathname.endsWith('/url')) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return handleFileWrite(this, requestData);
+		}
+		if (method === 'PATCH') {
+			if (pathname.endsWith('/view') || pathname.endsWith('/url')) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			// Partial uploads (binary diffs) aren't supported locally; the
+			// client should fall back to a full upload (per dataserver docs).
+			return [405, 'text/plain', 'Partial uploads are not supported by the local API'];
+		}
 		let item = await Zotero.Items.getByLibraryAndKeyAsync(libraryID, pathParams.itemKey);
 		if (!item) return _404;
 		if (!item.isFileAttachment()) {
@@ -756,7 +1265,7 @@ Zotero.Server.LocalAPI.ItemFile = class extends LocalAPIEndpoint {
 		if (pathname.endsWith('/url')) {
 			return [200, 'text/plain', item.getLocalFileURL()];
 		}
-		return [302, { 'Location': item.getLocalFileURL() }, ''];
+		return [302, { Location: item.getLocalFileURL() }, ''];
 	}
 };
 Zotero.Server.Endpoints["/api/users/:userID/items/:itemKey/file"] = Zotero.Server.LocalAPI.ItemFile;
@@ -766,11 +1275,151 @@ Zotero.Server.Endpoints["/api/groups/:groupID/items/:itemKey/file/view"] = Zoter
 Zotero.Server.Endpoints["/api/users/:userID/items/:itemKey/file/view/url"] = Zotero.Server.LocalAPI.ItemFile;
 Zotero.Server.Endpoints["/api/groups/:groupID/items/:itemKey/file/view/url"] = Zotero.Server.LocalAPI.ItemFile;
 
+/**
+ * Local-only endpoint that receives the raw bytes for a previously authorized
+ * upload (the URL returned in the authorize phase). Stages the file in the
+ * temp directory; it's moved into the attachment's storage directory when the
+ * upload is registered.
+ */
+Zotero.Server.LocalAPI.UploadReceiver = class extends LocalAPIEndpoint {
+	supportedMethods = ['POST'];
+
+	// Web API clients post the bytes to S3 rather than to Zotero, so they don't
+	// include Zotero-specific headers on this request
+	requireServerIDOnWrite = false;
+
+	// Overridden so the write block doesn't run: no API key or library write check
+	// applies here, and the response isn't a data object
+	async _initInternal(requestData) {
+		try {
+			if (!Zotero.Prefs.get('httpServer.localAPI.enabled')) {
+				return this.makeResponse(403, 'text/plain', 'Local API is not enabled');
+			}
+			requestData.headers = new Headers(requestData.headers);
+
+			let uploadKey = requestData.pathParams.uploadKey;
+			pruneExpired(PENDING_UPLOADS);
+			let upload = PENDING_UPLOADS.get(uploadKey);
+			if (!upload) {
+				return this.makeResponse(404, 'text/plain', 'Unknown or expired upload key');
+			}
+
+			let data = requestData.data;
+			let bytes;
+			if (data instanceof Ci.nsIInputStream) {
+				let binaryStream = Cc["@mozilla.org/binaryinputstream;1"]
+					.createInstance(Ci.nsIBinaryInputStream);
+				binaryStream.setInputStream(data);
+				let available = binaryStream.available();
+				bytes = new Uint8Array(binaryStream.readByteArray(available));
+			}
+			else if (Array.isArray(data)) {
+				// multipart/form-data upload (params=1): the server has already parsed the
+				// body into form fields, so take the file bytes from the `file` part's body,
+				// which the parser preserves as a binary string (one char per byte)
+				let filePart = data.find(part => part.params && part.params.name === 'file');
+				if (!filePart) {
+					return this.makeResponse(400, 'text/plain', 'No file content provided');
+				}
+				bytes = Uint8Array.from(filePart.body, c => c.charCodeAt(0) & 0xff);
+			}
+			else if (typeof data === 'string') {
+				// Raw text body (a non-binary upload sent with a text content type)
+				let encoder = new TextEncoder();
+				bytes = encoder.encode(data);
+			}
+			else {
+				return this.makeResponse(400, 'text/plain', 'No file content provided');
+			}
+
+			let item = await Zotero.Items.getByLibraryAndKeyAsync(upload.libraryID, upload.itemKey);
+			if (!item || !item.isFileAttachment()) {
+				await discardPendingUpload(uploadKey);
+				return this.makeResponse(404, 'text/plain', 'Attachment item no longer exists');
+			}
+
+			// Stage the file in the temp directory, so that the attachment's existing file
+			// isn't touched unless registration preconditions pass
+			let stagedPath = PathUtils.join(
+				Zotero.getTempDirectory().path, 'localAPIUpload-' + uploadKey);
+			await IOUtils.write(stagedPath, bytes);
+
+			// Verify the actual md5 matches what was claimed in the authorize phase.
+			let actualMD5 = await Zotero.Utilities.Internal.md5Async(stagedPath);
+			if (actualMD5 !== upload.md5) {
+				await IOUtils.remove(stagedPath, { ignoreAbsent: true });
+				PENDING_UPLOADS.delete(uploadKey);
+				return this.makeResponse(400, 'text/plain',
+					`File MD5 does not match expected (got ${actualMD5}, expected ${upload.md5})`);
+			}
+
+			upload.stagedPath = stagedPath;
+			upload.uploaded = true;
+			return this.makeResponse(201, 'text/plain', '');
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return this.makeResponse(500, 'text/plain', 'Upload failed: ' + e.message);
+		}
+	}
+};
+Zotero.Server.Endpoints["/api/local/uploads/:uploadKey"] = Zotero.Server.LocalAPI.UploadReceiver;
+
+
+// Mirrors dataserver's Zotero_API::$maxWriteFullText
+const MAX_WRITE_FULLTEXT = 10;
+
+/**
+ * Validate a single fulltext write payload. Throws HTTPError(400) on failure.
+ */
+function validateFullTextItemBody(body) {
+	if (typeof body !== 'object' || body === null || Array.isArray(body)) {
+		throw new HTTPError(400, 'Body must be a JSON object');
+	}
+	if (typeof body.content !== 'string') {
+		throw new HTTPError(400, "'content' must be a string");
+	}
+	for (let stat of ['indexedChars', 'totalChars', 'indexedPages', 'totalPages']) {
+		if (body[stat] !== undefined && body[stat] !== null && !Number.isInteger(body[stat])) {
+			throw new HTTPError(400, `'${stat}' must be an integer`);
+		}
+	}
+}
 
 Zotero.Server.LocalAPI.ItemFullText = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'PUT'];
+
+	supportedDataTypes = ['application/json'];
+
+	async run(requestData) {
+		let { pathParams, libraryID, data } = requestData;
+		if (requestData.method === 'PUT') {
+			let body;
+			try {
+				body = this._parseJSONBody(data);
+				validateFullTextItemBody(body);
+			}
+			catch (e) {
+				if (e instanceof HTTPError) return [e.status, 'text/plain', e.message];
+				throw e;
+			}
+
+			let newVersion;
+			try {
+				newVersion = await storeItemFullText(libraryID, pathParams.itemKey, body);
+			}
+			catch (e) {
+				if (e instanceof HTTPError) return [e.status, 'text/plain', e.message];
+				throw e;
+			}
+
+			return [
+				204,
+				{ 'Last-Modified-Version': newVersion },
+				''
+			];
+		}
 
-	async run({ pathParams, libraryID }) {
 		let item = await Zotero.Items.getByLibraryAndKeyAsync(libraryID, pathParams.itemKey);
 		if (!item || !item.isFileAttachment() || !Zotero.Fulltext.isCachedMIMEType(item.attachmentContentType)) {
 			return _404;
@@ -808,9 +1457,15 @@ Zotero.Server.Endpoints["/api/groups/:groupID/items/:itemKey/fulltext"] = Zotero
 
 
 Zotero.Server.LocalAPI.FullText = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'POST'];
 
-	async run({ searchParams, libraryID }) {
+	supportedDataTypes = ['application/json'];
+
+	async run(requestData) {
+		if (requestData.method === 'POST') {
+			return writeBulkFullText(this, requestData);
+		}
+		let { searchParams, libraryID } = requestData;
 		let since = parseInt(searchParams.get('since'));
 		if (Number.isNaN(since)) {
 			return [400, 'text/plain', `Invalid 'since' value '${searchParams.get('since')}'`];
@@ -832,10 +1487,90 @@ Zotero.Server.Endpoints["/api/users/:userID/fulltext"] = Zotero.Server.LocalAPI.
 Zotero.Server.Endpoints["/api/groups/:groupID/fulltext"] = Zotero.Server.LocalAPI.FullText;
 
 
-Zotero.Server.LocalAPI.Searches = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+async function writeBulkFullText(endpoint, requestData) {
+	let { libraryID, data } = requestData;
 
-	async run({ libraryID }) {
+	let body;
+	try {
+		endpoint._checkLibraryIfUnmodifiedSinceVersion(requestData, { required: true });
+		body = endpoint._parseJSONBody(data);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) return [e.status, 'text/plain', e.message];
+		throw e;
+	}
+
+	if (!Array.isArray(body)) {
+		return [400, 'text/plain', 'Uploaded data must be a JSON array'];
+	}
+	if (body.length === 0) {
+		return [400, 'text/plain', 'No full-text entries provided'];
+	}
+	if (body.length > MAX_WRITE_FULLTEXT) {
+		return [
+			413,
+			'text/plain',
+			`Cannot write more than ${MAX_WRITE_FULLTEXT} full-text entries at a time`
+		];
+	}
+
+	let results = new MultiWriteResults();
+	for (let i = 0; i < body.length; i++) {
+		let entry = body[i];
+		let providedKey = '';
+		try {
+			if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+				throw new HTTPError(400, `Invalid value for index ${i}; expected JSON object`);
+			}
+			if (typeof entry.key !== 'string' || !entry.key) {
+				throw new HTTPError(400, "'key' is required");
+			}
+			providedKey = entry.key;
+			validateObjectKey(providedKey);
+			validateFullTextItemBody(entry);
+
+			await storeItemFullText(libraryID, providedKey, entry);
+			// Mirrors dataserver: successful fulltext entries return only the key, no full JSON
+			results.addSuccess(i, { key: providedKey });
+		}
+		catch (e) {
+			Zotero.debug(`Local API: fulltext write index ${i} failed: ${e.message || e}`, 2);
+			if (!(e instanceof HTTPError)) {
+				Zotero.logError(e);
+			}
+			results.addFailure(i, providedKey, e);
+		}
+	}
+
+	return [
+		200,
+		{
+			'Content-Type': 'application/json',
+			'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion,
+		},
+		JSON.stringify(results.toJSON(), null, 4)
+	];
+}
+
+
+Zotero.Server.LocalAPI.Searches = class extends LocalAPIEndpoint {
+	supportedMethods = ['GET', 'POST', 'DELETE'];
+
+	async run(requestData) {
+		const WRITE_PATH_RE = /^\/api\/(?:users|groups)\/[^/]+\/searches\/?$/;
+		if (requestData.method === 'POST') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return writeMultipleObjects(this, requestData, 'search');
+		}
+		if (requestData.method === 'DELETE') {
+			if (!WRITE_PATH_RE.test(requestData.pathname)) {
+				return [405, 'text/plain', 'Method not allowed for this path'];
+			}
+			return deleteMultipleObjects(this, requestData, 'search', 'searchKey');
+		}
+		let { libraryID } = requestData;
 		let searches = await Zotero.Searches.getAll(libraryID);
 		return { data: searches };
 	}
@@ -844,9 +1579,16 @@ Zotero.Server.Endpoints["/api/users/:userID/searches"] = Zotero.Server.LocalAPI.
 Zotero.Server.Endpoints["/api/groups/:groupID/searches"] = Zotero.Server.LocalAPI.Searches;
 
 Zotero.Server.LocalAPI.Search = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'PUT', 'PATCH', 'DELETE'];
 
-	async run({ pathParams, libraryID }) {
+	async run(requestData) {
+		if (requestData.method === 'PUT' || requestData.method === 'PATCH') {
+			return writeSingleObject(this, requestData, 'search', requestData.method === 'PATCH');
+		}
+		if (requestData.method === 'DELETE') {
+			return deleteSingleObject(this, requestData, 'search');
+		}
+		let { pathParams, libraryID } = requestData;
 		let search = Zotero.Searches.getByLibraryAndKey(libraryID, pathParams.searchKey);
 		if (!search) return _404;
 		return { data: search };
@@ -857,12 +1599,42 @@ Zotero.Server.Endpoints["/api/groups/:groupID/searches/:searchKey"] = Zotero.Ser
 
 
 Zotero.Server.LocalAPI.Tags = class extends LocalAPIEndpoint {
-	supportedMethods = ['GET'];
+	supportedMethods = ['GET', 'DELETE'];
 
-	async run({ libraryID }) {
-		let tags = await Zotero.Tags.getAll(libraryID);
-		let json = await Zotero.Tags.toResponseJSON(libraryID, tags);
-		return { data: json };
+	async run(requestData) {
+		let { libraryID, searchParams } = requestData;
+		if (requestData.method === 'DELETE') {
+			this._checkLibraryIfUnmodifiedSinceVersion(requestData, { required: true });
+
+			let raw = searchParams.get('tag');
+			if (!raw) {
+				return [400, 'text/plain', "'tag' not provided"];
+			}
+			// '||' separates tag names; values are already URL-decoded at this point.
+			let names = raw.split('||').map(t => t.trim()).filter(Boolean);
+			if (!names.length) {
+				return [400, 'text/plain', "'tag' not provided"];
+			}
+			if (names.length > MAX_DELETE_OBJECTS) {
+				return [413, 'text/plain', `Cannot delete more than ${MAX_DELETE_OBJECTS} tags at a time`];
+			}
+
+			let tagIDs = names.map(name => Zotero.Tags.getID(name)).filter(id => !!id);
+			if (tagIDs.length) {
+				await Zotero.Tags.removeFromLibrary(libraryID, tagIDs);
+			}
+
+			return [
+				204,
+				{ 'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion },
+				''
+			];
+		}
+		else {
+			let tags = await Zotero.Tags.getAll(libraryID);
+			let json = await Zotero.Tags.toResponseJSON(libraryID, tags);
+			return { data: json };
+		}
 	}
 };
 Zotero.Server.Endpoints["/api/users/:userID/tags"] = Zotero.Server.LocalAPI.Tags;
@@ -918,10 +1690,54 @@ Zotero.Server.LocalAPI.OpenReaderItems = class extends LocalAPIEndpoint {
 };
 Zotero.Server.Endpoints["/api/reader/openItems"] = Zotero.Server.LocalAPI.OpenReaderItems;
 
+ * Show the local API authorization dialog. Stubbable in tests.
+ * @returns {Promise<{ allow: boolean, remember: boolean }>}
+ */
+Zotero.Server.LocalAPI._promptForAuthorization = async function (appName) {
+	let title = Zotero.ftl.formatValueSync('local-api-authorize-title');
+	let text = Zotero.ftl.formatValueSync('local-api-authorize-text', { appName });
+	let allowLabel = Zotero.ftl.formatValueSync('general-allow');
+	let alwaysAllowLabel = Zotero.ftl.formatValueSync('general-always-allow');
+	let denyLabel = Zotero.ftl.formatValueSync('general-deny');
+
+	let index = Zotero.Prompt.confirm({
+		title,
+		text,
+		button0: allowLabel,
+		button1: alwaysAllowLabel,
+		button2: denyLabel,
+		defaultButton: 2,
+	});
+	return { allow: index === 0 || index === 1, remember: index === 1 };
+};
+
+/**
+ * Number of remembered (persistent) local API authorizations.
+ */
+Zotero.Server.LocalAPI.getAuthorizationCount = async function () {
+	let keys = await _loadLocalAPIKeys();
+	return keys.filter(k => k.remember).length;
+};
+
+/**
+ * Discard every stored local API authorization. Subsequent write requests will
+ * have to reauthorize.
+ */
+Zotero.Server.LocalAPI.clearAuthorizations = async function () {
+	_localAPIKeysCache = [];
+	let path = _localAPIKeysPath();
+	if (await IOUtils.exists(path)) {
+		await IOUtils.remove(path);
+	}
+};
+
+Zotero.Server.LocalAPI._resetAuthorizeRateLimit = function () {
+	_authorizeTimestamps = [];
+};
 
 /**
  * Convert a {@link Zotero.DataObject}, or an array of DataObjects, to response JSON
- * 		with appropriate included data based on the 'include' query parameter.
+ * with appropriate included data based on the 'include' query parameter.
  *
  * @param {Zotero.DataObject | Zotero.DataObject[]} dataObjectOrObjects
  * @param {URLSearchParams} searchParams
@@ -937,7 +1753,9 @@ async function toResponseJSON(dataObjectOrObjects, searchParams) {
 	let responseJSON = dataObject.toResponseJSONAsync
 		? await dataObject.toResponseJSONAsync({
 			apiURL: `http://localhost:${Zotero.Server.port}/api/`,
-			includeGroupDetails: true
+			includeGroupDetails: true,
+			syncedStorageProperties: false,
+			syncedVersionProperty: false,
 		})
 		: dataObject;
 	
@@ -1007,7 +1825,7 @@ async function citeprocToHTML(itemOrItems, searchParams, asCitationList) {
 			style = Zotero.Styles.get(styleID);
 		}
 		catch (e) {
-			throw new BadRequestError(`Invalid style: ${styleIDOrURL} (${e.message})`);
+			throw new HTTPError(400, `Invalid style: ${styleIDOrURL} (${e.message})`);
 		}
 	}
 	if (!style) {
@@ -1015,6 +1833,7 @@ async function citeprocToHTML(itemOrItems, searchParams, asCitationList) {
 	}
 	
 	let cslEngine = style.getCiteProc(locale, 'html', { cache: true });
+	// eslint-disable-next-line camelcase
 	cslEngine.opt.development_extensions.wrap_url_and_doi = linkWrap;
 	return Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, items, 'html', asCitationList);
 }
@@ -1023,7 +1842,7 @@ async function citeprocToHTML(itemOrItems, searchParams, asCitationList) {
  * Export items to a string with the given translator.
  *
  * @param {Zotero.Item|Zotero.Item[]} itemOrItems
- * @param {String} translatorID
+ * @param {string} translatorID
  * @returns {Promise<String>}
  */
 function exportItems(itemOrItems, translatorID) {
@@ -1050,8 +1869,8 @@ function exportItems(itemOrItems, translatorID) {
  * Evaluate the API's search syntax: https://www.zotero.org/support/dev/web_api/v3/basics#search_syntax
  *
  * @param {Zotero.Search} parentSearch
- * @param {String[]} searchStrings The search strings provided by the client as query parameters
- * @param {String} condition The search condition name
+ * @param {string[]} searchStrings The search strings provided by the client as query parameters
+ * @param {string} condition The search condition name
  */
 function buildSearchFromSearchSyntax(parentSearch, searchStrings, condition) {
 	for (let searchString of searchStrings) {
@@ -1091,4 +1910,843 @@ function searchToDebugJSON(search) {
 	};
 }
 
-class BadRequestError extends Error {}
+/**
+ * Validate an object key from a query parameter or JSON body. Throws HTTPError(400) if invalid.
+ */
+function validateObjectKey(key) {
+	if (typeof key !== 'string' || !Zotero.Utilities.isValidObjectKey(key)) {
+		throw new HTTPError(400, `Invalid key: '${key}'`);
+	}
+	return key;
+}
+
+/**
+ * Parse a comma-separated list of keys from a query parameter, validating each.
+ * Throws HTTPError if missing, malformed, or exceeds the max-delete limit.
+ */
+function parseKeyList(searchParams, paramName) {
+	let raw = searchParams.get(paramName);
+	if (!raw) {
+		throw new HTTPError(400, `'${paramName}' not provided`);
+	}
+	let keys = raw.split(',').map(k => k.trim()).filter(Boolean);
+	if (!keys.length) {
+		throw new HTTPError(400, `'${paramName}' not provided`);
+	}
+	if (keys.length > MAX_DELETE_OBJECTS) {
+		throw new HTTPError(413, `Cannot delete more than ${MAX_DELETE_OBJECTS} objects at a time`);
+	}
+	for (let key of keys) {
+		validateObjectKey(key);
+	}
+	return keys;
+}
+
+/**
+ * Return the response JSON for a successfully written data object, using the
+ * same options used elsewhere in the local API.
+ */
+async function dataObjectToResponseJSON(dataObject) {
+	return dataObject.toResponseJSONAsync({
+		apiURL: `http://localhost:${Zotero.Server.port}/api/`,
+		includeGroupDetails: true,
+		syncedStorageProperties: false,
+		syncedVersionProperty: false,
+	});
+}
+
+/**
+ * Look up an existing object by library + key, returning null if not found.
+ * `kind` is one of 'item', 'collection', 'search'.
+ */
+async function getExistingObjectByKey(libraryID, key, kind) {
+	switch (kind) {
+		case 'item':
+			return Zotero.Items.getByLibraryAndKeyAsync(libraryID, key);
+		case 'collection':
+			return Zotero.Collections.getByLibraryAndKey(libraryID, key);
+		case 'search':
+			return Zotero.Searches.getByLibraryAndKey(libraryID, key);
+		default:
+			throw new Error(`Unknown object kind: ${kind}`);
+	}
+}
+
+/**
+ * Construct a new object of the given kind in the given library, ready
+ * for fromJSON(). For items, the itemType must be passed.
+ */
+function makeNewObject(libraryID, kind, itemType) {
+	let obj;
+	switch (kind) {
+		case 'item':
+			if (!itemType) {
+				throw new HTTPError(400, "itemType property not provided");
+			}
+			if (!Zotero.ItemTypes.getID(itemType)) {
+				throw new HTTPError(400, `Unknown itemType '${itemType}'`);
+			}
+			obj = new Zotero.Item(itemType);
+			break;
+		case 'collection':
+			obj = new Zotero.Collection();
+			break;
+		case 'search':
+			obj = new Zotero.Search();
+			break;
+		default:
+			throw new Error(`Unknown object kind: ${kind}`);
+	}
+	obj.libraryID = libraryID;
+	return obj;
+}
+
+/**
+ * Apply JSON to an existing or new data object. Throws HTTPError on validation
+ * failure. Caller is responsible for calling saveTx().
+ */
+function applyJSONToObject(obj, json, kind) {
+	try {
+		obj.fromJSON(json, { strict: false });
+	}
+	catch (e) {
+		if (e && e.name === 'ZoteroInvalidDataError') {
+			throw new HTTPError(400, e.message);
+		}
+		throw e;
+	}
+	if (kind === 'item' && obj.isNote() && typeof json.note === 'string') {
+		// fromJSON already sets the note for note/attachment items
+	}
+}
+
+/**
+ * Merge a PATCH JSON object onto the current item/collection/search JSON
+ * representation. Keys present in `patchJSON` (even if empty) take precedence;
+ * keys absent from `patchJSON` keep their existing values.
+ */
+function mergePatchJSON(existingJSON, patchJSON) {
+	let merged = { ...existingJSON };
+	for (let k of Object.keys(patchJSON)) {
+		merged[k] = patchJSON[k];
+	}
+	return merged;
+}
+
+/**
+ * Multi-object write (POST). Handles items, collections, searches uniformly.
+ */
+async function writeMultipleObjects(endpoint, requestData, kind) {
+	let { libraryID, data } = requestData;
+
+	let token;
+	let libraryVersionValidated;
+	let body;
+	try {
+		token = endpoint._checkWriteToken(requestData);
+		libraryVersionValidated = endpoint._checkLibraryIfUnmodifiedSinceVersion(requestData);
+		body = endpoint._parseJSONBody(data);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+
+	if (!Array.isArray(body)) {
+		return [400, 'text/plain', `Uploaded data must be a JSON array`];
+	}
+	if (body.length === 0) {
+		return [400, 'text/plain', `No ${kind}s provided`];
+	}
+	if (body.length > MAX_WRITE_OBJECTS) {
+		return [
+			413,
+			'text/plain',
+			`Cannot add more than ${MAX_WRITE_OBJECTS} ${kind}s at a time`
+		];
+	}
+
+	let results = new MultiWriteResults();
+
+	for (let i = 0; i < body.length; i++) {
+		let entry = body[i];
+		let providedKey = '';
+		try {
+			if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
+				throw new HTTPError(400, `Invalid value for index ${i} in uploaded data; expected JSON ${kind} object`);
+			}
+			providedKey = typeof entry.key === 'string' ? entry.key : '';
+
+			let obj;
+			let isUpdate = false;
+			if (providedKey) {
+				validateObjectKey(providedKey);
+				// Keyed writes require a concurrency precondition, either request-level or
+				// per-object (mirroring dataserver's checkJSONObjectVersion())
+				if (!libraryVersionValidated
+						&& (entry.version === undefined || entry.version === null)) {
+					throw new HTTPError(428, "Either If-Unmodified-Since-Version or "
+						+ "'version' property must be provided for 'key'-based writes");
+				}
+				obj = await getExistingObjectByKey(libraryID, providedKey, kind);
+				if (obj) {
+					isUpdate = true;
+					if (entry.version !== undefined && entry.version !== null) {
+						let expectedVersion = parseInt(entry.version);
+						if (Number.isNaN(expectedVersion)) {
+							throw new HTTPError(400, "Invalid version value");
+						}
+						if (expectedVersion !== obj.clientVersion) {
+							throw new HTTPError(412, `${kind} version mismatch: expected ${expectedVersion}, found ${obj.clientVersion}`);
+						}
+					}
+					// POST follows PATCH semantics: merge patch with existing
+					let existingJSON = obj.toJSON();
+					entry = mergePatchJSON(existingJSON, entry);
+				}
+				else {
+					if (entry.version !== undefined && entry.version !== null
+							&& parseInt(entry.version) > 0) {
+						throw new HTTPError(404, `${kind} doesn't exist `
+							+ `(expected version ${parseInt(entry.version)}; use 0 instead)`);
+					}
+					obj = makeNewObject(libraryID, kind, entry.itemType);
+					obj.key = providedKey;
+				}
+			}
+			else {
+				obj = makeNewObject(libraryID, kind, entry.itemType);
+			}
+
+			applyJSONToObject(obj, entry, kind);
+
+			if (obj.hasChanged()) {
+				await obj.saveTx();
+				let json = await dataObjectToResponseJSON(obj);
+				results.addSuccess(i, json);
+			}
+			else if (isUpdate) {
+				results.addUnchanged(i, obj.key);
+			}
+			else {
+				// New object with nothing to set -- treat as success
+				await obj.saveTx();
+				let json = await dataObjectToResponseJSON(obj);
+				results.addSuccess(i, json);
+			}
+		}
+		catch (e) {
+			Zotero.debug(`Local API: ${kind} write index ${i} failed: ${e.message || e}`, 2);
+			if (!(e instanceof HTTPError)) {
+				Zotero.logError(e);
+			}
+			results.addFailure(i, providedKey, e);
+		}
+	}
+
+	endpoint._recordWriteToken(token);
+
+	let headers = {
+		'Content-Type': 'application/json',
+		'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion,
+	};
+	return [200, headers, JSON.stringify(results.toJSON(), null, 4)];
+}
+
+/**
+ * Single-object write (PUT or PATCH).
+ */
+async function writeSingleObject(endpoint, requestData, kind, isPatch) {
+	let { libraryID, pathParams, data } = requestData;
+	let key;
+	switch (kind) {
+		case 'item':
+			key = pathParams.itemKey;
+			break;
+		case 'collection':
+			key = pathParams.collectionKey;
+			break;
+		case 'search':
+			key = pathParams.searchKey;
+			break;
+		default:
+			throw new Error(`Unknown kind: ${kind}`);
+	}
+
+	let body;
+	try {
+		validateObjectKey(key);
+		body = endpoint._parseJSONBody(data);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+	if (!body || typeof body !== 'object' || Array.isArray(body)) {
+		return [400, 'text/plain', 'Uploaded data must be a JSON object'];
+	}
+
+	let obj = await getExistingObjectByKey(libraryID, key, kind);
+	let isUpdate = !!obj;
+
+	if (isUpdate) {
+		// Per-object version check
+		if (body.version !== undefined && body.version !== null) {
+			let expectedVersion = parseInt(body.version);
+			if (Number.isNaN(expectedVersion)) {
+				return [400, 'text/plain', 'Invalid version value'];
+			}
+			if (expectedVersion !== obj.clientVersion) {
+				return [
+					412,
+					'text/plain',
+					`${kind} version mismatch: expected ${expectedVersion}, found ${obj.clientVersion}`
+				];
+			}
+		}
+		else {
+			let header = requestData.headers.get('If-Unmodified-Since-Version');
+			if (header === null) {
+				return [428, 'text/plain', 'If-Unmodified-Since-Version not provided'];
+			}
+			let expectedVersion = parseInt(header);
+			if (Number.isNaN(expectedVersion) || expectedVersion < 0) {
+				return [400, 'text/plain', 'Invalid If-Unmodified-Since-Version value'];
+			}
+			if (obj.clientVersion > expectedVersion) {
+				return [
+					412,
+					'text/plain',
+					`${kind} has been modified since specified version `
+					+ `(expected ${expectedVersion}, found ${obj.clientVersion})`
+				];
+			}
+		}
+
+		if (isPatch) {
+			let existingJSON = obj.toJSON();
+			body = mergePatchJSON(existingJSON, body);
+		}
+	}
+	else {
+		if (!body.itemType && kind === 'item') {
+			return [400, 'text/plain', 'itemType property not provided'];
+		}
+		try {
+			obj = makeNewObject(libraryID, kind, body.itemType);
+			obj.key = key;
+		}
+		catch (e) {
+			if (e instanceof HTTPError) {
+				return [e.status, 'text/plain', e.message];
+			}
+			throw e;
+		}
+	}
+
+	try {
+		applyJSONToObject(obj, body, kind);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+
+	if (obj.hasChanged()) {
+		await obj.saveTx();
+	}
+
+	return [
+		204,
+		{ 'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion },
+		''
+	];
+}
+
+/**
+ * Multi-object DELETE (e.g. ?itemKey=KEY1,KEY2,...).
+ *
+ * `paramName` is the query parameter name ('itemKey', 'collectionKey', 'searchKey').
+ */
+async function deleteMultipleObjects(endpoint, requestData, kind, paramName) {
+	let { libraryID, searchParams } = requestData;
+
+	try {
+		endpoint._checkLibraryIfUnmodifiedSinceVersion(requestData, { required: true });
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+
+	let keys;
+	try {
+		keys = parseKeyList(searchParams, paramName);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+
+	for (let key of keys) {
+		let obj = await getExistingObjectByKey(libraryID, key, kind);
+		if (obj) {
+			await obj.eraseTx();
+		}
+	}
+
+	return [
+		204,
+		{ 'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion },
+		''
+	];
+}
+
+/**
+ * Single-object DELETE.
+ */
+async function deleteSingleObject(endpoint, requestData, kind) {
+	let { libraryID, pathParams } = requestData;
+	let key;
+	switch (kind) {
+		case 'item':
+			key = pathParams.itemKey;
+			break;
+		case 'collection':
+			key = pathParams.collectionKey;
+			break;
+		case 'search':
+			key = pathParams.searchKey;
+			break;
+		default:
+			throw new Error(`Unknown kind: ${kind}`);
+	}
+
+	try {
+		validateObjectKey(key);
+	}
+	catch (e) {
+		if (e instanceof HTTPError) {
+			return [e.status, 'text/plain', e.message];
+		}
+		throw e;
+	}
+
+	let obj = await getExistingObjectByKey(libraryID, key, kind);
+	if (!obj) {
+		return _404;
+	}
+
+	// Per-object version check: prefer If-Unmodified-Since-Version against the
+	// object's own clientVersion, falling back to library-level when checking
+	// the bare header against library version (which the base helper does).
+	let header = requestData.headers.get('If-Unmodified-Since-Version');
+	if (header === null) {
+		return [428, 'text/plain', 'If-Unmodified-Since-Version not provided'];
+	}
+	let expectedVersion = parseInt(header);
+	if (Number.isNaN(expectedVersion) || expectedVersion < 0) {
+		return [400, 'text/plain', 'Invalid If-Unmodified-Since-Version value'];
+	}
+	if (obj.clientVersion > expectedVersion) {
+		return [
+			412,
+			'text/plain',
+			`${kind} has been modified since specified version `
+			+ `(expected ${expectedVersion}, found ${obj.clientVersion})`
+		];
+	}
+
+	await obj.eraseTx();
+
+	return [
+		204,
+		{ 'Last-Modified-Version': Zotero.Libraries.get(libraryID).clientVersion },
+		''
+	];
+}
+
+/**
+ * Handle POST /items/:itemKey/file: either an authorize call (no `upload=`)
+ * or a register call (`upload=<uploadKey>`).
+ *
+ * Content-Type must be application/x-www-form-urlencoded per the web API spec.
+ */
+async function handleFileWrite(endpoint, requestData) {
+	let { libraryID, pathParams, data, headers } = requestData;
+
+	if (!data || typeof data !== 'object') {
+		return [400, 'text/plain', 'Content-Type must be application/x-www-form-urlencoded'];
+	}
+
+	let item = await Zotero.Items.getByLibraryAndKeyAsync(libraryID, pathParams.itemKey);
+	if (!item) return _404;
+	if (!item.isFileAttachment()) {
+		return [400, 'text/plain', `Not a file attachment: ${item.key}`];
+	}
+	let linkMode = item.attachmentLinkMode;
+	if (linkMode !== Zotero.Attachments.LINK_MODE_IMPORTED_FILE
+			&& linkMode !== Zotero.Attachments.LINK_MODE_IMPORTED_URL) {
+		return [400, 'text/plain', 'Cannot upload files for non-imported attachments'];
+	}
+	if (!Zotero.Libraries.get(libraryID).filesEditable) {
+		return [403, 'text/plain', 'File editing denied'];
+	}
+
+	// Register phase
+	if (data.upload !== undefined) {
+		return registerUpload(item, data, headers);
+	}
+
+	// Authorize phase
+	return authorizeUpload(item, data, headers, requestData);
+}
+
+/**
+ * Authorize a new file upload. Validates the request, then returns either
+ * {exists: 1} if the file already matches locally, or upload details with an
+ * uploadKey that the client uses to actually transmit the file bytes.
+ */
+async function authorizeUpload(item, params, headers, requestData) {
+	// Validate If-Match / If-None-Match
+	let ifMatch = headers.get('If-Match');
+	let ifNoneMatch = headers.get('If-None-Match');
+	if (!ifMatch && !ifNoneMatch) {
+		return [428, 'text/plain', 'If-Match/If-None-Match header not provided'];
+	}
+
+	// Current synced hash for this attachment, if any
+	let currentSyncedMD5 = item.attachmentSyncedHash || null;
+
+	if (ifMatch) {
+		let match = /^"?([a-f0-9]{32})"?$/.exec(ifMatch);
+		if (!match) {
+			return [400, 'text/plain', 'Invalid If-Match header'];
+		}
+		let expected = match[1];
+		if (!currentSyncedMD5) {
+			return [412, 'text/plain', 'If-Match set but file does not exist'];
+		}
+		if (currentSyncedMD5 !== expected) {
+			return [412, 'text/plain', 'ETag does not match current version of file'];
+		}
+	}
+	if (ifNoneMatch !== null) {
+		if (ifNoneMatch !== '*') {
+			return [400, 'text/plain', 'Invalid value for If-None-Match header'];
+		}
+		if (currentSyncedMD5) {
+			return [412, 'text/plain', 'If-None-Match: * set but file exists'];
+		}
+	}
+
+	// Validate form params
+	let md5 = params.md5;
+	if (!md5 || !/^[a-f0-9]{32}$/i.test(md5)) {
+		return [400, 'text/plain', 'MD5 hash not provided'];
+	}
+	md5 = md5.toLowerCase();
+	let filename = params.filename;
+	if (!filename) {
+		return [400, 'text/plain', 'File name not provided'];
+	}
+	// Reject anything that isn't a bare filename, since it's joined onto the storage
+	// directory path when the upload is received
+	if (filename.includes('/') || filename.includes('\\') || filename === '..' || filename === '.') {
+		return [400, 'text/plain', 'Invalid file name'];
+	}
+	let filesize = params.filesize;
+	if (filesize === undefined || filesize === null || filesize === '') {
+		return [400, 'text/plain', 'File size not provided'];
+	}
+	filesize = parseInt(filesize);
+	if (Number.isNaN(filesize) || filesize < 0) {
+		return [400, 'text/plain', 'Invalid file size value'];
+	}
+	if (filesize > 4 * 1024 * 1024 * 1024) {
+		return [400, 'text/plain', 'Files above 4 GB are not currently supported'];
+	}
+	let mtime = params.mtime;
+	if (mtime === undefined || mtime === null || mtime === '') {
+		return [400, 'text/plain', 'File modification time not provided'];
+	}
+	mtime = parseInt(mtime);
+	if (Number.isNaN(mtime) || mtime < 0) {
+		return [400, 'text/plain', 'Invalid mtime value'];
+	}
+	// Per the spec, mtime is in milliseconds; reject values that look like seconds.
+	if (mtime > 0 && mtime < 10000000000) {
+		return [400, 'text/plain', 'mtime must be provided in milliseconds, not seconds'];
+	}
+
+	// If the local file already matches the requested MD5, no upload is needed.
+	try {
+		let existingPath = await item.getFilePathAsync();
+		if (existingPath) {
+			let existingMD5 = await Zotero.Utilities.Internal.md5Async(existingPath);
+			if (existingMD5 === md5) {
+				// Persist the requested mtime so subsequent reads agree
+				item.attachmentSyncedHash = md5;
+				item.attachmentSyncedModificationTime = mtime;
+				await item.saveTx();
+				return [
+					200,
+					{ 'Content-Type': 'application/json' },
+					JSON.stringify({ exists: 1 })
+				];
+			}
+		}
+	}
+	catch (e) {
+		Zotero.debug(`File exists check failed: ${e.message}`, 2);
+	}
+
+	let contentType = params.contentType || item.attachmentContentType || 'application/octet-stream';
+
+	// Generate an uploadKey, remember the pending upload, return URL
+	pruneExpired(PENDING_UPLOADS);
+	let uploadKey = Zotero.Utilities.randomString(32);
+	PENDING_UPLOADS.set(uploadKey, {
+		libraryID: item.libraryID,
+		itemKey: item.key,
+		md5,
+		filename,
+		filesize,
+		mtime,
+		contentType,
+		charset: params.charset || item.attachmentCharset || null,
+		uploaded: false,
+		stagedPath: null,
+		expires: Date.now() + UPLOAD_KEY_TTL_SECONDS * 1000,
+	});
+
+	let host = requestData.headers.get('Host') || `localhost:${Zotero.Server.port}`;
+	let url = `http://${host}/api/local/uploads/${uploadKey}`;
+
+	// params=1 in the body requests the multipart upload form (vs. the default prefix/suffix)
+	if (String(params.params) === '1') {
+		return [
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				url,
+				uploadKey,
+				// In the web API, params holds S3 HTML form fields (key, policy, signature, etc.).
+				// There's no S3 locally, but we emit `key` so clients have something to iterate.
+				// The receiver ignores the returned values.
+				params: {
+					key: md5,
+				},
+			})
+		];
+	}
+
+	return [
+		200,
+		{ 'Content-Type': 'application/json' },
+		JSON.stringify({
+			url,
+			uploadKey,
+			contentType,
+			prefix: '',
+			suffix: '',
+		})
+	];
+}
+
+/**
+ * Register a previously-uploaded file (phase 3 of the upload flow).
+ * Moves the staged file into the attachment's storage directory and updates
+ * the attachment item with the new filename, md5, and mtime, then returns 204
+ * with the new library version.
+ */
+async function registerUpload(item, params, headers) {
+	pruneExpired(PENDING_UPLOADS);
+	let uploadKey = params.upload;
+	let upload = PENDING_UPLOADS.get(uploadKey);
+	if (!upload) {
+		return [400, 'text/plain', 'Invalid or expired upload key'];
+	}
+	if (upload.libraryID !== item.libraryID || upload.itemKey !== item.key) {
+		return [400, 'text/plain', 'Upload key does not match item'];
+	}
+	if (!upload.uploaded) {
+		return [400, 'text/plain', 'File contents were not uploaded'];
+	}
+
+	// Re-check If-Match / If-None-Match (the client repeats these in register)
+	let ifMatch = headers.get('If-Match');
+	let ifNoneMatch = headers.get('If-None-Match');
+	let currentSyncedMD5 = item.attachmentSyncedHash || null;
+	if (ifMatch) {
+		let m = /^"?([a-f0-9]{32})"?$/.exec(ifMatch);
+		if (!m || !currentSyncedMD5 || currentSyncedMD5 !== m[1]) {
+			await discardPendingUpload(uploadKey);
+			return [412, 'text/plain', 'ETag does not match current version of file'];
+		}
+	}
+	if (ifNoneMatch === '*' && currentSyncedMD5) {
+		await discardPendingUpload(uploadKey);
+		return [412, 'text/plain', 'If-None-Match: * set but file exists'];
+	}
+
+	// Preconditions passed, so move the staged file into the storage directory
+	let dir = Zotero.Attachments.getStorageDirectory(item);
+	await IOUtils.makeDirectory(dir.path, { ignoreExisting: true });
+	let destPath = PathUtils.join(dir.path, upload.filename);
+	await IOUtils.move(upload.stagedPath, destPath);
+
+	item.attachmentFilename = upload.filename;
+	item.attachmentSyncedHash = upload.md5;
+	item.attachmentSyncedModificationTime = upload.mtime;
+	if (upload.contentType) {
+		item.attachmentContentType = upload.contentType;
+	}
+	if (upload.charset) {
+		item.attachmentCharset = upload.charset;
+	}
+	await item.saveTx();
+
+	PENDING_UPLOADS.delete(uploadKey);
+
+	return [
+		204,
+		{ 'Last-Modified-Version': Zotero.Libraries.get(item.libraryID).clientVersion },
+		''
+	];
+}
+
+/**
+ * Apply a validated fulltext write to a single item. Returns the new library
+ * client version. Throws HTTPError(404) if the item is missing or isn't a file
+ * attachment, and HTTPError(400) if it isn't an indexable MIME type.
+ */
+async function storeItemFullText(libraryID, itemKey, body) {
+	let item = await Zotero.Items.getByLibraryAndKeyAsync(libraryID, itemKey);
+	if (!item || !item.isFileAttachment()) {
+		throw new HTTPError(404, 'Not found');
+	}
+	if (!Zotero.Fulltext.isCachedMIMEType(item.attachmentContentType)) {
+		throw new HTTPError(400, 'Full-text content is not supported for this item type');
+	}
+
+	let library = Zotero.Libraries.get(libraryID);
+	let newVersion = await Zotero.DB.executeTransaction(async () => library.incrementClientVersion());
+
+	await Zotero.Fulltext.setItemContent(libraryID, itemKey, {
+		content: body.content,
+		indexedChars: body.indexedChars,
+		totalChars: body.totalChars,
+		indexedPages: body.indexedPages,
+		totalPages: body.totalPages,
+	}, newVersion);
+	// setItemContent() queues the write via the background processor. Flush it now so the
+	// content is immediately visible to subsequent GETs.
+	await Zotero.Fulltext.indexSyncedContent(item.id);
+
+	return newVersion;
+}
+
+function pruneExpired(map) {
+	let now = Date.now();
+	for (let [k, v] of map) {
+		let expiry = typeof v === 'number' ? v : v.expires;
+		if (expiry && expiry < now) {
+			map.delete(k);
+			if (v.stagedPath) {
+				IOUtils.remove(v.stagedPath, { ignoreAbsent: true })
+					.catch(e => Zotero.logError(e));
+			}
+		}
+	}
+}
+
+/**
+ * Delete a pending upload, along with its staged file if the bytes were
+ * already received.
+ */
+async function discardPendingUpload(uploadKey) {
+	let upload = PENDING_UPLOADS.get(uploadKey);
+	PENDING_UPLOADS.delete(uploadKey);
+	if (upload && upload.stagedPath) {
+		await IOUtils.remove(upload.stagedPath, { ignoreAbsent: true });
+	}
+}
+
+class HTTPError extends Error {
+	constructor(status, message) {
+		super(message);
+		this.status = status;
+	}
+}
+
+/**
+ * Builder for the canonical multi-object write response shape.
+ *
+ * Implements dataserver's Zotero_Results (model/Results.inc.php):
+ *   {
+ *     "successful": { "<index>": <full response JSON object> },
+ *     "success":    { "<index>": "<objectKey>" },
+ *     "unchanged":  { "<index>": "<objectKey>" },
+ *     "failed":     { "<index>": { "key": "<objectKey>", "code": <int>, "message": "<str>" } }
+ *   }
+ */
+class MultiWriteResults {
+	constructor() {
+		this.successful = {};
+		this.success = {};
+		this.unchanged = {};
+		this.failed = {};
+	}
+
+	addSuccess(index, responseJSON) {
+		let i = String(index);
+		this.successful[i] = responseJSON;
+		this.success[i] = responseJSON.key;
+	}
+
+	addUnchanged(index, key) {
+		this.unchanged[String(index)] = key;
+	}
+
+	addFailure(index, key, codeOrError, message) {
+		let code;
+		let msg;
+		if (codeOrError instanceof HTTPError) {
+			code = codeOrError.status;
+			msg = codeOrError.message;
+		}
+		else if (codeOrError instanceof Error) {
+			code = 400;
+			msg = codeOrError.message;
+		}
+		else {
+			code = codeOrError;
+			msg = message;
+		}
+		this.failed[String(index)] = {
+			key: key || "",
+			code,
+			message: msg
+		};
+	}
+
+	toJSON() {
+		return {
+			successful: this.successful,
+			success: this.success,
+			unchanged: this.unchanged,
+			failed: this.failed,
+		};
+	}
+}
diff --git a/chrome/content/zotero/xpcom/session.js b/chrome/content/zotero/xpcom/session.js
index f96875e1d2..3e47a06d5d 100644
--- a/chrome/content/zotero/xpcom/session.js
+++ b/chrome/content/zotero/xpcom/session.js
@@ -30,6 +30,7 @@ Zotero.Session = new function () {
 	let _state = {
 		windows: []
 	};
+	let _initialized = false;
 
 	Zotero.defineProperty(this, 'state', {
 		get: () => {
@@ -48,6 +49,7 @@ Zotero.Session = new function () {
 				Zotero.logError(e);
 			}
 		}
+		_initialized = true;
 	};
 	
 	this.setLastClosedZoteroPaneState = function (state) {
@@ -59,6 +61,11 @@ Zotero.Session = new function () {
 	}, DEBOUNCED_SAVING_DELAY);
 
 	this.save = async function () {
+		// Don't overwrite the saved session if startup failed before the session was loaded
+		if (!_initialized) {
+			return;
+		}
+		
 		try {
 			// Saving is triggered in `zotero.js` when a quit event is received,
 			// though if it was triggered by closing a window, ZoteroPane might
diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js
index 29deaf3cae..2b3abaa5e8 100644
--- a/chrome/content/zotero/xpcom/storage.js
+++ b/chrome/content/zotero/xpcom/storage.js
@@ -111,8 +111,6 @@ Zotero.Sync.Storage = new function () {
 			_syncInProgress = false;
 		}
 		
-		Zotero.DB.rollbackAllTransactions();
-		
 		if (e) {
 			Zotero.debug(e, 1);
 		}
diff --git a/chrome/content/zotero/xpcom/storage/fileChangeWatcher.js b/chrome/content/zotero/xpcom/storage/fileChangeWatcher.js
index e4bdc7a8a1..37596caba1 100644
--- a/chrome/content/zotero/xpcom/storage/fileChangeWatcher.js
+++ b/chrome/content/zotero/xpcom/storage/fileChangeWatcher.js
@@ -34,6 +34,21 @@
  *   Windows -- ReadDirectoryChangesW (live recursive directory watch)
  *   Linux   -- inotify (live per-directory watches)
  *
+ * The storage directory is shared by all libraries, so backend events are drained once per sync
+ * session via snapshot(), which maps the changed item keys to items across all libraries and
+ * immediately runs the modification check on them, recording any changes in the database. The
+ * per-library storage engines then only need to ask needsFullScan() whether the watcher can be
+ * relied on for their library or a full scan is required -- because the library hasn't been
+ * scanned since a point where events may have been missed (watcher startup on the live-watcher
+ * platforms, or a backend fallback signal such as a missing event journal baseline, a buffer
+ * overflow, or an error). As insurance against silently dropped events, the live-watcher
+ * platforms also do a full scan on every manual sync and daily on background syncs.
+ *
+ * On macOS the set of libraries scanned since the last journal discontinuity is persisted to a
+ * pref, since the FSEvents journal survives restarts and full scans would otherwise be repeated
+ * (or, worse, skipped) after a restart. An absent pref means no library has been scanned, so
+ * every library gets one full scan the first time this code runs.
+ *
  * On unsupported platforms or on error, falls back to the existing scan logic.
  */
 Zotero.Sync.Storage.FileChangeWatcher = {
@@ -46,12 +61,20 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 	// Key validation pattern
 	_keyPattern: /^[A-Z0-9]{8}$/,
 
-	// For live watcher backends (RDCW and inotify), track whether the first call has happened
-	// (returns null to trigger a full scan) and enforce periodic full scans every
-	// _MAX_WATCHER_AGE ms
-	_liveWatcherFirstCall: true,
-	_liveWatcherLastFullScanTime: 0,
-	_MAX_WATCHER_AGE: 10800000, // 3 hours -- matches storageEngine.maxCheckAge
+	// Whether snapshot() has been called since init
+	_snapshotTaken: false,
+
+	// macOS: libraries fully scanned since the last event journal discontinuity (persisted)
+	_scannedLibraries: null,
+
+	// Windows/Linux: libraryID -> time of the last full scan this session
+	_lastFullScan: {},
+
+	_SCANNED_LIBRARIES_PREF: 'sync.storage.watcher.scannedLibraries',
+
+	// How long watcher results can be relied on for background syncs on the live-watcher
+	// platforms before a full scan is done as insurance against silently dropped events
+	_MAX_WATCHER_AGE: 86400000, // 24 hours
 
 	init() {
 		try {
@@ -75,6 +98,11 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 		let initFn;
 		let backendName;
 		if (Zotero.isMac) {
+			if (!this._storageRootIsLocalVolume()) {
+				Zotero.debug("FileChangeWatcher: Storage directory isn't on a local volume "
+					+ "-- falling back to scanning");
+				return;
+			}
 			initFn = '_initFSEvents';
 			backendName = 'fsevents';
 		}
@@ -101,14 +129,139 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 			Zotero.logError(e);
 			Zotero.debug("FileChangeWatcher: " + backendName + " init failed -- "
 				+ "falling back to legacy scanning");
+			return;
+		}
+
+		this._snapshotTaken = false;
+		this._lastFullScan = {};
+		this._loadScannedLibraries();
+	},
+
+	/**
+	 * Drain changed item keys from the backend, map them to items across all libraries, and run
+	 * the modification check on them, marking any changed files for upload in the database
+	 *
+	 * Called once per sync session, before the per-library storage engines run.
+	 */
+	async snapshot() {
+		if (!this.available) {
+			return;
+		}
+		this._snapshotTaken = true;
+		this._pruneScannedLibraries();
+		let keys;
+		try {
+			keys = this.getChangedItemKeys();
+		}
+		catch (e) {
+			Zotero.logError(e);
+			keys = null;
+		}
+		if (!keys) {
+			// Backend signaled fallback -- events may have been missed for any library, so
+			// require a full scan of each library
+			this._requireFullScans();
+			return;
+		}
+		if (!keys.size) {
+			return;
+		}
+		try {
+			// Map keys to items across all libraries -- a key can match items in multiple
+			// libraries, and checkForUpdatedFiles() filters out unchanged files by mtime/hash
+			let itemIDsByLibrary = {};
+			await Zotero.Utilities.Internal.forEachChunkAsync(
+				[...keys],
+				500,
+				async (chunk) => {
+					let rows = await Zotero.DB.queryAsync(
+						"SELECT libraryID, itemID FROM items WHERE key IN ("
+							+ chunk.map(() => '?').join(',') + ")",
+						chunk
+					);
+					for (let row of rows) {
+						if (!itemIDsByLibrary[row.libraryID]) {
+							itemIDsByLibrary[row.libraryID] = [];
+						}
+						itemIDsByLibrary[row.libraryID].push(row.itemID);
+					}
+				}
+			);
+			for (let libraryID in itemIDsByLibrary) {
+				await Zotero.Sync.Storage.Local.checkForUpdatedFiles(
+					parseInt(libraryID), itemIDsByLibrary[libraryID]
+				);
+			}
+		}
+		catch (e) {
+			// Don't lose changes if the check failed
+			Zotero.logError(e);
+			this._requireFullScans();
 		}
 	},
 
 	/**
-	 * Get the set of item keys whose storage files have changed since the last call to this method.
+	 * Whether a library needs a full modification scan instead of relying on watcher results
 	 *
-	 * @return {Set|null} Set of 8-char item keys, or null to signal that the caller should fall
-	 * back to a full scan
+	 * The caller should call recordFullScan() once the scan has completed.
+	 *
+	 * @param {Integer} libraryID
+	 * @param {Boolean} background - Whether this is a background sync -- on the live-watcher
+	 *     platforms, manual syncs always do a full scan as a user-triggered recovery mechanism
+	 * @return {Boolean}
+	 */
+	needsFullScan(libraryID, background) {
+		if (!this.available) {
+			return true;
+		}
+		let reason = null;
+		if (!this._snapshotTaken) {
+			reason = "no snapshot taken";
+		}
+		else if (this._backend == 'fsevents') {
+			if (!this._scannedLibraries.has(libraryID)) {
+				reason = "library not scanned since last event journal reset";
+			}
+		}
+		else if (!background) {
+			reason = "manual sync";
+		}
+		else {
+			let lastFullScan = this._lastFullScan[libraryID] || 0;
+			if (!lastFullScan) {
+				reason = "library not yet scanned this session";
+			}
+			else if (Date.now() - lastFullScan > this._MAX_WATCHER_AGE) {
+				reason = "daily refresh";
+			}
+		}
+		if (!reason) {
+			return false;
+		}
+		Zotero.debug("FileChangeWatcher: Full scan needed for library " + libraryID
+			+ " -- " + reason);
+		return true;
+	},
+
+	/**
+	 * Record that a full modification scan of a library was completed
+	 *
+	 * @param {Integer} libraryID
+	 */
+	recordFullScan(libraryID) {
+		this._lastFullScan[libraryID] = Date.now();
+		this._scannedLibraries.add(libraryID);
+		if (this._backend == 'fsevents') {
+			this._saveScannedLibraries();
+		}
+	},
+
+	/**
+	 * Drain the set of item keys whose storage files have changed since the last drain from the
+	 * platform backend
+	 *
+	 * @return {Set|null} Set of 8-char item keys, or null to signal that events may have been
+	 * missed and callers should fall back to full scans
 	 */
 	getChangedItemKeys() {
 		if (!this.available) {
@@ -125,8 +278,13 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 			}
 		}
 		catch (e) {
+			// A backend exception means the watcher can no longer be trusted (e.g., the
+			// inotify watch limit was reached), so disable it and let the legacy scan logic
+			// take over for the rest of the session
 			Zotero.logError(e);
-			Zotero.debug("FileChangeWatcher: getChangedItemKeys() failed -- signaling fallback");
+			Zotero.debug("FileChangeWatcher: getChangedItemKeys() failed -- disabling for "
+				+ "this session and falling back to legacy scanning");
+			this.close();
 		}
 		return null;
 	},
@@ -145,6 +303,7 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 		}
 		this._backend = null;
 		this.available = false;
+		this._snapshotTaken = false;
 	},
 
 	//
@@ -152,23 +311,57 @@ Zotero.Sync.Storage.FileChangeWatcher = {
 	//
 
 	/**
-	 * For live watcher backends (RDCW and inotify), check whether we should return null to
-	 * trigger a full scan (first call or periodic refresh).
-	 *
-	 * @return {boolean} true if getChangedItemKeys should return null
+	 * Remove scan records for libraries that no longer exist, both to keep the pref from
+	 * accumulating cruft and because SQLite can reuse the libraryID of a deleted library for a
+	 * new one, which shouldn't inherit the old library's scan record
 	 */
-	_liveWatcherNeedsFullScan() {
-		if (this._liveWatcherFirstCall) {
-			this._liveWatcherFirstCall = false;
-			this._liveWatcherLastFullScanTime = Date.now();
-			return true;
+	_pruneScannedLibraries() {
+		let libraryIDs = new Set(Zotero.Libraries.getAll().map(library => library.libraryID));
+		let pruned = false;
+		for (let libraryID of this._scannedLibraries) {
+			if (!libraryIDs.has(libraryID)) {
+				this._scannedLibraries.delete(libraryID);
+				pruned = true;
+			}
 		}
-		if (Date.now() - this._liveWatcherLastFullScanTime
-				> this._MAX_WATCHER_AGE) {
-			this._liveWatcherLastFullScanTime = Date.now();
-			return true;
+		for (let libraryID in this._lastFullScan) {
+			if (!libraryIDs.has(parseInt(libraryID))) {
+				delete this._lastFullScan[libraryID];
+			}
 		}
-		return false;
+		if (pruned && this._backend == 'fsevents') {
+			this._saveScannedLibraries();
+		}
+	},
+
+	_requireFullScans() {
+		this._scannedLibraries.clear();
+		this._lastFullScan = {};
+		if (this._backend == 'fsevents') {
+			this._saveScannedLibraries();
+		}
+	},
+
+	_loadScannedLibraries() {
+		this._scannedLibraries = new Set();
+		if (this._backend != 'fsevents') {
+			return;
+		}
+		try {
+			let scanned = Zotero.Prefs.get(this._SCANNED_LIBRARIES_PREF);
+			if (scanned) {
+				this._scannedLibraries = new Set(JSON.parse(scanned));
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
+		}
+	},
+
+	_saveScannedLibraries() {
+		Zotero.Prefs.set(
+			this._SCANNED_LIBRARIES_PREF, JSON.stringify([...this._scannedLibraries])
+		);
 	},
 
 	/**
diff --git a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_fsevents.js b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_fsevents.js
index a1052bfc84..cf79c9c9e5 100644
--- a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_fsevents.js
+++ b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_fsevents.js
@@ -56,6 +56,102 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 	_msg_id: null,
 	_msg_ptr: null,
 
+	/**
+	 * Look up the volume the storage directory is on
+	 *
+	 * @return {Object|false} - { flags, fsTypeName }, or false if it couldn't be determined
+	 */
+	_statfsStorageRoot() {
+		let { ctypes } = ChromeUtils.importESModule(
+			"resource://gre/modules/ctypes.sys.mjs"
+		);
+
+		const MFSTYPENAMELEN = 16;
+		const MAXPATHLEN = 1024;
+
+		let statfs_t = new ctypes.StructType("statfs", [
+			{ f_bsize: ctypes.uint32_t },
+			{ f_iosize: ctypes.int32_t },
+			{ f_blocks: ctypes.uint64_t },
+			{ f_bfree: ctypes.uint64_t },
+			{ f_bavail: ctypes.uint64_t },
+			{ f_files: ctypes.uint64_t },
+			{ f_ffree: ctypes.uint64_t },
+			{ f_fsid: ctypes.ArrayType(ctypes.int32_t, 2) },
+			{ f_owner: ctypes.uint32_t },
+			{ f_type: ctypes.uint32_t },
+			{ f_flags: ctypes.uint32_t },
+			{ f_fssubtype: ctypes.uint32_t },
+			{ f_fstypename: ctypes.ArrayType(ctypes.char, MFSTYPENAMELEN) },
+			{ f_mntonname: ctypes.ArrayType(ctypes.char, MAXPATHLEN) },
+			{ f_mntfromname: ctypes.ArrayType(ctypes.char, MAXPATHLEN) },
+			{ f_flags_ext: ctypes.uint32_t },
+			{ f_reserved: ctypes.ArrayType(ctypes.uint32_t, 7) }
+		]);
+
+		let lib;
+		try {
+			lib = ctypes.open("/usr/lib/libSystem.dylib");
+			let statfsFn;
+			// x86_64 keeps the 32-bit-inode statfs() under the plain name and the 64-bit-inode
+			// version under a suffixed symbol, while on arm64 statfs() is already 64-bit-inode
+			for (let symbol of ["statfs$INODE64", "statfs"]) {
+				try {
+					statfsFn = lib.declare(
+						symbol, ctypes.default_abi, ctypes.int,
+						ctypes.char.ptr, statfs_t.ptr
+					);
+					break;
+				}
+				catch (e) {
+					Zotero.debug("FileChangeWatcher: No " + symbol + "() symbol");
+				}
+			}
+			if (!statfsFn) {
+				throw new Error("statfs() not available");
+			}
+			let sb = statfs_t();
+			if (statfsFn(this._storageRoot, sb.address()) != 0) {
+				throw new Error("statfs() failed for " + this._storageRoot);
+			}
+			return {
+				flags: sb.f_flags,
+				fsTypeName: sb.f_fstypename.readString()
+			};
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return false;
+		}
+		finally {
+			if (lib) {
+				lib.close();
+			}
+		}
+	},
+
+	/**
+	 * Whether the storage directory is on a volume that FSEvents covers
+	 *
+	 * FSEvents is backed by a per-volume journal that only local volumes have. On a network
+	 * mount the stream is created and started successfully but never delivers any events, so
+	 * the watcher would report that nothing had changed for as long as it was used.
+	 */
+	_storageRootIsLocalVolume() {
+		const MNT_LOCAL = 0x00001000;
+
+		let info = this._statfsStorageRoot();
+		if (!info) {
+			return false;
+		}
+		if (!(info.flags & MNT_LOCAL)) {
+			Zotero.debug("FileChangeWatcher: Storage directory is on a " + info.fsTypeName
+				+ " volume, which FSEvents doesn't cover");
+			return false;
+		}
+		return true;
+	},
+
 	_initFSEvents() {
 		let { ctypes } = ChromeUtils.importESModule(
 			"resource://gre/modules/ctypes.sys.mjs"
@@ -198,20 +294,43 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 		}
 		let sinceEventId = ctypes.UInt64(savedIdStr);
 
+		// kFSEventStreamEventFlag flags indicating that events were dropped or coalesced,
+		// so changes may be missing from the replay
+		const MUST_SCAN_SUBDIRS = 0x01;
+		const USER_DROPPED = 0x02;
+		const KERNEL_DROPPED = 0x04;
+		const EVENT_IDS_WRAPPED = 0x08;
+		// Sentinel event marking the end of historical events -- not a file change
+		const HISTORY_DONE = 0x10;
+
 		let changedKeys = new Set();
+		let droppedEvents = false;
 		let storageRoot = this._storageRoot;
 		let keyPattern = this._keyPattern;
 
 		let callbackFn = this._FSEventStreamCallbackType.ptr(function (
 			_streamRef, _info, numEvents, eventPaths,
-			_eventFlags, _eventIds
+			eventFlags, _eventIds
 		) {
 			let n = Number(numEvents);
 			let StringArray = ctypes.ArrayType(ctypes.char.ptr, n);
 			let paths = ctypes.cast(
 				eventPaths, StringArray.ptr
 			).contents;
+			let FlagsArray = ctypes.ArrayType(ctypes.uint32_t, n);
+			let flags = ctypes.cast(
+				eventFlags, FlagsArray.ptr
+			).contents;
 			for (let i = 0; i < n; i++) {
+				let f = flags[i];
+				if (f & (MUST_SCAN_SUBDIRS | USER_DROPPED
+						| KERNEL_DROPPED | EVENT_IDS_WRAPPED)) {
+					droppedEvents = true;
+					continue;
+				}
+				if (f & HISTORY_DONE) {
+					continue;
+				}
 				let p = paths[i].readString();
 				if (!p.startsWith(storageRoot)) continue;
 				let relative = p.substring(storageRoot.length);
@@ -272,6 +391,14 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 			"sync.storage.watcher.fsEventsEventID", newEventId.toString()
 		);
 
+		if (droppedEvents) {
+			// The full scans triggered by the fallback cover everything up to now, so the
+			// advanced event ID baseline above remains valid
+			Zotero.debug("FileChangeWatcher: FSEvents reported dropped or coalesced events"
+				+ " -- signaling full scan");
+			return null;
+		}
+
 		return this._returnKeys(changedKeys);
 	},
 
diff --git a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_inotify.js b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_inotify.js
index 4f0e0ff076..f05d30806e 100644
--- a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_inotify.js
+++ b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_inotify.js
@@ -28,8 +28,9 @@
  * inotify backend for FileChangeWatcher (Linux)
  *
  * Like the Windows RDCW backend, inotify is a live watcher -- it only captures events from the
- * moment watches are set up. The first getChangedItemKeys() call returns null to trigger a full
- * scan. Periodic full scans every 3 hours ensure no changes are missed permanently.
+ * moment watches are set up, accumulating changes between getChangedItemKeys() calls. The core
+ * watcher compensates by requiring a full scan of each library after watcher startup and every
+ * 3 hours.
  *
  * Note: errno values are read from ctypes.errno, which Mozilla ctypes captures immediately after
  * each default_abi call. Using an explicit __errno_location() call would be unreliable because
@@ -124,7 +125,6 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 		this._inotifyWdToKey = new Map();
 		this._inotifyAccumulatedKeys = new Set();
 		this._inotifySubdirsSetUp = false;
-		this._liveWatcherFirstCall = true;
 	},
 
 	/**
@@ -150,9 +150,11 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 			);
 			if (wd < 0) {
 				if (ctypes.errno === this._ENOSPC) {
-					Zotero.debug("FileChangeWatcher: inotify watch limit reached after "
-						+ count + " directories -- some changes may be missed");
-					break;
+					// Watch coverage would be silently incomplete, so give up on the watcher
+					// entirely -- the thrown error makes the core watcher disable itself and
+					// fall back to legacy scanning
+					throw new Error("inotify watch limit reached after " + count
+						+ " directories");
 				}
 				continue;
 			}
@@ -270,18 +272,9 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 
 		let ok = this._inotifyDrainEvents();
 
-		// First call or periodic refresh -- signal full scan
-		if (this._liveWatcherNeedsFullScan()) {
-			Zotero.debug("FileChangeWatcher: Live watcher signaling full scan"
-				+ " (first call or periodic refresh)");
-			this._inotifyAccumulatedKeys.clear();
-			return null;
-		}
-
 		// Overflow -- signal full scan
 		if (!ok) {
 			this._inotifyAccumulatedKeys.clear();
-			this._liveWatcherLastFullScanTime = Date.now();
 			return null;
 		}
 
diff --git a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_rdcw.js b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_rdcw.js
index 97e2a13fe9..9dd252c710 100644
--- a/chrome/content/zotero/xpcom/storage/fileChangeWatcher_rdcw.js
+++ b/chrome/content/zotero/xpcom/storage/fileChangeWatcher_rdcw.js
@@ -31,9 +31,9 @@
  * Unlike the previous USN Change Journal backend, this works without admin privileges -- it only
  * needs read access to the storage directory itself.
  *
- * This is a live watcher (like inotify on Linux): the first getChangedItemKeys() call returns null
- * to trigger a full scan, then accumulates changes between calls. Periodic full scans every 3 hours
- * via _liveWatcherNeedsFullScan() ensure no changes are missed permanently.
+ * This is a live watcher (like inotify on Linux): it only captures events from the moment the
+ * watch is set up, accumulating changes between getChangedItemKeys() calls. The core watcher
+ * compensates by requiring a full scan of each library after watcher startup and every 3 hours.
  *
  * Approach -- overlapped I/O polling:
  *   1. Init: Open storage directory with FILE_FLAG_OVERLAPPED, create an event handle, issue the
@@ -202,7 +202,6 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 		this._overlapped.hEvent = this._eventHandle;
 
 		this._rdcwAccumulatedKeys = new Set();
-		this._liveWatcherFirstCall = true;
 
 		// ---- Issue first ReadDirectoryChangesW call ----
 
@@ -324,7 +323,6 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 						Zotero.debug("FileChangeWatcher: RDCW buffer overflow"
 							+ " -- signaling full scan");
 						this._rdcwAccumulatedKeys.clear();
-						this._liveWatcherLastFullScanTime = Date.now();
 						// Re-arm for future notifications
 						try {
 							this._rdcwArm();
@@ -349,7 +347,6 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 					Zotero.debug("FileChangeWatcher: RDCW returned 0 bytes"
 						+ " -- signaling full scan");
 					this._rdcwAccumulatedKeys.clear();
-					this._liveWatcherLastFullScanTime = Date.now();
 					try {
 						this._rdcwArm();
 					}
@@ -374,14 +371,6 @@ Object.assign(Zotero.Sync.Storage.FileChangeWatcher, {
 			}
 		}
 
-		// First call or periodic refresh -- signal full scan
-		if (this._liveWatcherNeedsFullScan()) {
-			Zotero.debug("FileChangeWatcher: Live watcher signaling full scan"
-				+ " (first call or periodic refresh)");
-			this._rdcwAccumulatedKeys.clear();
-			return null;
-		}
-
 		let keys = this._rdcwAccumulatedKeys;
 		this._rdcwAccumulatedKeys = new Set();
 		return this._returnKeys(keys);
diff --git a/chrome/content/zotero/xpcom/storage/storageEngine.js b/chrome/content/zotero/xpcom/storage/storageEngine.js
index 76ec88502a..615f55f5bd 100644
--- a/chrome/content/zotero/xpcom/storage/storageEngine.js
+++ b/chrome/content/zotero/xpcom/storage/storageEngine.js
@@ -146,38 +146,15 @@ Zotero.Sync.Storage.Engine.prototype.start = async function () {
 		Zotero.debug("No file editing access -- skipping file modification check for "
 			+ this.library.name);
 	}
-	// Use file change watcher to check only files that actually changed on disk
-	//
-	// Note: File-sync downloads also generate filesystem events, so recently downloaded files will
-	// appear here on the next sync cycle, but checkForUpdatedFiles() will see that the mtime/hash
-	// match the synced values and skip them.
+	// If the file change watcher is active, files that actually changed on disk were already
+	// checked and marked in the database when the sync runner took the watcher snapshot at the
+	// start of file syncing, so the scan can be skipped entirely unless this library needs a
+	// full scan (not yet scanned, watcher fallback, daily refresh, or manual sync)
 	else if (Zotero.Sync.Storage.FileChangeWatcher.available) {
-		let changedKeys = Zotero.Sync.Storage.FileChangeWatcher.getChangedItemKeys();
-		if (changedKeys) {
-			if (changedKeys.size > 0) {
-				let keysArray = Array.from(changedKeys);
-				let itemIDs = [];
-				// Batch to avoid hitting SQLite parameter limit
-				await Zotero.Utilities.Internal.forEachChunkAsync(
-					keysArray, 500, async function (chunk) {
-						let ids = await Zotero.DB.columnQueryAsync(
-							"SELECT itemID FROM items WHERE libraryID=? AND key IN ("
-								+ chunk.map(() => '?').join(',') + ")",
-							[libraryID, ...chunk]
-						);
-						itemIDs.push(...ids);
-					}
-				);
-				if (itemIDs.length) {
-					await this.local.checkForUpdatedFiles(libraryID, itemIDs);
-				}
-			}
-			// else: no changes detected, skip scan entirely
-		}
-		else {
-			// Watcher returned null (first run or error) -- full scan
+		if (Zotero.Sync.Storage.FileChangeWatcher.needsFullScan(libraryID, this.background)) {
 			this.local.lastFullFileCheck[libraryID] = new Date().getTime();
 			await this.local.checkForUpdatedFiles(libraryID);
+			Zotero.Sync.Storage.FileChangeWatcher.recordFullScan(libraryID);
 		}
 	}
 	// If this is a background sync, it's not the first sync of the session, the library has had
@@ -205,9 +182,11 @@ Zotero.Sync.Storage.Engine.prototype.start = async function () {
 	var downloadForced = await this.local.checkForForcedDownloads(libraryID);
 	
 	// If we don't have any forced downloads, we can skip downloads if no storage metadata has
-	// changed (meaning nothing else has uploaded files since the last successful file sync)
+	// changed (meaning nothing else has uploaded files since the last successful file sync) and
+	// nothing is already marked for download.
 	if (downloadAll && !downloadForced) {
-		if (this.library.storageVersion == this.library.libraryVersion) {
+		if (this.library.storageVersion == this.library.libraryVersion
+				&& !(await this.local.checkForPendingDownloads(libraryID))) {
 			Zotero.debug("No remote storage changes for " + this.library.name
 				+ " -- skipping file downloads");
 			downloadAll = false;
@@ -374,11 +353,15 @@ Zotero.Sync.Storage.Engine.prototype.queueItem = async function (item) {
 				+ item.libraryKey);
 	}
 	
-	if (type == 'upload') {
-		if (!((await item.fileExists()))) {
-			Zotero.debug("File " + item.libraryKey + " not available to upload -- skipping");
+	if (type == 'upload' && !(await item.fileExists())) {
+		Zotero.debug("File " + item.libraryKey + " not available to upload -- "
+			+ "marking for download");
+		await this.local.updateSyncStates([item], 'to_download');
+		if (!this.local.downloadOnSync(this.libraryID)) {
 			return;
 		}
+		type = 'download';
+		fn = 'downloadFile';
 	}
 	this.queues[type].add(() => {
 		var request = new Zotero.Sync.Storage.Request({
diff --git a/chrome/content/zotero/xpcom/storage/storageLocal.js b/chrome/content/zotero/xpcom/storage/storageLocal.js
index 518ec58303..d377168f26 100644
--- a/chrome/content/zotero/xpcom/storage/storageLocal.js
+++ b/chrome/content/zotero/xpcom/storage/storageLocal.js
@@ -289,8 +289,16 @@ Zotero.Sync.Storage.Local = {
 		var changed = false;
 		var statesToSet = {};
 		for (let item of items) {
-			// TODO: Catch error?
-			let state = await this._checkForUpdatedFile(item, attachmentData[item.id]);
+			let state;
+			try {
+				state = await this._checkForUpdatedFile(item, attachmentData[item.id]);
+			}
+			catch (e) {
+				// Don't let one broken attachment stop the rest of the library from syncing
+				Zotero.logError("Error checking attachment file for item " + item.libraryKey);
+				Zotero.logError(e);
+				continue;
+			}
 			if (state !== false) {
 				if (!statesToSet[state]) {
 					statesToSet[state] = [];
@@ -439,6 +447,18 @@ Zotero.Sync.Storage.Local = {
 	},
 	
 	
+	/**
+	 * Check for files already marked for download
+	 */
+	checkForPendingDownloads: async function (libraryID) {
+		var sql = "SELECT COUNT(*) FROM items JOIN itemAttachments USING (itemID) "
+			+ "WHERE libraryID=? AND syncState=?";
+		return !!((await Zotero.DB.valueQueryAsync(
+			sql, [libraryID, this.SYNC_STATE_TO_DOWNLOAD]
+		)));
+	},
+	
+	
 	/**
 	 * Get files marked as ready to download
 	 *
@@ -523,33 +543,42 @@ Zotero.Sync.Storage.Local = {
 	
 	
 	/**
-	 * Mark all stored files for upload checking
+	 * Mark all stored files for sync checking, with files that are missing locally marked for
+	 * download and the rest for upload
 	 *
-	 * This is used when switching between storage modes in the preferences so that all existing files
-	 * are uploaded via the new mode if necessary.
+	 * Used by "Reset File Sync History" and when switching between storage modes in the
+	 * preferences, so that all existing files are uploaded via the new mode if necessary.
 	 */
 	resetAllSyncStates: async function (libraryID) {
 		if (!libraryID) {
 			throw new Error("libraryID not provided");
 		}
 		
+		var sql = "SELECT itemID FROM items JOIN itemAttachments USING (itemID) "
+			+ "WHERE libraryID=? AND itemTypeID=? AND linkMode IN (?, ?, ?)";
+		var params = [
+			libraryID,
+			Zotero.ItemTypes.getID('attachment'),
+			Zotero.Attachments.LINK_MODE_IMPORTED_FILE,
+			Zotero.Attachments.LINK_MODE_IMPORTED_URL,
+			Zotero.Attachments.LINK_MODE_EMBEDDED_IMAGE,
+		];
+		var itemIDs = await Zotero.DB.columnQueryAsync(sql, params);
+		var items = await Zotero.Items.getAsync(itemIDs);
+		
+		var toUpload = [];
+		var toDownload = [];
+		for (let item of items) {
+			((await item.fileExists()) ? toUpload : toDownload).push(item);
+		}
+		
 		return Zotero.DB.executeTransaction(async function () {
-			var sql = "SELECT itemID FROM items JOIN itemAttachments USING (itemID) "
-				+ "WHERE libraryID=? AND itemTypeID=? AND linkMode IN (?, ?, ?)";
-			var params = [
-				libraryID,
-				Zotero.ItemTypes.getID('attachment'),
-				Zotero.Attachments.LINK_MODE_IMPORTED_FILE,
-				Zotero.Attachments.LINK_MODE_IMPORTED_URL,
-				Zotero.Attachments.LINK_MODE_EMBEDDED_IMAGE,
-			];
-			var itemIDs = await Zotero.DB.columnQueryAsync(sql, params);
-			for (let itemID of itemIDs) {
-				let item = Zotero.Items.get(itemID);
-				item._attachmentSyncState = this.SYNC_STATE_TO_UPLOAD;
+			if (toUpload.length) {
+				await this.updateSyncStates(toUpload, this.SYNC_STATE_TO_UPLOAD);
+			}
+			if (toDownload.length) {
+				await this.updateSyncStates(toDownload, this.SYNC_STATE_TO_DOWNLOAD);
 			}
-			sql = "UPDATE itemAttachments SET syncState=? WHERE itemID IN (" + sql + ")";
-			await Zotero.DB.queryAsync(sql, [this.SYNC_STATE_TO_UPLOAD].concat(params));
 			
 			var library = Zotero.Libraries.get(libraryID);
 			library.storageVersion = -1;
@@ -663,7 +692,14 @@ Zotero.Sync.Storage.Local = {
 			throw new Error("Downloaded file not found");
 		}
 		
-		await Zotero.Attachments.createDirectoryForItem(item);
+		try {
+			await Zotero.Attachments.createDirectoryForItem(item);
+		}
+		catch (e) {
+			Zotero.File.checkFileAccessError(
+				e, Zotero.Attachments.getStorageDirectory(item).path, 'create'
+			);
+		}
 		
 		var filename = item.attachmentFilename;
 		if (!filename) {
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index 263ac3bd52..bf844593d7 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -214,7 +214,8 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 	},
 
 	_loginManagerHost: 'chrome://zotero',
-	_loginManagerRealm: 'Zotero Storage Server',
+	_loginManagerRealm: 'Zotero Storage Server (encrypted)',
+	_loginManagerRealmLegacy: 'Zotero Storage Server',
 	
 	
 	get defaultError() {
@@ -238,14 +239,64 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 		}
 		
 		Zotero.debug('Getting WebDAV password');
+		
+		// Prefer the legacy realm during the transition window: an older version
+		// may have written a fresh value there after we migrated. Mirror it to
+		// the encrypted realm but keep the legacy entry so a downgrade can still
+		// read it. The legacy realm will be cleared in a future version once
+		// downgrades are unlikely.
+		var legacyLogins = await Services.logins.searchLoginsAsync({
+			origin: this._loginManagerHost,
+			httpRealm: this._loginManagerRealmLegacy,
+		});
+		for (let i = 0; i < legacyLogins.length; i++) {
+			if (legacyLogins[i].username == username) {
+				let password = legacyLogins[i].password;
+				if (!this._mirroredPassword) {
+					try {
+						Zotero.debug("Mirroring plaintext WebDAV password to encrypted storage");
+						await this._writeEncryptedPassword(username, password);
+						this._mirroredPassword = true;
+					}
+					catch (e) {
+						Zotero.logError(e);
+						if (!Zotero.Sync.Runner.backgroundSync) {
+							if (Zotero.OSKeyStore.isKeyStoreError(e)) {
+								Zotero.OSKeyStore.alertMigrateFailed();
+							}
+							else {
+								await Zotero.Sync.Data.Local.alertLoginManagerCorrupted();
+							}
+						}
+					}
+				}
+				return password;
+			}
+		}
+		
 		var logins = await Services.logins.searchLoginsAsync({
 			origin: this._loginManagerHost,
 			httpRealm: this._loginManagerRealm,
 		});
-		// Find user from returned array of nsILoginInfo objects
 		for (var i = 0; i < logins.length; i++) {
 			if (logins[i].username == username) {
-				return logins[i].password;
+				let password = logins[i].password;
+				if (Zotero.OSKeyStore.isEncrypted(password)) {
+					return Zotero.OSKeyStore.decrypt(password);
+				}
+				// Password stored without encryption after a failed write -- encrypt it now,
+				// in case the keystore has since become usable
+				if (!this._reencryptedPassword) {
+					this._reencryptedPassword = true;
+					try {
+						Zotero.debug("Encrypting unencrypted WebDAV password");
+						await this._writeEncryptedPassword(username, password);
+					}
+					catch (e) {
+						Zotero.logError(e);
+					}
+				}
+				return password;
 			}
 		}
 		
@@ -270,22 +321,37 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 			return;
 		}
 		
-		if (password == (await this.getPassword())) {
-			Zotero.debug("WebDAV password hasn't changed");
-			return;
+		// Skip the write if the password hasn't changed. This is an optimization,
+		// not a correctness requirement -- if we can't read the existing value
+		// (e.g. keychain locked), proceed with the write anyway.
+		try {
+			if (password == (await this.getPassword())) {
+				Zotero.debug("WebDAV password hasn't changed");
+				return;
+			}
+		}
+		catch (e) {
+			Zotero.logError(e);
 		}
 		
 		this._basicAuthHeader = false;
 		this._digestParams = null;
 
+		await this._savePassword(username, password);
+		
+		// Drop any leftover plaintext entry from the legacy realm
 		var logins = await Services.logins.searchLoginsAsync({
 			origin: this._loginManagerHost,
-			httpRealm: this._loginManagerRealm
+			httpRealm: this._loginManagerRealmLegacy
 		});
-		for (var i = 0; i < logins.length; i++) {
-			Zotero.debug('Clearing WebDAV passwords');
-			if (logins[i].httpRealm == this._loginManagerRealm) {
-				Services.logins.removeLogin(logins[i]);
+		for (let i = 0; i < logins.length; i++) {
+			if (logins[i].httpRealm == this._loginManagerRealmLegacy) {
+				try {
+					await Services.logins.removeLoginAsync(logins[i]);
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
 			}
 			break;
 		}
@@ -298,7 +364,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 			Zotero.debug('Clearing old WebDAV passwords');
 			if (logins[i].formSubmitURL == "Zotero Storage Server") {
 				try {
-					Services.logins.removeLogin(logins[i]);
+					await Services.logins.removeLoginAsync(logins[i]);
 				}
 				catch (e) {
 					Zotero.logError(e);
@@ -306,13 +372,72 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
 			}
 			break;
 		}
+	},
+	
+	/**
+	 * Store the password, retrying after a login manager repair and, if the keystore still
+	 * can't be used, offering to store the password without it
+	 */
+	async _savePassword(username, password) {
+		var error;
+		try {
+			await this._writeEncryptedPassword(username, password);
+			return;
+		}
+		catch (e) {
+			Zotero.logError(e);
+			error = e;
+		}
+		// If the write failed because the key database was unusable, reset the login manager
+		// and retry
+		if (await Zotero.Sync.Data.Local.repairLoginManager()) {
+			try {
+				await this._writeEncryptedPassword(username, password);
+				return;
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+		}
+		// The login manager can fail to store a value even when the keystore works -- e.g., if
+		// the key database is read-only -- and storing the password unencrypted wouldn't help
+		if (!Zotero.OSKeyStore.isKeyStoreError(error)) {
+			await Zotero.Sync.Data.Local.alertLoginManagerCorrupted();
+			throw error;
+		}
+		// A password that would read back as ciphertext can't be stored unencrypted
+		if (Zotero.OSKeyStore.isEncrypted(password)) {
+			throw error;
+		}
+		if (!Zotero.OSKeyStore.confirmUnencryptedFallback()) {
+			throw error;
+		}
+		await this._writePassword(username, password);
+		// The keystore is unusable, so don't try to encrypt again on the next read
+		this._reencryptedPassword = true;
+	},
+	
+	async _writeEncryptedPassword(username, password) {
+		await this._writePassword(username, password && await Zotero.OSKeyStore.encrypt(password));
+	},
+	
+	async _writePassword(username, storedValue) {
+		// Remove any existing entries in the encrypted realm for this user
+		var logins = await Services.logins.searchLoginsAsync({
+			origin: this._loginManagerHost,
+			httpRealm: this._loginManagerRealm
+		});
+		for (let i = 0; i < logins.length; i++) {
+			if (logins[i].username == username) {
+				await Services.logins.removeLoginAsync(logins[i]);
+			}
+		}
 		
-		if (password) {
-			Zotero.debug('Setting WebDAV password');
-			var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
+		if (storedValue) {
+			let nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
 				Components.interfaces.nsILoginInfo, "init");
-			var loginInfo = new nsLoginInfo(this._loginManagerHost, null,
-				this._loginManagerRealm, username, password, "", "");
+			let loginInfo = new nsLoginInfo(this._loginManagerHost, null,
+				this._loginManagerRealm, username, storedValue, "", "");
 			await Services.logins.addLoginAsync(loginInfo);
 		}
 	},
diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js
index 83e9a53407..3cb6ff6282 100644
--- a/chrome/content/zotero/xpcom/style.js
+++ b/chrome/content/zotero/xpcom/style.js
@@ -55,10 +55,6 @@ Zotero.Styles = new function () {
 	 * Initializes styles cache, loading metadata for styles into memory
 	 */
 	this.init = async function (options = {}) {
-		if (Zotero.Prefs.get('cite.useCiteprocRs')) {
-			await Zotero.CiteprocRs.init();
-		}
-		
 		// Wait until bundled files have been updated, except when this is called by the schema update
 		// code itself
 		if (!options.fromSchemaUpdate) {
@@ -532,9 +528,31 @@ Zotero.Styles = new function () {
 		};
 	};
 	
+	/**
+	 * Resolve a locale to one with an available CSL locale, using the primary
+	 * dialect of the language or the closest available locale (e.g.,
+	 * 'sr-Cyrl-RS' for 'sr-RS') if the exact locale isn't available
+	 *
+	 * @param {String} locale
+	 * @return {String} The resolved locale, or the passed locale if it can't
+	 *     be resolved
+	 */
+	this.resolveLocale = function (locale) {
+		if (!_initialized || !locale) {
+			return locale;
+		}
+		if (locale in Zotero.Styles.locales) {
+			return locale;
+		}
+		return Zotero.Styles.primaryDialects[locale]
+			|| Zotero.Utilities.Internal.resolveLocale(
+				locale, Object.keys(Zotero.Styles.locales), { silent: true })
+			|| locale;
+	};
+
 	/**
 	 * Populate menulist with locales
-	 * 
+	 *
 	 * @param {xul:menulist} menulist
 	 */
 	this.populateLocaleList = function (menulist) {
@@ -546,8 +564,7 @@ Zotero.Styles = new function () {
 		menulist.selectedItem = null;
 		menulist.removeAllItems();
 		
-		let fallbackLocale = Zotero.Styles.primaryDialects[Zotero.locale]
-			|| Zotero.locale;
+		let fallbackLocale = Zotero.Styles.resolveLocale(Zotero.locale);
 		
 		let menuLocales = Zotero.Utilities.deepCopy(Zotero.Styles.locales);
 		let menuLocalesKeys = Object.keys(menuLocales).sort();
@@ -618,7 +635,7 @@ Zotero.Styles = new function () {
 		if (menulist.labelElement) menulist.labelElement.disabled = false;
 		
 		let selectLocale = style.effectiveLocale || prefLocale || Zotero.locale;
-		selectLocale = Zotero.Styles.primaryDialects[selectLocale] || selectLocale;
+		selectLocale = Zotero.Styles.resolveLocale(selectLocale);
 		
 		// Make sure the locale we want to select is in the menulist
 		if (availableLocales.indexOf(selectLocale) == -1) {
@@ -755,12 +772,10 @@ Zotero.Style.prototype.getCiteProc = function (locale, format, options = {}) {
 	format = format || 'text';
 	automaticJournalAbbreviations = !!automaticJournalAbbreviations;
 
-	let useCiteprocRs = Zotero.Prefs.get('cite.useCiteprocRs');
-	
-	// We can cache the Engine instance if we aren't using citeproc-rs
-	// and this is an installed style. The output format is excluded from
-	// the cache key because setOutputFormat() can switch it cheaply.
-	let cacheKey = cache && !useCiteprocRs && this.path
+	// We can cache the Engine instance if this is an installed style. The output
+	// format is excluded from the cache key because setOutputFormat() can switch
+	// it cheaply.
+	let cacheKey = cache && this.path
 		? JSON.stringify({ locale, automaticJournalAbbreviations })
 		: null;
 	if (cacheKey && this._cachedEngines.has(cacheKey)) {
@@ -824,8 +839,11 @@ Zotero.Style.prototype.getCiteProc = function (locale, format, options = {}) {
 		let styleDOMXML = new DOMParser()
 			.parseFromString(this.getXML(), "text/xml");
 		
-		// apply XSLT and serialize output
-		let newDOMXML = Zotero.Styles.xsltProcessor.transformToDocument(styleDOMXML);
+		// apply XSLT and serialize output. transformToFragment() is used because
+		// transformToDocument() needs a load group, which it takes from the source
+		// document or from the window that created the processor, and there's
+		// neither here.
+		let newDOMXML = Zotero.Styles.xsltProcessor.transformToFragment(styleDOMXML, styleDOMXML);
 		var xml = new XMLSerializer().serializeToString(newDOMXML);
 	} else {
 		var xml = this.getXML();
@@ -834,44 +852,24 @@ Zotero.Style.prototype.getCiteProc = function (locale, format, options = {}) {
 	xml = this._eventToEventTitle(xml);
 	
 	try {
-		var citeproc;
-		var engineDesc;
-		if (useCiteprocRs) {
-			citeproc = new Zotero.CiteprocRs.Engine(
-				new Zotero.Cite.System({
-					automaticJournalAbbreviations,
-					uppercaseSubtitles: uppercaseSubtitles
-				}),
-				this,
-				xml,
-				locale,
-				format == 'text' ? 'plain' : format,
-				overrideLocale
-			);
-			engineDesc = 'CiteprocRs';
-		}
-		else {
-			citeproc = new Zotero.CiteProc.CSL.Engine(
-				new Zotero.Cite.System({
-					automaticJournalAbbreviations,
-					uppercaseSubtitles
-				}),
-				xml,
-				locale,
-				overrideLocale
-			);
-			citeproc.setOutputFormat(format);
-			citeproc.free = () => 0;
-			citeproc.opt.development_extensions.wrap_url_and_doi = true;
-			// Don't try to parse author names. We parse them in itemToCSLJSON
-			citeproc.opt.development_extensions.parse_names = false;
-			engineDesc = 'CSL';
-		}
+		var citeproc = new Zotero.CiteProc.CSL.Engine(
+			new Zotero.Cite.System({
+				automaticJournalAbbreviations,
+				uppercaseSubtitles
+			}),
+			xml,
+			locale,
+			overrideLocale
+		);
+		citeproc.setOutputFormat(format);
+		citeproc.opt.development_extensions.wrap_url_and_doi = true;
+		// Don't try to parse author names. We parse them in itemToCSLJSON
+		citeproc.opt.development_extensions.parse_names = false;
 		
 		// Cache the Engine instance if allowed
 		if (cacheKey) {
 			this._cachedEngines.set(cacheKey, citeproc);
-			Zotero.debug(`Cached ${engineDesc}.Engine instance with ${cacheKey} for ${this.styleID}`);
+			Zotero.debug(`Cached CSL.Engine instance with ${cacheKey} for ${this.styleID}`);
 		}
 
 		return citeproc;
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index 0ec88740ed..bebeb60750 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -180,7 +180,6 @@ Zotero.Sync.Server = new function () {
 					var ids = Zotero.DB.columnQuery(sql, [Zotero.Attachments.LINK_MODE_IMPORTED_FILE, Zotero.Attachments.LINK_MODE_IMPORTED_URL]);
 					if (ids) {
 						var items = Zotero.Items.get(ids);
-						var rolledBack = false;
 						for (let item of items) {
 							var file = item.getFile();
 							if (!file) {
@@ -191,9 +190,6 @@ Zotero.Sync.Server = new function () {
 								// TODO: move stripping logic (copied from _xmlize()) to Utilities
 								var xmlfn = file.leafName.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, '');
 								if (fn != xmlfn) {
-									if (!rolledBack) {
-										Zotero.DB.rollbackAllTransactions();
-									}
 									Zotero.debug("Changing invalid filename to " + xmlfn);
 									item.renameAttachmentFile(xmlfn);
 								}
diff --git a/chrome/content/zotero/xpcom/sync/syncAPIClient.js b/chrome/content/zotero/xpcom/sync/syncAPIClient.js
index 3af3766464..5931e41d90 100644
--- a/chrome/content/zotero/xpcom/sync/syncAPIClient.js
+++ b/chrome/content/zotero/xpcom/sync/syncAPIClient.js
@@ -672,13 +672,16 @@ Zotero.Sync.APIClient.prototype = {
 		let method;
 		let url;
 		let options = {
-			responseType: "blob",
+			// Could be audio bytes or a JSON { audioURL, timestamps } object
+			// Inspect the Content-Type before parsing
+			responseType: "arraybuffer",
 			errorDelayMax: 8000,
 		};
 		if (segment === 'sample') {
 			method = "GET";
 			let params = new URLSearchParams();
 			params.set('voice', voiceID);
+			params.set('timestamps', '1');
 			url = this.baseURL + "tts/sample?" + params;
 			options.noAPIKey = true;
 		}
@@ -691,18 +694,36 @@ Zotero.Sync.APIClient.prototype = {
 			options.body = JSON.stringify({
 				voice: voiceID,
 				text: segment.text,
+				timestamps: 1,
 			});
 		}
 		try {
 			let xmlhttp = await this.makeRequest(method, url, options);
-			return { audio: xmlhttp.response };
+			let contentType = xmlhttp.getResponseHeader('Content-Type') || '';
+			let cacheControl = xmlhttp.getResponseHeader('Cache-Control') || '';
+			let noStore = /(?:^|,)\s*no-store\s*(?:,|$)/i.test(cacheControl);
+			if (contentType.includes('application/json')) {
+				let json = JSON.parse(new TextDecoder().decode(xmlhttp.response));
+				let audioResponse = await Zotero.HTTP.request('GET', json.audioURL, {
+					responseType: "blob",
+					errorDelayMax: 8000,
+				});
+				return { audio: audioResponse.response, timestamps: json.timestamps, noStore };
+			}
+			return { audio: new Blob([xmlhttp.response], { type: contentType }), noStore };
 		}
 		catch (e) {
 			Zotero.logError(e);
 
 			let error;
 			if (e instanceof Zotero.HTTP.UnexpectedStatusException && e.status === 402) {
-				let body = await e.xmlhttp.response?.text();
+				let body = null;
+				try {
+					body = new TextDecoder().decode(e.xmlhttp.response);
+				}
+				catch {
+					// Ignore
+				}
 				error = body === 'daily_limit_exceeded' ? 'daily-limit-exceeded' : 'quota-exceeded';
 			}
 			else if (e instanceof Zotero.HTTP.BrowserOfflineException) {
diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
index 3c939a7cc9..8e2b10d610 100644
--- a/chrome/content/zotero/xpcom/sync/syncEngine.js
+++ b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -804,6 +804,7 @@ Zotero.Sync.Data.Engine.prototype._restoreRestoredCollectionItems = async functi
 					if (o.deleted) {
 						o.deleted = false
 						await o.saveTx();
+						Zotero.Sync.Data.Local.markRemoteChangesApplied();
 					}
 				}
 				else {
@@ -816,6 +817,7 @@ Zotero.Sync.Data.Engine.prototype._restoreRestoredCollectionItems = async functi
 					+ `to restored collection ${collection.libraryKey}`);
 				await Zotero.DB.executeTransaction(async function () {
 					await collection.addItems(addToCollection);
+					Zotero.Sync.Data.Local.markRemoteChangesApplied();
 				}.bind(this));
 			}
 			if (addToQueue.length) {
@@ -911,6 +913,7 @@ Zotero.Sync.Data.Engine.prototype._downloadDeletions = async function (since, ne
 					await obj.eraseTx({
 						skipDeleteLog: true
 					});
+					Zotero.Sync.Data.Local.markRemoteChangesApplied();
 					continue;
 				}
 				conflicts.push({
@@ -960,12 +963,13 @@ Zotero.Sync.Data.Engine.prototype._downloadDeletions = async function (since, ne
 							await obj.erase({
 								skipEditCheck: true
 							});
+							Zotero.Sync.Data.Local.markRemoteChangesApplied();
 						}
 					}.bind(this));
 				}.bind(this)
 			);
 		}
-		
+
 		if (toDelete.length) {
 			await Zotero.Utilities.Internal.forEachChunkAsync(
 				toDelete,
@@ -977,6 +981,7 @@ Zotero.Sync.Data.Engine.prototype._downloadDeletions = async function (since, ne
 								skipEditCheck: true,
 								skipDeleteLog: true
 							});
+							Zotero.Sync.Data.Local.markRemoteChangesApplied();
 						}
 					});
 				}
@@ -1423,7 +1428,7 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = async function (objectType, i
 						// in batches and we only get the final version, but it will guarantee that
 						// the object won't be redownloaded unnecessarily in the case of a full sync,
 						// because the version will be higher than whatever version is on the server.
-						let hasCacheObject = !!Zotero.Sync.Data.Local.getCacheObject(
+						let hasCacheObject = !!await Zotero.Sync.Data.Local.getCacheObject(
 							objectType, obj.libraryID, obj.key, obj.version
 						);
 						if (!hasCacheObject) {
diff --git a/chrome/content/zotero/xpcom/sync/syncEventListeners.js b/chrome/content/zotero/xpcom/sync/syncEventListeners.js
index 0ca39e6318..978bac7f18 100644
--- a/chrome/content/zotero/xpcom/sync/syncEventListeners.js
+++ b/chrome/content/zotero/xpcom/sync/syncEventListeners.js
@@ -331,7 +331,7 @@ Zotero.Sync.EventListeners.StorageFileOpenListener = {
 	},
 	
 	notify: function (event, type, ids, extraData) {
-		if (event == 'open' && type == 'file') {
+		if ((event == 'open' || event == 'reveal') && type == 'file') {
 			let timestamp = new Date().getTime();
 			
 			for (let i = 0; i < ids.length; i++) {
diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js
index d5a50384fd..d54a113675 100644
--- a/chrome/content/zotero/xpcom/sync/syncLocal.js
+++ b/chrome/content/zotero/xpcom/sync/syncLocal.js
@@ -30,57 +30,213 @@ if (!Zotero.Sync.Data) {
 Zotero.Sync.Data.Local = {
 	_syncQueueIntervals: [0.5, 1, 4, 16, 16, 16, 16, 16, 16, 16, 64], // hours
 	_loginManagerHost: 'chrome://zotero',
-	_loginManagerRealm: 'Zotero Web API',
+	_loginManagerRealm: 'Zotero Web API (encrypted)',
+	_loginManagerRealmLegacy: 'Zotero Web API',
 	_lastSyncTime: null,
 	_lastClassicSyncTime: null,
-	
+	// Cached hasCredentials() result, for the synchronous Zotero.Sync.Runner.enabled getter
+	_hasCredentials: false,
+	// Item/Collection-only -- synced settings can't affect the undo stack
+	_remoteChangesApplied: false,
+
+	get remoteChangesApplied() {
+		return this._remoteChangesApplied;
+	},
+
+	resetRemoteChangesApplied: function () {
+		this._remoteChangesApplied = false;
+	},
+
+	markRemoteChangesApplied: function () {
+		this._remoteChangesApplied = true;
+	},
+
 	init: async function () {
 		await this._loadLastSyncTime();
 		if (!_lastSyncTime) {
 			await this._loadLastClassicSyncTime();
 		}
+		await this.hasCredentials();
 	},
 	
 	
 	/**
 	 * @return {Promise}
 	 */
-	getAPIKey: function () {
-		var login = this._getAPIKeyLoginInfo();
-		return login
-			? login.password
-			// Fallback to old username/password
-			: this._getAPIKeyFromLogin();
+	getAPIKey: async function () {
+		// Prefer the legacy realm during the transition window: an older version
+		// may have written a fresh value there after we migrated, and we want
+		// to use the most recent value. Mirror it to the encrypted realm but
+		// keep the legacy entry so a downgrade can still read it. The legacy
+		// realm will be cleared in a future version once downgrades are
+		// unlikely.
+		var legacyLogin = await this._getLegacyAPIKeyLoginInfo();
+		if (legacyLogin) {
+			let apiKey = legacyLogin.password;
+			if (!this._mirroredAPIKey) {
+				try {
+					Zotero.debug("Mirroring plaintext API key to encrypted storage");
+					await this._writeEncryptedAPIKey(apiKey);
+					this._mirroredAPIKey = true;
+				}
+				catch (e) {
+					Zotero.logError(e);
+					if (!Zotero.Sync.Runner.backgroundSync) {
+						if (Zotero.OSKeyStore.isKeyStoreError(e)) {
+							Zotero.OSKeyStore.alertMigrateFailed();
+						}
+						else {
+							await this.alertLoginManagerCorrupted();
+						}
+					}
+				}
+			}
+			return apiKey;
+		}
+		var login = await this._getAPIKeyLoginInfo();
+		if (login) {
+			if (Zotero.OSKeyStore.isEncrypted(login.password)) {
+				return Zotero.OSKeyStore.decrypt(login.password);
+			}
+			// Key stored without encryption after a failed write -- encrypt it now, in case
+			// the keystore has since become usable
+			if (!this._reencryptedAPIKey) {
+				this._reencryptedAPIKey = true;
+				try {
+					Zotero.debug("Encrypting unencrypted API key");
+					await this._writeEncryptedAPIKey(login.password);
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+			}
+			return login.password;
+		}
+		// If the login manager had to be reset, the stored API key is gone, so tell the user
+		// to log in again
+		if (this._loginManagerRepaired && !this._loginManagerRepairAlertShown) {
+			this._loginManagerRepairAlertShown = true;
+			Zotero.alert(
+				null,
+				Zotero.getString('general-error'),
+				Zotero.getString('login-manager-reset')
+			);
+		}
+		// Fallback to old username/password
+		return this._getAPIKeyFromLogin();
 	},
 	
 	
 	/**
 	 * Check for an API key or a legacy username/password (which may or may not be valid)
+	 *
+	 * @return {Promise<Boolean>}
 	 */
-	hasCredentials: function () {
-		var login = this._getAPIKeyLoginInfo();
-		if (login) {
+	hasCredentials: async function () {
+		this._hasCredentials = await this._checkCredentials();
+		return this._hasCredentials;
+	},
+	
+	
+	/**
+	 * The result of the last hasCredentials() call, for callers that can't await
+	 *
+	 * @return {Boolean}
+	 */
+	get hasCachedCredentials() {
+		return this._hasCredentials;
+	},
+	
+	
+	_checkCredentials: async function () {
+		if ((await this._getAPIKeyLoginInfo()) || (await this._getLegacyAPIKeyLoginInfo())) {
 			return true;
 		}
 		// If no API key, check for legacy login
 		var username = Zotero.Prefs.get('sync.server.username');
-		return username && !!this.getLegacyPassword(username)
+		return !!username && !!(await this.getLegacyPassword(username));
 	},
 	
 	
 	setAPIKey: async function (apiKey) {
-		var oldLoginInfo = this._getAPIKeyLoginInfo();
+		var oldLoginInfo = await this._getAPIKeyLoginInfo();
+		var legacyLoginInfo = await this._getLegacyAPIKeyLoginInfo();
 		
 		// Clear old login
 		if ((!apiKey || apiKey === "")) {
 			if (oldLoginInfo) {
 				Zotero.debug("Clearing old API key");
-				Services.logins.removeLogin(oldLoginInfo);
+				await Services.logins.removeLoginAsync(oldLoginInfo);
 			}
+			if (legacyLoginInfo) {
+				await Services.logins.removeLoginAsync(legacyLoginInfo);
+			}
+			this._hasCredentials = false;
 			Zotero.Notifier.trigger('delete', 'api-key', []);
 			return;
 		}
 		
+		await this._saveAPIKey(apiKey);
+		// Drop any leftover plaintext entry from the legacy realm
+		if (legacyLoginInfo) {
+			await Services.logins.removeLoginAsync(legacyLoginInfo);
+		}
+		this._hasCredentials = true;
+		Zotero.Notifier.trigger('modify', 'api-key', []);
+	},
+	
+	
+	/**
+	 * Store the API key, retrying after a login manager repair and, if the keystore still
+	 * can't be used, offering to store the key without it
+	 */
+	_saveAPIKey: async function (apiKey) {
+		var error;
+		try {
+			await this._writeEncryptedAPIKey(apiKey);
+			return;
+		}
+		catch (e) {
+			Zotero.logError(e);
+			error = e;
+		}
+		// If the write failed because the key database was unusable, reset the login manager
+		// and retry, so that logging in works without a manual fix
+		if (await this.repairLoginManager()) {
+			try {
+				await this._writeEncryptedAPIKey(apiKey);
+				return;
+			}
+			catch (e) {
+				Zotero.logError(e);
+			}
+		}
+		// The login manager can fail to store a value even when the keystore works -- e.g., if
+		// the key database is read-only -- and storing the key unencrypted wouldn't help
+		if (!Zotero.OSKeyStore.isKeyStoreError(error)) {
+			if (!Zotero.Sync.Runner.backgroundSync) {
+				await this.alertLoginManagerCorrupted();
+			}
+			throw error;
+		}
+		// An automatic sync can reach this via the legacy credential upgrade in
+		// _getAPIKeyFromLogin(), so don't interrupt one with a dialog
+		if (Zotero.Sync.Runner.backgroundSync || !Zotero.OSKeyStore.confirmUnencryptedFallback()) {
+			throw error;
+		}
+		await this._writeAPIKey(apiKey);
+		// The keystore is unusable, so don't try to encrypt again on the next read
+		this._reencryptedAPIKey = true;
+	},
+	
+	
+	_writeEncryptedAPIKey: async function (apiKey) {
+		await this._writeAPIKey(await Zotero.OSKeyStore.encrypt(apiKey));
+	},
+	
+	
+	_writeAPIKey: async function (storedValue) {
+		var oldLoginInfo = await this._getAPIKeyLoginInfo();
 		var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
 				Components.interfaces.nsILoginInfo, "init");
 		var loginInfo = new nsLoginInfo(
@@ -88,7 +244,7 @@ Zotero.Sync.Data.Local = {
 			null,
 			this._loginManagerRealm,
 			'API Key',
-			apiKey,
+			storedValue,
 			'',
 			''
 		);
@@ -98,9 +254,8 @@ Zotero.Sync.Data.Local = {
 		}
 		else {
 			Zotero.debug("Replacing API key");
-			Services.logins.modifyLogin(oldLoginInfo, loginInfo);
+			await Services.logins.modifyLoginAsync(oldLoginInfo, loginInfo);
 		}
-		Zotero.Notifier.trigger('modify', 'api-key', []);
 	},
 	
 	
@@ -289,7 +444,7 @@ Zotero.Sync.Data.Local = {
 		var library = Zotero.Libraries.get(libraryID);
 		library.libraryVersion = -1;
 		await library.saveTx();
-		
+
 		await this.resetUnsyncedLibraryFiles(libraryID);
 	},
 	
@@ -349,8 +504,9 @@ Zotero.Sync.Data.Local = {
 					skipDeleteLog: true
 				}
 			);
+			this.markRemoteChangesApplied();
 		}
-		
+
 		// Deleted objects
 		keys = await Zotero.Sync.Data.Local.getDeleted(objectType, libraryID);
 		await this.removeObjectsFromDeleteLog(objectType, libraryID, keys);
@@ -402,24 +558,55 @@ Zotero.Sync.Data.Local = {
 	
 	
 	/**
-	 * @return {nsILoginInfo|false}
+	 * Reset the login manager if the NSS key database is unusable
+	 *
+	 * Zotero never sets a primary password, so if one is set on the key database, it was either
+	 * corrupted or copied in from a Firefox profile, and stored logins can never be decrypted,
+	 * since there's no primary-password prompt. Clear stored logins and reset the key database
+	 * so that credentials can be saved again.
+	 *
+	 * @return {Promise<Boolean>} - True if the login manager was reset
 	 */
-	_getAPIKeyLoginInfo: function () {
+	repairLoginManager: async function () {
 		try {
-			var logins = Services.logins.findLogins(
-				this._loginManagerHost,
-				null,
-				this._loginManagerRealm
-			);
+			let token = Cc["@mozilla.org/security/internalkeytoken;1"]
+				.createInstance(Ci.nsIPKCS11Token);
+			if (!token.hasPassword) {
+				return false;
+			}
+			Zotero.debug("Primary password set on NSS key database -- resetting login manager", 1);
+			await Services.logins.removeAllLoginsAsync();
+			this._hasCredentials = false;
+			token.reset();
+			token.changePassword("", "");
 		}
 		catch (e) {
 			Zotero.logError(e);
-			if (this._lastLoginManagerErrorTime > Date.now() - 60000) {
-				let msg = Zotero.getString('sync.error.loginManagerCorrupted1', Zotero.appName) + "\n\n"
-					+ Zotero.getString('sync.error.loginManagerCorrupted2', Zotero.appName);
-				Zotero.alert(null, Zotero.getString('general.error'), msg);
-				this._lastLoginManagerErrorTime = Date.now();
+			return false;
+		}
+		this._loginManagerRepaired = true;
+		return true;
+	},
+
+
+	/**
+	 * @return {Promise<nsILoginInfo|false>}
+	 */
+	_getAPIKeyLoginInfo: async function () {
+		try {
+			var logins = await Services.logins.searchLoginsAsync({
+				origin: this._loginManagerHost,
+				httpRealm: this._loginManagerRealm
+			});
+		}
+		catch (e) {
+			Zotero.logError(e);
+			// If the key database was unusable, reset the login manager so that credentials
+			// can be saved again
+			if (await this.repairLoginManager()) {
+				return false;
 			}
+			await this.alertLoginManagerCorrupted();
 			return false;
 		}
 		
@@ -428,25 +615,67 @@ Zotero.Sync.Data.Local = {
 	},
 	
 	
+	/**
+	 * Tell the user how to fix a login manager that can't read or write credentials, at most
+	 * once a minute, and offer to show the files to delete
+	 */
+	alertLoginManagerCorrupted: async function () {
+		if (this._lastLoginManagerErrorTime
+				&& this._lastLoginManagerErrorTime >= Date.now() - 60000) {
+			return;
+		}
+		this._lastLoginManagerErrorTime = Date.now();
+		let index = Zotero.Prompt.confirm({
+			title: Zotero.getString('general.error'),
+			text: Zotero.getString('sync.error.loginManagerCorrupted1', Zotero.appName) + "\n\n"
+				+ Zotero.getString('sync.error.loginManagerCorrupted2', Zotero.appName),
+			button0: Zotero.getString('login-manager-open-profile-directory'),
+			button1: Zotero.Prompt.BUTTON_TITLE_CANCEL
+		});
+		if (index != 0) {
+			return;
+		}
+		Zotero.launchFile(Zotero.Profile.dir);
+	},
+	
+	
+	/**
+	 * @return {Promise<nsILoginInfo|false>}
+	 */
+	_getLegacyAPIKeyLoginInfo: async function () {
+		try {
+			var logins = await Services.logins.searchLoginsAsync({
+				origin: this._loginManagerHost,
+				httpRealm: this._loginManagerRealmLegacy
+			});
+		}
+		catch (e) {
+			Zotero.logError(e);
+			return false;
+		}
+		return logins.length ? logins[0] : false;
+	},
+	
+	
 	_getAPIKeyFromLogin: async function () {
 		let username = Zotero.Prefs.get('sync.server.username');
 		if (username) {
 			// Check for legacy password if no password set in current session
 			// and no API keys stored yet
-			let password = this.getLegacyPassword(username);
+			let password = await this.getLegacyPassword(username);
 			if (!password) {
 				return "";
 			}
 			
 			let json = await Zotero.Sync.Runner.createAPIKeyFromCredentials(username, password);
-			this.removeLegacyLogins();
+			await this.removeLegacyLogins();
 			return json.key;
 		}
 		return "";
 	},
 	
 	
-	getLegacyPassword: function (username) {
+	getLegacyPassword: async function (username) {
 		var loginManagerHost = 'chrome://zotero';
 		var loginManagerRealm = 'Zotero Sync Server';
 		
@@ -455,7 +684,10 @@ Zotero.Sync.Data.Local = {
 		var loginManager = Components.classes["@mozilla.org/login-manager;1"]
 			.getService(Components.interfaces.nsILoginManager);
 		try {
-			var logins = loginManager.findLogins(loginManagerHost, null, loginManagerRealm);
+			var logins = await loginManager.searchLoginsAsync({
+				origin: loginManagerHost,
+				httpRealm: loginManagerRealm
+			});
 		}
 		catch (e) {
 			Zotero.logError(e);
@@ -470,7 +702,7 @@ Zotero.Sync.Data.Local = {
 		}
 		
 		// Pre-4.0.28.5 format, broken for findLogins and removeLogin in Fx41,
-		var logins = loginManager.findLogins(loginManagerHost, "", null);
+		var logins = await loginManager.searchLoginsAsync({ origin: loginManagerHost });
 		for (let i = 0; i < logins.length; i++) {
 			if (logins[i].username == username
 					&& logins[i].formSubmitURL == "Zotero Sync Server") {
@@ -481,7 +713,7 @@ Zotero.Sync.Data.Local = {
 	},
 	
 	
-	removeLegacyLogins: function () {
+	removeLegacyLogins: async function () {
 		var loginManagerHost = 'chrome://zotero';
 		var loginManagerRealm = 'Zotero Sync Server';
 		
@@ -490,7 +722,10 @@ Zotero.Sync.Data.Local = {
 		var loginManager = Components.classes["@mozilla.org/login-manager;1"]
 			.getService(Components.interfaces.nsILoginManager);
 		try {
-			var logins = loginManager.findLogins(loginManagerHost, null, loginManagerRealm);
+			var logins = await loginManager.searchLoginsAsync({
+				origin: loginManagerHost,
+				httpRealm: loginManagerRealm
+			});
 		}
 		catch (e) {
 			Zotero.logError(e);
@@ -499,7 +734,7 @@ Zotero.Sync.Data.Local = {
 		
 		// Remove all legacy users
 		for (let login of logins) {
-			loginManager.removeLogin(login);
+			await loginManager.removeLoginAsync(login);
 		}
 		// Remove the legacy pref
 		Zotero.Prefs.clear('sync.server.username');
@@ -779,9 +1014,7 @@ Zotero.Sync.Data.Local = {
 	 *         {Object[]} [conflicts] - An array of conflicting fields that can't be resolved automatically
 	 */
 	processObjectsFromJSON: async function (objectType, libraryID, json, options = {}) {
-		var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType);
 		var objectTypePlural = Zotero.DataObjectUtilities.getObjectTypePlural(objectType);
-		var ObjectType = Zotero.Utilities.capitalize(objectType);
 		var libraryName = Zotero.Libraries.get(libraryID).name;
 		
 		var knownErrors = new Set([
@@ -815,360 +1048,134 @@ Zotero.Sync.Data.Local = {
 			});
 		}
 		
-		var batchSize = options.getNotifierBatchSize ? options.getNotifierBatchSize() : json.length;
 		var notifierQueues = [];
 		
 		try {
-			for (let i = 0; i < json.length; i++) {
-				// Batch notifier updates
-				if (notifierQueues.length == batchSize) {
-					await Zotero.Notifier.commit(notifierQueues);
-					notifierQueues = [];
-					// Get the current batch size, which might have increased
-					if (options.getNotifierBatchSize) {
-						batchSize = options.getNotifierBatchSize()
-					}
-				}
-				let notifierQueue = new Zotero.Notifier.Queue({
-					skipAutoSync: true
-				});
+			for (let i = 0; i < json.length;) {
+				// Batch size for the save transaction and notifier updates, increased as processing
+				// progresses so that new objects start coming in one by one but then switch to
+				// larger chunks
+				let batchSize = options.getNotifierBatchSize ? options.getNotifierBatchSize() : json.length;
+				let batch = json.slice(i, i + batchSize);
+				i += batch.length;
 				
-				let jsonObject = json[i];
-				let jsonData = jsonObject.data;
-				let objectKey = jsonObject.key;
-				
-				let saveOptions = {};
-				Object.assign(saveOptions, options);
-				saveOptions.isNewObject = false;
-				saveOptions.skipCache = false;
-				saveOptions.storageDetailsChanged = false;
-				saveOptions.notifierQueue = notifierQueue;
-				
-				Zotero.debug(`Processing ${objectType} ${libraryID}/${objectKey}`);
-				Zotero.debug(jsonObject);
-				
-				// Skip objects with unmet dependencies
-				if (objectType == 'item' || objectType == 'collection') {
-					// Missing parent collection or item
-					let parentProp = 'parent' + objectType[0].toUpperCase() + objectType.substr(1);
-					let parentKey = jsonData[parentProp];
-					if (parentKey) {
-						let parentObj = await objectsClass.getByLibraryAndKeyAsync(
-							libraryID, parentKey, { noCache: true }
-						);
-						if (!parentObj) {
-							let error = new Error("Parent of " + objectType + " "
-								+ libraryID + "/" + jsonData.key + " not found -- skipping");
-							error.name = "ZoteroMissingObjectError";
-							Zotero.debug(error.message);
-							results.push({
-								key: objectKey,
-								processed: false,
-								error,
-								retry: true
-							});
-							continue;
-						}
-					}
-					
-					// Missing collection -- this could happen if the collection was deleted
-					// locally and an item in it was modified remotely
-					if (objectType == 'item' && jsonData.collections) {
-						let error;
-						for (let key of jsonData.collections) {
-							let collection = Zotero.Collections.getByLibraryAndKey(libraryID, key);
-							if (!collection) {
-								error = new Error(`Collection ${libraryID}/${key} not found `
-									+ `-- skipping item`);
-								error.name = "ZoteroMissingObjectError";
-								Zotero.debug(error.message);
-								results.push({
-									key: objectKey,
-									processed: false,
-									error,
-									retry: false
+				// Try to process the batch in a single transaction
+				let batchSaved = false;
+				if (batch.length > 1) {
+					let batchResults = [];
+					let batchQueues = [];
+					try {
+						await Zotero.DB.executeTransaction(async function () {
+							for (let jsonObject of batch) {
+								let notifierQueue = new Zotero.Notifier.Queue({
+									skipAutoSync: true
 								});
-								
-								// If the collection is in the delete log, the deletion will upload
-								// after downloads are done. Otherwise, we somehow missed
-								// downloading it and should add it to the queue to try again.
-								if (!((await this.getDateDeleted('collection', libraryID, key)))) {
-									await this.addObjectsToSyncQueue('collection', libraryID, [key]);
+								// Pass a deep copy, since the object can be modified during
+								// processing and a failed batch is reprocessed with the
+								// original data
+								await this._processObjectFromJSON(
+									objectType,
+									libraryID,
+									JSON.parse(JSON.stringify(jsonObject)),
+									options,
+									notifierQueue,
+									batchResults
+								);
+								if (notifierQueue.size) {
+									batchQueues.push(notifierQueue);
 								}
-								break;
 							}
-						}
-						if (error) {
-							continue;
-						}
+						}.bind(this));
+						results.push(...batchResults);
+						notifierQueues.push(...batchQueues);
+						batchSaved = true;
+					}
+					catch (e) {
+						Zotero.debug(`Batch save of ${batch.length} ${objectTypePlural} failed `
+							+ "-- reprocessing individually", 2);
+						Zotero.debug(e, 2);
 					}
 				}
 				
-				// Errors have to be thrown in order to roll back the transaction, so catch those here
-				// and continue
-				try {
-					await Zotero.DB.executeTransaction(async function () {
-						let obj = await objectsClass.getByLibraryAndKeyAsync(
-							libraryID, objectKey, { noCache: true }
-						);
-						let restored = false;
-						if (obj) {
-							Zotero.debug("Matching local " + objectType + " exists", 4);
-							
-							let jsonDataLocal = obj.toJSON();
-							
-							// For items, check if mtime or file hash changed in metadata,
-							// which would indicate that a remote storage sync took place and
-							// a download is needed
-							if (objectType == 'item' && obj.isStoredFileAttachment()) {
-								if (jsonDataLocal.mtime != jsonData.mtime
-										|| jsonDataLocal.md5 != jsonData.md5) {
-									saveOptions.storageDetailsChanged = true;
-								}
-								if (jsonDataLocal.filename != jsonData.filename) {
-									saveOptions.renameFile = true;
-									saveOptions.previousFilename = obj.attachmentFilename;
-								}
-							}
-							
-							// Local object has been modified since last sync
-							if (!obj.synced) {
-								Zotero.debug("Local " + objectType + " " + obj.libraryKey
-										+ " has been modified since last sync", 4);
-								
-								let cachedJSON = await this.getCacheObject(
-									objectType, obj.libraryID, obj.key, obj.version
-								);
-								let result = this._reconcileChanges(
-									objectType,
-									cachedJSON.data,
-									jsonDataLocal,
-									jsonData,
-									['mtime', 'md5', 'dateAdded', 'dateModified']
-								);
-								
-								// If local object became a child item and remote was added to any
-								// collections, we need to remove the 'collections' changes and add
-								// the parent item to those collections instead
-								if (objectType == 'item'
-										&& !obj.isTopLevelItem()
-										&& (obj.isNote() || obj.isAttachment())) {
-									let collections = result.changes
-										.filter(x => x.field == 'collections' && x.op == 'member-add')
-										.map(x => x.value);
-									if (collections.length) {
-										result.changes = result.changes
-											.filter(x => !(x.field == 'collections' && x.op == 'member-add'));
-										saveOptions.newParentItemCollections = collections;
-									}
-								}
-								
-								// If no changes, just update local version number and mark as synced
-								if (!result.changes.length && !result.conflicts.length) {
-									Zotero.debug("No remote changes to apply to local "
-										+ objectType + " " + obj.libraryKey);
-									saveOptions.skipData = true;
-									// If either there were additional local changes after cancelling
-									// out equivalent changes on both sides or the local object was
-									// different but we ignored the changes (e.g., ISBN hyphenation),
-									// keep as unsynced. In the latter case, since we're skipping
-									// data, the local fields won't be overwritten.
-									if (result.localChanged) {
-										saveOptions.saveAsUnsynced = true;
-									}
-									let saveResults = await this._saveObjectFromJSON(
-										obj,
-										jsonObject,
-										saveOptions
-									);
-									results.push(saveResults);
-									if (!saveResults.processed) {
-										throw saveResults.error;
-									}
-									return;
-								}
-								
-								if (result.conflicts.length) {
-									if (objectType != 'item') {
-										throw new Error(`Unexpected conflict on ${objectType} object`);
-									}
-									
-									// Skip conflict resolution if there are invalid fields
-									try {
-										let testObj = obj.clone();
-										testObj.fromJSON(jsonData, { strict: true });
-									}
-									catch (e) {
-										results.push({
-											key: objectKey,
-											processed: false,
-											error: e,
-											retry: false
-										});
-										throw e;
-									}
-									
-									Zotero.debug("Conflict!", 2);
-									Zotero.debug(jsonDataLocal);
-									Zotero.debug(jsonData);
-									Zotero.debug(result);
-									results.push({
-										libraryID,
-										key: objectKey,
-										processed: false,
-										conflict: true,
-										left: jsonDataLocal,
-										right: jsonData,
-										changes: result.changes,
-										conflicts: result.conflicts
-									});
-									return;
-								}
-								
-								// If no conflicts, apply remote changes automatically
-								Zotero.debug(`Applying remote changes to ${objectType} `
-									+ obj.libraryKey);
-								Zotero.debug(result.changes);
-								// If there were local changes as well, keep object as unsynced and
-								// save the remote version to the sync cache rather than the merged
-								// version
-								if (result.localChanged) {
-									saveOptions.saveAsUnsynced = true;
-									saveOptions.cacheObject = jsonObject.data;
-								}
-								Zotero.DataObjectUtilities.applyChanges(
-									jsonDataLocal, result.changes
-								);
-								// Transfer properties that aren't in the changeset
-								['version', 'dateAdded', 'dateModified'].forEach(x => {
-									if (jsonData[x] === undefined) return;
-									if (jsonDataLocal[x] !== jsonData[x]) {
-										Zotero.debug(`Applying remote '${x}' value`);
-									}
-									jsonDataLocal[x] = jsonData[x];
-								})
-								jsonObject.data = jsonDataLocal;
-							}
-						}
-						// Object doesn't exist locally
-						else {
-							Zotero.debug(ObjectType + " doesn't exist locally");
-							
-							saveOptions.isNewObject = true;
-							
-							// Check if object has been deleted locally
-							let dateDeleted = await this.getDateDeleted(
-								objectType, libraryID, objectKey
-							);
-							if (dateDeleted) {
-								Zotero.debug(ObjectType + " was deleted locally");
-								
-								switch (objectType) {
-									case 'item':
-										if (jsonData.deleted) {
-											Zotero.debug("Remote item is in trash -- allowing local deletion to propagate");
-											results.push({
-												libraryID,
-												key: objectKey,
-												processed: true
-											});
-											return;
-										}
-										
-										results.push({
-											libraryID,
-											key: objectKey,
-											processed: false,
-											conflict: true,
-											left: {
-												deleted: true,
-												dateDeleted: Zotero.Date.dateToSQL(dateDeleted, true)
-											},
-											right: jsonData
-										});
-										return;
-									
-									// Auto-restore some locally deleted objects that have changed remotely
-									case 'collection':
-									case 'search':
-										Zotero.debug(`${ObjectType} ${objectKey} was modified remotely `
-											+ '-- restoring');
-										await this.removeObjectsFromDeleteLog(
-											objectType,
-											libraryID,
-											[objectKey]
-										);
-										restored = true;
-										break;
-									
-									default:
-										throw new Error("Unknown object type '" + objectType + "'");
-								}
-							}
-							
-							// Create new object
-							obj = new Zotero[ObjectType];
-							obj.libraryID = libraryID;
-							obj.key = objectKey;
-							await obj.loadPrimaryData();
-							
-							// Don't cache new items immediately, which skips reloading after save
-							saveOptions.skipCache = true;
-						}
-						
-						let saveResults = await this._saveObjectFromJSON(obj, jsonObject, saveOptions);
-						if (restored) {
-							saveResults.restored = true;
-						}
-						results.push(saveResults);
-						if (!saveResults.processed) {
-							throw saveResults.error;
-						}
-					}.bind(this));
-					
-					if (notifierQueue.size) {
-						notifierQueues.push(notifierQueue);
-					}
-				}
-				catch (e) {
-					// This allows errors handled by syncRunner to know the library in question
-					e.libraryID = libraryID;
-					
-					// Display nicer debug line for known errors
-					if (knownErrors.has(e.name)) {
-						let desc = e.name
-							.replace(/^Zotero/, "")
-							// Convert "MissingObjectError" to "missing object error"
-							.split(/([a-z]+)/).join(' ').trim()
-							.replace(/([A-Z]) ([a-z]+)/g, "$1$2").toLowerCase();
-						let msg = Zotero.Utilities.capitalize(desc) + " for "
-							+ `${objectType} ${jsonObject.key} in ${Zotero.Libraries.get(libraryID).name}`;
-						Zotero.debug(msg, 2);
-						Zotero.debug(e, 2);
-						Components.utils.reportError(msg + ": " + e.message);
-					}
-					else {
-						Zotero.logError(e);
-					}
-					
-					if (options.onError) {
-						options.onError(e);
-					}
-					
-					if (Zotero.DB.closed) {
-						e.fatal = true;
-					}
-					if (options.stopOnError || e.fatal) {
-						throw e;
-					}
-				}
-				finally {
+				if (batchSaved) {
 					if (options.onObjectProcessed) {
-						options.onObjectProcessed();
+						for (let j = 0; j < batch.length; j++) {
+							options.onObjectProcessed();
+						}
+					}
+				}
+				// Process objects individually if the batch was a single object or the batch
+				// transaction failed, so that an error rolls back only that object's save
+				else {
+					for (let jsonObject of batch) {
+						let notifierQueue = new Zotero.Notifier.Queue({
+							skipAutoSync: true
+						});
+						
+						// Errors have to be thrown in order to roll back the transaction, so catch
+						// those here and continue
+						try {
+							await Zotero.DB.executeTransaction(async function () {
+								await this._processObjectFromJSON(
+									objectType,
+									libraryID,
+									jsonObject,
+									options,
+									notifierQueue,
+									results
+								);
+							}.bind(this));
+							
+							if (notifierQueue.size) {
+								notifierQueues.push(notifierQueue);
+							}
+						}
+						catch (e) {
+							// This allows errors handled by syncRunner to know the library in question
+							e.libraryID = libraryID;
+							
+							// Display nicer debug line for known errors
+							if (knownErrors.has(e.name)) {
+								let desc = e.name
+									.replace(/^Zotero/, "")
+									// Convert "MissingObjectError" to "missing object error"
+									.split(/([a-z]+)/).join(' ').trim()
+									.replace(/([A-Z]) ([a-z]+)/g, "$1$2").toLowerCase();
+								let msg = Zotero.Utilities.capitalize(desc) + " for "
+									+ `${objectType} ${jsonObject.key} in ${Zotero.Libraries.get(libraryID).name}`;
+								Zotero.debug(msg, 2);
+								Zotero.debug(e, 2);
+								Components.utils.reportError(msg + ": " + e.message);
+							}
+							else {
+								Zotero.logError(e);
+							}
+							
+							if (options.onError) {
+								options.onError(e);
+							}
+							
+							if (Zotero.DB.closed) {
+								e.fatal = true;
+							}
+							if (options.stopOnError || e.fatal) {
+								throw e;
+							}
+						}
+						finally {
+							if (options.onObjectProcessed) {
+								options.onObjectProcessed();
+							}
+						}
 					}
 				}
 				
 				await Zotero.Promise.delay(10);
+				
+				if (notifierQueues.length) {
+					await Zotero.Notifier.commit(notifierQueues);
+					notifierQueues = [];
+				}
 			}
 		}
 		finally {
@@ -1190,6 +1197,314 @@ Zotero.Sync.Data.Local = {
 	},
 	
 	
+	/**
+	 * Process a single downloaded object and update or create the local object
+	 *
+	 * Must be called within a transaction. Errors are thrown so that the transaction can be
+	 * rolled back.
+	 *
+	 * @param {String} objectType
+	 * @param {Integer} libraryID
+	 * @param {Object} jsonObject - Downloaded JSON API object
+	 * @param {Object} options - Options passed to processObjectsFromJSON()
+	 * @param {Zotero.Notifier.Queue} notifierQueue
+	 * @param {Object[]} results - Array to add a result object to
+	 */
+	_processObjectFromJSON: async function (objectType, libraryID, jsonObject, options, notifierQueue, results) {
+		Zotero.DB.requireTransaction();
+		
+		var objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(objectType);
+		var ObjectType = Zotero.Utilities.capitalize(objectType);
+		
+		var jsonData = jsonObject.data;
+		var objectKey = jsonObject.key;
+		
+		var saveOptions = {};
+		Object.assign(saveOptions, options);
+		saveOptions.isNewObject = false;
+		saveOptions.skipCache = false;
+		saveOptions.storageDetailsChanged = false;
+		saveOptions.notifierQueue = notifierQueue;
+		
+		Zotero.debug(`Processing ${objectType} ${libraryID}/${objectKey}`);
+		Zotero.debug(jsonObject);
+		
+		// Skip objects with unmet dependencies
+		if (objectType == 'item' || objectType == 'collection') {
+			// Missing parent collection or item
+			let parentProp = 'parent' + objectType[0].toUpperCase() + objectType.substr(1);
+			let parentKey = jsonData[parentProp];
+			if (parentKey) {
+				let parentObj = await objectsClass.getByLibraryAndKeyAsync(
+					libraryID, parentKey, { noCache: true }
+				);
+				if (!parentObj) {
+					let error = new Error("Parent of " + objectType + " "
+						+ libraryID + "/" + jsonData.key + " not found -- skipping");
+					error.name = "ZoteroMissingObjectError";
+					Zotero.debug(error.message);
+					results.push({
+						key: objectKey,
+						processed: false,
+						error,
+						retry: true
+					});
+					return;
+				}
+			}
+			
+			// Missing collection -- this could happen if the collection was deleted
+			// locally and an item in it was modified remotely
+			if (objectType == 'item' && jsonData.collections) {
+				let error;
+				for (let key of jsonData.collections) {
+					let collection = Zotero.Collections.getByLibraryAndKey(libraryID, key);
+					if (!collection) {
+						error = new Error(`Collection ${libraryID}/${key} not found `
+							+ `-- skipping item`);
+						error.name = "ZoteroMissingObjectError";
+						Zotero.debug(error.message);
+						results.push({
+							key: objectKey,
+							processed: false,
+							error,
+							retry: false
+						});
+						
+						// If the collection is in the delete log, the deletion will upload
+						// after downloads are done. Otherwise, we somehow missed
+						// downloading it and should add it to the queue to try again.
+						if (!((await this.getDateDeleted('collection', libraryID, key)))) {
+							await this.addObjectsToSyncQueue('collection', libraryID, [key]);
+						}
+						break;
+					}
+				}
+				if (error) {
+					return;
+				}
+			}
+		}
+		
+		let obj = await objectsClass.getByLibraryAndKeyAsync(
+			libraryID, objectKey, { noCache: true }
+		);
+		let restored = false;
+		if (obj) {
+			Zotero.debug("Matching local " + objectType + " exists", 4);
+			
+			let jsonDataLocal = obj.toJSON();
+			
+			// For items, check if mtime or file hash changed in metadata,
+			// which would indicate that a remote storage sync took place and
+			// a download is needed
+			if (objectType == 'item' && obj.isStoredFileAttachment()) {
+				if (jsonDataLocal.mtime != jsonData.mtime
+						|| jsonDataLocal.md5 != jsonData.md5) {
+					saveOptions.storageDetailsChanged = true;
+				}
+				if (jsonDataLocal.filename != jsonData.filename) {
+					saveOptions.renameFile = true;
+					saveOptions.previousFilename = obj.attachmentFilename;
+				}
+			}
+			
+			// Local object has been modified since last sync
+			if (!obj.synced) {
+				Zotero.debug("Local " + objectType + " " + obj.libraryKey
+						+ " has been modified since last sync", 4);
+				
+				let cachedJSON = await this.getCacheObject(
+					objectType, obj.libraryID, obj.key, obj.version
+				);
+				let result = this._reconcileChanges(
+					objectType,
+					cachedJSON.data,
+					jsonDataLocal,
+					jsonData,
+					['mtime', 'md5', 'dateAdded', 'dateModified']
+				);
+				
+				// If local object became a child item and remote was added to any
+				// collections, we need to remove the 'collections' changes and add
+				// the parent item to those collections instead
+				if (objectType == 'item'
+						&& !obj.isTopLevelItem()
+						&& (obj.isNote() || obj.isAttachment())) {
+					let collections = result.changes
+						.filter(x => x.field == 'collections' && x.op == 'member-add')
+						.map(x => x.value);
+					if (collections.length) {
+						result.changes = result.changes
+							.filter(x => !(x.field == 'collections' && x.op == 'member-add'));
+						saveOptions.newParentItemCollections = collections;
+					}
+				}
+				
+				// If no changes, just update local version number and mark as synced
+				if (!result.changes.length && !result.conflicts.length) {
+					Zotero.debug("No remote changes to apply to local "
+						+ objectType + " " + obj.libraryKey);
+					saveOptions.skipData = true;
+					// If either there were additional local changes after cancelling
+					// out equivalent changes on both sides or the local object was
+					// different but we ignored the changes (e.g., ISBN hyphenation),
+					// keep as unsynced. In the latter case, since we're skipping
+					// data, the local fields won't be overwritten.
+					if (result.localChanged) {
+						saveOptions.saveAsUnsynced = true;
+					}
+					let saveResults = await this._saveObjectFromJSON(
+						obj,
+						jsonObject,
+						saveOptions
+					);
+					results.push(saveResults);
+					if (!saveResults.processed) {
+						throw saveResults.error;
+					}
+					return;
+				}
+				
+				if (result.conflicts.length) {
+					if (objectType != 'item') {
+						throw new Error(`Unexpected conflict on ${objectType} object`);
+					}
+					
+					// Skip conflict resolution if there are invalid fields
+					try {
+						let testObj = obj.clone();
+						testObj.fromJSON(jsonData, { strict: true });
+					}
+					catch (e) {
+						results.push({
+							key: objectKey,
+							processed: false,
+							error: e,
+							retry: false
+						});
+						throw e;
+					}
+					
+					Zotero.debug("Conflict!", 2);
+					Zotero.debug(jsonDataLocal);
+					Zotero.debug(jsonData);
+					Zotero.debug(result);
+					results.push({
+						libraryID,
+						key: objectKey,
+						processed: false,
+						conflict: true,
+						left: jsonDataLocal,
+						right: jsonData,
+						changes: result.changes,
+						conflicts: result.conflicts
+					});
+					return;
+				}
+				
+				// If no conflicts, apply remote changes automatically
+				Zotero.debug(`Applying remote changes to ${objectType} `
+					+ obj.libraryKey);
+				Zotero.debug(result.changes);
+				// If there were local changes as well, keep object as unsynced and
+				// save the remote version to the sync cache rather than the merged
+				// version
+				if (result.localChanged) {
+					saveOptions.saveAsUnsynced = true;
+					saveOptions.cacheObject = jsonObject.data;
+				}
+				Zotero.DataObjectUtilities.applyChanges(
+					jsonDataLocal, result.changes
+				);
+				// Transfer properties that aren't in the changeset
+				['version', 'dateAdded', 'dateModified'].forEach(x => {
+					if (jsonData[x] === undefined) return;
+					if (jsonDataLocal[x] !== jsonData[x]) {
+						Zotero.debug(`Applying remote '${x}' value`);
+					}
+					jsonDataLocal[x] = jsonData[x];
+				})
+				jsonObject.data = jsonDataLocal;
+			}
+		}
+		// Object doesn't exist locally
+		else {
+			Zotero.debug(ObjectType + " doesn't exist locally");
+			
+			saveOptions.isNewObject = true;
+			
+			// Check if object has been deleted locally
+			let dateDeleted = await this.getDateDeleted(
+				objectType, libraryID, objectKey
+			);
+			if (dateDeleted) {
+				Zotero.debug(ObjectType + " was deleted locally");
+				
+				switch (objectType) {
+					case 'item':
+						if (jsonData.deleted) {
+							Zotero.debug("Remote item is in trash -- allowing local deletion to propagate");
+							results.push({
+								libraryID,
+								key: objectKey,
+								processed: true
+							});
+							return;
+						}
+						
+						results.push({
+							libraryID,
+							key: objectKey,
+							processed: false,
+							conflict: true,
+							left: {
+								deleted: true,
+								dateDeleted: Zotero.Date.dateToSQL(dateDeleted, true)
+							},
+							right: jsonData
+						});
+						return;
+					
+					// Auto-restore some locally deleted objects that have changed remotely
+					case 'collection':
+					case 'search':
+						Zotero.debug(`${ObjectType} ${objectKey} was modified remotely `
+							+ '-- restoring');
+						await this.removeObjectsFromDeleteLog(
+							objectType,
+							libraryID,
+							[objectKey]
+						);
+						restored = true;
+						break;
+					
+					default:
+						throw new Error("Unknown object type '" + objectType + "'");
+				}
+			}
+			
+			// Create new object
+			obj = new Zotero[ObjectType];
+			obj.libraryID = libraryID;
+			obj.key = objectKey;
+			await obj.loadPrimaryData();
+			
+			// Don't cache new items immediately, which skips reloading after save
+			saveOptions.skipCache = true;
+		}
+		
+		let saveResults = await this._saveObjectFromJSON(obj, jsonObject, saveOptions);
+		if (restored) {
+			saveResults.restored = true;
+		}
+		results.push(saveResults);
+		if (!saveResults.processed) {
+			throw saveResults.error;
+		}
+	},
+	
+	
 	_checkCacheJSON: function (json) {
 		if (json.key === undefined) {
 			Zotero.debug(json, 1);
@@ -1388,6 +1703,7 @@ Zotero.Sync.Data.Local = {
 									await obj.erase({
 										notifierQueue
 									});
+									Zotero.Sync.Data.Local.markRemoteChangesApplied();
 								}
 								catch (e) {
 									results.push({
@@ -1561,6 +1877,7 @@ Zotero.Sync.Data.Local = {
 				obj.synced = true;
 			}
 			await obj.save(saveOptions);
+			this.markRemoteChangesApplied();
 			let cacheJSON = options.cacheObject ? options.cacheObject : json.data;
 			await this.saveCacheObject(obj.objectType, obj.libraryID, cacheJSON);
 			// Delete older versions of the object in the cache
@@ -1596,13 +1913,18 @@ Zotero.Sync.Data.Local = {
 				}
 			}
 			
-			// See explanation in processObjectsFromJSON()
+			// See explanation in _processObjectFromJSON()
 			if (options.newParentItemCollections) {
 				let parentItem = obj.parentItem;
 				for (let c of options.newParentItemCollections) {
 					parentItem.addToCollection(c);
 				}
 				await parentItem.save(saveOptions);
+				// The cached parent item keeps the added collections in memory if the
+				// transaction is rolled back, so reload it
+				Zotero.DB.addCurrentCallback("rollback", function () {
+					return parentItem.reload(['primaryData', 'collections'], true);
+				});
 			}
 		}
 		catch (e) {
@@ -1792,6 +2114,7 @@ Zotero.Sync.Data.Local = {
 		
 		var changes = [];
 		var conflicts = [];
+		var localChanged = false;
 		
 		for (let i = 0; i < changeset.length; i++) {
 			let c2 = changeset[i];
@@ -1814,6 +2137,19 @@ Zotero.Sync.Data.Local = {
 				continue;
 			}
 			
+			// Auto-resolve lastRead by keeping the most recent value
+			if (c2.field == 'lastRead') {
+				if ((currentJSON.lastRead || 0) > (c2.value || 0)) {
+					// Local is more recent -- keep it and upload
+					localChanged = true;
+				}
+				else {
+					// Remote is more recent -- apply it
+					changes.push(c2);
+				}
+				continue;
+			}
+			
 			// Field changes are conflicts
 			//
 			// Since we don't know what changed, use only 'add' and 'delete'
@@ -1834,7 +2170,6 @@ Zotero.Sync.Data.Local = {
 			conflicts.push([c1, c2]);
 		}
 		
-		var localChanged = false;
 		var normalizeHTML = (str) => {
 			let parser = new DOMParser();
 			str = parser.parseFromString(str, 'text/html');
diff --git a/chrome/content/zotero/xpcom/sync/syncRunner.js b/chrome/content/zotero/xpcom/sync/syncRunner.js
index 7ac415f658..c1ec39f87a 100644
--- a/chrome/content/zotero/xpcom/sync/syncRunner.js
+++ b/chrome/content/zotero/xpcom/sync/syncRunner.js
@@ -35,10 +35,11 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	
 	Zotero.defineProperty(this, 'enabled', {
 		get: () => {
-			return _apiKey || Zotero.Sync.Data.Local.hasCredentials();
+			return !!_apiKey || Zotero.Sync.Data.Local.hasCachedCredentials;
 		}
 	});
 	Zotero.defineProperty(this, 'syncInProgress', { get: () => _syncInProgress });
+	Zotero.defineProperty(this, 'backgroundSync', { get: () => _backgroundSync });
 	Zotero.defineProperty(this, 'lastSyncStatus', { get: () => _lastSyncStatus });
 	
 	Zotero.defineProperty(this, 'RESET_MODE_FROM_SERVER', { value: 1 });
@@ -73,6 +74,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	var _delayPromises = new Set();
 	var _firstInSession = true;
 	var _syncInProgress = false;
+	var _backgroundSync = false;
 	var _queuedSyncOptions = [];
 	var _stopping = false;
 	var _canceller;
@@ -116,13 +118,13 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	this.sync = Zotero.serial(function (options = {}) {
 		return this._sync(options);
 	});
-	
-	
+
+
 	this._sync = async function (options) {
 		// Clear message list
 		_errors = [];
 		_tooltipMessages = [];
-		
+
 		// Shouldn't be possible because of serial()
 		if (_syncInProgress) {
 			let msg = Zotero.getString('sync.error.syncInProgress');
@@ -131,7 +133,12 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 			return false;
 		}
 		_syncInProgress = true;
+		_backgroundSync = !!options.background;
 		_stopping = false;
+
+		// Reset remote-change tracking for this sync; the undo stack is
+		// cleared lazily at the end only if remote mutations were applied.
+		Zotero.Sync.Data.Local.resetRemoteChangesApplied();
 		
 		try {
 			await Zotero.Notifier.trigger('start', 'sync', []);
@@ -321,7 +328,14 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 		}
 		finally {
 			await this.end(options);
-			
+
+			// Clear undo history if this iteration applied remote changes.
+			// Done before any restart/queued recursive call so the inner
+			// sync's reset doesn't lose the decision made here.
+			if (Zotero.Sync.Data.Local.remoteChangesApplied) {
+				Zotero.UndoHistory.clear();
+			}
+
 			if (options.restartSync) {
 				delete options.restartSync;
 				Zotero.debug("Restarting sync");
@@ -334,7 +348,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 				await this._sync(JSON.parse(_queuedSyncOptions.shift()));
 				return;
 			}
-			
+
 			Zotero.debug("Done syncing");
 			Zotero.Notifier.trigger('finish', 'sync', librariesToSync || []);
 		}
@@ -696,6 +710,9 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	 */
 	var _doFileSync = async function (libraries, options) {
 		Zotero.debug("Starting file syncing");
+		// Drain file change events and run the modification check on the changed files across
+		// all libraries
+		await Zotero.Sync.Storage.FileChangeWatcher.snapshot();
 		var resyncLibraries = []
 		for (let libraryID of libraries) {
 			_stopCheck();
@@ -907,6 +924,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
 	
 	this.end = async function (options) {
 		_syncInProgress = false;
+		_backgroundSync = false;
 		await this.checkErrors(_errors, options);
 		if (!options.restartSync) {
 			let showOnSyncButton = !options.background
diff --git a/chrome/content/zotero/xpcom/translate b/chrome/content/zotero/xpcom/translate
index d08300c2c0..dd524aea9a 160000
--- a/chrome/content/zotero/xpcom/translate
+++ b/chrome/content/zotero/xpcom/translate
@@ -1 +1 @@
-Subproject commit d08300c2c01a4d6ef325f05cbefc6c138a99f811
+Subproject commit dd524aea9a556cd23eb9dc8cc617219a98d0fb47
diff --git a/chrome/content/zotero/xpcom/translation/translate_item.js b/chrome/content/zotero/xpcom/translation/translate_item.js
index 4fb2c4f675..8d5b326f08 100644
--- a/chrome/content/zotero/xpcom/translation/translate_item.js
+++ b/chrome/content/zotero/xpcom/translation/translate_item.js
@@ -30,6 +30,9 @@
  * @param {Object} options
  *         <li>libraryID - ID of library in which items should be saved</li>
  *         <li>collections - New collections to create (used during Import translation</li>
+ *         <li>autoCreatedCollectionID - ID of a collection in 'collections' that was created to
+ *             hold this import, and so can be used for the imported data's own top-level
+ *             collection instead of being made its parent</li>
  *         <li>attachmentMode - One of Zotero.Translate.ItemSaver.ATTACHMENT_* specifying how attachments should be saved</li>
  *         <li>linkFiles - Save attachments as linked files instead of stored files</li>
  *         <li>forceTagType - Force tags to specified tag type</li>
@@ -49,6 +52,7 @@ Zotero.Translate.ItemSaver = function (options) {
 	}
 	
 	this._collections = options.collections || false;
+	this._autoCreatedCollectionID = options.autoCreatedCollectionID || false;
 	
 	// If group filesEditable==false, don't save attachments
 	this.attachmentMode = Zotero.Libraries.get(this._libraryID).filesEditable ? options.attachmentMode :
@@ -300,6 +304,25 @@ Zotero.Translate.ItemSaver.prototype = {
 		return childAttachments;
 	},
 
+	/**
+	 * Expand a resolver list into URL objects, running any function resolvers
+	 *
+	 * @param {(Object|Function)[]} resolvers - See downloadFirstAvailableFile()
+	 * @return {Promise<Object[]>}
+	 */
+	async _getURLObjectsFromResolvers(resolvers) {
+		let urlObjects = [];
+		for (let resolver of resolvers) {
+			if (typeof resolver == 'function') {
+				urlObjects.push(...await resolver());
+			}
+			else {
+				urlObjects.push(resolver);
+			}
+		}
+		return urlObjects;
+	},
+
 	/**
 	 * Gets a list of OA PDF URLs for items that did not receive a PDF attachment
 	 * from the translator
@@ -326,7 +349,7 @@ Zotero.Translate.ItemSaver.prototype = {
 			if (!resolvers.length) {
 				return urlObjects;
 			}
-			urlObjects = await resolvers[0]();
+			urlObjects = await this._getURLObjectsFromResolvers(resolvers);
 			// If there are possible URLs, create a status line for the PDF
 			if (urlObjects.length) {
 				let title = Zotero.getString('findPDF.openAccessPDF');
@@ -384,9 +407,14 @@ Zotero.Translate.ItemSaver.prototype = {
 			// Translated attachment failed, so we didn't check for OA PDFs yet and didn't
 			// update the status line
 			// Look for OA PDFs now
-			resolvers = Zotero.Attachments.getPDFResolvers(item, ['oa']);
-			if (resolvers.length) {
-				resolvers = await resolvers[0]();
+			try {
+				resolvers = await this._getURLObjectsFromResolvers(
+					Zotero.Attachments.getPDFResolvers(item, ['oa'])
+				);
+			}
+			catch (e) {
+				Zotero.logError(e);
+				resolvers = [];
 			}
 
 			// Add custom resolvers
@@ -450,6 +478,42 @@ Zotero.Translate.ItemSaver.prototype = {
 	},
 	
 	
+	/**
+	 * Determine whether the collection created to hold an import can be used for the imported
+	 * data's own top-level collection, instead of being made its parent
+	 *
+	 * @param {Object[]} collections - Top-level collections from the translator
+	 * @param {Integer|null} rootCollectionID
+	 * @return {Integer|null} - The collection to use, or null to nest within it as usual
+	 */
+	_getCollectionToReuse: function (collections, rootCollectionID) {
+		if (!this._autoCreatedCollectionID || this._autoCreatedCollectionID != rootCollectionID
+				|| collections.length != 1) {
+			return null;
+		}
+		
+		// Items are added to the collection as they're saved, so it can only stand in for the
+		// imported collection if everything in it belongs somewhere in that collection
+		var itemIDs = new Set();
+		var collectionsToProcess = [collections[0]];
+		while (collectionsToProcess.length) {
+			for (let child of collectionsToProcess.shift().children) {
+				if (child.type === "collection") {
+					collectionsToProcess.push(child);
+				}
+				else if (this._IDMap[child.id]) {
+					itemIDs.add(this._IDMap[child.id]);
+				}
+			}
+		}
+		
+		var collection = Zotero.Collections.get(rootCollectionID);
+		return collection.getChildItems(true).every(itemID => itemIDs.has(itemID))
+			? rootCollectionID
+			: null;
+	},
+	
+	
 	"saveCollections": async function (collections) {
 		var collectionsToProcess = collections.slice();
 		// Use first collection passed to translate process as the root
@@ -457,21 +521,28 @@ Zotero.Translate.ItemSaver.prototype = {
 			? this._collections[0] : null;
 		var parentIDs = collections.map(c => null);
 		var topLevelCollections = [];
+		var itemsInCollections = new Set();
+		var reusedCollectionID = this._getCollectionToReuse(collections, rootCollectionID);
+		var reusedCollectionItems = new Set();
 
 		await Zotero.DB.executeTransaction(async function () {
 			while(collectionsToProcess.length) {
 				var collection = collectionsToProcess.shift();
 				var parentID = parentIDs.shift();
 
-				var newCollection = new Zotero.Collection;
-				newCollection.libraryID = this._libraryID;
-				newCollection.name = collection.name;
-				if (parentID) {
-					newCollection.parentID = parentID;
+				var newCollection;
+				if (!parentID && reusedCollectionID) {
+					newCollection = Zotero.Collections.get(reusedCollectionID);
+					newCollection.name = collection.name;
 				}
 				else {
-					newCollection.parentID = rootCollectionID;
-					topLevelCollections.push(newCollection)
+					newCollection = new Zotero.Collection;
+					newCollection.libraryID = this._libraryID;
+					newCollection.name = collection.name;
+					newCollection.parentID = parentID ? parentID : rootCollectionID;
+				}
+				if (!parentID) {
+					topLevelCollections.push(newCollection);
 				}
 				await newCollection.save(this._saveOptions);
 
@@ -496,6 +567,23 @@ Zotero.Translate.ItemSaver.prototype = {
 				if(toAdd.length) {
 					Zotero.debug("Translate: Adding " + toAdd, 5);
 					await newCollection.addItems(toAdd);
+					toAdd.forEach(itemID => itemsInCollections.add(itemID));
+					if (newCollection.id === reusedCollectionID) {
+						toAdd.forEach(itemID => reusedCollectionItems.add(itemID));
+					}
+				}
+			}
+
+			// Items are added to the collections passed to the translate process as they're
+			// saved, so remove the ones that belong to an imported collection
+			if (itemsInCollections.size && this._collections) {
+				for (let collectionID of this._collections) {
+					// The reused collection keeps the items that belong to it
+					let itemIDs = collectionID === reusedCollectionID
+						? [...itemsInCollections].filter(id => !reusedCollectionItems.has(id))
+						: [...itemsInCollections];
+					let collection = Zotero.Collections.get(collectionID);
+					await collection.removeItems(itemIDs, this._saveOptions);
 				}
 			}
 		}.bind(this));
@@ -1084,19 +1172,38 @@ Zotero.Translate.ItemGetter.prototype = {
 	},
 	
 	setCollection: function (collection, getChildCollections) {
-		// get items in this collection
-		var items = new Set(collection.getChildItems());
+		this.setCollections([collection], getChildCollections);
+	},
+	
+	setCollections: function (collections, getChildCollections) {
+		// get items in these collections
+		var items = new Set();
+		for (let collection of collections) {
+			collection.getChildItems().forEach(item => items.add(item));
+			
+			if (getChildCollections) {
+				// Get items in all descendant collections
+				let descendantCollections = Zotero.Collections.getByParent(collection.id, true);
+				for (let descendantCollection of descendantCollections) {
+					let childItems = descendantCollection.getChildItems();
+					childItems.forEach(item => items.add(item));
+				}
+			}
+		}
 		
 		if (getChildCollections) {
-			// Get child collections
-			this._collectionsLeft = Zotero.Collections.getByParent(collection.id);
-			
-			// Get items in all descendant collections
-			let descendantCollections = Zotero.Collections.getByParent(collection.id, true);
-			for (let collection of descendantCollections) {
-				let childItems = collection.getChildItems();
-				childItems.forEach(item => items.add(item));
-			}
+			// Collections below other given collections are exported as descendants of those
+			let ids = new Set(collections.map(collection => collection.id));
+			this._collectionsLeft = collections.filter((collection) => {
+				let parentID = collection.parentID;
+				while (parentID) {
+					if (ids.has(parentID)) {
+						return false;
+					}
+					parentID = Zotero.Collections.get(parentID).parentID;
+				}
+				return true;
+			});
 		}
 		
 		this._itemsLeft = Array.from(items.values());
diff --git a/chrome/content/zotero/xpcom/undoHistory.js b/chrome/content/zotero/xpcom/undoHistory.js
new file mode 100644
index 0000000000..9feb10cbe1
--- /dev/null
+++ b/chrome/content/zotero/xpcom/undoHistory.js
@@ -0,0 +1,520 @@
+/*
+	***** BEGIN LICENSE BLOCK *****
+
+	Copyright © 2026 Corporation for Digital Scholarship
+					 Vienna, Virginia, USA
+					 https://digitalscholar.org
+
+	This file is part of Zotero.
+
+	Zotero is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	Zotero is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+
+	***** END LICENSE BLOCK *****
+*/
+
+/**
+ * In-memory undo/redo stack for DataObject field changes.
+ *
+ * Hooks into DB transaction lifecycle to batch all saves within a single
+ * executeTransaction() into one undo step. Only tracks modifications to
+ * existing objects.
+ *
+ * Capture is opt-in via a two-call staging protocol within a transaction:
+ *   - stageChange(record) -- append a change record to the pending entry
+ *   - stageAction(action, args) -- attach an action label
+ * Both must be called within the same transaction for the entry to land on
+ * the undo stack. A transaction that stages changes without an action (or
+ * vice versa, with no staged changes) is silently discarded at commit.
+ * DataObject.save() calls stageChange unconditionally for non-isNew saves;
+ * stageAction is opt-in via save({ undoAction, undoActionArgs }) or by an
+ * outer caller invoking Zotero.UndoHistory.stageAction() directly inside
+ * the transaction.
+ */
+Zotero.UndoHistory = {
+	_undoStack: [],
+	_redoStack: [],
+	_pendingEntry: null,
+	_maxSteps: 100,
+	_opQueue: Promise.resolve(),
+
+	init() {
+		// default (100) when unset or non-numeric. 0 (or less) disables undo/redo entirely.
+		let steps = Zotero.Prefs.get('undoHistory.steps');
+		this._maxSteps = Number.isInteger(steps) ? steps : 100;
+		this.clear();
+	},
+
+	/**
+	 * @return {Boolean}
+	 */
+	isEnabled() {
+		return this._maxSteps > 0;
+	},
+
+	clear() {
+		this._undoStack = [];
+		this._redoStack = [];
+		this._pendingEntry = null;
+	},
+
+	/**
+	 * Discard both stacks if any entry references an object in the given library.
+	 * @param {Integer} libraryID
+	 */
+	clearForLibrary(libraryID) {
+		let affectsLibrary = entry => entry.changes.some(change => change.libraryID === libraryID);
+		if (this._undoStack.some(affectsLibrary) || this._redoStack.some(affectsLibrary)) {
+			this.clear();
+		}
+	},
+
+	/**
+	 * Return a window controller for cmd_undo/cmd_redo that defers to
+	 * native text-editing controllers when they are active.
+	 * Caller should append it to window.controllers.
+	 *
+	 * @param {Document} doc
+	 * @return {Object}
+	 */
+	getController(doc) {
+		return {
+			supportsCommand: cmd => cmd === 'cmd_undo' || cmd === 'cmd_redo',
+			isCommandEnabled: (cmd) => {
+				// Defer to native text-editing controllers when they can
+				// handle undo/redo (e.g. focused input/textarea)
+				if (this._hasNativeCommand(doc, cmd)) return false;
+				if (cmd === 'cmd_undo') return this.canUndo();
+				if (cmd === 'cmd_redo') return this.canRedo();
+				return false;
+			},
+			doCommand: (cmd) => {
+				if (cmd === 'cmd_undo') this.undo();
+				else if (cmd === 'cmd_redo') this.redo();
+			},
+			onEvent: () => {}
+		};
+	},
+
+	canUndo() {
+		return this._undoStack.length > 0;
+	},
+
+	canRedo() {
+		return this._redoStack.length > 0;
+	},
+
+	/**
+	 * Run an undo/redo operation only after all previously queued ones have
+	 * settled, so each step's staleness check sees the fully committed result
+	 * of the step before it. Returns the operation's own result; a failure in
+	 * one operation doesn't stall the queue for the next.
+	 *
+	 * @param {Function} fn -- async operation returning Promise<Boolean>
+	 * @return {Promise<Boolean>}
+	 */
+	_enqueue(fn) {
+		this._opQueue = this._opQueue.then(fn, fn);
+		return this._opQueue;
+	},
+
+	/**
+	 * Check whether the focused element has a native controller (e.g.
+	 * text-editing) that supports undo/redo, meaning UndoHistory should defer.
+	 * Checks the focused element's own controllers directly to avoid
+	 * re-entrancy with the command dispatcher.
+	 *
+	 * @param {Document} doc
+	 * @return {Boolean}
+	 */
+	hasNativeUndo(doc) {
+		return this._hasNativeCommand(doc, 'cmd_undo');
+	},
+
+	hasNativeRedo(doc) {
+		return this._hasNativeCommand(doc, 'cmd_redo');
+	},
+
+	_hasNativeCommand(doc, cmd) {
+		// If focus is in a child window (e.g. note-editor or reader iframe),
+		// it handles its own undo/redo internally
+		let focusedWindow = doc.commandDispatcher.focusedWindow;
+		if (focusedWindow && focusedWindow !== doc.defaultView) {
+			return true;
+		}
+		let el = doc.commandDispatcher.focusedElement;
+		if (!el) return false;
+		// Iframes (note-editor, reader) handle their own undo/redo
+		// internally but don't expose XUL controllers for it
+		if (el.tagName === 'iframe' || el.tagName === 'IFRAME') return true;
+		let controllers;
+		try {
+			controllers = el.controllers;
+		}
+		catch {
+			return false;
+		}
+		if (!controllers) return false;
+		for (let i = 0; i < controllers.getControllerCount(); i++) {
+			let ctrl = controllers.getControllerAt(i);
+			if (ctrl.supportsCommand(cmd)) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/**
+	 * Undo the most recent change entry. Serialized through a queue.
+	 *
+	 * @return {Promise<Boolean>} -- true if an entry was undone
+	 */
+	undo() {
+		return this._enqueue(() => this._undo());
+	},
+
+	_undo() {
+		// Undo restores the 'old' snapshot; decline if a covered object no
+		// longer holds the recorded 'new' value (an outside writer changed it).
+		return this._apply({
+			fromStack: '_undoStack',
+			toStack: '_redoStack',
+			staleSide: 'new',
+			applySide: 'old',
+			label: 'undo'
+		});
+	},
+
+	/**
+	 * Redo the most recently undone entry. Serialized through the same queue as undo()
+	 *
+	 * @return {Promise<Boolean>} -- true if an entry was redone
+	 */
+	redo() {
+		return this._enqueue(() => this._redo());
+	},
+
+	_redo() {
+		// Redo reapplies the 'new' snapshot; decline if a covered object no
+		// longer holds the recorded 'old' value (mirrors the check in _undo).
+		return this._apply({
+			fromStack: '_redoStack',
+			toStack: '_undoStack',
+			staleSide: 'old',
+			applySide: 'new',
+			label: 'redo'
+		});
+	},
+
+	/**
+	 * Pop the top entry off one stack, write back the recorded snapshot for the
+	 * given side, and -- on success -- push the entry onto the opposite stack.
+	 * Shared implementation behind _undo() (applySide 'old') and _redo()
+	 * (applySide 'new').
+	 *
+	 * The staleness check and the apply share one transaction so they're atomic.
+	 * If any object no longer holds its recorded `staleSide` value, an outside
+	 * writer changed it and replaying would clobber that change, so we decline
+	 * and discard history. A mid-apply failure is likewise untrustworthy, so we
+	 * realign memory with the rolled-back DB and discard.
+	 *
+	 * @param {Object} opts
+	 * @param {String} opts.fromStack -- name of the stack to pop the entry from
+	 * @param {String} opts.toStack -- name of the stack to push the entry to on success
+	 * @param {String} opts.staleSide -- recorded side the object must still hold ('new'/'old')
+	 * @param {String} opts.applySide -- recorded side to write back ('old'/'new')
+	 * @param {String} opts.label -- 'undo' or 'redo', for debug logging
+	 * @return {Promise<Boolean>} -- true if an entry was applied
+	 */
+	async _apply({ fromStack, toStack, staleSide, applySide, label }) {
+		let entry = this[fromStack].pop();
+		if (!entry) return false;
+		let stale = false;
+		try {
+			await Zotero.DB.executeTransaction(async () => {
+				if (this._entryIsStale(entry, staleSide)) {
+					stale = true;
+					return;
+				}
+				for (let change of entry.changes) {
+					let obj = this._getObject(change);
+					if (!obj) continue;
+					// Apply itemTypeID first so setType() migrates fields before
+					// the type-specific fields are restored on the correct type
+					if (change.fields.itemTypeID) {
+						this._applyFieldValue(obj, 'itemTypeID', change.fields.itemTypeID[applySide]);
+					}
+					for (let [field, values] of Object.entries(change.fields)) {
+						if (field === 'itemTypeID') continue;
+						this._applyFieldValue(obj, field, values[applySide]);
+					}
+					await obj.save({ skipSelect: true, skipDateModifiedUpdate: change.skipDateModified });
+				}
+			});
+			if (stale) {
+				Zotero.debug(`UndoHistory: declining stale ${label} entry`);
+				this.clear();
+				return false;
+			}
+			this[toStack].push(entry);
+			return true;
+		}
+		catch (e) {
+			Zotero.debug(`UndoHistory: ${label} failed: ` + e);
+			// Realign memory with the rolled-back DB before clearing history.
+			await this._reloadEntryObjects(entry);
+			// A failure means the object drifted out from under our snapshots,
+			// so the rest of the stack can't be trusted either. Discard history
+			// rather than risk applying stale values.
+			this.clear();
+			return false;
+		}
+	},
+
+	// -- Transaction lifecycle callbacks --
+
+	_onTransactionBegin(_id) {
+		this._pendingEntry = null;
+	},
+
+	_onTransactionCommit(_id) {
+		// Only push entries that staged both changes and an action;
+		// anything else (orphan captures, action without changes) is dropped
+		if (this._pendingEntry && this._pendingEntry.changes.length && this._pendingEntry.action) {
+			this._undoStack.push(this._pendingEntry);
+			this._redoStack = [];
+			if (this._undoStack.length > this._maxSteps) {
+				this._undoStack.splice(0, this._undoStack.length - this._maxSteps);
+			}
+		}
+		this._pendingEntry = null;
+	},
+
+	_onTransactionRollback(_id) {
+		this._pendingEntry = null;
+	},
+
+	/**
+	 * Stage an action label on the pending entry. Must be called inside a
+	 * transaction. Together with one or more stageChange() calls in the same
+	 * transaction, this is what makes the staged changes land on the undo
+	 * stack at commit -- a transaction that doesn't call stageAction has its
+	 * staged changes silently discarded.
+	 *
+	 * If called more than once in the same transaction, the last call wins.
+	 *
+	 * @param {String} action -- Fluent message ID (e.g. 'undo-action-add-tag')
+	 * @param {Object} [actionArgs] -- Fluent message arguments (e.g. { count: 3 })
+	 */
+	stageAction(action, actionArgs) {
+		if (!this.isEnabled()) {
+			return;
+		}
+		Zotero.DB.requireTransaction();
+		if (!this._pendingEntry) {
+			this._pendingEntry = { changes: [], action: null, actionArgs: null };
+		}
+		this._pendingEntry.action = action;
+		this._pendingEntry.actionArgs = actionArgs || null;
+	},
+
+	/**
+	 * Get the action description for the top of the undo stack
+	 *
+	 * @return {{ action: String, actionArgs: Object }|null}
+	 */
+	getUndoAction() {
+		let entry = this._undoStack[this._undoStack.length - 1];
+		if (!entry || !entry.action) return null;
+		return { action: entry.action, actionArgs: entry.actionArgs };
+	},
+
+	/**
+	 * Get the action description for the top of the redo stack
+	 *
+	 * @return {{ action: String, actionArgs: Object }|null}
+	 */
+	getRedoAction() {
+		let entry = this._redoStack[this._redoStack.length - 1];
+		if (!entry || !entry.action) return null;
+		return { action: entry.action, actionArgs: entry.actionArgs };
+	},
+
+	/**
+	 * Stage a change record. Must be called inside a transaction; without
+	 * a matching stageAction() in the same transaction, the record is
+	 * discarded at commit.
+	 *
+	 * Records for the same (objectType, id) are coalesced field-by-field:
+	 * first-write-wins for `old`, last-write-wins for `new`. This lets a
+	 * loop that saves the same object multiple times produce one composite
+	 * record spanning the whole transaction.
+	 *
+	 * @param {Object} changeRecord
+	 */
+	stageChange(changeRecord) {
+		if (!this.isEnabled()) {
+			return;
+		}
+		Zotero.DB.requireTransaction();
+		if (!this._pendingEntry) {
+			this._pendingEntry = { changes: [], action: null, actionArgs: null };
+		}
+		let existing = this._pendingEntry.changes.find(
+			c => c.objectType === changeRecord.objectType && c.id === changeRecord.id);
+		if (existing) {
+			existing.skipDateModified = !!(existing.skipDateModified && changeRecord.skipDateModified);
+			for (let [field, vals] of Object.entries(changeRecord.fields)) {
+				if (existing.fields[field]) {
+					existing.fields[field].new = vals.new;
+				}
+				else {
+					existing.fields[field] = vals;
+				}
+			}
+		}
+		else {
+			this._pendingEntry.changes.push(changeRecord);
+		}
+	},
+
+	/**
+	 * Realign in-memory state with the DB after a failed apply. The apply runs
+	 * many saves in one transaction; if a later one throws, the transaction
+	 * rolls back, but objects saved earlier already hold their reverted values
+	 * in memory. Reload each covered object so memory matches the committed DB.
+	 * Objects that no longer resolve (e.g. erased) or fail to reload are skipped.
+	 *
+	 * @param {Object} entry
+	 */
+	async _reloadEntryObjects(entry) {
+		for (let change of entry.changes) {
+			let obj = this._getObject(change);
+			if (!obj) {
+				continue;
+			}
+			try {
+				await obj.reload(null, true);
+			}
+			catch (e) {
+				Zotero.debug('UndoHistory: failed to reload object after apply failure: ' + e);
+			}
+		}
+	},
+
+	/**
+	 * Resolve a change record to a live DataObject
+	 *
+	 * @param {Object} change
+	 * @return {Zotero.DataObject|null}
+	 */
+	_getObject(change) {
+		let objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(change.objectType);
+		return objectsClass ? objectsClass.get(change.id) : null;
+	},
+
+	/**
+	 * Apply a value to the appropriate setter on an object
+	 *
+	 * @param {Zotero.DataObject} obj
+	 * @param {String} field
+	 * @param {*} value
+	 */
+	_applyFieldValue(obj, field, value) {
+		if (field === 'deleted') {
+			obj.deleted = value;
+		}
+		else if (field === 'name') {
+			obj.name = value;
+		}
+		else if (field === 'parentKey') {
+			// parentID setter routes through _setParentKey, which marks
+			// `parentKey` in _previousData (not parentID)
+			obj.parentKey = value;
+		}
+		else if (field === 'collections') {
+			obj.setCollections(value);
+		}
+		else if (field === 'tags') {
+			obj.setTags(value);
+		}
+		else if (field === 'note') {
+			obj.setNote(value);
+		}
+		else if (field === 'creators') {
+			// value is an object mapping orderIndex -> creator data (or empty object)
+			let maxIndex = -1;
+			for (let idx of Object.keys(value)) {
+				let i = parseInt(idx);
+				let creatorData = value[i];
+				obj.setCreator(i, creatorData);
+				if (i > maxIndex) maxIndex = i;
+			}
+			// Remove any creators beyond the restored set
+			while (obj.hasCreatorAt(maxIndex + 1)) {
+				obj.removeCreator(maxIndex + 1);
+			}
+		}
+		else if (field === 'relations') {
+			// value is a flat array of [predicate, object] pairs
+			let relObj = {};
+			for (let [predicate, object] of value) {
+				if (!relObj[predicate]) relObj[predicate] = [];
+				relObj[predicate].push(object);
+			}
+			obj.setRelations(relObj);
+		}
+		else if (field === 'itemTypeID') {
+			obj.setType(value);
+		}
+		else if (obj instanceof Zotero.Item) {
+			obj.setField(field, value);
+		}
+		else {
+			obj[field] = value;
+		}
+	},
+
+	/**
+	 * Whether an object covered by the entry no longer holds the value we
+	 * recorded for the given side ('new' for undo, 'old' for redo) -- meaning
+	 * something outside this history changed it and replaying would clobber that
+	 * change. Objects that no longer resolve (e.g. erased) are skipped.
+	 *
+	 * @param {Object} entry
+	 * @param {String} side -- 'new' (undo) or 'old' (redo)
+	 * @return {Boolean}
+	 */
+	_entryIsStale(entry, side) {
+		for (let change of entry.changes) {
+			let obj = this._getObject(change);
+			if (!obj) {
+				continue;
+			}
+
+			let matches;
+			try {
+				matches = obj.matchesUndoSnapshot(change.fields, side);
+			}
+			catch (e) {
+				// Can't verify the snapshot, so we can't rule out an external change
+				Zotero.debug('UndoHistory: could not verify snapshot for staleness; declining entry: ' + e);
+				return true;
+			}
+			if (!matches) {
+				return true;
+			}
+		}
+		return false;
+	}
+};
diff --git a/chrome/content/zotero/xpcom/users.js b/chrome/content/zotero/xpcom/users.js
index ae069cd1f5..9262131c64 100644
--- a/chrome/content/zotero/xpcom/users.js
+++ b/chrome/content/zotero/xpcom/users.js
@@ -139,6 +139,18 @@ Zotero.Users = new function () {
 			return;
 		}
 		await Zotero.DB.queryAsync("REPLACE INTO users VALUES (?, ?)", [userID, name]);
+		// Restore the cached name if the transaction is rolled back
+		if (Zotero.DB.inTransaction()) {
+			let previous = _users[userID];
+			Zotero.DB.addCurrentCallback("rollback", () => {
+				if (previous === undefined) {
+					delete _users[userID];
+				}
+				else {
+					_users[userID] = previous;
+				}
+			});
+		}
 		_users[userID] = name;
 	}
 };
diff --git a/chrome/content/zotero/xpcom/utilities b/chrome/content/zotero/xpcom/utilities
index 1dd38e27ed..4051881d59 160000
--- a/chrome/content/zotero/xpcom/utilities
+++ b/chrome/content/zotero/xpcom/utilities
@@ -1 +1 @@
-Subproject commit 1dd38e27edf81e9d9c4161c957b7efb7f5681ac3
+Subproject commit 4051881d59c6c12d34417d4c226f37218051be90
diff --git a/chrome/content/zotero/xpcom/utilities_internal.js b/chrome/content/zotero/xpcom/utilities_internal.js
index 8d2c19bc3c..33d5a1cf7f 100644
--- a/chrome/content/zotero/xpcom/utilities_internal.js
+++ b/chrome/content/zotero/xpcom/utilities_internal.js
@@ -36,6 +36,100 @@ ChromeUtils.defineESModuleGetters(globalThis, {
 Zotero.Utilities.Internal = {
 	SNAPSHOT_SAVE_TIMEOUT: 30000,
 
+	// Characters that NFKD leaves in a non-ASCII form: letters with no decomposition (letter
+	// ligatures and others) and the fraction slash NFKD introduces (½ -> "1⁄2"). Converted via an
+	// explicit map applied after NFKD/lowercasing, so that e.g. a search for "soren" matches
+	// "Søren" and "1/2" matches "½". Typographic ligatures (fi, fl, ...), superscripts, full-width
+	// forms, etc. don't need an entry -- NFKD already reduces those to ASCII.
+	_searchNormalizeMap: {
+		'ø': 'o',
+		'œ': 'oe',
+		'æ': 'ae',
+		'ł': 'l',
+		'đ': 'd',
+		'ð': 'd',
+		'þ': 'th',
+		'ß': 'ss',
+		'ı': 'i',
+		'⁄': '/'
+	},
+
+	// The rich-text formatting tags Zotero supports in item fields (see the rich-text bibliography
+	// support page). Stripped when normalizing so search matches the field's plain text: a phrase
+	// isn't broken across a formatted word (e.g., an italicized species name) and the tag markup
+	// itself isn't matchable. Only this whitelist is stripped, so literal angle brackets in a value
+	// stay searchable.
+	_searchFormattingTagRE: /<\/?(?:i|b|sub|sup)>|<span (?:style="font-variant:small-caps;"|class="nocase")>|<\/span>/g,
+
+
+	/**
+	 * Normalize a string to a case- and accent-insensitive form for searching
+	 *
+	 * Strips Zotero's supported field formatting tags (see _searchFormattingTagRE), then uses
+	 * Unicode NFKD compatibility decomposition (ICU-backed) to split combining marks off their base
+	 * letters and reduce presentation variants (typographic ligatures, superscripts, full-width
+	 * forms, etc.) to plain ASCII, strips the marks, converts a few non-decomposing letters via
+	 * _searchNormalizeMap, and folds typographic quotes and dashes to their ASCII forms. This is the
+	 * form stored in the normalized search columns and applied to search terms, so that e.g.
+	 * "seance" matches "séance", "x2" matches "x²", and "children's" matches a curly apostrophe.
+	 *
+	 * If you change this function or _searchNormalizeMap, add a userdata migration step that
+	 * re-normalizes existing rows whose raw value contains the affected characters (scan with
+	 * GLOB/LIKE).
+	 *
+	 * @param {String} str
+	 * @return {String}
+	 */
+	normalizeForSearch: function (str) {
+		if (!str) {
+			return str;
+		}
+		let map = Zotero.Utilities.Internal._searchNormalizeMap;
+		// Strip supported formatting tags so they don't break phrase matches or match themselves
+		if (str.includes('<')) {
+			str = str.replace(Zotero.Utilities.Internal._searchFormattingTagRE, '');
+		}
+		return str.normalize('NFKD').replace(/[\u0300-\u036f]/g, '').toLowerCase()
+			.replace(/[\u00f8\u0153\u00e6\u0142\u0111\u00f0\u00fe\u00df\u0131\u2044]/g, c => map[c])
+			// Fold typographic quotes and dashes to their ASCII forms, which NFKD leaves alone, so
+			// curly quotes and en/em dashes in stored text (from a word processor or translator)
+			// match the straight quotes and hyphens typed in a search. Dashes all fold to a single
+			// hyphen, since that's what a search is typed with.
+			.replace(/[\u2018\u2019\u201a\u201b\u2032]/g, "'")
+			.replace(/[\u201c\u201d\u201e\u201f\u2033]/g, '"')
+			.replace(/[\u2010\u2011\u2012\u2013\u2014\u2015\u2212]/g, '-')
+			// Recompose (NFC) so kana and Hangul that NFKD split apart -- が into か + dakuten,
+			// 한 into jamo -- are put back together. Otherwise their decomposed forms would
+			// substring-match shorter ones under LIKE/instr (か matching が, 하 matching 한). Latin
+			// folding is unaffected: its diacritics were already stripped above, so nothing is
+			// left to recompose.
+			.normalize('NFC');
+	},
+
+
+	/**
+	 * Compute the value to store in a normalized search column for a given source value
+	 *
+	 * Returns the normalized form only when normalizing changes more than the case of ASCII letters,
+	 * which is all SQLite's default LIKE folds; otherwise returns null, so the bulk of plain-ASCII
+	 * values cost nothing and queries fall back to the raw column via COALESCE. A value with folded
+	 * diacritics, folded forms, or non-ASCII case (Greek, Cyrillic, ...) that LIKE wouldn't fold is
+	 * stored, so a normalized search term still matches it.
+	 *
+	 * @param {String} value
+	 * @return {String|null}
+	 */
+	normalizeForSearchStorage: function (value) {
+		if (typeof value != 'string' || !value) {
+			return null;
+		}
+		let normalized = Zotero.Utilities.Internal.normalizeForSearch(value);
+		// Lowercasing only the ASCII letters, so the comparison treats a case difference as
+		// significant unless LIKE would fold it
+		let asciiLowercased = value.replace(/[A-Z]/g, c => c.toLowerCase());
+		return normalized === asciiLowercased ? null : normalized;
+	},
+
 	/**
 	 * Run a function on chunks of a given size of an array's elements.
 	 *
@@ -134,14 +228,18 @@ Zotero.Utilities.Internal = {
 	
 	
 	/**
+	 * Get the MD5 hash of a file, reading it via an off-main-thread stream and hashing it
+	 * a segment at a time so that the main thread is never blocked for the whole file
+	 *
 	 * @param {nsIFile|String} file  File or file path
+	 * @return {Promise<String|false>}  Lowercase hex string, or false if the file doesn't exist
 	 */
 	md5Async: async function (file) {
 		function toHexString(charCode) {
 			return ("0" + charCode.toString(16)).slice(-2);
 		}
 		
-		var file = Zotero.File.pathToFile(file);
+		file = Zotero.File.pathToFile(file);
 		try {
 			let { size } = await IOUtils.stat(file.path);
 			if (size === 0) {
@@ -163,29 +261,45 @@ Zotero.Utilities.Internal = {
 		
 		var is = Cc["@mozilla.org/network/file-input-stream;1"]
 			.createInstance(Ci.nsIFileInputStream);
-		try {
-			is.init(Zotero.File.pathToFile(file), -1, -1, Ci.nsIFileInputStream.CLOSE_ON_EOF);
-			ch.updateFromStream(is, -1);
-			// Get binary string and convert to hex string
-			let hash = ch.finish(false);
-			let hexStr = "";
-			for (let i = 0; i < hash.length; i++) {
-				hexStr += toHexString(hash.charCodeAt(i));
-			}
-			return hexStr;
-		}
-		catch (e) {
-			try {
-				ch.finish(false);
-			}
-			catch (e) {
-				Zotero.logError(e);
-			}
-			throw e;
-		}
-		finally {
-			is.close();
-		}
+		// DEFER_OPEN so that the file is opened on the pump's background thread rather than
+		// synchronously here
+		is.init(file, -1, -1, Ci.nsIFileInputStream.CLOSE_ON_EOF | Ci.nsIFileInputStream.DEFER_OPEN);
+		
+		var pump = Cc["@mozilla.org/network/input-stream-pump;1"]
+			.createInstance(Ci.nsIInputStreamPump);
+		pump.init(is, 0, 0, true);
+		
+		return new Promise((resolve, reject) => {
+			pump.asyncRead({
+				onStartRequest: function (_request) {},
+				
+				onDataAvailable: function (request, inputStream, offset, count) {
+					ch.updateFromStream(inputStream, count);
+				},
+				
+				onStopRequest: function (_request, status) {
+					if (!Components.isSuccessCode(status)) {
+						try {
+							ch.finish(false);
+						}
+						catch (e) {
+							Zotero.logError(e);
+						}
+						reject(new Components.Exception("Error reading " + file.path, status));
+						return;
+					}
+					// Get binary string and convert to hex string
+					let hash = ch.finish(false);
+					let hexStr = "";
+					for (let i = 0; i < hash.length; i++) {
+						hexStr += toHexString(hash.charCodeAt(i));
+					}
+					resolve(hexStr);
+				},
+				
+				QueryInterface: ChromeUtils.generateQI(["nsIStreamListener", "nsIRequestObserver"])
+			});
+		});
 	},
 	
 	
@@ -388,13 +502,13 @@ Zotero.Utilities.Internal = {
 	},
 	
 	containsEmoji: function (str) {
-		let re = /\p{RGI_Emoji}|[\p{Extended_Pictographic}--[©®™]]/gv;
+		let re = /\p{RGI_Emoji}|[[\p{Extended_Pictographic}[\p{So}&&[☀-➿\u{1F000}-\u{1FAFF}]]]--[©®™\u{1F1E6}-\u{1F1FF}]]/gv;
 		return !!str.match(re);
 	},
 
 	includesEmoji: function (str) {
 		// Remove emoji, Zero Width Joiner, and Variation Selector-16 and compare lengths
-		const re = /(?:(?:\p{RGI_Emoji}|[\p{Extended_Pictographic}--[©®™]])(?!\uFE0F)|.\uFE0F)+/gv;
+		const re = /(?:(?:\p{RGI_Emoji}|[[\p{Extended_Pictographic}[\p{So}&&[☀-➿\u{1F000}-\u{1FAFF}]]]--[©®™\u{1F1E6}-\u{1F1FF}]])(?!\uFE0F)|.\uFE0F)+/gv;
 		return str.replace(re, '').length !== str.length;
 	},
 	
@@ -631,6 +745,51 @@ Zotero.Utilities.Internal = {
 		return result;
 	},
 	
+	/**
+	 * Run a Gatekeeper assessment of the running app bundle
+	 *
+	 * Safari computes a code signing dictionary for the bundled Safari extension each time it
+	 * launches, and blocks the extension if that fails, which leaves the connector missing from
+	 * Safari's extensions list. The computation can start failing when the app is updated, and it
+	 * keeps failing on every subsequent launch. An assessment refreshes the system state that the
+	 * computation depends on, and Safari loads the extension again the next time it starts.
+	 *
+	 * macOS only. Does nothing for source builds, which don't bundle the extension.
+	 *
+	 * @return {Promise}
+	 */
+	assessAppBundle: async function () {
+		if (!Zotero.isMac || Zotero.isSourceBuild) {
+			return;
+		}
+		
+		let bundle = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent.parent.parent;
+		
+		Zotero.debug("Running Gatekeeper assessment of " + bundle.path);
+		
+		let proc = await Subprocess.call({
+			command: '/usr/sbin/spctl',
+			arguments: ['-a', '-vv', bundle.path],
+			stderr: 'pipe'
+		});
+		
+		// spctl writes its verdict to stderr
+		let output = "";
+		let str;
+		while ((str = await proc.stderr.readString())) {
+			output += str;
+		}
+		let { exitCode } = await proc.wait();
+		
+		let message = "Gatekeeper assessment returned " + exitCode + "\n\n" + output.trim();
+		if (exitCode) {
+			Zotero.warn(message);
+		}
+		else {
+			Zotero.debug(message);
+		}
+	},
+	
 	/**
 	 * Get string data from the clipboard
 	 * @param {String[]} mimeType MIME type of data to get
@@ -832,12 +991,6 @@ Zotero.Utilities.Internal = {
 	},
 	
 	blobToText: async function (blob, charset = null) {
-		if (!charset) {
-			var matches = blob.type && blob.type.match(/charset=([a-z0-9\-_+])/i);
-			if (matches) {
-				charset = matches[1];
-			}
-		}
 		return new Promise(function (resolve) {
 			let fr = new FileReader();
 			fr.addEventListener("loadend", function () {
@@ -1621,6 +1774,10 @@ Zotero.Utilities.Internal = {
 	 * Create a libraryOrCollection DOM tree to place in <menupopup> element.
 	 * If has no children, returns a <menuitem> element, otherwise <menu>.
 	 *
+	 * When the menu belongs to a <menulist>, typing while the menu is closed selects the
+	 * first matching target at any depth, since the platform's own find-as-you-type only
+	 * reaches the items of the open popup.
+	 *
 	 * @param {Library|Collection} libraryOrCollection
 	 * @param {Node<menupopup>} elem Parent element
 	 * @param {Zotero.Library|Zotero.Collection} currentTarget Currently selected item (displays as checked)
@@ -1628,22 +1785,24 @@ Zotero.Utilities.Internal = {
 	 * 		Receives the event and libraryOrCollection for given item.
 	 * @param {Function} disabledPred If provided, called on each library/collection
 	 * 		to determine whether disabled
+	 * @param {Object} [options]
+	 * @param {Function} [options.filter] If provided, called on each library/collection to
+	 * 		determine whether to include it. An excluded target is replaced by its subcollections.
 	 *
-	 * @return {Node<menuitem>|Node<menu>} appended node
+	 * @return {Node<menuitem>|Node<menu>|null} appended node, or null if the target was excluded
 	 */
-	createMenuForTarget: function (libraryOrCollection, elem, currentTarget, clickAction, disabledPred) {
+	createMenuForTarget: function (libraryOrCollection, elem, currentTarget, clickAction, disabledPred, options = {}) {
 		var doc = elem.ownerDocument;
 		function _createMenuitem(label, value, icon, command, disabled) {
 			let menuitem = doc.createXULElement('menuitem');
 			menuitem.setAttribute("label", label);
 			if (value == currentTarget) {
-				// type="checkbox" hides icon, so only set if checked
-				menuitem.setAttribute("type", "checkbox");
+				// Not type="checkbox", which suppresses the icon
 				menuitem.setAttribute("checked", "true");
 			}
 			menuitem.setAttribute("value", value);
 			menuitem.setAttribute("image", icon);
-			menuitem.setAttribute("disabled", disabled);
+			menuitem.toggleAttribute("disabled", disabled);
 			menuitem.addEventListener('command', command);
 			menuitem.classList.add('menuitem-iconic');
 			return menuitem;
@@ -1666,54 +1825,172 @@ Zotero.Utilities.Internal = {
 			return menu;
 		}
 		
-		var imageSrc = libraryOrCollection.treeViewImage;
-		
-		// Create menuitem for library or collection itself, to be placed either directly in the
-		// containing menu or as the top item in a submenu
-		var menuitem = _createMenuitem(
-			libraryOrCollection.name,
-			libraryOrCollection.treeViewID,
-			imageSrc,
-			function (event) {
-				clickAction(event, libraryOrCollection);
-			},
-			disabledPred && disabledPred(libraryOrCollection)
-		);
-		
-		var collections;
-		if (libraryOrCollection.objectType == 'collection') {
-			collections = Zotero.Collections.getByParent(libraryOrCollection.id);
-		}
-		else {
-			collections = Zotero.Collections.getByLibrary(libraryOrCollection.libraryID);
-		}
-		
-		// If no subcollections, place menuitem for target directly in containing men
-		if (collections.length == 0) {
-			elem.appendChild(menuitem);
-			return menuitem;
-		}
-		
-		// Otherwise create a submenu for the target's subcollections
-		var menu = _createMenu(
-			libraryOrCollection.name,
-			libraryOrCollection.treeViewID,
-			imageSrc,
-			function (event) {
-				clickAction(event, libraryOrCollection);
+		// The menu isn't rebuilt between openings, so move the checkmark to the target
+		// that's activated. A <menulist> marks the item clicked in its own popup as
+		// selected, drawing a checkmark of its own, and can't clear it when the next
+		// pick is in a submenu, so clear that too.
+		function _setCurrentTarget(target) {
+			if (!currentTarget) {
+				return;
+			}
+			for (let menuitem of elem.querySelectorAll('menuitem[checked], menuitem[selected]')) {
+				menuitem.removeAttribute('checked');
+				menuitem.removeAttribute('selected');
+			}
+			let menuitem = elem.querySelector(`menuitem[value="${target.treeViewID}"]`);
+			if (menuitem) {
+				menuitem.setAttribute('checked', 'true');
 			}
-		);
-		var menupopup = menu.firstChild;
-		menupopup.appendChild(menuitem);
-		menupopup.appendChild(doc.createXULElement('menuseparator'));
-		for (let collection of collections) {
-			let collectionMenu = this.createMenuForTarget(
-				collection, elem, currentTarget, clickAction, disabledPred
-			);
-			menupopup.appendChild(collectionMenu);
 		}
-		elem.appendChild(menu);
-		return menu;
+		
+		function _appendTarget(target, parent) {
+			let collections = target.objectType == 'collection'
+				? Zotero.Collections.getByParent(target.id)
+				: Zotero.Collections.getByLibrary(target.libraryID);
+			
+			// Subcollections move up to take the place of an excluded target
+			if (options.filter && !options.filter(target)) {
+				for (let collection of collections) {
+					_appendTarget(collection, parent);
+				}
+				return null;
+			}
+			
+			let command = (event) => {
+				_setCurrentTarget(target);
+				clickAction(event, target);
+			};
+			let imageSrc = target.treeViewImage;
+			
+			// Create menuitem for library or collection itself, to be placed either directly in
+			// the containing menu or as the top item in a submenu
+			let menuitem = _createMenuitem(
+				target.name,
+				target.treeViewID,
+				imageSrc,
+				command,
+				disabledPred && disabledPred(target)
+			);
+			
+			// If no subcollections, place menuitem for target directly in containing menu
+			if (collections.length == 0) {
+				parent.appendChild(menuitem);
+				return menuitem;
+			}
+			
+			// Otherwise create a submenu for the target's subcollections
+			let menu = _createMenu(target.name, target.treeViewID, imageSrc, command);
+			let menupopup = menu.firstChild;
+			menupopup.appendChild(menuitem);
+			menupopup.appendChild(doc.createXULElement('menuseparator'));
+			for (let collection of collections) {
+				_appendTarget(collection, menupopup);
+			}
+			parent.appendChild(menu);
+			return menu;
+		}
+		
+		var node = _appendTarget(libraryOrCollection, elem);
+		this.addMenuFindAsYouType(elem);
+		return node;
+	},
+	
+	
+	MENU_FIND_AS_YOU_TYPE_TIMEOUT: 1000,
+	
+	
+	/**
+	 * Whether typing in `menulist` is currently building up a find-as-you-type search
+	 *
+	 * @param {Node<menulist>} menulist
+	 * @return {Boolean}
+	 */
+	isMenuFindAsYouTypeActive: function (menulist) {
+		let state = menulist._findAsYouType;
+		return !!state?.buffer
+			&& Date.now() - state.time <= this.MENU_FIND_AS_YOU_TYPE_TIMEOUT;
+	},
+	
+	
+	/**
+	 * Select an item by typing on the closed <menulist> whose menu is `elem``
+	 *
+	 * A menulist's built-in find-as-you-type only looks at the direct children of its
+	 * menupopup, so an item in a submenu can't be reached from the keyboard without opening
+	 * the menu. This matches on every menuitem in the menu instead, and cycles through the
+	 * matches when the same character is typed repeatedly.
+	 *
+	 * @param {Node<menupopup>} elem
+	 * @param {Function} [getLabel] Given a menuitem, the text to match it on, for a menu
+	 *     whose items are shown with a different label than the menulist gives them
+	 */
+	addMenuFindAsYouType: function (elem, getLabel = item => item.label) {
+		var menulist = elem.closest('menulist');
+		if (!menulist) {
+			return;
+		}
+		// The search is kept on the menulist so that the space-opens-a-menulist handler in
+		// customElements.js can see one in progress
+		if (menulist._findAsYouType) {
+			Object.assign(menulist._findAsYouType, { popup: elem, getLabel, buffer: '', time: 0 });
+			return;
+		}
+		let state = menulist._findAsYouType = { popup: elem, getLabel, buffer: '', time: 0 };
+		
+		menulist.addEventListener('keydown', (event) => {
+			// A later call can replace the menu, so take these from the state rather than
+			// from this call's arguments
+			let { popup, getLabel: getItemLabel } = state;
+			// The menu has been replaced by one this doesn't know about
+			if (menulist.menupopup != popup) {
+				return;
+			}
+			// Let the platform handle typing while the popup is open, and ignore in-progress
+			// IME composition (event.key is "Process")
+			if (menulist.open || event.isComposing
+					|| event.ctrlKey || event.metaKey || event.altKey) {
+				return;
+			}
+			// Only act on a single printable character. Count code points rather than UTF-16
+			// units so supplementary-plane characters aren't treated as multi-key sequences.
+			if (Array.from(event.key).length != 1) {
+				return;
+			}
+			
+			// Start a new search if enough time has passed since the last keystroke
+			let now = Date.now();
+			if (now - state.time > this.MENU_FIND_AS_YOU_TYPE_TIMEOUT) {
+				state.buffer = '';
+			}
+			state.time = now;
+			
+			// With no search to continue, leave the space to open the menu
+			if (event.key == ' ' && !state.buffer) {
+				return;
+			}
+			state.buffer += event.key.toLowerCase();
+			// Keep the platform's own incremental search from acting on the same keystroke
+			event.preventDefault();
+			
+			// When the same character is typed repeatedly, cycle through the matching items,
+			// starting after the current one
+			let items = [...popup.querySelectorAll('menuitem:not([disabled], [hidden])')];
+			let cycling = state.buffer.length > 1
+				&& [...state.buffer].every(c => c == state.buffer[0]);
+			let prefix = cycling ? state.buffer[0] : state.buffer;
+			let startIndex = cycling
+				? items.findIndex(item => item.hasAttribute('checked')) + 1
+				: 0;
+			
+			for (let i = 0; i < items.length; i++) {
+				let item = items[(startIndex + i) % items.length];
+				if (getItemLabel(item).toLowerCase().startsWith(prefix)) {
+					event.stopPropagation();
+					item.doCommand();
+					break;
+				}
+			}
+		}, true);
 	},
 	
 	openPreferences: function (paneID, options = {}) {
@@ -1789,7 +2066,7 @@ Zotero.Utilities.Internal = {
 		
 		// Pull window to foreground
 		Zotero.Utilities.Internal.activate(pane.document.defaultView);
-		pane.document.ownerGlobal.focus();
+		pane.document.documentGlobal.focus();
 	},
 	
 	
@@ -2097,6 +2374,14 @@ Zotero.Utilities.Internal = {
 			}
 			ev.listeners.delete(listener);
 		};
+		
+		/**
+		 * Remove all listeners from all events, so that an object being torn down doesn't
+		 * keep its listeners' closures alive
+		 */
+		cls.prototype.clearEventListeners = function () {
+			this._events = null;
+		};
 
 		cls.prototype._waitForEvent = async function (event) {
 			return new Zotero.Promise((resolve) => {
@@ -2107,224 +2392,12 @@ Zotero.Utilities.Internal = {
 
 	
 	/**
-	 * Splits a string by outer-most brackets (`{{` and '}}' by default, configurable).
-	 *
-	 * @param {string} input - The input string to split.
-	 * @returns {string[]} An array of strings split by outer-most brackets.
-	 */
-	splitByOuterBrackets: function (input, left = '{{', right = '}}') {
-		const result = [];
-		let startIndex = 0;
-		let depth = 0;
-
-		for (let i = 0; i < input.length; i++) {
-			if (input.slice(i, i + 2) === left) {
-				if (depth === 0) {
-					result.push(input.slice(startIndex, i));
-					startIndex = i;
-				}
-				depth++;
-			}
-			else if (input.slice(i, i + 2) === right) {
-				depth--;
-				if (depth === 0) {
-					result.push(input.slice(startIndex, i + 2));
-					startIndex = i + 2;
-				}
-			}
-		}
-
-		if (startIndex < input.length) {
-			result.push(input.slice(startIndex));
-		}
-
-		return result;
-	},
-
-	/**
-	 * A basic templating engine
-	 *
-	 * - 'if' statement does case-insensitive string comparison
-	 * -  functions can be called from if statements but must be wrapped in {{}} if arguments are passed (e.g. {{myFunction arg1="foo" arg2="bar"}})
-	 *
-	 * Vars example:
-	 *  {
-	 * 	  color: '#ff6666',
-	 * 	  highlight: '<span class="highlight">This is a highlight</span>,
-	 *    comment: 'This is a comment',
-	 *    citation: '<span class="citation">(Author, 1900)</citation>',
-	 *    image: '<img src="…"/>',
-	 *    tags: (attrs) => ['tag1', 'tag2'].map(tag => tag.name).join(attrs.join || ' ')
-	 *  }
-	 *
-	 * Template example:
-	 *  {{if color == '#ff6666'}}
-	 *    <h2>{{highlight}}</h2>
-	 *  {{elseif color == '#2ea8e5'}}
-	 *    {{if comment}}<p>{{comment}}:</p>{{endif}}<blockquote>{{highlight}}</blockquote><p>{{citation}}</p>
-	 *  {{else}}
-	 *    <p>{{highlight}} {{citation}} {{comment}} {{if tags}} #{{tags join=' #'}}{{endif}}</p>
-	 *  {{endif}}
-	 *
-	 * @param {String} template
-	 * @param {Object} vars
-	 * @returns {String} HTML
+	 * @deprecated Use generateHTMLFromTemplate() from modules/templates.mjs
 	 */
 	generateHTMLFromTemplate: function (template, vars) {
-		const hyphenToCamel = varName => varName.replace(/-(.)/g, (_, g1) => g1.toUpperCase());
-
-		const getAttributes = (part) => {
-			let attrsRegexp = new RegExp(/(([\w-]*) *=+ *(['"])((\\\3|[^\3])*?)\3)/g);
-			let attrs = {};
-			let match;
-			while ((match = attrsRegexp.exec(part))) {
-				if (match[1]) { // if first alternative (i.e. argument with value wrapped in " or ') matched, even if value is empty
-					attrs[hyphenToCamel(match[2])] = match[4];
-				}
-			}
-			return attrs;
-		};
-
-		
-		const evaluateIdentifier = (ident, args = {}) => {
-			ident = hyphenToCamel(ident);
-
-			if (!(ident in vars)) {
-				return '';
-			}
-
-			const identValue = typeof vars[ident] === 'function' ? vars[ident](args) : vars[ident];
-
-			if (Array.isArray(identValue)) {
-				return identValue.length ? identValue.join(',') : '';
-			}
-
-			if (typeof identValue !== 'string') {
-				throw new Error(`Identifier "${ident}" does not evaluate to a string`);
-			}
-			
-			return identValue;
-		};
-		
-		// evaluates extracted (i.e. without brackets) statement (e.g. `sum a="1" b="2"`) into a string value
-		const evaluateStatement = (statement) => {
-			statement = statement.trim();
-			const operator = statement.split(' ', 1)[0].trim();
-			const args = statement.slice(operator.length).trim();
-
-			return evaluateIdentifier(operator, getAttributes(args));
-		};
-
-		// splits raw (i.e. bracketed) statement (e.g. `{{ sum a="1" b="2" }}) into operator and arguments (e.g. ['sum', 'a="1" b="2"'])
-		const splitStatement = (statement) => {
-			statement = statement.slice(2, -2).trim();
-			const operator = statement.split(' ', 1)[0].trim();
-			const args = statement.slice(operator.length).trim();
-			return [operator, args];
-		};
-
-		// We allow unquoted numbers in conditions, e.g. `a == 1` or `a == 1.0`  but not `a == 1.0.0` or `a == 1st edition`
-		const asNumber = (string) => {
-			if (typeof string === 'number') {
-				return string;
-			}
-			const number = parseFloat(string);
-			if (!Number.isNaN(number) && string?.trim().match(/^[+-]?\d+(\.\d+)?$/)) {
-				return number;
-			}
-			return null;
-		};
-
-		// evaluates a condition (e.g. `a == "b"`) into a boolean value
-		const evaluateCondition = (condition) => {
-			const comparators = ['==', '!=', "<=", ">=", '<', '>'];
-			condition = condition.trim();
-			
-			// Regular expression breakdown for condition matching:
-			// - `match[1]`: Left operand if it's a statement enclosed in `{{...}}`.
-			// - `match[3]`: Left operand if it's a string literal, extracted without quotes.
-			// - `match[4]`: Left operand if it's a standalone identifier (e.g., a variable) or a number
-			// - `match[6]`: Right operand if it's a statement enclosed in `{{...}}`.
-			// - `match[8]`: Right operand if it's a string literal, extracted without quotes.
-			// - `match[9]`: Right operand if it's a standalone identifier or a number.
-			// - `match[2]` and `match[7]`: Captured quotes around string literals, used to ensure matching pairs.
-			// - `match[5]`: The comparator (e.g., `==`, `!=`, `<`, `>`, etc.), extracted from `comparators.join('|')`.
-			const match = condition.match(new RegExp(String.raw`(?:{{(.*?)}}|(?:(['"])(.*?)\2)|([^ ]+)) *(${comparators.join('|')}) *(?:{{(.*?)}}|(?:(['"])(.*?)\7)|([^ ]+))`));
-			
-			if (!match) {
-				// condition is a statement or identifier without a comparator
-				if (condition.startsWith('{{')) {
-					const [operator, args] = splitStatement(condition);
-					return !!evaluateIdentifier(operator, getAttributes(args));
-				}
-				return !!evaluateIdentifier(condition);
-			}
-
-			const left = match[1] ? evaluateStatement(match[1]) : match[3] ?? asNumber(match[4]) ?? evaluateIdentifier(match[4]) ?? '';
-			const comparator = match[5];
-			const right = match[6] ? evaluateStatement(match[6]) : match[8] ?? asNumber(match[9]) ?? evaluateIdentifier(match[9]) ?? '';
-
-			switch (comparator) {
-				default:
-				case '==':
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() == right.toLowerCase() : asNumber(left) == asNumber(right);
-				case '!=':
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() != right.toLowerCase() : asNumber(left) != asNumber(right);
-				case ">=":
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() >= right.toLowerCase() : asNumber(left) >= asNumber(right);
-				case "<=":
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() <= right.toLowerCase() : asNumber(left) <= asNumber(right);
-				case '>':
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() > right.toLowerCase() : asNumber(left) > asNumber(right);
-				case '<':
-					return (asNumber(left) === null || asNumber(right === null)) ? left.toLowerCase() < right.toLowerCase() : asNumber(left) < asNumber(right);
-			}
-		};
-
-		let html = '';
-		const levels = [{ condition: true }];
-		const parts = this.splitByOuterBrackets(template);
-
-		for (let i = 0; i < parts.length; i++) {
-			let part = parts[i];
-			let level = levels[levels.length - 1];
-
-			if (part.startsWith('{{')) {
-				const [operator, args] = splitStatement(part);
-			
-				if (operator === 'if') {
-					level = { condition: false, executed: false, parentCondition: levels[levels.length - 1].condition };
-					levels.push(level);
-				}
-				if (['if', 'elseif'].includes(operator)) {
-					if (!level.executed) {
-						level.condition = level.parentCondition && evaluateCondition(args);
-						level.executed = level.condition;
-					}
-					else {
-						level.condition = false;
-					}
-					continue;
-				}
-				else if (operator === 'else') {
-					level.condition = level.parentCondition && !level.executed;
-					level.executed = level.condition;
-					continue;
-				}
-				else if (operator === 'endif') {
-					levels.pop();
-					continue;
-				}
-				if (level.condition) {
-					const attrs = getAttributes(part);
-					html += evaluateIdentifier(operator, attrs);
-				}
-			}
-			else if (level.condition) {
-				html += part;
-			}
-		}
-		return html;
+		Zotero.debug("Zotero.Utilities.Internal.generateHTMLFromTemplate() is deprecated -- use modules/templates.mjs");
+		let { generateHTMLFromTemplate } = ChromeUtils.importESModule("chrome://zotero/content/modules/templates.mjs");
+		return generateHTMLFromTemplate(template, vars);
 	},
 
 	/**
@@ -2576,18 +2649,21 @@ Zotero.Utilities.Internal = {
 	},
 
 	/**
-	 * Check whether an object belongs to a closed window, and is therefore
-	 * keeping it alive.
+	 * Check whether an object or function belongs to a closed window, and is
+	 * therefore keeping it alive.
+	 *
+	 * A window only counts as leaked once it's closed and detached from its
+	 * docShell, which happens after its 'unload' handlers have run.
 	 *
 	 * @param {any} obj
 	 * @returns {boolean}
 	 */
 	isObjectLeakingWindow(obj) {
-		if (typeof obj !== 'object' || obj === null) {
+		if (obj === null || (typeof obj !== 'object' && typeof obj !== 'function')) {
 			return false;
 		}
 		let global = Cu.getGlobalForObject(obj);
-		return global.constructor.name === 'Window' && global.closed;
+		return global.constructor.name === 'Window' && global.closed && !global.docShell;
 	}
 };
 
@@ -3361,9 +3437,16 @@ Zotero.Utilities.Internal.onDragItems = function (event, itemIDs, dragImage = ev
 	let files = items
 		.filter(item => item.isAttachment())
 		.map(item => item.getFilePath())
-		.filter(path => path);
+		.filter(path => path)
+		.map(path => Zotero.File.pathToFile(path))
+		.filter(file => file.exists());
 
 	if (files.length) {
+		if (Zotero.isWin) {
+			// Copies from earlier drags are no longer in use
+			Zotero.TempFileDragDataProvider.removeCopies();
+		}
+
 		// Advanced multi-file drag (with unique filenames, which otherwise happen automatically on
 		// Windows but not Linux) and auxiliary snapshot file copying on macOS
 		let dataProvider;
@@ -3372,33 +3455,44 @@ Zotero.Utilities.Internal.onDragItems = function (event, itemIDs, dragImage = ev
 		}
 
 		for (let i = 0; i < files.length; i++) {
-			let file = Zotero.File.pathToFile(files[i]);
+			let file = files[i];
 
 			if (dataProvider) {
 				Zotero.debug("Adding application/x-moz-file-promise");
 				event.dataTransfer.mozSetDataAt("application/x-moz-file-promise", dataProvider, i);
 			}
 
-			// Allow dragging to filesystem on Linux and Windows
-			let uri;
-			if (!Zotero.isMac) {
+			// Allow dragging to filesystem on Linux
+			if (Zotero.isLinux) {
 				Zotero.debug("Adding text/x-moz-url " + i);
-				uri = Zotero.File.pathToFileURI(file);
+				let uri = Zotero.File.pathToFileURI(file);
 				event.dataTransfer.mozSetDataAt("text/x-moz-url", uri + '\n' + file.leafName, i);
 			}
 
-			// Allow dragging to web targets (e.g., Gmail)
+			// Allow dragging to the filesystem and web targets (e.g., Gmail). On Windows, hand
+			// targets a copy in the temp directory, since File Explorer moves a dropped file for
+			// an unmodified drag and would otherwise move it out of storage.
 			Zotero.debug("Adding application/x-moz-file " + i);
-			event.dataTransfer.mozSetDataAt("application/x-moz-file", file, i);
+			event.dataTransfer.mozSetDataAt(
+				"application/x-moz-file",
+				Zotero.isWin ? new Zotero.TempFileDragDataProvider(files[i]) : file,
+				i
+			);
 
-			if (Zotero.isWin) {
-				event.dataTransfer.mozSetDataAt("application/x-moz-file-promise-url", uri, i);
-			}
-			else if (Zotero.isLinux) {
-				// Don't create a symlink for an unmodified drag
+			if (Zotero.isLinux) {
+				// Copy rather than symlink for an unmodified drag. Drops within Zotero can still
+				// move -- see LibraryTreeView::setDropEffect().
 				event.dataTransfer.effectAllowed = 'copy';
 			}
 		}
+
+		if (Zotero.isWin) {
+			event.currentTarget.addEventListener(
+				'dragend',
+				() => Zotero.TempFileDragDataProvider.onDragEnd(),
+				{ once: true }
+			);
+		}
 	}
 
 	// Get Quick Copy format for current URL (set via /ping from connector)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index e6c17ba7b8..c9333c598f 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -156,6 +156,9 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 	var _locked = false;
 	var _shutdownListeners = [];
 	var _progressMessage;
+	var _progressDeterminate;
+	var _progressGeneration = 0;
+	var _progressOwner;
 	var _progressMeters;
 	var _progressPopup;
 	var _lastPercentage;
@@ -540,6 +543,12 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 		Zotero.DB.addCallback('begin', id => Zotero.Notifier.begin(id));
 		Zotero.DB.addCallback('commit', id => Zotero.Notifier.commit(null, id));
 		Zotero.DB.addCallback('rollback', id => Zotero.Notifier.reset(id));
+
+		// Initialize undo history and add its callbacks to the DB layer
+		Zotero.UndoHistory.init();
+		Zotero.DB.addCallback('begin', id => Zotero.UndoHistory._onTransactionBegin(id));
+		Zotero.DB.addCallback('commit', id => Zotero.UndoHistory._onTransactionCommit(id));
+		Zotero.DB.addCallback('rollback', id => Zotero.UndoHistory._onTransactionRollback(id));
 		
 		try {
 			// Require >=2.1b3 database to ensure proper locking
@@ -591,18 +600,22 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 				throw true;
 			}
 			
+			let upgradeMessageTimeoutID;
 			try {
-				var updated = await Zotero.Schema.updateSchema({
-					onBeforeUpdate: (options = {}) => {
-						if (options.minor) return;
-						try {
-							Zotero.showZoteroPaneProgressMeter(
-								Zotero.getString('upgrade.status')
-							)
-						}
-						catch (e) {
-							Zotero.logError(e);
-						}
+				await Zotero.Schema.updateSchema({
+					// Show "Upgrading database…" if the upgrade is still running after a short
+					// delay, so that the message doesn't flash during quick upgrades
+					onBeforeUpdate: () => {
+						upgradeMessageTimeoutID = setTimeout(() => {
+							try {
+								Zotero.showZoteroPaneProgressMeter(
+									Zotero.getString('upgrade.status')
+								)
+							}
+							catch (e) {
+								Zotero.logError(e);
+							}
+						}, 500);
 					}
 				});
 			}
@@ -656,12 +669,18 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 					throw e;
 				}
 				
-				let stack = e.stack ? Zotero.Utilities.Internal.filterStack(e.stack) : null;
-				Zotero.startupError = Zotero.getString('startupError.databaseUpgradeError')
-					+ "\n\n"
-					+ (stack || e);
+				// Report the error unless corruption recovery has already started a quit
+				// or restart
+				if (!Zotero.skipLoading) {
+					Zotero.startupError = Zotero.getString('startupError.databaseUpgradeError')
+						+ "\n\n"
+						+ _formatStartupError(e);
+				}
 				throw e;
 			}
+			finally {
+				clearTimeout(upgradeMessageTimeoutID);
+			}
 			
 			const { ZoteroProtocolHandler } = ChromeUtils.importESModule(
 				`chrome://zotero/content/ZoteroProtocolHandler.mjs`
@@ -671,8 +690,15 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 			const { ZoteroAutoComplete } = ChromeUtils.importESModule(
 				`chrome://zotero/content/zotero-autocomplete.mjs`
 			);
+			
 			ZoteroAutoComplete.init();
 
+			const { OptionsAutoComplete } = ChromeUtils.importESModule(
+				`chrome://zotero/content/modules/optionsAutoComplete.mjs`
+			);
+			
+			OptionsAutoComplete.init();
+
 			await Zotero.Users.init();
 			await Zotero.Libraries.init();
 			
@@ -689,8 +715,8 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 			Zotero.locked = false;
 			
 			// Initialize various services
-			if(Zotero.Prefs.get("httpServer.enabled")) {
-				Zotero.Server.init();
+			if (Zotero.Prefs.get("httpServer.enabled")) {
+				await Zotero.Server.init();
 			}
 			
 			await Zotero.Fulltext.init();
@@ -762,15 +788,22 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 				// Feed updates (e.g., deleting old items) can interfere with this, so pause them
 				// until we're done
 				let feedPauser = await Zotero.Feeds.pause();
+				let started = new Date();
 				try {
 					await Zotero.Schema.migrateExtraFields({
 						onProgress: ({ progress, progressMax }) => {
+							// Only show the progress window if the migration is still running
+							// after a short delay, so that it doesn't flash for a few items
 							if (!progressWin) {
+								if (new Date() - started < 500) {
+									return;
+								}
 								progressWin = new Zotero.ProgressWindow({
 									closeOnClick: false
 								});
-								let title = Zotero.getString('upgrade.status');
-								progressWin.changeHeadline(title);
+								progressWin.changeHeadline(
+									Zotero.getString('migrate-extra-fields-progress-headline')
+								);
 								itemProgress = new progressWin.ItemProgress(
 									'journalArticle',
 									Zotero.getString('migrate-extra-fields-progress-message')
@@ -784,7 +817,9 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 				}
 				catch (e) {
 					Zotero.logError(e);
-					itemProgress.setError();
+					if (itemProgress) {
+						itemProgress.setError();
+					}
 				}
 				finally {
 					feedPauser.resume();
@@ -793,15 +828,34 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 					progressWin.startCloseTimer(3000);
 				}
 			});
-			
+
+			// Populate normalized search columns after an upgrade. This is local-only derived
+			// data, so we don't need to wait for sync for correctness, but we run after the
+			// initial auto-sync (like the Extra migration) so the backfill doesn't compete with a
+			// large initial download. It's sub-second for typical libraries and chunked so the UI
+			// stays responsive on large ones, and search degrades gracefully until it finishes --
+			// so it runs silently, without a progress window of its own (the full-text content
+			// index shows one for the slower, more visible pass).
+			Zotero.startupSyncPromise.then(async () => {
+				if (Zotero.test) return;
+				try {
+					await Zotero.Schema.populateNormalizedSearchColumns();
+				}
+				catch (e) {
+					Zotero.logError(e);
+				}
+			});
+
 			return true;
 		}
 		catch (e) {
 			Zotero.logError(e);
-			if (!Zotero.startupError) {
+			// Report a generic error unless a more specific one was set above or corruption
+			// recovery has already started a quit or restart
+			if (!Zotero.startupError && !Zotero.skipLoading) {
 				Zotero.startupError = Zotero.getString('startupError', Zotero.appName) + "\n\n"
 					+ Zotero.getString('db.integrityCheck.reportInForums') + "\n\n"
-					+ e.message ? (e.message + "\n\n" + e.stack) : e;
+					+ _formatStartupError(e);
 			}
 			return false;
 		}
@@ -828,6 +882,11 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 			else if (!Zotero.File.pathToFile(dbfile).isWritable()) {
 				var msg = 'Cannot write to ' + dbfile;
 			}
+			// Shouldn't be reached, since the checks above should catch anything SQLite refuses
+			// to write to, but don't continue with a connection that couldn't be configured
+			else if (Zotero.DB.readOnly) {
+				var msg = dbfile + ' was opened read-only';
+			}
 			else {
 				var msg = false;
 			}
@@ -842,6 +901,11 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 			}
 		}
 		catch (e) {
+			// If a database corruption handler already resolved the error and initiated a
+			// quit or restart, don't show a startup error
+			if (Zotero.skipLoading) {
+				return false;
+			}
 			if (_checkDataDirAccessError(e)) {}
 			else if (_checkDataDirStorageIOError(e)) {}
 			// Storage busy
@@ -849,10 +913,9 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 				Zotero.startupError = Zotero.getString('startupError.databaseInUse');
 			}
 			else {
-				let stack = e.stack ? Zotero.Utilities.Internal.filterStack(e.stack) : null;
 				Zotero.startupError = Zotero.getString('startupError', Zotero.appName) + "\n\n"
 					+ Zotero.getString('db.integrityCheck.reportInForums') + "\n\n"
-					+ (stack || e);
+					+ _formatStartupError(e);
 			}
 			
 			Zotero.debug(e.toString(), 1);
@@ -865,6 +928,20 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 	};
 	
 	
+	/**
+	 * Format an error for a startup error message
+	 *
+	 * SpiderMonkey stacks contain only frames, so the message has to be included with them.
+	 *
+	 * @param {Error|*} e
+	 * @return {String|*}
+	 */
+	function _formatStartupError(e) {
+		var stack = e.stack ? Zotero.Utilities.Internal.filterStack(e.stack) : null;
+		return [e.message, stack].filter(x => x).join("\n\n") || e;
+	}
+	
+	
 	function _checkDataDirAccessError(e) {
 		if (e.name != 'NS_ERROR_FILE_ACCESS_DENIED' && !e.message.includes('2152857621')) {
 			return false;
@@ -1180,7 +1257,10 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 					Zotero.Utilities.Internal.Environment.clearMozillaVariables();
 				}
 				
-				svc.loadURI(Services.io.newURI(url, null, null));
+				svc.loadURI(
+					Services.io.newURI(url, null, null),
+					Services.scriptSecurityManager.getSystemPrincipal(),
+				);
 				return;
 			}
 		}
@@ -1706,12 +1786,30 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 	 * @param {String} msg
 	 * @param {Boolean} [determinate=false]
 	 * @param {Boolean} [modalOnly=false] - Don't use popup if Zotero pane isn't showing
-	 * @return	void
+	 * @return {Object} - Token that can optionally be passed to
+	 *     restoreZoteroPaneProgressMeter() to restore the previous display state, for callers
+	 *     that might be interrupting another operation's progress display. Callers that own
+	 *     the display can ignore it and clear with hideZoteroPaneOverlays() as usual.
 	 */
 	this.showZoteroPaneProgressMeter = function (msg, determinate, icon, modalOnly) {
+		// Capture the previous display state and owner so that the caller can restore them
+		// with restoreZoteroPaneProgressMeter()
+		var token = {
+			owner: ++_progressGeneration,
+			previousOwner: _progressOwner,
+			locked: this.locked,
+			message: _progressMessage,
+			determinate: _progressDeterminate,
+			percentage: _lastPercentage
+		};
+		_progressOwner = token.owner;
 		// If msg is undefined, keep any existing message. If false/null/"", clear.
 		// The message is also cleared when the meters are hidden.
 		_progressMessage = msg = (msg === undefined ? _progressMessage : msg) || "";
+		_progressDeterminate = determinate;
+		// The new meter starts at 0 if determinate and empty otherwise, so a first update
+		// that matches the previous meter's state shouldn't be suppressed
+		_lastPercentage = determinate ? 0 : null;
 		var currentWindow = Services.wm.getMostRecentWindow("navigator:browser");
 		var enumerator = Services.wm.getEnumerator("navigator:browser");
 		var progressMeters = [];
@@ -1762,7 +1860,36 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 		}
 		this.locked = true;
 		_progressMeters = progressMeters;
+		return token;
 	}
+
+
+	/**
+	 * Restore the progress display to its state before a showZoteroPaneProgressMeter() call,
+	 * using the object returned by that call. Does nothing if the display has been changed
+	 * again since then, in which case the newer operation owns it. Restores ownership to the
+	 * previous owner, so nested tokens can be restored in reverse order.
+	 */
+	this.restoreZoteroPaneProgressMeter = function (token) {
+		if (!token || token.owner != _progressOwner) {
+			return;
+		}
+		if (!token.locked) {
+			this.hideZoteroPaneOverlays();
+			return;
+		}
+		this.showZoteroPaneProgressMeter(token.message || null, token.determinate);
+		// Hand the display back to the previous owner rather than keeping the owner id
+		// minted by the call above
+		_progressOwner = token.previousOwner;
+		// Restore the meter position, which showZoteroPaneProgressMeter() reset
+		_lastPercentage = token.percentage;
+		if (token.determinate && token.percentage !== null && token.percentage !== undefined) {
+			for (let pm of _progressMeters) {
+				pm.setAttribute('value', token.percentage);
+			}
+		}
+	};
 	
 	
 	/**
@@ -1791,6 +1918,9 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 			}
 		}
 		_lastPercentage = percentage;
+		// Updating with or without a percentage switches the meter between determinate and
+		// indeterminate, so keep the recorded mode accurate for restoration
+		_progressDeterminate = percentage !== null;
 	}
 	
 	
@@ -1811,11 +1941,14 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 		if (_progressPopup) {
 			_progressPopup.close();
 		}
-		
+
+		_progressGeneration++;
+		_progressOwner = null;
 		_progressMessage = null;
+		_progressDeterminate = null;
+		_lastPercentage = null;
 		_progressMeters = [];
 		_progressPopup = null;
-		_lastPercentage = null;
 	}
 	
 	
@@ -1864,7 +1997,10 @@ const { CommandLineOptions } = ChromeUtils.importESModule("chrome://zotero/conte
 		await Zotero.DB.executeTransaction(async function () {
 			return Zotero.Tags.purge();
 		});
-		await Zotero.Fulltext.purgeUnusedWords();
+		// Items.purge() below resets the pref
+		if (Zotero.Prefs.get('purge.items')) {
+			await Zotero.FullText.purgeOrphanedContent();
+		}
 		await Zotero.Items.purge();
 		// DEBUG: this might not need to be permanent
 		//yield Zotero.DB.executeTransaction(async function () {
@@ -2202,6 +2338,9 @@ Zotero.VersionHeader = {
 Zotero.DragDrop = {
 	currentEvent: null,
 	currentOrientation: 0,
+	// The effect set by the tree's last onDragOver() via LibraryTreeView::setDropEffect(), which
+	// can differ from the drop event's dropEffect
+	currentDropEffect: null,
 	
 	getDataFromDataTransfer: function (dataTransfer, firstOnly) {
 		var dt = dataTransfer;
diff --git a/chrome/content/zotero/zotero-autocomplete.mjs b/chrome/content/zotero/zotero-autocomplete.mjs
index 3b8a5ca553..e309e8a821 100644
--- a/chrome/content/zotero/zotero-autocomplete.mjs
+++ b/chrome/content/zotero/zotero-autocomplete.mjs
@@ -58,7 +58,15 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 		throw new Error("Invalid JSON passed to autocomplete");
 	}
 	var [fieldName, , subField] = searchParams.fieldName.split("-");
-	
+
+	// Library scope: accept a single libraryID (e.g. the item pane and tags box) or an
+	// array of libraryIDs (advanced search across a multi-library selection). An empty
+	// array means no library filter (suggest values from all libraries).
+	var libraryIDs = searchParams.libraryIDs
+		|| (searchParams.libraryID ? [searchParams.libraryID] : []);
+	// Bare '?' placeholder list, e.g. "?, ?, ?", for sites that push params sequentially
+	var libraryPlaceholders = libraryIDs.map(() => '?').join(', ');
+
 	var resultsCallback;
 	
 	switch (fieldName) {
@@ -68,11 +76,14 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 		case 'tag':
 			var sql = "SELECT DISTINCT name AS val, NULL AS id FROM tags WHERE name LIKE ? ESCAPE '\\'";
 			var sqlParams = [Zotero.DB.escapeSQLExpression(searchString) + '%'];
-			if (searchParams.libraryID) {
-				sql += " AND tagID IN (SELECT tagID FROM itemTags JOIN items USING (itemID) "
-					+ "WHERE libraryID=?)";
-				sqlParams.push(searchParams.libraryID);
+			// Suggest only tags on items that aren't in the trash, optionally scoped by library
+			sql += " AND tagID IN (SELECT tagID FROM itemTags JOIN items USING (itemID) "
+				+ "WHERE itemID NOT IN (SELECT itemID FROM deletedItems)";
+			if (libraryIDs.length) {
+				sql += ` AND libraryID IN (${libraryPlaceholders})`;
+				sqlParams.push(...libraryIDs);
 			}
+			sql += ")";
 			if (searchParams.itemID) {
 				sql += " AND name NOT IN (SELECT name FROM tags WHERE tagID IN ("
 					+ "SELECT tagID FROM itemTags WHERE itemID = ?))";
@@ -90,13 +101,15 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 			// 		1 == search single-field creators
 			// 		2 == search both
 			if (searchParams.fieldMode == 2) {
+				// TRIM() so that a two-field creator with an empty first name
+				// doesn't produce a value with a leading space
 				var sql = "SELECT DISTINCT CASE fieldMode WHEN 1 THEN lastName "
-					+ "WHEN 0 THEN firstName || ' ' || lastName END AS val, NULL AS id "
+					+ "WHEN 0 THEN TRIM(firstName || ' ' || lastName) END AS val, NULL AS id "
 					+ "FROM creators ";
-				if (fieldName != 'creator' || searchParams.libraryID) {
+				if (fieldName != 'creator' || libraryIDs.length) {
 					sql += "JOIN itemCreators USING (creatorID) ";
 				}
-				if (searchParams.libraryID) {
+				if (libraryIDs.length) {
 					sql += "JOIN items USING (itemID) ";
 				}
 				sql += "WHERE CASE fieldMode "
@@ -108,9 +121,9 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 					sql += "AND creatorTypeID=? ";
 					sqlParams.push(Zotero.CreatorTypes.getID(fieldName));
 				}
-				if (searchParams.libraryID) {
-					sql += ` AND libraryID=? `;
-					sqlParams.push(searchParams.libraryID);
+				if (libraryIDs.length) {
+					sql += ` AND libraryID IN (${libraryPlaceholders}) `;
+					sqlParams.push(...libraryIDs);
 				}
 				sql += "ORDER BY val";
 			}
@@ -137,7 +150,7 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 				}
 				
 				var fromSQL = " FROM creators "
-				if (searchParams.libraryID) {
+				if (libraryIDs.length) {
 					fromSQL += "JOIN itemCreators USING (creatorID) JOIN items USING (itemID) ";
 				}
 				fromSQL += "WHERE " + subField + " LIKE ?1 AND fieldMode=?2";
@@ -155,11 +168,11 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 					}
 					fromSQL += ")";
 				}
-				if (searchParams.libraryID) {
-					fromSQL += ` AND libraryID=?${sqlParams.length + 1}`;
-					sqlParams.push(searchParams.libraryID);
+				if (libraryIDs.length) {
+					fromSQL += ` AND libraryID IN (${libraryIDs.map((_, i) => '?' + (sqlParams.length + 1 + i)).join(', ')})`;
+					sqlParams.push(...libraryIDs);
 				}
-				
+
 				sql += fromSQL;
 				
 				// If double-field mode, include matches for just this field
@@ -179,9 +192,9 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 			var sql = "SELECT DISTINCT DATE(" + fieldName + ", 'localtime') AS val, NULL AS id "
 				+ "FROM items WHERE " + fieldName + " LIKE ? ";
 			var sqlParams = [searchString + '%'];
-			if (searchParams.libraryID) {
-				sql += "AND libraryID=? ";
-				sqlParams.push(searchParams.libraryID);
+			if (libraryIDs.length) {
+				sql += `AND libraryID IN (${libraryPlaceholders}) `;
+				sqlParams.push(...libraryIDs);
 			}
 			sql += "ORDER BY " + fieldName;
 			
@@ -191,14 +204,14 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 			var fieldID = Zotero.ItemFields.getID('accessDate');
 			
 			var sql = "SELECT DISTINCT DATE(value, 'localtime') AS val, NULL AS id FROM itemData ";
-			if (searchParams.libraryID) {
+			if (libraryIDs.length) {
 				sql += "JOIN items USING (itemID) ";
 			}
 			sql += "WHERE fieldID=? AND value LIKE ? ";
 			var sqlParams = [fieldID, searchString + '%'];
-			if (searchParams.libraryID) {
-				sql += "AND libraryID=? ";
-				sqlParams.push(searchParams.libraryID);
+			if (libraryIDs.length) {
+				sql += `AND libraryID IN (${libraryPlaceholders}) `;
+				sqlParams.push(...libraryIDs);
 			}
 			sql += "ORDER BY value";
 			
@@ -218,7 +231,7 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 			var valueField = fieldName == 'date' ? 'SUBSTR(value, 12, 100)' : 'value';
 			
 			var sql = "SELECT DISTINCT " + valueField + " AS val, NULL AS id FROM itemData ";
-			if (searchParams.libraryID) {
+			if (libraryIDs.length) {
 				sql += "JOIN items USING (itemID) ";
 			}
 			sql += "JOIN itemDataValues USING (valueID) "
@@ -230,10 +243,10 @@ ZoteroAutoComplete.prototype.startSearch = async function (searchString, searchP
 					+ "NATURAL JOIN itemDataValues WHERE fieldID=?1 AND itemID=?3) ";
 				sqlParams.push(searchParams.itemID);
 			}
-			// Limit to specific library
-			if (searchParams.libraryID) {
-				sql += `AND libraryID=?${sqlParams.length + 1} `;
-				sqlParams.push(searchParams.libraryID);
+			// Limit to specific libraries
+			if (libraryIDs.length) {
+				sql += `AND libraryID IN (${libraryIDs.map((_, i) => '?' + (sqlParams.length + 1 + i)).join(', ')}) `;
+				sqlParams.push(...libraryIDs);
 			}
 			sql += "ORDER BY value";
 	}
diff --git a/chrome/content/zotero/zotero.mjs b/chrome/content/zotero/zotero.mjs
index c8dc7cefdc..97568c6bac 100644
--- a/chrome/content/zotero/zotero.mjs
+++ b/chrome/content/zotero/zotero.mjs
@@ -73,7 +73,6 @@ const xpcomFilesLocal = [
 	'attachmentReadObserver',
 	'browserRequest',
 	'cite',
-	'citeprocRsBridge',
 	'data/library',
 	'data/libraries',
 	'data/dataObject',
@@ -112,11 +111,14 @@ const xpcomFilesLocal = [
 	'locateManager',
 	'mime',
 	'notifier',
+	'undoHistory',
 	'fileHandlers',
+	'osKeyStore',
 	'plugins',
 	'pluginAPI/menuManager',
 	'pluginAPI/itemPaneManager',
 	'pluginAPI/itemTreeManager',
+	'sdt',
 	'reader',
 	'progressQueue',
 	'progressQueueDialog',
@@ -126,6 +128,7 @@ const xpcomFilesLocal = [
 	'retractions',
 	'router',
 	'schema',
+	'searchQuery',
 	'server/server',
 	'server/server_integration',
 	'server/server_connector',
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 5a48549b52..bf86cf5f4c 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -38,6 +38,8 @@ var ZoteroPane = new function () {
 	this._listeners = {};
 	this.__defineGetter__('loaded', function () { return _loaded; });
 	var _lastSelectedItems = [];
+	// [element, listener] for the collection tree focus listener added in initCollectionsTree()
+	var _collectionsTreeFocusListener = null;
 	var lastFocusedElement = null;
 	this.lastKeyPress = null;
 	
@@ -48,7 +50,6 @@ var ZoteroPane = new function () {
 	this.captureKeyDown = captureKeyDown;
 	this.handleKeyUp = handleKeyUp;
 	this.handleKeyPress = handleKeyPress;
-	this.getSelectedCollection = getSelectedCollection;
 	this.getSelectedSavedSearch = getSelectedSavedSearch;
 	this.getSortField = getSortField;
 	this.getSortDirection = getSortDirection;
@@ -63,6 +64,8 @@ var ZoteroPane = new function () {
 	|| ev.getModifierState("Control") || ev.getModifierState("OS");
 	
 	const TAB_NUMBER_CODE_RE = /^(?:Numpad|Digit)([0-9])$/;
+	
+	const RECENT_COLLECTIONS_SHOWN = 5;
 
 	var self = this,
 		_loaded = false, _madeVisible = false,
@@ -106,7 +109,11 @@ var ZoteroPane = new function () {
 		}
 		
 		_loaded = true;
-		
+
+		// Register a window controller for global undo/redo. Appending (rather
+		// than inserting at 0) ensures text-editing controllers take priority.
+		window.controllers.appendController(Zotero.UndoHistory.getController(document));
+
 		var zp = document.getElementById('zotero-pane');
 		Zotero.UIProperties.registerRoot(zp);
 		zp.addEventListener('UIPropertiesChanged', () => {
@@ -364,12 +371,12 @@ var ZoteroPane = new function () {
 				'zotero-tb-add': {
 					ArrowNext: () => document.getElementById("zotero-tb-lookup"),
 					ArrowPrevious: () => null,
-					Tab: () => document.getElementById("zotero-tb-search")._searchModePopup.flattenedTreeParentNode.focus(),
+					Tab: () => document.getElementById("zotero-tb-search").focus(),
 					ShiftTab: () => {
-						if (collectionsPane.getAttribute("collapsed")) {
+						if (collectionsPane.hasAttribute("collapsed")) {
 							return document.getElementById('zotero-tb-sync');
 						}
-						if (tagContainer.getAttribute('collapsed') == "true") {
+						if (tagContainer.hasAttribute('collapsed')) {
 							return focusCollectionTree();
 						}
 						return document.querySelector("#zotero-tag-selector button");
@@ -378,7 +385,7 @@ var ZoteroPane = new function () {
 				'zotero-tb-lookup': {
 					ArrowNext: () => document.getElementById("zotero-tb-attachment-add"),
 					ArrowPrevious: () => document.getElementById("zotero-tb-add"),
-					Tab: () => document.getElementById("zotero-tb-search")._searchModePopup.flattenedTreeParentNode.focus(),
+					Tab: () => document.getElementById("zotero-tb-search").focus(),
 					ShiftTab: () => document.getElementById('zotero-tb-collections-search').click(),
 					Enter: () => Zotero_Lookup.showPanel(event.target),
 					' ': () => Zotero_Lookup.showPanel(event.target)
@@ -386,13 +393,13 @@ var ZoteroPane = new function () {
 				'zotero-tb-attachment-add': {
 					ArrowNext: () => document.getElementById("zotero-tb-note-add"),
 					ArrowPrevious: () => document.getElementById("zotero-tb-lookup"),
-					Tab: () => document.getElementById("zotero-tb-search")._searchModePopup.flattenedTreeParentNode.focus(),
+					Tab: () => document.getElementById("zotero-tb-search").focus(),
 					ShiftTab: () => document.getElementById('zotero-tb-collections-search').click()
 				},
 				'zotero-tb-note-add': {
 					ArrowNext: () => null,
 					ArrowPrevious: () => document.getElementById("zotero-tb-attachment-add"),
-					Tab: () => document.getElementById("zotero-tb-search")._searchModePopup.flattenedTreeParentNode.focus(),
+					Tab: () => document.getElementById("zotero-tb-search").focus(),
 					ShiftTab: () => document.getElementById('zotero-tb-collections-search').click()
 				},
 				'zotero-tb-search-dropmarker': {
@@ -401,15 +408,20 @@ var ZoteroPane = new function () {
 					Tab: () => document.getElementById("zotero-tb-search-textbox"),
 					ShiftTab: () => document.getElementById('zotero-tb-add')
 				},
+				'advanced-collapse-button': {
+					ShiftTab: () => document.getElementById('zotero-tb-add')
+				},
 				'zotero-tb-search-textbox': {
+					Tab: () => document.getElementById("zotero-tb-search-advanced-button"),
+					ShiftTab: () => document.getElementById("zotero-tb-search").focus()
+				},
+				'zotero-tb-search-advanced-button': {
 					Tab: () => document.getElementById("zotero-tb-toggle-item-pane-stacked"),
-					ShiftTab: () => {
-						document.getElementById("zotero-tb-search")._searchModePopup.flattenedTreeParentNode.focus();
-					}
+					ShiftTab: () => document.getElementById("zotero-tb-search-textbox")
 				},
 				'zotero-tb-toggle-item-pane-stacked': {
 					Tab: () => itemTree.querySelector(".virtualized-table"),
-					ShiftTab: () => document.getElementById("zotero-tb-search-textbox")
+					ShiftTab: () => document.getElementById("zotero-tb-search-advanced-button")
 				},
 			};
 			moveFocus(actionsMap, event, true);
@@ -420,7 +432,7 @@ var ZoteroPane = new function () {
 				'collection-tree': {
 					ShiftTab: () => document.getElementById('zotero-tb-collections-search').click(),
 					Tab: () => {
-						if (tagContainer.getAttribute('collapsed') == "true") {
+						if (tagContainer.hasAttribute('collapsed')) {
 							return document.getElementById('zotero-tb-add');
 						}
 						// If tag selector is collapsed, go to "New item" button, otherwise focus tag selector
@@ -438,8 +450,26 @@ var ZoteroPane = new function () {
 
 		itemTree.addEventListener("keydown", (event) => {
 			let actionsMap = {
-				'item-tree-main-default': {
-					ShiftTab: () => document.getElementById('zotero-tb-toggle-item-pane-stacked')
+				// The item tree's DOM id has a view-specific suffix, so key on the current view's id
+				[ZoteroPane.itemsView?.id]: {
+					ShiftTab: () => {
+						let advancedSearchDeck = document.getElementById('zotero-advanced-search-pane-deck');
+						// Advanced Search open - focus the last focusable element of the deck
+						if (advancedSearchDeck?.state === 'open') {
+							Services.focus.moveFocus(
+								window,
+								document.getElementById('zotero-items-pane'),
+								Services.focus.MOVEFOCUS_BACKWARD,
+								0
+							);
+							return null;
+						}
+						// Advanced Search collapsed - focus the close button
+						if (advancedSearchDeck?.state === 'collapsed') {
+							return document.querySelector('#zotero-tb-search .advanced-close-button');
+						}
+						return document.getElementById('zotero-tb-toggle-item-pane-stacked');
+					}
 				}
 			};
 			moveFocus(actionsMap, event);
@@ -547,8 +577,10 @@ var ZoteroPane = new function () {
 			
 		Zotero_Tabs.init();
 		ZoteroContextPane.init();
-		await ZoteroPane.initCollectionsTree();
+		// The items tree has to be initialized first, since the collections tree selects a
+		// row as soon as it's initialized, which loads items into the items tree
 		await ZoteroPane.initItemsTree();
+		await ZoteroPane.initCollectionsTree();
 		ZoteroPane.initCollectionTreeSearch();
 		
 		// Add a default progress window
@@ -749,11 +781,19 @@ var ZoteroPane = new function () {
 		
 		this.serializePersist();
 
+		if (_collectionsTreeFocusListener) {
+			let [elem, listener] = _collectionsTreeFocusListener;
+			elem.removeEventListener("focus", listener);
+			_collectionsTreeFocusListener = null;
+		}
 		if(this.collectionsView) this.collectionsView.unregister();
 		if(this.itemsView) this.itemsView.unregister();
 		if (_syncRemindersObserverID) {
 			Zotero.Notifier.unregisterObserver(_syncRemindersObserverID);
 		}
+		if (_apiKeyObserverID) {
+			Zotero.Notifier.unregisterObserver(_apiKeyObserverID);
+		}
 		
 		this.uninitContainers();
 		
@@ -1066,7 +1106,9 @@ var ZoteroPane = new function () {
 			else {
 				enableHighlight = !event.shiftKey && !event.metaKey && event.key == "Control" && !event.altKey;
 			}
-			let isItemTreeFocused = document.activeElement.id == "item-tree-main-default";
+			// The item tree's DOM id has a view-specific suffix (e.g. "item-tree-main-default",
+			// "item-tree-main-recentlyRead"), so match on the prefix to cover all views
+			let isItemTreeFocused = document.activeElement.id.startsWith("item-tree-main");
 			// Only highlight collections when itemTree is focused to try to avoid
 			// conflicts with other shortcuts
 			if (enableHighlight && isItemTreeFocused) {
@@ -1336,29 +1378,30 @@ var ZoteroPane = new function () {
 					Zotero.Sync.Runner.sync();
 					break;
 				case 'saveToZotero':
-					var collectionTreeRow = this.getCollectionTreeRow();
-					if (collectionTreeRow.isFeedsOrFeed()) {
+					var collectionTreeRows = this.getCollectionTreeRows();
+					if (collectionTreeRows[0].isFeedsOrFeed()) {
 						this.itemPane.translateSelectedItems();
 					} else {
 						Zotero.debug(command + ' does not do anything in non-feed views')
 					}
 					break;
 				case 'toggleAllRead':
-					var collectionTreeRow = this.getCollectionTreeRow();
-					if (collectionTreeRow.isFeed()) {
+					var collectionTreeRows = this.getCollectionTreeRows();
+					if (collectionTreeRows[0].isFeed()) {
 						this.markFeedRead();
 					}
 					break;
-				case 'toggleRead':
+				case 'toggleRead': {
 					// Toggle read/unread
-					let row = this.getCollectionTreeRow();
-					if (!row || !row.isFeedsOrFeed()) return;
+					let rows = this.getCollectionTreeRows();
+					if (!rows.some(row => row.isFeedsOrFeed())) return;
 					this.toggleSelectedItemsRead();
 					if (itemReadTimeout) {
 						clearTimeout(itemReadTimeout);
 						itemReadTimeout = null;
 					}
 					break;
+				}
 				
 				// Handled by <key>s in standalone.js, pointing to <command>s in zoteroPane.xul,
 				// which are enabled or disabled by this.updateQuickCopyCommands(), called by
@@ -1386,7 +1429,14 @@ var ZoteroPane = new function () {
 	 * _data_ is an optional object with field:value for itemData
 	 */
 	this.newItem = async function (typeID, data, row, manual) {
-		if ((row === undefined || row === null) && this.getCollectionTreeRow()) {
+		// Shouldn't be reachable with multiple libraries selected (toolbar is disabled),
+		// but just in case
+		let rows = this.getCollectionTreeRows();
+		if (new Set(rows.map(r => r.ref.libraryID)).size > 1) {
+			return;
+		}
+
+		if ((row === undefined || row === null) && rows.length) {
 			row = this.collectionsView.selection.focused;
 			
 			// Make sure currently selected view is editable
@@ -1407,6 +1457,8 @@ var ZoteroPane = new function () {
 			var collectionTreeRow = null;
 		}
 		
+		let selectedCollectionTreeRows = rows.filter(r => r.isCollection());
+
 		let itemID;
 		await Zotero.DB.executeTransaction(async function () {
 			var item = new Zotero.Item(typeID);
@@ -1416,14 +1468,14 @@ var ZoteroPane = new function () {
 			}
 			itemID = await item.save();
 			
-			if (collectionTreeRow && collectionTreeRow.isCollection()) {
-				await collectionTreeRow.ref.addItem(itemID);
+			for (let r of selectedCollectionTreeRows) {
+				await r.ref.addItem(itemID);
 			}
 		});
 		
 		// Expand the item pane if it's closed
-		if (this.itemPane.getAttribute("collapsed") == "true") {
-			this.itemPane.setAttribute("collapsed", false);
+		if (this.itemPane.hasAttribute("collapsed")) {
+			this.itemPane.removeAttribute("collapsed");
 		}
 		
 		//set to Info tab
@@ -1472,7 +1524,7 @@ var ZoteroPane = new function () {
 			return null;
 		}
 		
-		var libraryID = this.getSelectedLibraryID();
+		var libraryID = this.getSelectedLibraryIDs()[0];
 		
 		// Get a unique "Untitled" name for this level in the collection hierarchy
 		var collections;
@@ -1551,59 +1603,9 @@ var ZoteroPane = new function () {
 		this.loadURI(Zotero.Groups.addGroupURL);
 	}
 	
-	
-	this.newSearch = async function () {
-		if (Zotero.DB.inTransaction()) {
-			await Zotero.DB.waitForTransaction();
-		}
-		
-		var libraryID = this.getSelectedLibraryID();
-		
-		var s = new Zotero.Search();
-		s.libraryID = libraryID;
-		s.addCondition('title', 'contains', '');
-		
-		var searches = await Zotero.Searches.getAll(libraryID)
-		var prefix = Zotero.getString('pane.collections.untitled');
-		var name = Zotero.Utilities.Internal.getNextName(
-			prefix,
-			searches.map(s => s.name).filter(n => n.startsWith(prefix))
-		);
-		
-		var io = { dataIn: { search: s, name }, dataOut: null };
-		window.openDialog('chrome://zotero/content/searchDialog.xhtml','','chrome,modal,centerscreen',io);
-		if (!io.dataOut) {
-			return false;
-		}
-		s.fromJSON(io.dataOut.json);
-		await s.saveTx();
-		return s.id;
-	};
-	
 	this.setVirtual = function (libraryID, type, show, select) {
 		return this.collectionsView.toggleVirtualCollection(libraryID, type, show, select);
 	};
-	
-	this.openAdvancedSearchWindow = function () {
-		var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-					.getService(Components.interfaces.nsIWindowMediator);
-		var enumerator = wm.getEnumerator('zotero:search');
-		while (enumerator.hasMoreElements()) {
-			var win = enumerator.getNext();
-		}
-		
-		if (win) {
-			win.focus();
-			return;
-		}
-		
-		var s = new Zotero.Search();
-		s.libraryID = this.getSelectedLibraryID();
-		s.addCondition('title', 'contains', '');
-		
-		var io = {dataIn: {search: s}, dataOut: null};
-		window.openDialog('chrome://zotero/content/advancedSearch.xhtml', '', 'chrome,dialog=no,centerscreen', io);
-	};
 
 	this.initItemsTree = async function () {
 		try {
@@ -1619,10 +1621,26 @@ var ZoteroPane = new function () {
 				emptyMessage: Zotero.getString('pane.items.loading')
 			});
 			ZoteroPane.itemsView.onRefresh.addListener(() => ZoteroPane.setTagScope());
-			// Update itemPane on initial load
+			// Update the item pane on every refresh, so the "items in this view" count stays in
+			// sync when the result set changes without a selection change (e.g., quick search,
+			// tag filter, or sort with nothing selected)
 			ZoteroPane.itemsView.onRefresh.addListener(async () => {
 				await ZoteroPane.itemSelected();
-			}, true);
+			});
+			// Also update the count when rows are added or removed by notifier events with
+			// nothing selected (e.g., items downloaded during a sync). Debounced so that the
+			// item pane doesn't re-render within the notifier dispatch or once per event in
+			// a burst of changes.
+			let updateUnselectedCount = Zotero.Utilities.debounce(() => {
+				if (!ZoteroPane.itemsView.selection.count) {
+					ZoteroPane.itemPane.render();
+				}
+			}, 100);
+			ZoteroPane.itemsView.onRowCountChange.addListener(() => {
+				if (!ZoteroPane.itemsView.selection.count) {
+					updateUnselectedCount();
+				}
+			});
 			ZoteroPane.itemsView.waitForLoad().then(() => Zotero.uiIsReady());
 
 			ItemTreeMenuBar.setItemTreeSortKeys(ZoteroPane.itemsView);
@@ -1640,9 +1658,13 @@ var ZoteroPane = new function () {
 			ZoteroPane.collectionsView = await CollectionTree.init(collectionsTree, {
 				onSelectionChange: prevSelection => ZoteroPane.onCollectionSelected(prevSelection),
 				onContextMenu: (...args) => ZoteroPane.onCollectionsContextMenuOpen(...args),
-				dragAndDrop: true
+				dragAndDrop: true,
+				multiSelect: true
 			});
-			collectionsTree.firstChild.addEventListener("focus", ZoteroPane.collectionsView.recordCollectionTreeFocus);
+			let treeElem = collectionsTree.firstChild;
+			let focusListener = ZoteroPane.collectionsView.recordCollectionTreeFocus;
+			treeElem.addEventListener("focus", focusListener);
+			_collectionsTreeFocusListener = [treeElem, focusListener];
 		}
 		catch (e) {
 			Zotero.logError(e);
@@ -1653,7 +1675,7 @@ var ZoteroPane = new function () {
 	this.initTagSelector = async function () {
 		try {
 			var container = document.getElementById('zotero-tag-selector-container');
-			if (!container.hasAttribute('collapsed') || container.getAttribute('collapsed') == 'false') {
+			if (!container.hasAttribute('collapsed')) {
 				this.tagSelector = await Zotero.TagSelector.init(
 					document.getElementById('zotero-tag-selector'),
 					{
@@ -1684,9 +1706,6 @@ var ZoteroPane = new function () {
 			}
 			this.tagSelector.handleResize();
 		}
-		if (this.collectionsView) {
-			this.collectionsView.updateHeight();
-		}
 	}, 100);
 	
 	
@@ -1703,8 +1722,8 @@ var ZoteroPane = new function () {
 	// Keep in sync with ZoteroStandalone.updateViewOption()
 	this.toggleTagSelector = async function () {
 		var container = document.getElementById('zotero-tag-selector-container');
-		var showing = container.getAttribute('collapsed') == 'true';
-		container.setAttribute('collapsed', !showing);
+		var showing = container.hasAttribute('collapsed');
+		container.toggleAttribute('collapsed', !showing);
 		
 		// If showing, set scope to items in current view
 		// and focus filter textbox
@@ -1721,11 +1740,25 @@ var ZoteroPane = new function () {
 	
 	
 	this.tagSelectorShown = function () {
-		var collectionTreeRow = this.getCollectionTreeRow();
-		if (!collectionTreeRow) return;
+		var collectionTreeRows = this.getCollectionTreeRows();
+		if (!collectionTreeRows.length) return;
 		var tagSelector = document.getElementById('zotero-tag-selector-container');
-		return !tagSelector.hasAttribute('collapsed')
-			|| tagSelector.getAttribute('collapsed') == 'false';
+		return !tagSelector.hasAttribute('collapsed');
+	};
+
+
+	this.updateTagSelectorViewSettingsMenu = async function () {
+		document.getElementById('show-automatic').toggleAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
+		document.getElementById('display-all-tags').toggleAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
+		document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
+		var libraryID = ZoteroPane.tagSelector.libraryID;
+		var library = Zotero.Libraries.get(libraryID);
+		// 'Delete Automatic Tags in This Library' is per-library, so disable it when the
+		// selection spans multiple libraries
+		var enabled = !ZoteroPane.tagSelector.multiLibrary
+			&& library.editable
+			&& (await Zotero.Tags.getAutomaticInLibrary(libraryID)).length > 0;
+		document.getElementById('delete-automatic-tags').disabled = !enabled;
 	};
 	
 	
@@ -1735,89 +1768,407 @@ var ZoteroPane = new function () {
 	 * Passed to the items tree to trigger on changes
 	 */
 	this.setTagScope = async function () {
-		var collectionTreeRow = self.getCollectionTreeRow();
+		var collectionTreeRows = this.getCollectionTreeRows();
 		if (self.tagSelectorShown()) {
 			if (!ZoteroPane.tagSelector) {
 				await this.initTagSelector();
 			}
-			if (collectionTreeRow.editable) {
+			if (collectionTreeRows.every(o => o.editable)) {
 				ZoteroPane_Local.tagSelector.setMode('edit');
 			}
 			else {
 				ZoteroPane_Local.tagSelector.setMode('view');
 			}
 			ZoteroPane_Local.tagSelector.onItemViewChanged({
-				libraryID: collectionTreeRow.ref && collectionTreeRow.ref.libraryID,
-				collectionTreeRow
+				libraryID: collectionTreeRows[0].ref && collectionTreeRows[0].ref.libraryID,
+				collectionTreeRows
 			});
 		}
 	};
 	
-	
 	this.onCollectionSelected = Zotero.serial(async function () {
-		var collectionTreeRow = this.getCollectionTreeRow();
-		if (!collectionTreeRow) {
+		var collectionTreeRows = this.getCollectionTreeRows();
+		if (!collectionTreeRows.length) {
 			Zotero.debug('ZoteroPane.onCollectionSelected: No selected collection found');
 			return;
 		}
-		
-		if (this.itemsView && this.itemsView.collectionTreeRow && this.itemsView.collectionTreeRow.id == collectionTreeRow.id) {
+
+		// Only certain combinations of rows can be shown together in one items view.
+		// Collections, saved searches, and library roots can be mixed freely, within or
+		// across libraries, except that a library root can't be combined with a collection
+		// or saved search -- a library already shows all of its items, so pairing it with
+		// one of its own child collections/searches has no use case. Recently Read can be
+		// combined only with other Recently Read rows (across libraries). All other special
+		// views (Trash, Duplicates, etc.) can't be shown alongside anything else. The
+		// visibility-group check enforces both the Recently Read restriction and the
+		// feed/non-feed split: Recently Read and feeds are each their own group, so pairing
+		// one with a collection (or with each other) spans two groups, which can't share an
+		// items view. When the selected rows can't be shown together, drop everything except
+		// the focused row and show just that. Selections spanning multiple libraries are
+		// shown grouped by library in the items list.
+		if (collectionTreeRows.length > 1) {
+			let combinable = collectionTreeRows.every(
+				row => row.isCollection() || row.isSearch() || row.isLibrary(true)
+					|| row.isFeeds() || row.isRecentlyRead()
+			);
+			let mixesVisibilityGroups = new Set(
+				collectionTreeRows.map(row => row.visibilityGroup)
+			).size > 1;
+			// A library root already shows all of its items, so don't combine it with a
+			// collection or saved search (which share its visibility group)
+			let mixesLibraryAndCollection = collectionTreeRows.some(row => row.isLibrary(true))
+				&& collectionTreeRows.some(row => row.isCollection() || row.isSearch());
+			if (!combinable || mixesVisibilityGroups || mixesLibraryAndCollection) {
+				Zotero.debug("ZoteroPane.onCollectionSelected: Selected rows can't be shown "
+					+ "together -- keeping only the focused row");
+				// Drop all but the focused row. Don't await selectByID() here: it awaits
+				// waitForSelect(), whose 'select' event can't fire until this handler
+				// returns, so it would deadlock. Reducing the selection directly
+				// re-triggers onCollectionSelected() with the single row.
+				this.collectionsView.selection.select(this.collectionsView.selection.focused);
+				return;
+			}
+		}
+
+		if (this.itemsView?.collectionTreeRows
+				&& Zotero.Utilities.arrayEquals(
+					collectionTreeRows.map(r => r.id).sort(),
+					this.itemsView.collectionTreeRows.map(r => r.id).sort()
+				)) {
 			Zotero.debug("ZoteroPane.onCollectionSelected: Collection selection hasn't changed");
 
 			// Update enabled actions, in case editability has changed
-			this._updateEnabledActionsForRow(collectionTreeRow);
+			this._updateEnabledActionsForCollectionTreeRows(collectionTreeRows);
+			return;
+		}
+		
+		let advancedSearchDeck = document.getElementById('zotero-advanced-search-pane-deck');
+		if (this.itemsView.collectionTreeRows[0]?.isSearch()
+				&& advancedSearchDeck.state === 'open'
+				&& advancedSearchDeck.selectedSearchType === 'saved'
+				&& !(await this._confirmCloseSavedSearchEditor())) {
+			// Revert the selection to just the search being edited, suppressing the
+			// selection event so that this handler doesn't re-run and re-prompt
+			this.collectionsView.selection.selectEventsSuppressed = true;
+			try {
+				let index = this.collectionsView.getRowIndexByID(this.itemsView.collectionTreeRows[0].id);
+				if (index !== false) {
+					this.collectionsView.selection.select(index);
+				}
+			}
+			finally {
+				this.collectionsView.selection.selectEventsSuppressed = false;
+			}
 			return;
 		}
 		
 		// Rename tab
-		Zotero_Tabs.rename('zotero-pane', collectionTreeRow.getName());
-		
-		let type = Zotero.Libraries.get(collectionTreeRow.ref.libraryID).libraryType;
+		let tabName = collectionTreeRows.length == 1
+			? collectionTreeRows[0].getName()
+			: Zotero.getString('tab-title-multiple-collections');
+		Zotero_Tabs.rename('zotero-pane', tabName);
 		
 		// Clear quick search and tag selector when switching views
-		document.getElementById('zotero-tb-search-textbox').value = "";
+		document.getElementById('zotero-tb-search').onCollectionSelected();
 		if (ZoteroPane.tagSelector) {
 			ZoteroPane.tagSelector.clearTagSelection();
 		}
 		
-		collectionTreeRow.setSearch('');
-		if (ZoteroPane.tagSelector) {
-			collectionTreeRow.setTags(ZoteroPane.tagSelector.getTagSelection());
-		}
+		this._refreshAdvancedSearchPane(collectionTreeRows);
+		this._updateEnabledActionsForCollectionTreeRows(collectionTreeRows);
 		
-		this._updateEnabledActionsForRow(collectionTreeRow);
+		for (let collectionTreeRow of collectionTreeRows) {
+			collectionTreeRow.setSearch('');
+			if (ZoteroPane.tagSelector) {
+				collectionTreeRow.setTags(ZoteroPane.tagSelector.getTagSelection());
+			}
 
-		// If item data not yet loaded for library, load it now.
-		// Other data types are loaded at startup
-		if (collectionTreeRow.isFeeds()) {
-			var feedsToLoad = Zotero.Feeds.getAll().filter(feed => !feed.getDataLoaded('item'));
-			if (feedsToLoad.length) {
-				Zotero.debug("Waiting for items to load for feeds " + feedsToLoad.map(feed => feed.libraryID));
-				ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
-				for (let feed of feedsToLoad) {
-					await feed.waitForDataLoad('item');
+			// If item data not yet loaded for library, load it now.
+			// Other data types are loaded at startup
+			if (collectionTreeRow.isFeeds()) {
+				var feedsToLoad = Zotero.Feeds.getAll().filter(feed => !feed.getDataLoaded('item'));
+				if (feedsToLoad.length) {
+					Zotero.debug("Waiting for items to load for feeds " + feedsToLoad.map(feed => feed.libraryID));
+					ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
+					for (let feed of feedsToLoad) {
+						await feed.waitForDataLoad('item');
+					}
+				}
+			}
+			else {
+				var library = Zotero.Libraries.get(collectionTreeRow.ref.libraryID);
+				if (!library.getDataLoaded('item')) {
+					Zotero.debug("Waiting for items to load for library " + library.libraryID);
+					ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
+					await library.waitForDataLoad('item');
 				}
 			}
 		}
-		else {
-			var library = Zotero.Libraries.get(collectionTreeRow.ref.libraryID);
-			if (!library.getDataLoaded('item')) {
-				Zotero.debug("Waiting for items to load for library " + library.libraryID);
-				ZoteroPane_Local.setItemsPaneMessage(Zotero.getString('pane.items.loading'));
-				await library.waitForDataLoad('item');
+		
+		await this.itemsView.changeCollectionTreeRows(collectionTreeRows);
+		
+		Zotero.Prefs.set('lastViewedFolder', collectionTreeRows[0].id);
+		// The focused row is the one just clicked, whereas collectionTreeRows is in tree order
+		let focusedRow = this.collectionsView.selectedTreeRow;
+		if (focusedRow && focusedRow.isCollection()) {
+			Zotero.Collections.addToRecent(focusedRow.ref);
+		}
+	});
+
+
+	/**
+	 * @param {Zotero.CollectionTreeRow[]} [collectionTreeRows] - During collection selection,
+	 *     the newly selected rows, which aren't in the items view yet
+	 */
+	this._refreshAdvancedSearchPane = function (collectionTreeRows) {
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+
+		deck.pane.refresh();
+
+		let search = deck.state === 'closed' || deck.selectedSearchType !== 'temporary' || !deck.pane.active
+			? null
+			: deck.pane.search;
+		if (collectionTreeRows) {
+			for (let collectionTreeRow of collectionTreeRows) {
+				collectionTreeRow.setAdvancedSearch(search);
+			}
+			return undefined;
+		}
+		// Apply via the items view, whose rows can be different objects from the
+		// collection tree's current rows
+		return this.itemsView.setFilter('advanced-search', search);
+	};
+
+
+	/**
+	 * Prompt to save changes in the open saved-search editor and close it
+	 *
+	 * If the editor has no changes to save, or if the search being edited was deleted or
+	 * trashed, leaving nothing to save the changes to, the editor is closed without a prompt.
+	 *
+	 * @return {Promise<Boolean>} - False if the user chose Cancel, leaving the editor open
+	 */
+	this._confirmCloseSavedSearchEditor = async function () {
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+		let editedSearch = Zotero.Searches.get(deck.pane.editedSearchID);
+		if (!editedSearch || editedSearch.deleted || !deck.pane.hasChanges) {
+			await deck.pane.cancel();
+			return true;
+		}
+		let result = Zotero.Prompt.confirm({
+			window,
+			title: Zotero.getString('saved-search-close-confirmation-title'),
+			text: Zotero.getString('saved-search-close-confirmation-body'),
+			button0: Zotero.Prompt.BUTTON_TITLE_SAVE,
+			button1: Zotero.Prompt.BUTTON_TITLE_CANCEL,
+			button2: Zotero.Prompt.BUTTON_TITLE_DONT_SAVE
+		});
+		switch (result) {
+			case 0:
+				await deck.pane.save();
+				return true;
+			case 1:
+				return false;
+			default:
+				await deck.pane.cancel();
+				return true;
+		}
+	};
+	
+	
+	/**
+	 * @param {'open' | 'collapsed' | 'closed'} state
+	 * @param {Boolean} [skipRefresh=false] - Don't refresh the items view
+	 */
+	this.setAdvancedSearchState = async function (state, { skipRefresh = false } = {}) {
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+		// Replacing or closing the saved-search editor discards its working copy, so
+		// prompt to save changes first, as when switching collections
+		if (deck.state === 'open' && deck.selectedSearchType === 'saved') {
+			if (!(await this._confirmCloseSavedSearchEditor())) {
+				return;
+			}
+			// The editor is now closed, which is all a close or collapse needs; only
+			// opening the temporary pane continues
+			if (state !== 'open') {
+				return;
 			}
 		}
+		let oldState = deck.state;
+		deck.selectedSearchType = 'temporary';
+		deck.state = state;
 		
-		await this.itemsView.changeCollectionTreeRow(collectionTreeRow);
+		let advancedSearchPane = deck.pane;
+
+		document.getElementById('zotero-tb-search').updateMode();
+		let refreshPromise;
+		if (!skipRefresh && !(state === 'open' && oldState === 'collapsed'
+				|| state === 'collapsed' && oldState === 'open')) {
+			// State change changes displayed items - refresh the tree
+			refreshPromise = this._refreshAdvancedSearchPane();
+		}
 		
-		Zotero.Prefs.set('lastViewedFolder', collectionTreeRow.id);
-	});
+		// Update the pane state synchronously, so that a state change initiated
+		// while the refresh below is pending doesn't see a stale search
+		if (state === 'closed') {
+			advancedSearchPane.search = null;
+		}
+		else if (state === 'open') {
+			Zotero_Tabs.select('zotero-pane');
+			advancedSearchPane.focus();
+		}
+		
+		await refreshPromise;
+	};
+	
+	
+	/**
+	 * @param {'open' | 'collapsed' | 'closed'} state
+	 */
+	this.toggleAdvancedSearchState = async function (state) {
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+		if (state === deck.state && deck.selectedSearchType !== 'saved') {
+			// If we're trying to open the pane, and it's already open but not focused,
+			// focus it
+			if (state === 'open' && !deck.pane.matches(':focus-within')) {
+				deck.pane.focus();
+				return;
+			}
+			
+			// Flip the state
+			switch (state) {
+				case 'open':
+					state = 'closed';
+					break;
+				case 'collapsed':
+				case 'closed':
+					state = 'open';
+					break;
+			}
+		}
+		await this.setAdvancedSearchState(state);
+	};
+
+
+	/**
+	 * Open the Advanced Search pane seeded from the quick search text, reproducing
+	 * the current quick search mode as editable conditions.
+	 *
+	 * The quick search field is cleared, since its text now lives in the Advanced
+	 * Search. Closing the Advanced Search resets to an unfiltered view rather than
+	 * restoring the quick search.
+	 *
+	 * @param {String} searchText
+	 * @param {String} [mode='fields'] - The quick search mode to reproduce
+	 */
+	this.openAdvancedSearchFromQuickSearch = async function (searchText, mode = 'fields') {
+		// Conditions written in the query ("tag:foo") become conditions in the
+		// search; what's left is split into words (keeping quoted phrases
+		// intact), as the quick search does
+		let { tree, text } = Zotero.SearchQuery.parse(searchText);
+		let parts = Zotero.SearchConditions.parseSearchString(text);
+		if (!parts.length && !tree) {
+			await this.toggleAdvancedSearchState('open');
+			return;
+		}
+
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+		let search = new Zotero.Search();
+		let libraryID = this.getSelectedLibraryIDs()[0];
+		if (libraryID) {
+			search.libraryID = libraryID;
+		}
+
+		// Reproduce the quick search mode as editable conditions, one per word joined
+		// with "all": Title/Creator/Year and All Fields & Tags each map to a single
+		// condition, Everything to an "any" group of Any Field plus full-text.
+		// Title/Creator/Year matches only top-level items, so set the result level to item.
+		if (tree) {
+			// The words are joined to the conditions with "all", so an "any"
+			// query becomes a group rather than something they're OR'd into
+			Zotero.SearchQuery.addToSearch(search, parts.length && tree.joinMode === 'any'
+				? { joinMode: 'all', children: [tree] }
+				: tree);
+		}
+		if (mode === 'titleCreatorYear') {
+			search.addCondition('resultLevel', 'item');
+		}
+		for (let part of parts) {
+			if (mode === 'everything') {
+				search.addCondition('groupStart', 'true', '');
+				search.addCondition('joinMode', 'any');
+				search.addCondition('anyField', 'contains', part.text);
+				search.addCondition('fulltextContent', 'contains', part.text);
+				search.addCondition('groupEnd', 'true', '');
+			}
+			else if (mode === 'titleCreatorYear') {
+				search.addCondition('titleCreatorYear', 'contains', part.text);
+			}
+			else {
+				search.addCondition('anyField', 'contains', part.text);
+			}
+		}
+
+		// Show the Advanced Search and seed it, without yet touching the items list,
+		// so that the quick search results stay visible until they're replaced below
+		deck.selectedSearchType = 'temporary';
+		deck.state = 'open';
+		deck.pane.search = search;
+		deck.pane.refresh();
+
+		// Clear the quick search text and every selected row's filter (without their own
+		// refresh), so the field doesn't flash empty and closing Advanced Search returns
+		// to an unfiltered view. The submit() below replaces the results in place.
+		let searchBox = document.getElementById('zotero-tb-search');
+		searchBox.updateMode();
+		searchBox.value = '';
+		for (let collectionTreeRow of this.itemsView.collectionTreeRows) {
+			collectionTreeRow.setSearch('');
+		}
+
+		Zotero_Tabs.select('zotero-pane');
+		await deck.pane.submit();
+		// Focus the first condition so the user can refine the seeded search
+		deck.pane.focus();
+	};
+
+
+	/**
+	 * @param {'open' | 'closed'} state
+	 */
+	this.setSavedSearchEditorState = async function (state) {
+		let collectionTreeRow = this.getCollectionTreeRows()[0];
+		if (state === 'open' && !collectionTreeRow.isSearch()) {
+			throw new Error('Cannot show saved search editor outside search row');
+		}
+		
+		let deck = document.getElementById('zotero-advanced-search-pane-deck');
+		deck.selectedSearchType = 'saved';
+		deck.state = state;
+		
+		if (state === 'open') {
+			deck.pane.search = collectionTreeRow.ref;
+		}
+
+		document.getElementById('zotero-tb-search').updateMode();
+		let refreshPromise = this._refreshAdvancedSearchPane();
+		if (state === 'open') {
+			deck.pane.focus();
+		}
+		await refreshPromise;
+	};
+
+
+	this.openAdvancedSearchWindow = function () {
+		Zotero.debug(`ZoteroPane.openAdvancedSearchWindow() is deprecated -- use ZoteroPane.toggleAdvancedSearchState() instead`);
+		this.toggleAdvancedSearchState('open');
+	};
 	
 	
 	/**
 	 * Enable or disable toolbar icons, menu options, and commands as necessary
 	 */
-	this._updateEnabledActionsForRow = function (collectionTreeRow) {
+	this._updateEnabledActionsForCollectionTreeRows = function (collectionTreeRows) {
 		const disableIfNoEdit = [
 			"menu_newItem",
 			"cmd_zotero_addByIdentifier",
@@ -1825,7 +2176,6 @@ var ZoteroPane = new function () {
 			"menu_noteAdd",
 			
 			"cmd_zotero_newCollection",
-			"cmd_zotero_newSavedSearch",
 			"cmd_zotero_import",
 			"cmd_zotero_importFromClipboard",
 			
@@ -1842,6 +2192,11 @@ var ZoteroPane = new function () {
 			"zotero-tb-attachment-add",
 			"zotero-tb-note-add",
 		];
+		// Disable item/collection creation when selected rows span multiple libraries
+		let multipleLibraries = new Set(
+			collectionTreeRows.map(o => (o.isFeeds() ? -1 : o.ref.libraryID))
+		).size > 1;
+
 		for (let i = 0; i < disableIfNoEdit.length; i++) {
 			let command = disableIfNoEdit[i];
 			let el = document.getElementById(command);
@@ -1849,8 +2204,8 @@ var ZoteroPane = new function () {
 			
 			// If a trash is selected, new collection depends on the
 			// editability of the library
-			if (collectionTreeRow.isTrash() && command == 'cmd_zotero_newCollection') {
-				var overrideEditable = Zotero.Libraries.get(collectionTreeRow.ref.libraryID).editable;
+			if (collectionTreeRows[0].isTrash() && command == 'cmd_zotero_newCollection') {
+				var overrideEditable = Zotero.Libraries.get(collectionTreeRows[0].ref.libraryID).editable;
 			}
 			else {
 				var overrideEditable = false;
@@ -1858,11 +2213,12 @@ var ZoteroPane = new function () {
 			
 			// Don't allow normal buttons in My Publications, because things need to
 			// be dragged and go through the wizard
-			let forceDisable = collectionTreeRow.isPublications()
+			let forceDisable = collectionTreeRows[0].isPublications()
 				&& command != 'cmd_zotero_newCollection'
 				&& command != 'zotero-tb-note-add';
 			
-			if ((collectionTreeRow.editable || overrideEditable) && !forceDisable) {
+			if ((collectionTreeRows.every(o => o.editable) || overrideEditable)
+					&& !forceDisable && !multipleLibraries) {
 				if(el.hasAttribute("disabled")) el.removeAttribute("disabled");
 			} else {
 				el.setAttribute("disabled", "true");
@@ -1872,8 +2228,26 @@ var ZoteroPane = new function () {
 	
 	
 	this.getCollectionTreeRow = function () {
-		return this.collectionsView && this.collectionsView.selection.count
-			&& this.collectionsView.getRow(this.collectionsView.selection.focused);
+		if (!this.collectionsView) {
+			return false;
+		}
+		this.collectionsView._requireSingleSelection("ZoteroPane.getCollectionTreeRow()",
+			"ZoteroPane.getCollectionTreeRows()");
+		return this.getCollectionTreeRows()[0] || false;
+	}
+	
+	
+	/**
+	 * return {CollectionTreeRow[]}
+	 */
+	this.getCollectionTreeRows = function () {
+		if (!this.collectionsView) {
+			return [];
+		}
+		// selection.selected is in click order -- return rows in collections-list order
+		return [...this.collectionsView.selection.selected]
+			.sort((a, b) => a - b)
+			.map(index => this.collectionsView.getRow(index));
 	}
 	
 	
@@ -1888,9 +2262,9 @@ var ZoteroPane = new function () {
 				Zotero.debug("Items view not available in itemSelected", 2);
 				return false;
 			}
-			let collectionTreeRow = this.getCollectionTreeRow();
+			let collectionTreeRows = this.getCollectionTreeRows();
 			// I don't think this happens in normal usage, but it can happen during tests
-			if (!collectionTreeRow) {
+			if (!collectionTreeRows.length) {
 				return false;
 			}
 			
@@ -1899,7 +2273,7 @@ var ZoteroPane = new function () {
 			// Display buttons at top of item pane depending on context. This needs to run even if the
 			// selection hasn't changed, because the selected items might have been modified.
 			this.itemPane.data = selectedItems;
-			this.itemPane.collectionTreeRow = collectionTreeRow;
+			this.itemPane.collectionTreeRows = collectionTreeRows;
 			this.itemPane.itemsView = this.itemsView;
 			this.itemPane.editable = this.collectionsView.editable;
 			this.itemPane.updateItemPaneButtons(selectedItems);
@@ -1953,7 +2327,7 @@ var ZoteroPane = new function () {
 			['cmd_zotero_newChildURLAttachment', oneItemSelected],
 		];
 		for (let command of commandsEnabled) {
-			document.getElementById(command[0]).setAttribute('disabled', !command[1]);
+			document.getElementById(command[0]).toggleAttribute('disabled', !command[1]);
 		}
 
 		Zotero.MenuManager.updateMenuPopup(
@@ -2022,9 +2396,9 @@ var ZoteroPane = new function () {
 			}
 		}
 		
-		document.getElementById('cmd_zotero_copyCitation').setAttribute('disabled', !canCopy);
-		document.getElementById('cmd_zotero_copyBibliography').setAttribute('disabled', !canCopy);
-		document.getElementById('cmd_zotero_copyAnnotation').setAttribute('disabled', !canCopy);
+		document.getElementById('cmd_zotero_copyCitation').toggleAttribute('disabled', !canCopy);
+		document.getElementById('cmd_zotero_copyBibliography').toggleAttribute('disabled', !canCopy);
+		document.getElementById('cmd_zotero_copyAnnotation').toggleAttribute('disabled', !canCopy);
 	};
 	
 	
@@ -2069,9 +2443,15 @@ var ZoteroPane = new function () {
 		
 		await Zotero.DB.executeTransaction(async function () {
 			newItem = item.clone();
-			// If in a collection, add new item to it
-			if (self.getCollectionTreeRow().isCollection() && newItem.isTopLevelItem()) {
-				newItem.setCollections([self.getCollectionTreeRow().ref.id]);
+			// If in collections, add new item to all selected collections
+			// that the original item belongs to
+			if (newItem.isTopLevelItem()) {
+				let collectionIDs = self.getCollectionTreeRows()
+					.filter(r => r.isCollection() && item.inCollection(r.ref.id))
+					.map(r => r.ref.id);
+				if (collectionIDs.length) {
+					newItem.setCollections(collectionIDs);
+				}
 			}
 			await newItem.save();
 			if (item.isNote() && Zotero.Libraries.get(newItem.libraryID).filesEditable) {
@@ -2171,8 +2551,8 @@ var ZoteroPane = new function () {
 	 * @return {Boolean}
 	 */
 	this.canDeleteSelectedItems = function () {
-		let collectionTreeRow = this.getCollectionTreeRow();
-		if (collectionTreeRow.isTrash()) {
+		let collectionTreeRows = this.getCollectionTreeRows();
+		if (collectionTreeRows[0].isTrash()) {
 			for (let index of this.itemsView.selection.selected) {
 				while (index != -1 && !this.itemsView.getRow(index).ref.deleted) {
 					index = this.itemsView.getParentIndex(index);
@@ -2182,7 +2562,7 @@ var ZoteroPane = new function () {
 				}
 			}
 		}
-		else if (collectionTreeRow.isShare()) {
+		else if (collectionTreeRows[0].isShare()) {
 			return false;
 		}
 		// If multiple items are selected and only some are annotations, disallow delete unless we
@@ -2190,7 +2570,7 @@ var ZoteroPane = new function () {
 		let selected = this.itemsView.getSelectedItems();
 		if (!selected.every(item => item.isAnnotation())
 			&& selected.some(item => item.isAnnotation())) {
-			return collectionTreeRow.isTrash();
+			return collectionTreeRows[0].isTrash();
 		}
 		return true;
 	};
@@ -2212,9 +2592,9 @@ var ZoteroPane = new function () {
 		if (!this.itemsView || !this.itemsView.selection.count) {
 			return;
 		}
-		var collectionTreeRow = this.getCollectionTreeRow();
+		var collectionTreeRows = this.getCollectionTreeRows();
 		
-		if (!collectionTreeRow.isTrash() && !collectionTreeRow.isBucket() && !this.canEdit()) {
+		if (!collectionTreeRows[0].isTrash() && !collectionTreeRows[0].isBucket() && !this.canEdit()) {
 			this.displayCannotEditLibraryMessage();
 			return;
 		}
@@ -2246,7 +2626,7 @@ var ZoteroPane = new function () {
 		if (this.itemsView.getSelectedItems().every(item => item.isAnnotation())) {
 			prompt = toDelete;
 		}
-		else if (collectionTreeRow.isPublications()) {
+		else if (collectionTreeRows[0].isPublications()) {
 			let toRemoveFromPublications = {
 				title: Zotero.getString('pane.items.removeFromPublications.title'),
 				text: Zotero.getString(
@@ -2255,18 +2635,18 @@ var ZoteroPane = new function () {
 			};
 			prompt = force ? toTrash : toRemoveFromPublications;
 		}
-		else if (collectionTreeRow.isRecentlyRead()) {
+		else if (collectionTreeRows[0].isRecentlyRead()) {
 			prompt = force ? toTrash : toRemove;
 		}
-		else if (collectionTreeRow.isLibrary(true)
-				|| collectionTreeRow.isSearch()
-				|| collectionTreeRow.isUnfiled()
-				|| collectionTreeRow.isRetracted()
-				|| collectionTreeRow.isDuplicates()) {
+		else if (collectionTreeRows[0].isLibrary(true)
+				|| collectionTreeRows.some(row => row.isSearch())
+				|| collectionTreeRows[0].isUnfiled()
+				|| collectionTreeRows[0].isRetracted()
+				|| collectionTreeRows[0].isDuplicates()) {
 			// In library, don't prompt if meta key was pressed
 			prompt = (force && !fromMenu) ? false : toTrash;
 		}
-		else if (collectionTreeRow.isCollection()) {
+		else if (collectionTreeRows.every(row => row.isCollection())) {
 			if (force) {
 				prompt = toTrash;
 			}
@@ -2280,9 +2660,14 @@ var ZoteroPane = new function () {
 				// descendant collections (even if also in the selected collection),
 				// prompt to remove from all
 				if (Zotero.Prefs.get('recursiveCollections')) {
-					let descendants = collectionTreeRow.ref.getDescendents(false, 'collection');
-					let inSubcollection = descendants
-						.some(({ id }) => this.itemsView.getSelectedItems()
+					// Removal recurses into the descendants of every selected collection
+					// (see CollectionViewItemTree), so check all of them when deciding
+					// whether to show the recursive-removal prompt
+					let descendantIDs = collectionTreeRows
+						.filter(row => row.isCollection())
+						.flatMap(row => row.ref.getDescendents(false, 'collection').map(({ id }) => id));
+					let inSubcollection = descendantIDs
+						.some(id => this.itemsView.getSelectedItems()
 							.some(item => item.inCollection(id)));
 					if (inSubcollection) {
 						var prompt = {
@@ -2301,7 +2686,7 @@ var ZoteroPane = new function () {
 				}
 			}
 		}
-		else if (collectionTreeRow.isTrash() || collectionTreeRow.isBucket()) {
+		else if (collectionTreeRows[0].isTrash() || collectionTreeRows[0].isBucket()) {
 			prompt = toDelete;
 		}
 		
@@ -2335,6 +2720,7 @@ var ZoteroPane = new function () {
 			skipDateModifiedUpdate: true
 		};
 		await Zotero.DB.executeTransaction(async () => {
+			Zotero.UndoHistory.stageAction('undo-action-add-related');
 			for (let index1 = 0; index1 < selectedItems.length; index1++) {
 				for (let index2 = index1 + 1; index2 < selectedItems.length; index2++) {
 					let item1 = selectedItems[index1];
@@ -2349,96 +2735,129 @@ var ZoteroPane = new function () {
 	};
 	
 	
-	this.deleteSelectedCollection = function (deleteItems) {
-		var collectionTreeRow = this.getCollectionTreeRow();
+	this.deleteSelectedCollection = async function (deleteItems) {
+		var collectionTreeRows = this.getCollectionTreeRows();
+		if (!collectionTreeRows.length) {
+			return;
+		}
 		
-		// Don't allow deleting libraries or My Publications
-		if (collectionTreeRow.isLibrary(true) && !collectionTreeRow.isFeed()) {
+		// Don't allow deleting libraries
+		if (collectionTreeRows.some(o => o.isLibrary(true)) && !collectionTreeRows.every(o => o.isFeed())) {
 			return;
 		}
 		
 		// Remove virtual duplicates collection
-		if (collectionTreeRow.isDuplicates()) {
-			this.setVirtual(collectionTreeRow.ref.libraryID, 'duplicates', false);
+		if (collectionTreeRows[0].isDuplicates()) {
+			this.setVirtual(collectionTreeRows[0].ref.libraryID, 'duplicates', false);
 			return;
 		}
 		// Remove virtual unfiled collection
-		else if (collectionTreeRow.isUnfiled()) {
-			this.setVirtual(collectionTreeRow.ref.libraryID, 'unfiled', false);
+		else if (collectionTreeRows[0].isUnfiled()) {
+			this.setVirtual(collectionTreeRows[0].ref.libraryID, 'unfiled', false);
 			return;
 		}
 		// Remove virtual recently read collection
-		else if (collectionTreeRow.isRecentlyRead()) {
-			this.setVirtual(collectionTreeRow.ref.libraryID, 'recentlyRead', false);
+		else if (collectionTreeRows[0].isRecentlyRead()) {
+			this.setVirtual(collectionTreeRows[0].ref.libraryID, 'recentlyRead', false);
 			return;
 		}
 		// Remove virtual retracted collection
-		else if (collectionTreeRow.isRetracted()) {
-			this.setVirtual(collectionTreeRow.ref.libraryID, 'retracted', false);
+		else if (collectionTreeRows[0].isRetracted()) {
+			this.setVirtual(collectionTreeRows[0].ref.libraryID, 'retracted', false);
 			return;
 		}
 		// Hide "My Publications"
-		else if (collectionTreeRow.isPublications()) {
-			this.setVirtual(collectionTreeRow.ref.libraryID, 'publications', false);
+		else if (collectionTreeRows[0].isPublications()) {
+			this.setVirtual(collectionTreeRows[0].ref.libraryID, 'publications', false);
 			return;
 		}
 		
-		if (!this.canEdit() && !collectionTreeRow.isFeedsOrFeed()) {
+		if (!this.canEdit() && !collectionTreeRows[0].isFeedsOrFeed()) {
 			this.displayCannotEditLibraryMessage();
 			return;
 		}
-		
-		
+
+		// A mixed-type selection (e.g., a collection and a saved search) has no
+		// coherent confirmation, so only delete a homogeneous selection
+		if (collectionTreeRows.length > 1
+				&& !collectionTreeRows.every(r => r.type === collectionTreeRows[0].type)) {
+			return;
+		}
+
 		var ps = Services.prompt;
 		buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
 			+ ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL;
-		if (this.getCollectionTreeRow()) {
-			var title, message;
-			// Work out the required title and message
-			if (collectionTreeRow.isCollection()) {
-				if (deleteItems) {
-					title = Zotero.getString('pane.collections.deleteWithItems.title');
-					message = Zotero.getString('pane.collections.deleteWithItems');
-				}
-				else {
-					title = Zotero.getString('pane.collections.delete.title');
-					message = Zotero.getString('pane.collections.delete')
-							+ "\n\n"
-							+ Zotero.getString('pane.collections.delete.keepItems');
-				}
+		var title, message;
+		var count = collectionTreeRows.length;
+		// Work out the required title and message
+		if (collectionTreeRows[0].isCollection()) {
+			if (deleteItems) {
+				[title, message] = await document.l10n.formatValues([
+					{ id: 'collections-delete-with-items-title', args: { count } },
+					{ id: 'collections-delete-with-items-message', args: { count } },
+				]);
 			}
-			else if (collectionTreeRow.isFeed()) {
-				title = Zotero.getString('pane.feed.deleteWithItems.title');
-				message = Zotero.getString('pane.feed.deleteWithItems');
-			}
-			else if (collectionTreeRow.isSearch()) {
-				title = Zotero.getString('pane.collections.deleteSearch.title');
-				message = Zotero.getString('pane.collections.deleteSearch');
-			}
-			
-			// Display prompt
-			var index = ps.confirmEx(
-				null,
-				title,
-				message,
-				buttonFlags,
-				title,
-				"", "", "", {}
-			);
-			if (index == 0) {
-				return this.collectionsView.deleteSelection(deleteItems);
+			else {
+				let keepItems;
+				[title, message, keepItems] = await document.l10n.formatValues([
+					{ id: 'collections-delete-title', args: { count } },
+					{ id: 'collections-delete-message', args: { count } },
+					{ id: 'collections-delete-keep-items', args: { count } },
+				]);
+				message = message + "\n\n" + keepItems;
 			}
 		}
+		else if (collectionTreeRows[0].isFeed()) {
+			title = Zotero.getString('pane.feed.deleteWithItems.title');
+			message = Zotero.getString('pane.feed.deleteWithItems');
+		}
+		else if (collectionTreeRows[0].isSearch()) {
+			[title, message] = await document.l10n.formatValues([
+				{ id: 'collections-delete-search-title', args: { count } },
+				{ id: 'collections-delete-search-message', args: { count } },
+			]);
+		}
+			
+		// Display prompt
+		var index = ps.confirmEx(
+			null,
+			title,
+			message,
+			buttonFlags,
+			title,
+			"", "", "", {}
+		);
+		if (index == 0) {
+			return this.collectionsView.deleteSelection(deleteItems);
+		}
 	}
 
+	this.clearAllLastRead = async function () {
+		let collectionTreeRows = this.getCollectionTreeRows();
+		if (collectionTreeRows.length != 1 || !collectionTreeRows[0].isRecentlyRead()) {
+			return;
+		}
+
+		let result = Services.prompt.confirm(
+			window,
+			Zotero.getString('general.warning'),
+			Zotero.getString('recently-read-clear-all-confirm')
+		);
+		if (!result) {
+			return;
+		}
+
+		await Zotero.Items.clearAllLastRead(collectionTreeRows[0].ref.libraryID);
+	};
+
+
 	/**
 	 * Check whether every selected item can be restored from trash
 	 *
 	 * @return {Boolean}
 	 */
 	this.canRestoreSelectedItems = function () {
-		let collectionTreeRow = this.getCollectionTreeRow();
-		if (!collectionTreeRow.isTrash()) {
+		if (!this.getCollectionTreeRows()[0].isTrash()) {
 			return false;
 		}
 
@@ -2458,9 +2877,22 @@ var ZoteroPane = new function () {
 		let isSelected = object => selectedObjects.includes(object);
 
 		await Zotero.DB.executeTransaction(async () => {
+			let undoAction;
+			if (selectedObjects.every(o => o instanceof Zotero.Item)) {
+				undoAction = 'undo-action-restore-items';
+			}
+			else if (selectedObjects.every(o => o instanceof Zotero.Collection)) {
+				undoAction = 'undo-action-restore-collection';
+			}
+			else {
+				undoAction = 'undo-action-restore-objects';
+			}
+			Zotero.UndoHistory.stageAction(undoAction, { count: selectedObjects.length });
+
 			for (let row = 0; row < this.itemsView.rowCount; row++) {
 				// Only look at top-level items
-				if (this.itemsView.getLevel(row) !== 0) {
+				if (this.itemsView.getLevel(row) !== 0
+						|| !this.itemsView.getRow(row).isObjectRow) {
 					continue;
 				}
 
@@ -2514,7 +2946,7 @@ var ZoteroPane = new function () {
 	 * @return {Promise}
 	 */
 	this.emptyTrash = async function () {
-		var libraryID = this.getSelectedLibraryID();
+		var libraryID = this.getSelectedLibraryIDs()[0];
 		
 		var result = Services.prompt.confirm(
 			null,
@@ -2543,6 +2975,7 @@ var ZoteroPane = new function () {
 				Zotero.hideZoteroPaneOverlays();
 			}
 			await Zotero.purgeDataObjects();
+			Zotero.UndoHistory.clear();
 		}
 	};
 	
@@ -2554,7 +2987,7 @@ var ZoteroPane = new function () {
 			return;
 		}
 
-		var row = this.getCollectionTreeRow();
+		var row = this.getCollectionTreeRows()[0];
 		if (!row) {
 			return;
 		}
@@ -2571,34 +3004,13 @@ var ZoteroPane = new function () {
 			return;
 		}
 
-		var row = this.getCollectionTreeRow();
+		var row = this.getCollectionTreeRows()[0];
 		if (row) {
 			if (row.isCollection()) {
 				this.collectionsView.startEditing(row);
 			}
 			else {
-				let s = row.ref.clone();
-				let groups = [];
-				// Promises don't work in the modal dialog, so get the group name here, if
-				// applicable, and pass it in. We only need the group that this search belongs
-				// to, if any, since the library drop-down is disabled for saved searches.
-				if (Zotero.Libraries.get(s.libraryID).libraryType == 'group') {
-					groups.push(Zotero.Groups.getByLibraryID(s.libraryID));
-				}
-				var io = {
-					dataIn: {
-						search: s,
-						name: row.getName(),
-						groups: groups
-					},
-					dataOut: null
-				};
-				window.openDialog('chrome://zotero/content/searchDialog.xhtml','','chrome,modal,centerscreen',io);
-				if (io.dataOut) {
-					row.ref.fromJSON(io.dataOut.json);
-					await row.ref.saveTx();
-					Zotero_Tabs.rename("zotero-pane", row.ref.name);
-				}
+				this.setSavedSearchEditorState('open');
 			}
 		}
 	};
@@ -2606,7 +3018,7 @@ var ZoteroPane = new function () {
 	// Move selected collection to specified target collection or library.
 	// Target has to be in the same library as the currently selected collection.
 	this.moveCollection = async (target) => {
-		let selected = this.getSelectedCollection();
+		let selected = this.getSelectedCollections()[0];
 		if (!selected) return;
 
 		if (target.libraryID !== selected.libraryID) {
@@ -2619,13 +3031,13 @@ var ZoteroPane = new function () {
 			selected.parentID = target.id;
 		}
 		
-		await selected.saveTx();
+		await selected.saveTx({ undoAction: 'undo-action-move-collection' });
 	};
 
 	// Copy selected collection into another collection or library.
 	// Partially, a replication of drag-drop mechanism from CollectionTree.onDrop.
 	this.copyCollection = async (target) => {
-		let selected = this.getSelectedCollection();
+		let selected = this.getSelectedCollections()[0];
 		if (!selected) return;
 
 		let targetTreeRowID = `L${target.libraryID}`;
@@ -2657,10 +3069,10 @@ var ZoteroPane = new function () {
 	};
 
 	this.markFeedRead = async function () {
-		var row = this.getCollectionTreeRow();
-		if (!row) return;
+		var rows = this.getCollectionTreeRows();
+		if (!rows.length) return;
 
-		let feeds = row.isFeeds() ? Zotero.Feeds.getAll() : [row.ref];
+		let feeds = rows.some(row => row.isFeeds()) ? Zotero.Feeds.getAll() : rows.map(row => row.ref);
 		for (let feed of feeds) {
 			let feedItemIDs = await Zotero.FeedItems.getAll(feed.libraryID, true, false, true);
 			await Zotero.FeedItems.toggleReadByID(feedItemIDs, true);
@@ -2669,8 +3081,9 @@ var ZoteroPane = new function () {
 
 	
 	this.editSelectedFeed = async function () {
-		var row = this.getCollectionTreeRow();
-		if (!row) return;
+		var rows = this.getCollectionTreeRows();
+		if (!rows.length) return;
+		var row = rows[0];
 		
 		let feed = row.ref;
 		let data = {
@@ -2694,7 +3107,7 @@ var ZoteroPane = new function () {
 	};
 	
 	this.refreshFeed = function () {
-		var row = this.getCollectionTreeRow();
+		var row = this.getCollectionTreeRows()[0];
 		if (!row) return;
 		
 		let feed = row.ref;
@@ -2808,13 +3221,6 @@ var ZoteroPane = new function () {
 	}
 	
 	
-	this.handleSearchInput = function (textbox, event) {
-		if (textbox.searchTextbox.value.indexOf('"') != -1) {
-			this.setItemsPaneMessage(Zotero.getString('advancedSearchMode'));
-		}
-	}
-	
-	
 	/**
 	 * @return {Promise}
 	 */
@@ -2824,18 +3230,40 @@ var ZoteroPane = new function () {
 		}
 		var search = document.getElementById('zotero-tb-search');
 		var searchVal = search.searchTextbox.value;
-		if (!runAdvanced && searchVal.indexOf('"') != -1) {
+		if (!runAdvanced && Zotero.SearchQuery.hasOpenQuote(searchVal)) {
 			return;
 		}
 		var spinner = document.getElementById('zotero-tb-search-spinner');
 		spinner.setAttribute("status", "animate");
 		spinner.style.visibility = 'visible';
-		await this.itemsView.setFilter('search', searchVal);
+		// A query with conditions in it ("by:smith crispr") filters by those
+		// and matches whatever text is left over the way the current mode
+		// does; anything else is text to search for, as typed
+		// Each selected row scopes the query to its own library, so the query
+		// carries none of its own -- with one, a multi-library selection would
+		// match only in that library
+		let query = Zotero.SearchQuery.getSearch(searchVal, {
+			mode: Zotero.Prefs.get('search.quicksearch-mode')
+		});
+		if (query) {
+			this._quickSearchIsQuery = true;
+			await this.itemsView.setFilter('search', '');
+			await this.itemsView.setFilter('advanced-search', query);
+		}
+		else {
+			// Only clear a search this set, so an open Advanced Search keeps
+			// its own
+			if (this._quickSearchIsQuery) {
+				this._quickSearchIsQuery = false;
+				await this.itemsView.setFilter('advanced-search', null);
+			}
+			// A condition whose value hasn't been typed yet is left out of the
+			// text, so completing a condition name doesn't search for it
+			await this.itemsView.setFilter('search',
+				Zotero.SearchQuery.parse(searchVal).text);
+		}
 		spinner.style.removeProperty("visibility");
 		spinner.removeAttribute("status");
-		if (runAdvanced) {
-			this.clearItemsPaneMessage();
-		}
 	};
 	
 	
@@ -2854,9 +3282,10 @@ var ZoteroPane = new function () {
 
 
 	var _syncRemindersObserverID = null;
+	var _apiKeyObserverID = null;
 	this.initSyncReminders = function (startup) {
-		if (startup) {
-			Zotero.Notifier.registerObserver(
+		if (startup && !_apiKeyObserverID) {
+			_apiKeyObserverID = Zotero.Notifier.registerObserver(
 				{
 					notify: (event) => {
 						// When the API Key is deleted we need to add an observer
@@ -3106,22 +3535,57 @@ var ZoteroPane = new function () {
 	};
 	
 	this.getSelectedLibraryID = function () {
-		return this.collectionsView.getSelectedLibraryID();
+		this.collectionsView._requireSingleSelection("ZoteroPane.getSelectedLibraryID()",
+			"ZoteroPane.getSelectedLibraryIDs()");
+		var libraryIDs = this.getSelectedLibraryIDs();
+		return libraryIDs.length ? libraryIDs[0] : false;
 	}
-	
-	
-	function getSelectedCollection(asID) {
-		return this.collectionsView.getSelectedCollection(asID);
+
+
+	/**
+	 * @return {Integer[]} - libraryIDs of the selected rows, in collections-list order
+	 */
+	this.getSelectedLibraryIDs = function () {
+		if (!this.collectionsView) {
+			return [];
+		}
+		return this.collectionsView.getSelectedLibraryIDs();
 	}
-	
-	
+
+
+	this.getSelectedCollection = function (asID) {
+		this.collectionsView._requireSingleSelection("ZoteroPane.getSelectedCollection()",
+			"ZoteroPane.getSelectedCollections()");
+		return this.getSelectedCollections(asID)[0];
+	}
+
+
+	this.getSelectedCollections = function (asID) {
+		return this.collectionsView.getSelectedCollections(asID);
+	}
+
+
 	function getSelectedSavedSearch(asID) {
-		return this.collectionsView.getSelectedSearch(asID);
+		this.collectionsView._requireSingleSelection("ZoteroPane.getSelectedSavedSearch()",
+			"ZoteroPane.getSelectedSavedSearches()");
+		var searches = this.getSelectedSavedSearches(asID);
+		return searches.length ? searches[0] : false;
 	}
-	
-	
+
+
+	this.getSelectedSavedSearches = function (asID) {
+		return this.collectionsView.getSelectedSearches(asID);
+	}
+
+
 	this.getSelectedGroup = function (asID) {
-		return this.collectionsView.getSelectedGroup(asID);
+		this.collectionsView._requireSingleSelection("ZoteroPane.getSelectedGroup()",
+			"ZoteroPane.getCollectionTreeRows() filtered by isGroup()");
+		var group = this.getCollectionTreeRows().find(row => row.isGroup());
+		if (group) {
+			return asID ? group.ref.id : group.ref;
+		}
+		return false;
 	}
 	
 	
@@ -3135,8 +3599,17 @@ var ZoteroPane = new function () {
 	 * Return an array of Item objects for selected items
 	 *
 	 * If asIDs is true, return an array of itemIDs instead
+	 *
+	 * If libraryTabOnly is true, return the library tab's item tree selection even if
+	 * another tab is currently selected
 	 */
-	this.getSelectedItems = function (asIDs) {
+	this.getSelectedItems = function (asIDs, { libraryTabOnly = false } = {}) {
+		if (libraryTabOnly) {
+			if (!this.itemsView) {
+				return [];
+			}
+			return this.itemsView.getSelectedItems(asIDs);
+		}
 		switch (Zotero_Tabs.selectedType) {
 			case 'library':
 				if (!this.itemsView) {
@@ -3185,6 +3658,23 @@ var ZoteroPane = new function () {
 				return this.getSelectedItems(asIDs);
 		}
 	};
+
+
+	/**
+	 * Returns all items in the selected collection tree rows, ignoring quicksearch,
+	 * tag, and advanced search filters
+	 *
+	 * @return {Promise<Zotero.Item[]>}
+	 */
+	this.getUnfilteredItems = async function () {
+		var itemSet = new Set();
+		for (let row of this.getCollectionTreeRows()) {
+			for (let item of await row.getItems({ unfiltered: true })) {
+				itemSet.add(item);
+			}
+		}
+		return [...itemSet];
+	};
 	
 	
 	function getSortField() {
@@ -3229,6 +3719,11 @@ var ZoteroPane = new function () {
 	 * Show context menu once it's ready
 	 */
 	this.onItemsContextMenuOpen = async function (event, x, y) {
+		// Library section headers (in a grouped cross-library view) aren't items, so
+		// don't show the item context menu when one is right-clicked
+		if (event.target?.closest?.('.library-header-row')) {
+			return;
+		}
 		await ZoteroPane.buildItemContextMenu();
 		x = x || event.screenX;
 		y = y || event.screenY;
@@ -3260,7 +3755,7 @@ var ZoteroPane = new function () {
 			label: Zotero.getString('sync.sync'),
 			oncommand: () => {
 				Zotero.Sync.Runner.sync({
-					libraries: [this.getSelectedLibraryID()],
+					libraries: [this.getSelectedLibraryIDs()[0]],
 				});
 			}
 		},
@@ -3271,14 +3766,10 @@ var ZoteroPane = new function () {
 			id: "newCollection",
 			command: "cmd_zotero_newCollection"
 		},
-		{
-			id: "newSavedSearch",
-			command: "cmd_zotero_newSavedSearch"
-		},
 		{
 			id: "newSubcollection",
 			oncommand: () => {
-				this.newCollection(this.getSelectedCollection().key);
+				this.newCollection(this.getSelectedCollections()[0].key);
 			}
 		},
 		{
@@ -3291,31 +3782,31 @@ var ZoteroPane = new function () {
 		{
 			id: "showDuplicates",
 			oncommand: () => {
-				this.setVirtual(this.getSelectedLibraryID(), 'duplicates', true, true);
+				this.setVirtual(this.getSelectedLibraryIDs()[0], 'duplicates', true, true);
 			}
 		},
 		{
 			id: "showUnfiled",
 			oncommand: () => {
-				this.setVirtual(this.getSelectedLibraryID(), 'unfiled', true, true);
+				this.setVirtual(this.getSelectedLibraryIDs()[0], 'unfiled', true, true);
 			}
 		},
 		{
 			id: "showRecentlyRead",
 			oncommand: () => {
-				this.setVirtual(this.getSelectedLibraryID(), 'recentlyRead', true, true);
+				this.setVirtual(this.getSelectedLibraryIDs()[0], 'recentlyRead', true, true);
 			}
 		},
 		{
 			id: "showRetracted",
 			oncommand: () => {
-				this.setVirtual(this.getSelectedLibraryID(), 'retracted', true, true);
+				this.setVirtual(this.getSelectedLibraryIDs()[0], 'retracted', true, true);
 			}
 		},
 		{
 			id: "showPublications",
 			oncommand: () => {
-				this.setVirtual(this.getSelectedLibraryID(), 'publications', true, true);
+				this.setVirtual(this.getSelectedLibraryIDs()[0], 'publications', true, true);
 			}
 		},
 		{
@@ -3347,6 +3838,10 @@ var ZoteroPane = new function () {
 			id: "deleteCollection",
 			oncommand: () => this.deleteSelectedCollection()
 		},
+		{
+			id: "clearAllLastRead",
+			oncommand: () => this.clearAllLastRead()
+		},
 		{
 			id: "deleteCollectionAndItems",
 			oncommand: () => this.deleteSelectedCollection(true)
@@ -3378,7 +3873,7 @@ var ZoteroPane = new function () {
 			id: "removeLibrary",
 			label: Zotero.getString('pane.collections.menu.remove.library'),
 			oncommand: () => {
-				let library = Zotero.Libraries.get(this.getSelectedLibraryID());
+				let library = Zotero.Libraries.get(this.getSelectedLibraryIDs()[0]);
 				let ps = Services.prompt;
 				let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
 					+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL);
@@ -3399,20 +3894,22 @@ var ZoteroPane = new function () {
 	];
 	
 	this.buildCollectionContextMenu = async function () {
-		var libraryID = this.getSelectedLibraryID();
+		var libraryID = this.getSelectedLibraryIDs()[0];
 		var options = _collectionContextMenuOptions;
 		
-		var collectionTreeRow = this.getCollectionTreeRow();
+		var collectionTreeRows = this.getCollectionTreeRows();
 		// This can happen if selection is changing during delayed second call below
-		if (!collectionTreeRow) {
+		if (!collectionTreeRows.length) {
 			return;
 		}
+		let libraryIDs = new Set(collectionTreeRows.map(o => o.ref.libraryID));
+		let multipleLibraries = libraryIDs.size > 1;
 		
 		// If the items view isn't initialized, this was a right-click on a different collection
 		// and the new collection's items are still loading, so continue menu after loading is
 		// done. This causes some menu items (e.g., export/createBib/loadReport) to appear gray
 		// in the menu at first and then turn black once there are items
-		if (!collectionTreeRow.isHeader() && !this.itemsView.initialized) {
+		if (!collectionTreeRows[0].isHeader() && !this.itemsView.initialized) {
 			await this.itemsView.waitForLoad();
 		}
 		
@@ -3441,7 +3938,7 @@ var ZoteroPane = new function () {
 		var show = [], disable = [];
 		
 		let useHideOrDelete = "delete";
-		if (collectionTreeRow.isCollection()) {
+		if (collectionTreeRows[0].isCollection()) {
 			show = [
 				'newSubcollection',
 				'sep2',
@@ -3459,42 +3956,62 @@ var ZoteroPane = new function () {
 			if (!this.itemsView.rowCount) {
 				disable = ['createBibCollection', 'loadReport'];
 				
-				// If no items in subcollections either, disable export
-				if (!(await collectionTreeRow.ref.getDescendents(false, 'item', false).length)) {
+				// If no items in any of the collections' subcollections either, disable export
+				if (!(await Promise.all(collectionTreeRows.map(o => o.ref.getDescendents(false, 'item', false)))).flat().length) {
 					disable.push('exportCollection');
 				}
 			}
 			
 			// Adjust labels
-			document.l10n.setAttributes(m.editSelectedCollection, 'collections-menu-rename-collection');
+			document.l10n.setAttributes(m.editSelectedCollection, 'collections-menu-rename');
 			document.l10n.setAttributes(m.moveCollection, 'collections-menu-move-collection');
 			document.l10n.setAttributes(m.copyCollection, 'collections-menu-copy-collection');
 			
-			m.deleteCollection.setAttribute('label', Zotero.getString('pane.collections.menu.delete.collection'));
-			m.deleteCollectionAndItems.setAttribute('label', Zotero.getString('pane.collections.menu.delete.collectionAndItems'));
-			m.exportCollection.setAttribute('label', Zotero.getString('pane.collections.menu.export.collection'));
-			m.createBibCollection.setAttribute('label', Zotero.getString('pane.collections.menu.createBib.collection'));
-			m.loadReport.setAttribute('label', Zotero.getString('pane.collections.menu.generateReport.collection'));
+			document.l10n.setAttributes(m.deleteCollection, 'collections-menu-delete', { count: collectionTreeRows.length });
+			document.l10n.setAttributes(m.deleteCollectionAndItems, 'collections-menu-delete-with-items', { count: collectionTreeRows.length });
+			document.l10n.setAttributes(m.exportCollection, 'collections-menu-export');
+			document.l10n.setAttributes(m.createBibCollection, 'collections-menu-create-bibliography');
+			document.l10n.setAttributes(m.loadReport, 'collections-menu-generate-report');
+
+			// New Subcollection and Rename act on a single collection, so hide them
+			// when more than one row is selected
+			if (collectionTreeRows.length > 1) {
+				show = show.filter(id => id != 'newSubcollection' && id != 'editSelectedCollection');
+			}
+			// A mixed-type selection has no coherent delete confirmation, so hide the
+			// delete actions unless every selected row is a collection
+			if (!collectionTreeRows.every(r => r.isCollection())) {
+				show = show.filter(id => id != 'deleteCollection' && id != 'deleteCollectionAndItems');
+			}
+
+			// Hide move/copy when collections span multiple libraries, and disable
+			// the report (its URL is scoped to a single library)
+			if (multipleLibraries) {
+				show = show.filter(id => id != 'moveCollection' && id != 'copyCollection');
+				disable.push('loadReport');
+			}
 		}
-		else if (collectionTreeRow.isFeed()) {
+		else if (collectionTreeRows[0].isFeed()) {
 			show = [
 				'refreshFeed',
 				'sep2',
 				'markReadFeed',
-				'editSelectedFeed',
-				'deleteCollectionAndItems'
+				'deleteCollectionAndItems',
 			];
+			if (collectionTreeRows.length == 1) {
+				show.push('editSelectedFeed');
+			}
 			
-			if (collectionTreeRow.ref.unreadCount == 0) {
+			if (collectionTreeRows.every(o => o.ref.unreadCount == 0)) {
 				disable = ['markReadFeed'];
 			}
 			
 			// Adjust labels
 			m.refreshFeed.setAttribute('label', Zotero.getString('pane.collections.menu.refresh.feed'));
 			m.markReadFeed.setAttribute('label', Zotero.getString('pane.collections.menu.markAsRead.feed'));
-			m.deleteCollectionAndItems.setAttribute('label', Zotero.getString('pane.collections.menu.delete.feedAndItems'));
+			document.l10n.setAttributes(m.deleteCollectionAndItems, 'collections-menu-unsubscribe');
 		}
-		else if (collectionTreeRow.isFeeds()) {
+		else if (collectionTreeRows.some(row => row.isFeeds())) {
 			show = [
 				'refreshFeed',
 				'sep2',
@@ -3502,7 +4019,7 @@ var ZoteroPane = new function () {
 				'addFeed',
 			];
 
-			if (collectionTreeRow.ref.unreadCount == 0) {
+			if (collectionTreeRows.every(row => row.ref.unreadCount === 0)) {
 				disable = ['markReadFeed'];
 			}
 
@@ -3510,45 +4027,53 @@ var ZoteroPane = new function () {
 			m.refreshFeed.setAttribute('label', Zotero.getString('pane.collections.menu.refresh.allFeeds'));
 			m.markReadFeed.setAttribute('label', Zotero.getString('pane.collections.menu.markAsRead.allFeeds'));
 		}
-		else if (collectionTreeRow.isSearch()) {
+		else if (collectionTreeRows[0].isSearch()) {
 			show = [
-				'editSelectedCollection',
-				'duplicate',
 				'deleteCollection',
 				'sep3',
 				'exportCollection',
 				'createBibCollection',
 				'loadReport'
 			];
-			
+			if (collectionTreeRows.length == 1) {
+				show.push('editSelectedCollection', 'duplicate');
+			}
 			
 			if (!this.itemsView.rowCount) {
 				disable.push('exportCollection', 'createBibCollection', 'loadReport');
 			}
 			
 			// Adjust labels
-			document.l10n.setAttributes(m.editSelectedCollection, 'collections-menu-edit-saved-search');
-			m.duplicate.setAttribute('label', Zotero.getString('pane.collections.menu.duplicate.savedSearch'));
+			document.l10n.setAttributes(m.editSelectedCollection, 'collections-menu-edit-search');
+			document.l10n.setAttributes(m.duplicate, 'collections-menu-duplicate-search');
 			m.duplicate.classList.add('zotero-menuitem-duplicate-saved-search');
 			m.duplicate.classList.remove('zotero-menuitem-duplicate-collection');
-			m.deleteCollection.setAttribute('label', Zotero.getString('pane.collections.menu.delete.savedSearch'));
-			m.exportCollection.setAttribute('label', Zotero.getString('pane.collections.menu.export.savedSearch'));
-			m.createBibCollection.setAttribute('label', Zotero.getString('pane.collections.menu.createBib.savedSearch'));
-			m.loadReport.setAttribute('label', Zotero.getString('pane.collections.menu.generateReport.savedSearch'));
+			document.l10n.setAttributes(m.deleteCollection, 'collections-menu-delete-search', { count: collectionTreeRows.length });
+			document.l10n.setAttributes(m.exportCollection, 'collections-menu-export');
+			document.l10n.setAttributes(m.createBibCollection, 'collections-menu-create-bibliography');
+			document.l10n.setAttributes(m.loadReport, 'collections-menu-generate-report');
+
+			// Hide delete for a mixed-type selection (see the collection branch)
+			if (!collectionTreeRows.every(r => r.isSearch())) {
+				show = show.filter(id => id != 'deleteCollection');
+			}
 		}
-		else if (collectionTreeRow.isTrash()) {
+		else if (collectionTreeRows[0].isTrash()) {
 			show = ['emptyTrash'];
 		}
-		else if (collectionTreeRow.isDuplicates() || collectionTreeRow.isUnfiled() || collectionTreeRow.isRecentlyRead()
-				|| collectionTreeRow.isRetracted()) {
+		else if (collectionTreeRows[0].isDuplicates() || collectionTreeRows[0].isUnfiled() || collectionTreeRows[0].isRecentlyRead()
+				|| collectionTreeRows[0].isRetracted()) {
 			show = ['deleteCollection'];
+			if (collectionTreeRows.length == 1 && collectionTreeRows[0].isRecentlyRead()) {
+				show.push('clearAllLastRead');
+			}
 			
 			m.deleteCollection.setAttribute('label', Zotero.getString('general.hide'));
 			useHideOrDelete = "hide";
 		}
-		else if (collectionTreeRow.isHeader()) {
+		else if (collectionTreeRows[0].isHeader()) {
 		}
-		else if (collectionTreeRow.isPublications()) {
+		else if (collectionTreeRows[0].isPublications()) {
 			show = ['exportFile', 'deleteCollection'];
 			m.deleteCollection.setAttribute('label', Zotero.getString('general.hide'));
 			useHideOrDelete = "hide";
@@ -3561,8 +4086,7 @@ var ZoteroPane = new function () {
 				show.push(
 					'sync',
 					'sep1',
-					'newCollection',
-					'newSavedSearch'
+					'newCollection'
 				);
 			}
 				// Only show "Show Duplicates", "Show Unfiled Items", and "Show Retracted" if rows are hidden
@@ -3624,11 +4148,11 @@ var ZoteroPane = new function () {
 		// Disable some actions if user doesn't have write access
 		//
 		// Some actions are disabled via their commands in onCollectionSelected()
-		if (collectionTreeRow.isWithinGroup()
-				&& !collectionTreeRow.editable
-				&& !collectionTreeRow.isDuplicates()
-				&& !collectionTreeRow.isUnfiled()
-				&& !collectionTreeRow.isRetracted()) {
+		if (collectionTreeRows[0].isWithinGroup()
+				&& collectionTreeRows.every(o => !o.editable)
+				&& !collectionTreeRows[0].isDuplicates()
+				&& !collectionTreeRows[0].isUnfiled()
+				&& !collectionTreeRows[0].isRetracted()) {
 			disable.push(
 				'newSubcollection',
 				'editSelectedCollection',
@@ -3639,8 +4163,8 @@ var ZoteroPane = new function () {
 		}
 		
 		// If within non-editable group or trash it empty, disable Empty Trash
-		if (collectionTreeRow.isTrash()) {
-			if ((collectionTreeRow.isWithinGroup() && !collectionTreeRow.isWithinEditableGroup()) || !this.itemsView.rowCount) {
+		if (collectionTreeRows[0].isTrash()) {
+			if ((collectionTreeRows[0].isWithinGroup() && !collectionTreeRows[0].isWithinEditableGroup()) || !this.itemsView.rowCount) {
 				disable.push('emptyTrash');
 			}
 		}
@@ -3648,11 +4172,11 @@ var ZoteroPane = new function () {
 		// Hide and enable all actions by default (so if they're shown they're enabled)
 		for (let i in m) {
 			m[i].setAttribute('hidden', true);
-			m[i].setAttribute('disabled', false);
+			m[i].removeAttribute('disabled');
 		}
 		
 		for (let id of show) {
-			m[id].setAttribute('hidden', false);
+			m[id].removeAttribute('hidden');
 		}
 		
 		for (let id of disable) {
@@ -3664,7 +4188,15 @@ var ZoteroPane = new function () {
 			"main/library/collection",
 			{
 				getContext: () => ({
-					collectionTreeRow,
+					get collectionTreeRow() {
+						if (collectionTreeRows.length > 1) {
+							throw new Error("collectionTreeRow was removed -- use collectionTreeRows");
+						}
+						Zotero.Plugins.warnRemovedAPICall("Menu context collectionTreeRow",
+							"collectionTreeRows");
+						return collectionTreeRows[0];
+					},
+					collectionTreeRows,
 					tabType: "library",
 					tabSubType: undefined,
 					tabID: "zotero-pane",
@@ -3724,8 +4256,8 @@ var ZoteroPane = new function () {
 			return;
 		}
 		
-		var collectionTreeRow = this.getCollectionTreeRow();
-		var isTrash = collectionTreeRow.isTrash();
+		var collectionTreeRows = this.getCollectionTreeRows();
+		var isTrash = collectionTreeRows[0].isTrash();
 		
 		if (isTrash) {
 			show.add(m.deleteFromLibrary);
@@ -3737,11 +4269,11 @@ var ZoteroPane = new function () {
 				disable.add(m.restoreToLibrary);
 			}
 		}
-		else if (!collectionTreeRow.isFeedsOrFeed()) {
+		else if (!collectionTreeRows[0].isFeedsOrFeed()) {
 			show.add(m.moveToTrash);
 		}
 
-		if(!collectionTreeRow.isFeedsOrFeed()) {
+		if (!collectionTreeRows[0].isFeedsOrFeed()) {
 			show.add(m.sep4);
 			show.add(m.exportItems);
 			show.add(m.createBib);
@@ -3749,7 +4281,13 @@ var ZoteroPane = new function () {
 		}
 		
 		var items = this.getSelectedItems();
-		
+
+		// A report URL is scoped to a single library, so disable it when the selected
+		// items span libraries (possible in a cross-library items list)
+		if (new Set(items.map(item => item.libraryID)).size > 1) {
+			disable.add(m.loadReport);
+		}
+
 		if (items.length > 0) {
 			// Multiple items selected
 			if (items.length > 1) {
@@ -3760,11 +4298,11 @@ var ZoteroPane = new function () {
 					canIndex = true,
 					canRecognize = true,
 					canUnrecognize = true;
-				var canMarkRead = collectionTreeRow.isFeedsOrFeed();
+				var canMarkRead = collectionTreeRows[0].isFeedsOrFeed();
 				var markUnread = true;
 				
 				for (let item of items) {
-					if (canMerge && (!item.isRegularItem() || item.isFeedItem || collectionTreeRow.isDuplicates())) {
+					if (canMerge && (!item.isRegularItem() || item.isFeedItem || collectionTreeRows[0].isDuplicates())) {
 						canMerge = false;
 					}
 					
@@ -3827,9 +4365,9 @@ var ZoteroPane = new function () {
 				}
 				
 				// "Add/Create Note from Annotations" and "Find Available PDFs"
-				if (collectionTreeRow.filesEditable
-						&& !collectionTreeRow.isDuplicates()
-						&& !collectionTreeRow.isFeedsOrFeed()) {
+				if (collectionTreeRows[0].filesEditable
+						&& !collectionTreeRows[0].isDuplicates()
+						&& !collectionTreeRows[0].isFeedsOrFeed()) {
 					if (items.some(item => attachmentsWithExtractableAnnotations(item).length)
 							|| items.some(item => isAttachmentWithExtractableAnnotations(item))
 							|| items.some(item => item.isAnnotation())) {
@@ -3879,7 +4417,7 @@ var ZoteroPane = new function () {
 				
 				// Block certain actions on files if no access and at least one item is a file
 				// attachment
-				if (!collectionTreeRow.filesEditable) {
+				if (!collectionTreeRows[0].filesEditable) {
 					for (let item of items) {
 						if (item.isFileAttachment()) {
 							disable.add(m.moveToTrash);
@@ -3900,7 +4438,7 @@ var ZoteroPane = new function () {
 				
 				if (!isTrash) {
 					// Show in Library
-					if (!collectionTreeRow.isLibrary(true)) {
+					if (!collectionTreeRows.every(o => o.isLibrary(true))) {
 						show.add(m.showInLibrary);
 						show.add(m.sep1);
 					}
@@ -3941,7 +4479,7 @@ var ZoteroPane = new function () {
 					if (Zotero.Attachments.canFindFileForItem(item)) {
 						show.add(m.findFile);
 						show.add(m.sep3);
-						if (!collectionTreeRow.filesEditable) {
+						if (!collectionTreeRows[0].filesEditable) {
 							disable.add(m.findFile);
 						}
 					}
@@ -3986,7 +4524,7 @@ var ZoteroPane = new function () {
 							menu.childNodes[m.toggleRead].setAttribute('label', Zotero.getString('pane.item.markAsRead'));
 						}
 					}
-					else if (!collectionTreeRow.isPublications()) {
+					else if (!collectionTreeRows[0].isPublications()) {
 						if (item.itemType == 'book' || item.itemType == 'bookSection') {
 							let toBookMenuItem = menu.childNodes[m.duplicateAndConvert];
 							toBookMenuItem.setAttribute('label', Zotero.getString('pane.items.menu.duplicateAndConvert.'
@@ -4013,7 +4551,7 @@ var ZoteroPane = new function () {
 				});
 				
 				// Block certain actions on files if no access
-				if (item.isFileAttachment() && !collectionTreeRow.filesEditable) {
+				if (item.isFileAttachment() && !collectionTreeRows[0].filesEditable) {
 					[m.moveToTrash, m.createParent]
 						.forEach(function (x) {
 							disable.add(x);
@@ -4025,7 +4563,7 @@ var ZoteroPane = new function () {
 		else
 		{
 			// Show in Library
-			if (!collectionTreeRow.isLibrary()) {
+			if (!collectionTreeRows.every(o => o.isLibrary(true))) {
 				show.add(m.showInLibrary);
 				show.add(m.sep1);
 			}
@@ -4042,6 +4580,7 @@ var ZoteroPane = new function () {
 			].forEach(x => disable.add(x));
 			
 		}
+		
 		// Show "Export Note…" if all notes or attachments
 		var noteExport = items.every(item => item.isNote() || item.isAttachment());
 		// Disable export if all notes are empty
@@ -4063,7 +4602,7 @@ var ZoteroPane = new function () {
 			show.delete(m.createBib);
 		}
 		
-		if ((!collectionTreeRow.editable || collectionTreeRow.isPublications()) && !collectionTreeRow.isFeedsOrFeed()) {
+		if ((!collectionTreeRows[0].editable || collectionTreeRows[0].isPublications()) && !collectionTreeRows[0].isFeedsOrFeed()) {
 			for (let i in m) {
 				// Still allow some options for non-editable views
 				switch (i) {
@@ -4081,7 +4620,7 @@ var ZoteroPane = new function () {
 						continue;
 					}
 				}
-				else if (collectionTreeRow.isPublications()) {
+				else if (collectionTreeRows[0].isPublications()) {
 					switch (i) {
 					case 'addNote':
 					case 'removeItems':
@@ -4094,8 +4633,8 @@ var ZoteroPane = new function () {
 		}
 
 		// Add to collection
-		if (!collectionTreeRow.isFeedsOrFeed()
-			&& collectionTreeRow.editable
+		if (!collectionTreeRows[0].isFeedsOrFeed()
+			&& collectionTreeRows[0].editable
 			&& Zotero.Items.keepTopLevel(items).every(item => item.isTopLevelItem())
 		) {
 			menu.childNodes[m.addToCollection].setAttribute('label', Zotero.getString('pane.items.menu.addToCollection'));
@@ -4104,15 +4643,18 @@ var ZoteroPane = new function () {
 		
 		// Remove from collection / Recently Read
 		menu.childNodes[m.removeItems].removeAttribute('data-l10n-id');
-		if (collectionTreeRow.isCollection() && items.every(item => item.isTopLevelItem())) {
+		// Removing from a collection isn't meaningful when a saved search is also
+		// selected, since its items needn't be in any of the collections
+		if (collectionTreeRows.every(row => row.isCollection())
+				&& items.every(item => item.isTopLevelItem())) {
 			menu.childNodes[m.removeItems].setAttribute('label', Zotero.getString('pane.items.menu.remove' + multiple));
 			show.add(m.removeItems);
 		}
-		else if (collectionTreeRow.isPublications()) {
+		else if (collectionTreeRows[0].isPublications()) {
 			menu.childNodes[m.removeItems].setAttribute('label', Zotero.getString('pane.items.menu.removeFromPublications' + multiple));
 			show.add(m.removeItems);
 		}
-		else if (collectionTreeRow.isRecentlyRead()) {
+		else if (collectionTreeRows[0].isRecentlyRead()) {
 			// Disable for child items that aren't attachments with lastRead
 			let canRemove = items.every((item) => {
 				if (item.isTopLevelItem()) return true;
@@ -4127,7 +4669,7 @@ var ZoteroPane = new function () {
 		}
 		
 		// Show in library
-		if (collectionTreeRow.isFeeds()) {
+		if (collectionTreeRows[0].isFeeds()) {
 			menu.childNodes[m.showInLibrary].setAttribute('label', Zotero.getString('pane.items.menu.showInFeed'));
 		}
 		else {
@@ -4175,7 +4717,7 @@ var ZoteroPane = new function () {
 		for (let i in m) {
 			let pos = m[i];
 			menu.childNodes[pos].setAttribute('hidden', true);
-			menu.childNodes[pos].setAttribute('disabled', false);
+			menu.childNodes[pos].removeAttribute('disabled');
 		}
 		
 		for (let x of disable) {
@@ -4183,7 +4725,7 @@ var ZoteroPane = new function () {
 		}
 		
 		for (let x of show) {
-			menu.childNodes[x].setAttribute('hidden', false);
+			menu.childNodes[x].removeAttribute('hidden');
 		}
 
 		// No locate menu options if annotations are selected
@@ -4197,7 +4739,15 @@ var ZoteroPane = new function () {
 			"main/library/item",
 			{
 				getContext: () => ({
-					collectionTreeRow,
+					get collectionTreeRow() {
+						if (collectionTreeRows.length > 1) {
+							throw new Error("collectionTreeRow was removed -- use collectionTreeRows");
+						}
+						Zotero.Plugins.warnRemovedAPICall("Menu context collectionTreeRow",
+							"collectionTreeRows");
+						return collectionTreeRows[0];
+					},
+					collectionTreeRows,
 					items,
 					tabType: "library",
 					tabSubType: undefined,
@@ -4215,10 +4765,10 @@ var ZoteroPane = new function () {
 		let popup = event.target;
 		popup.replaceChildren();
 
-		let selected = this.getSelectedCollection();
+		let selected = this.getSelectedCollections();
 
 		// Add current library at the top to be able to move collections into it
-		let library = Zotero.Libraries.get(ZoteroPane.getSelectedLibraryID());
+		let library = Zotero.Libraries.get(ZoteroPane.getSelectedLibraryIDs()[0]);
 		let libraryMenuItem = document.createXULElement("menuitem");
 		libraryMenuItem.setAttribute("label", library.name);
 		libraryMenuItem.setAttribute("image", library.treeViewImage);
@@ -4229,14 +4779,14 @@ var ZoteroPane = new function () {
 				event.stopPropagation();
 			}
 		});
-		// Disable for already top-level collections
-		libraryMenuItem.disabled = !selected.parentID;
+		// Disable if all collections are already top-level collections
+		libraryMenuItem.disabled = selected.every(o => !o.parentID);
 		libraryMenuItem.classList.add('menuitem-iconic');
 		popup.appendChild(libraryMenuItem);
 		popup.appendChild(document.createXULElement("menuseparator"));
 		
 		// Build menus for each top-level collection of this library
-		let collections = Zotero.Collections.getByLibrary(this.getSelectedLibraryID());
+		let collections = Zotero.Collections.getByLibrary(this.getSelectedLibraryIDs()[0]);
 		for (let col of collections) {
 			let menuItem = Zotero.Utilities.Internal.createMenuForTarget(
 				col,
@@ -4251,9 +4801,11 @@ var ZoteroPane = new function () {
 				
 				(target) => {
 					// can't move collection into itself, its parent or its children
-					return selected == target
-						|| selected.parentKey == target.key
-						|| selected.hasDescendent('collection', target.id);
+					return selected.some((c) => {
+						return c == target
+							|| c.parentKey == target.key
+							|| c.hasDescendent('collection', target.id);
+					});
 				}
 			);
 			popup.append(menuItem);
@@ -4265,7 +4817,7 @@ var ZoteroPane = new function () {
 		if (event.target !== event.currentTarget) return;
 		let popup = document.getElementById("zotero-copy-collection-popup");
 		popup.replaceChildren();
-		let selected = this.getSelectedCollection();
+		let selected = this.getSelectedCollections()[0];
 
 		// Fetch all libraries
 		let topLevelEntries = Zotero.Libraries.getAll().filter(lib => !(lib instanceof Zotero.Feed));
@@ -4342,6 +4894,19 @@ var ZoteroPane = new function () {
 		}
 	};
 
+	
+	function _getCollectionPathLabel(collection) {
+		var names = [collection.name];
+		var parentID = collection.parentID;
+		while (parentID) {
+			let parent = Zotero.Collections.get(parentID);
+			names.unshift(parent.name);
+			parentID = parent.parentID;
+		}
+		return names.join(' \u203A ');
+	}
+	
+	
 	this.buildAddItemToCollectionMenu = function (event, items = this.getSelectedItems()) {
 		if (event.target !== event.currentTarget) return;
 		let popup = event.target;
@@ -4366,6 +4931,27 @@ var ZoteroPane = new function () {
 			throw new Error('All items must be the same library');
 		}
 		
+		let containsItems = collection => items.every(item => collection.hasItem(item));
+		
+		// Recently used collections above the full list, skipping any that already contain
+		// all the items so that every slot is a usable target
+		let recent = Zotero.Collections.getRecent(libraryID)
+			.filter(collection => !containsItems(collection))
+			.slice(0, RECENT_COLLECTIONS_SHOWN);
+		if (recent.length) {
+			let menuitems = recent.map((collection) => {
+				let menuitem = document.createXULElement('menuitem');
+				// Full path, since collections in different parts of the tree can share a name
+				menuitem.setAttribute('label', _getCollectionPathLabel(collection));
+				menuitem.setAttribute('image', collection.treeViewImage);
+				menuitem.classList.add('menuitem-iconic');
+				menuitem.addEventListener('command',
+					() => this.addItemsToCollection(items, collection));
+				return menuitem;
+			});
+			popup.append(...menuitems, document.createXULElement('menuseparator'));
+		}
+		
 		let collections = Zotero.Collections.getByLibrary(libraryID);
 		for (let col of collections) {
 			let menuItem = Zotero.Utilities.Internal.createMenuForTarget(
@@ -4378,7 +4964,7 @@ var ZoteroPane = new function () {
 						event.stopPropagation();
 					}
 				},
-				collection => items.every(item => collection.hasItem(item))
+				containsItems
 			);
 			popup.append(menuItem);
 		}
@@ -4396,15 +4982,22 @@ var ZoteroPane = new function () {
 			}
 			// Only allow targets within the current library for now
 			// TODO: Come back to this once we support copying items between libraries from the Add to Collection menu
-			let id = await this.newCollection(this.getSelectedCollection()?.key);
+			let id = await this.newCollection(this.getSelectedCollections()[0]?.key);
 			if (!id) {
 				return;
 			}
 			collection = Zotero.Collections.get(id);
 		}
 
-		await Zotero.DB.executeTransaction(
-			() => collection.addItems(items.map(item => item.id)));
+		let ids = items.map(item => item.id);
+		await Zotero.DB.executeTransaction(async () => {
+			Zotero.UndoHistory.stageAction(
+				'undo-action-add-to-collection',
+				{ count: ids.length }
+			);
+			await collection.addItems(ids);
+		});
+		Zotero.Collections.addToRecent(collection);
 	};
 
 
@@ -4530,6 +5123,13 @@ var ZoteroPane = new function () {
 	 *     popup mode (where a note isn't created immediately), or false if library isn't editable
 	 */
 	this.newNote = async function (popup, parentKey, text, citeURI) {
+		// Shouldn't be reachable with multiple libraries selected (toolbar is disabled),
+		// but just in case
+		let rows = this.getCollectionTreeRows();
+		if (new Set(rows.map(r => r.ref.libraryID)).size > 1) {
+			return;
+		}
+
 		if (!this.canEdit()) {
 			this.displayCannotEditLibraryMessage();
 			return false;
@@ -4537,13 +5137,7 @@ var ZoteroPane = new function () {
 		
 		if (popup) {
 			// TODO: _text_
-			var c = this.getSelectedCollection();
-			if (c) {
-				this.openNote(null, { col: c.id, parentKey });
-			}
-			else {
-				this.openNote(null, { parentKey });
-			}
+			this.openNote(null, { parentKey });
 			return null;
 		}
 		
@@ -4559,13 +5153,15 @@ var ZoteroPane = new function () {
 		}
 		
 		var item = new Zotero.Item('note');
-		item.libraryID = this.getSelectedLibraryID();
+		item.libraryID = this.getSelectedLibraryIDs()[0];
 		item.setNote(text);
 		if (parentKey) {
 			item.parentKey = parentKey;
 		}
-		else if (this.getCollectionTreeRow().isCollection()) {
-			item.addToCollection(this.getCollectionTreeRow().ref.id);
+		else if (this.getCollectionTreeRows().every(row => row.isCollection())) {
+			for (let row of this.getCollectionTreeRows()) {
+				item.addToCollection(row.ref.id);
+			}
 		}
 		var itemID = await item.saveTx({
 			notifierData: {
@@ -4635,19 +5231,17 @@ var ZoteroPane = new function () {
 	
 	
 	this.openNote = function (itemID, options = {
-		col: undefined,
 		parentKey: undefined,
 		openInWindow: undefined
 	}) {
 		let {
-			col,
 			parentKey,
 			openInWindow,
 		} = options;
 		if (openInWindow === undefined) {
 			openInWindow = Zotero.Prefs.get('openNoteInNewWindow');
 		}
-		
+
 		return Zotero.Notes.open(itemID, undefined, {
 			openInWindow,
 		});
@@ -4701,7 +5295,13 @@ var ZoteroPane = new function () {
 	this.addAttachmentFromDialog = async function (link, parentItemID, files = null) {
 		var libraryID;
 		if (Zotero_Tabs.selectedType === 'library') {
-			let collectionTreeRow = this.getCollectionTreeRow();
+			// Shouldn't be reachable with multiple libraries selected (toolbar is disabled),
+			// but just in case
+			let rows = this.getCollectionTreeRows();
+			if (new Set(rows.map(r => r.ref.libraryID)).size > 1) {
+				return null;
+			}
+			let collectionTreeRow = rows[0];
 			if (link && collectionTreeRow.isPublications()) {
 				Zotero.alert(
 					null,
@@ -4743,9 +5343,9 @@ var ZoteroPane = new function () {
 		}
 		var addedItems = [];
 		var notifierQueue = new Zotero.Notifier.Queue();
-		var collection;
+		var collections;
 		var fileBaseName;
-		
+
 		try {
 			if (parentItemID) {
 				// If only one item is being added, automatic renaming is enabled, and the parent item
@@ -4760,9 +5360,9 @@ var ZoteroPane = new function () {
 					}
 				}
 			}
-			// If not adding to an item, add to the current collection
+			// If not adding to an item, add to all selected collections
 			else {
-				collection = this.getSelectedCollection(true);
+				collections = this.getSelectedCollections(true);
 			}
 
 			// If we have more than one file, we only want to call setAutoAttachmentTitle()
@@ -4796,7 +5396,7 @@ var ZoteroPane = new function () {
 						file,
 						title: delaySetAutoAttachmentTitle ? '' : undefined,
 						parentItemID,
-						collections: collection ? [collection] : undefined,
+						collections: collections && collections.length ? collections : undefined,
 						saveOptions: {
 							notifierQueue
 						},
@@ -4815,7 +5415,7 @@ var ZoteroPane = new function () {
 						fileBaseName,
 						title: delaySetAutoAttachmentTitle ? '' : undefined,
 						parentItemID,
-						collections: collection ? [collection] : undefined,
+						collections: collections && collections.length ? collections : undefined,
 						saveOptions: {
 							notifierQueue
 						},
@@ -5192,8 +5792,11 @@ var ZoteroPane = new function () {
 			
 			if (fileExists && !redownload) {
 				Zotero.debug("Opening " + path);
-				Zotero.Notifier.trigger('open', 'file', item.id);
 				await launchFile(path, item);
+				// Trigger after launchFile(), which may save a content-type fix
+				// to the item -- 'open' observers save changes to the item
+				// (e.g., lastRead), which could discard an in-flight change
+				Zotero.Notifier.trigger('open', 'file', item.id);
 				continue;
 			}
 			
@@ -5238,8 +5841,11 @@ var ZoteroPane = new function () {
 			Zotero.Notifier.trigger('redraw', 'item', []);
 			
 			Zotero.debug("Opening " + path);
-			Zotero.Notifier.trigger('open', 'file', item.id);
 			await launchFile(path, item);
+			// Trigger after launchFile(), which may save a content-type fix
+			// to the item -- 'open' observers save changes to the item
+			// (e.g., lastRead), which could discard an in-flight change
+			Zotero.Notifier.trigger('open', 'file', item.id);
 		}
 	});
 	
@@ -5258,7 +5864,7 @@ var ZoteroPane = new function () {
 		// Only applies when selected items are not top level items
 		if (selectedItems.some(item => item.isRegularItem())) return;
 
-		let libraryID = this.getSelectedLibraryID();
+		let libraryID = this.getSelectedLibraryIDs()[0];
 		let shouldConvertToStandaloneAttachment = false;
 		let extraButtons = [];
 		// Keep in sync with Zotero.RecognizeDocument.canRecognize()
@@ -5302,6 +5908,11 @@ var ZoteroPane = new function () {
 		// If "Convert to Standalone Attachment" is selected, make all attachments top-level items
 		if (shouldConvertToStandaloneAttachment) {
 			await Zotero.DB.executeTransaction(async () => {
+				Zotero.UndoHistory.stageAction(
+					'undo-action-convert-to-standalone',
+					{ count: selectedItems.length }
+				);
+
 				for (let item of selectedItems) {
 					let parent = Zotero.Items.get(item.parentID);
 					if (parent) {
@@ -5324,6 +5935,11 @@ var ZoteroPane = new function () {
 		if (!newParentItem.length) return;
 
 		await Zotero.DB.executeTransaction(async () => {
+			Zotero.UndoHistory.stageAction(
+				'undo-action-change-parent-item',
+				{ count: selectedItems.length }
+			);
+
 			for (let item of selectedItems) {
 				item.parentID = newParentItem[0].id;
 				await item.save({ skipSelect: true });
@@ -5455,7 +6071,7 @@ var ZoteroPane = new function () {
 			// launch the parent directory
 			Zotero.launchFile(file.parent);
 		}
-		Zotero.Notifier.trigger('open', 'file', attachment.id);
+		Zotero.Notifier.trigger('reveal', 'file', attachment.id);
 	};
 	
 	
@@ -6007,7 +6623,7 @@ var ZoteroPane = new function () {
 		var note = await Zotero.EditorInstance.createNoteFromAnnotations(
 			annotations,
 			{
-				collectionID: this.getSelectedCollection(true)
+				collectionID: this.getSelectedCollections(true)[0]
 			}
 		);
 		await this.selectItem(note.id);
@@ -6385,12 +7001,13 @@ var ZoteroPane = new function () {
 			return [];
 		}));
 		await Zotero.DB.executeTransaction(async () => {
+			Zotero.UndoHistory.stageAction('undo-action-normalize-attachment-titles');
 			for (let attachment of attachments) {
 				if (attachment.getField('title').replace(/\.[^.]+$/, '') !== attachment.attachmentFilename.replace(/\.[^.]+$/, '')) {
 					Zotero.debug(`Skipping attachment with modified title: ${attachment.getField('title')}`);
 					continue;
 				}
-				
+
 				let forceFirstOfType = !!attachment.parentItemID
 					&& await attachment.parentItem.getBestAttachment() === attachment;
 				attachment.setAutoAttachmentTitle({ forceFirstOfType });
@@ -6538,7 +7155,7 @@ var ZoteroPane = new function () {
 			}
 			// Otherwise select Retracted Items collection
 			else {
-				let libraryID = this.getSelectedLibraryID();
+				let libraryID = this.getSelectedLibraryIDs()[0];
 				await this.collectionsView.selectByID("R" + libraryID);
 			}
 		}.bind(this);
@@ -6583,12 +7200,19 @@ var ZoteroPane = new function () {
 	 * before the installer displays the "scary" OS prompt to access other application data.
 	 * @returns {Promise<Object>} Object with either install, dismiss or remindLater set to true.
 	 */
-	this.showMacWordPluginInstallWarning = function () {
+	this.showMacWordPluginInstallWarning = function (options = {}) {
 		return new Promise((resolve) => {
 			const panel = document.getElementById('mac-word-plugin-install-container');
+			const message = document.querySelector('#mac-word-plugin-install-banner .message');
 			const action = document.getElementById('mac-word-plugin-install-action');
 			const remind = document.getElementById('mac-word-plugin-install-remind-later');
 			const dontAskAgain = document.getElementById('mac-word-plugin-install-dont-ask-again');
+
+			// On macOS 27 (Golden Gate) and later, the user allows the installation in a
+			// folder-selection dialog rather than approving an OS permission prompt
+			message.dataset.l10nId = options.folderAccess
+				? 'mac-word-plugin-install-folder-message'
+				: 'mac-word-plugin-install-message';
 			
 			// TODO: Replace with ftl string
 			dontAskAgain.label = Zotero.getString('general.dontAskAgain');
@@ -6663,8 +7287,9 @@ var ZoteroPane = new function () {
 
 	
 	this.showPostUpgradeBanner = function () {
-		// Don't show for beta builds or if disabled
-		if (Zotero.isBetaBuild || !Zotero.Prefs.get('showPostUpgradeBanner')) {
+		// Don't show for non-release builds or if disabled
+		if (Zotero.isBetaBuild || Zotero.isDevBuild || Zotero.isSourceBuild
+				|| !Zotero.Prefs.get('showPostUpgradeBanner')) {
 			return;
 		}
 		// Don't show if we've already shown a banner for this or a higher major version
@@ -6747,6 +7372,7 @@ var ZoteroPane = new function () {
 		Zotero.Prefs.set('autoRenameFiles.bannerShown', true);
 	};
 
+	
 	/**
 	 * Sets the layout to either a three-vertical-pane layout and a layout where itemsPane is above itemPane
 	 */
@@ -6771,11 +7397,6 @@ var ZoteroPane = new function () {
 		}
 
 		this.updateLayoutConstraints();
-		if (ZoteroPane.itemsView) {
-			// Need to immediately rerender the items here without any debouncing
-			// since tree height will have changed
-			ZoteroPane.itemsView._updateHeight();
-		}
 		ZoteroContextPane.update();
 		Zotero_Tabs.updateSidebarLayout();
 	};
@@ -6928,7 +7549,7 @@ var ZoteroPane = new function () {
 		const windowAutoStackMinWidth = 930;
 		if (window.innerWidth < windowAutoStackMinWidth) {
 			// Disable layout mode menus because the standard mode is not available
-			layoutModeMenus.forEach(menu => menu.setAttribute("disabled", "true"));
+			layoutModeMenus.forEach(menu => menu.toggleAttribute("disabled", "true"));
 			// If the window is too small in standard mode, enter stack mode temporarily
 			if (!isStackedMode && !isTempStackedMode) {
 				Zotero.Prefs.set('tempStackedMode', true);
@@ -6959,9 +7580,6 @@ var ZoteroPane = new function () {
 
 		var collectionsPaneWidth = collectionsPane.getBoundingClientRect().width;
 		tagSelector.style.maxWidth = collectionsPaneWidth + 'px';
-		if (ZoteroPane.itemsView) {
-			ZoteroPane.itemsView.updateHeight();
-		}
 
 		this.handleTagSelectorResize();
 
@@ -7036,30 +7654,30 @@ var ZoteroPane = new function () {
 
 	this.buildFieldTransformMenu = function ({ target, onTransform }) {
 		let doc = target.ownerDocument;
-		let value = target.value;
-		let valueTitleCased = Zotero.Utilities.capitalizeTitle(value, true);
-		let valueSentenceCased = Zotero.Utilities.sentenceCase(value);
+		let values = target.values;
+		let valuesTitleCased = values.map(v => Zotero.Utilities.capitalizeTitle(v, true));
+		let valuesSentenceCased = values.map(v => Zotero.Utilities.sentenceCase(v));
 
 		let menupopup = doc.createXULElement('menupopup');
 
 		let titleCase = doc.createXULElement('menuitem');
 		titleCase.setAttribute('label', Zotero.getString('zotero.item.textTransform.titlecase'));
 		titleCase.addEventListener('command', () => {
-			onTransform(valueTitleCased);
+			onTransform(valuesTitleCased);
 		});
-		titleCase.disabled = valueTitleCased == value;
+		titleCase.disabled = values.every((v, i) => valuesTitleCased[i] === v);
 		menupopup.append(titleCase);
 
 		let sentenceCase = doc.createXULElement('menuitem');
 		sentenceCase.setAttribute('label', Zotero.getString('zotero.item.textTransform.sentencecase'));
 		sentenceCase.addEventListener('command', () => {
-			onTransform(valueSentenceCased);
+			onTransform(valuesSentenceCased);
 		});
-		sentenceCase.disabled = valueSentenceCased == value;
+		sentenceCase.disabled = values.every((v, i) => valuesSentenceCased[i] === v);
 		menupopup.append(sentenceCase);
 
 		Zotero.Utilities.Internal.updateEditContextMenu(menupopup, target);
-
+	
 		return menupopup;
 	};
 };
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 62de1383fd..a1eab8bae9 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -102,7 +102,7 @@
 		<command id="cmd_zotero_import" oncommand="Zotero_File_Interface.showImportWizard();"/>
 		<command id="cmd_zotero_importFromClipboard" oncommand="Zotero_File_Interface.importFromClipboard();"/>
 		<command id="cmd_zotero_exportLibrary" oncommand="Zotero_File_Interface.exportFile();"/>
-		<command id="cmd_zotero_advancedSearch" oncommand="ZoteroPane_Local.openAdvancedSearchWindow();"/>
+		<command id="cmd_zotero_advancedSearch" oncommand="ZoteroPane.toggleAdvancedSearchState('open');"/>
 		<command id="cmd_zotero_copyCitation"
 				 oncommand="ZoteroPane_Local.copySelectedItemsToClipboard(true);"
 				 disabled="true"/>
@@ -114,9 +114,8 @@
 				 disabled="true"/>
 		<command id="cmd_zotero_createTimeline" oncommand="Zotero_Timeline_Interface.loadTimeline();"/>
 		<command id="cmd_zotero_rtfScan" oncommand="window.openDialog('chrome://zotero/content/rtfScan.xhtml', 'rtfScan', 'chrome,centerscreen')"/>
-		<command id="cmd_zotero_newCollection" oncommand="ZoteroPane_Local.newCollection(ZoteroPane_Local.getSelectedCollection()?.key)"/>
+		<command id="cmd_zotero_newCollection" oncommand="ZoteroPane_Local.newCollection(ZoteroPane_Local.getSelectedCollections()[0]?.key)"/>
 		<command id="cmd_zotero_newFeed_fromURL" oncommand="ZoteroPane_Local.newFeedFromURL()"/>
-		<command id="cmd_zotero_newSavedSearch" oncommand="ZoteroPane_Local.newSearch()"/>
 		<command id="cmd_zotero_addByIdentifier" oncommand="Zotero_Lookup.showPanel()"/>
 		<command id="cmd_zotero_newStandaloneFileAttachment" oncommand="ZoteroPane.addAttachmentFromDialog()"/>
 		<command id="cmd_zotero_newStandaloneLinkedFileAttachment" oncommand="ZoteroPane.addAttachmentFromDialog(true)"/>
@@ -428,7 +427,7 @@
 									key="key_find" accesskey="&findCmd.accesskey;"
 									oncommand="ZoteroStandalone.currentReader.toggleFindPopup({ open: true });"/>
 							<menuitem id="menu_advancedSearch"
-									label="&zotero.toolbar.advancedSearch;"
+									data-l10n-id="menuitem-advanced-search"
 									key="key_advancedSearch"
 									command="cmd_zotero_advancedSearch"/>
 							<menuseparator hidden="true" id="textfieldDirection-separator"/>
@@ -936,7 +935,6 @@
 			<menuitem class="zotero-menuitem-sync"/>
 			<menuseparator/>
 			<menuitem class="zotero-menuitem-new-collection" data-l10n-id="menu-new-collection"/>
-			<menuitem class="zotero-menuitem-new-saved-search" label="&zotero.toolbar.newSavedSearch.label;"/>
 			<menuitem class="zotero-menuitem-new-collection" label="&zotero.toolbar.newSubcollection.label;"/>
 			<menuitem class="zotero-menuitem-refresh-feed"/>
 			<menuseparator/>
@@ -966,6 +964,7 @@
 				</menupopup>
 			</menu>
 			<menuitem class="zotero-menuitem-delete-collection"/>
+			<menuitem class="zotero-menuitem-clear-all-last-read" data-l10n-id="collections-menu-clear-all-last-read"/>
 			<menuitem class="zotero-menuitem-move-to-trash"/>
 			<menuseparator/>
 			<menuitem class="zotero-menuitem-export"/>
@@ -1032,31 +1031,17 @@
 
 		<!-- Tag Selector -->
 		<menupopup id="tag-menu">
-			<menuitem label="&zotero.tagSelector.assignColor;"
+			<menuitem id="assign-color-tag" label="&zotero.tagSelector.assignColor;"
 				oncommand="ZoteroPane.tagSelector.openColorPickerWindow(); event.stopPropagation();"/>
-			<menuitem label="&zotero.tagSelector.renameTag;"
+			<menuitem id="rename-tag" label="&zotero.tagSelector.renameTag;"
 				oncommand="ZoteroPane.tagSelector.openRenamePrompt(); event.stopPropagation();"/>
 			<menuitem id="split-tag" label="&zotero.tagSelector.splitTag;"
 				oncommand="ZoteroPane.tagSelector.openTagSplitterWindow(event)"/>
-			<menuitem label="&zotero.tagSelector.deleteTag;"
+			<menuitem id="delete-tag" label="&zotero.tagSelector.deleteTag;"
 				oncommand="ZoteroPane.tagSelector.openDeletePrompt(); event.stopPropagation();"/>
 		</menupopup>
 		<menupopup id="tag-selector-view-settings-menu"
-			onpopupshowing="
-				document.getElementById('show-automatic').setAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
-				document.getElementById('display-all-tags').setAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
-				document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
-				(async function () {
-					var libraryID = ZoteroPane.tagSelector.libraryID;
-					var library = Zotero.Libraries.get(libraryID);
-					var enabled = false;
-					if (library.editable) {
-						if ((await Zotero.Tags.getAutomaticInLibrary(libraryID)).length) {
-							enabled = true;
-						}
-					}
-					document.getElementById('delete-automatic-tags').disabled = !enabled;
-				})();">
+			onpopupshowing="ZoteroPane.updateTagSelectorViewSettingsMenu();">
 			<menuitem id="num-selected" disabled="true"/>
 			<menuitem id="deselect-all" label="&zotero.tagSelector.clearAll;"
 				oncommand="ZoteroPane.tagSelector.deselectAll();;"/>
@@ -1278,6 +1263,7 @@
 												/>
 												
 												<panel id="zotero-lookup-panel" type="arrow" animate="false"
+														noautohide="true"
 														onpopupshown="Zotero_Lookup.onShown(event)"
 														onpopuphidden="Zotero_Lookup.onHidden(event)"
 														onfocusout="Zotero_Lookup.onFocusOut(event)"
@@ -1356,7 +1342,6 @@
 												<image id="zotero-tb-search-spinner" class="zotero-spinner-16"/>
 												<quick-search-textbox id="zotero-tb-search" timeout="250"
 														onkeydown="ZoteroPane_Local.handleSearchKeypress(this, event)"
-														oninput="ZoteroPane_Local.handleSearchInput(this, event)"
 														oncommand="ZoteroPane_Local.search()"/>
 												
 												<!-- Stacked mode only: Toggle Item Pane button -->
@@ -1370,6 +1355,7 @@
 											</hbox>
 											
 										</toolbar>
+										<advanced-search-deck id="zotero-advanced-search-pane-deck"/>
 										<hbox id="zotero-items-pane" class="virtualized-table-container" flex="1" clickthrough="never">
 											<html:div id="zotero-items-tree"></html:div>
 										</hbox>
diff --git a/chrome/locale/af-ZA/zotero/integration.ftl b/chrome/locale/af-ZA/zotero/integration.ftl
index 0cbec64cd0..a5d8109e6a 100644
--- a/chrome/locale/af-ZA/zotero/integration.ftl
+++ b/chrome/locale/af-ZA/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Library
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/af-ZA/zotero/preferences.ftl b/chrome/locale/af-ZA/zotero/preferences.ftl
index 2f3d4e29ff..6b269d4546 100644
--- a/chrome/locale/af-ZA/zotero/preferences.ftl
+++ b/chrome/locale/af-ZA/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/af-ZA/zotero/searchbox.dtd b/chrome/locale/af-ZA/zotero/searchbox.dtd
index 4c93800c97..e441b01fc3 100644
--- a/chrome/locale/af-ZA/zotero/searchbox.dtd
+++ b/chrome/locale/af-ZA/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Naam:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "Pas">
 <!ENTITY zotero.search.joinMode.any "enige">
 <!ENTITY zotero.search.joinMode.all "alles">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dae">
 <!ENTITY zotero.search.date.units.months "maande">
 <!ENTITY zotero.search.date.units.years "jare">
-
-<!ENTITY zotero.search.search "Soek">
-<!ENTITY zotero.search.clear "Skoon">
-<!ENTITY zotero.search.saveSearch "Stoor soektog">
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index 8ce3a9fc1c..8dbfbcdc18 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item...">
 <!ENTITY zotero.toolbar.newGroup "New Group...">
 <!ENTITY zotero.toolbar.newSubcollection.label "New Subcollection...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "New Saved Search...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Empty Trash">
 <!ENTITY zotero.toolbar.tagSelector.label "Show/Hide Tag Selector">
 <!ENTITY zotero.toolbar.actions.label "Actions">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferences...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/af-ZA/zotero/zotero.ftl b/chrome/locale/af-ZA/zotero/zotero.ftl
index bdff5f9b73..2a304cfbe0 100644
--- a/chrome/locale/af-ZA/zotero/zotero.ftl
+++ b/chrome/locale/af-ZA/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Druk
 general-remove = Remove
 general-add = Add
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Cancel
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Show in Library
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = Skoon
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Redigeer
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Loading…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citation Style:
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Quick Search
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Advanced Search
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Fields:
 search-conditions-collection = Collection
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Tipe item
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Child Note
 search-conditions-creator = Skepper
@@ -715,10 +897,26 @@ search-conditions-dateModified = Datum gewysig
 search-conditions-fulltextContent = Attachment Content
 search-conditions-programmingLanguage = Programming Language
 search-conditions-fileTypeID = Attachment File Type
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Attachment
+search-conditions-submenu-annotation = Annotation
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = File Type
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Author
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentation
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Install
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Soek
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = Stoor soektog
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Change Item Type
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index 6ed6adefb4..821b770f69 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 year ago
 date.relative.yearsAgo.multiple=%S years ago
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Are you sure you want to delete the selected collection?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Are you sure you want to delete the selected search?
 pane.collections.emptyTrash=Are you sure you want to permanently remove items in the Trash?
 pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Export Collection...
-pane.collections.menu.export.savedSearch=Export Saved Search...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Generate Report from Collection...
-pane.collections.menu.generateReport.savedSearch=Generate Report from Saved Search...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Rebuild Index
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Clear Index
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Clear All Except Web Links
-zotero.preferences.search.indexUnindexed=Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/ar/zotero/integration.ftl b/chrome/locale/ar/zotero/integration.ftl
index 5e63a75884..8eb5225120 100644
--- a/chrome/locale/ar/zotero/integration.ftl
+++ b/chrome/locale/ar/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = ملحق
 integration-citationDialog-details-prefix = بداية
 integration-citationDialog-details-suppressAuthor = حذف المؤلف
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = الحفاظ على ترتيب المصادر
+integration-citationDialog-preview-empty = معاينة
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = مكتبة
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = اضغط على Tab لتحديد العناصر المراد إضافتها إلى هذا الاستشهاد. اضغط على Escape لإلغاء التغييرات وإغلاق مربع الحوار.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = لقد أجريت
 integration-warning-discard-changes = تجاهل التغييرات
 integration-warning-command-is-running = يتم الآن تشغيل أمر دمج معالج النصوص.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ar/zotero/preferences.ftl b/chrome/locale/ar/zotero/preferences.ftl
index a91ab21e1f..aee076fb64 100644
--- a/chrome/locale/ar/zotero/preferences.ftl
+++ b/chrome/locale/ar/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = اللغة والمنطقة
 preferences-advanced-enable-bidi-ui =
     .label = تمكين أدوات تحرير النصوص ثنائية الاتجاه
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = العودة إلى الموقع الافتراضي...
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = مزامنة
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -129,3 +131,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ar/zotero/searchbox.dtd b/chrome/locale/ar/zotero/searchbox.dtd
index 4aa932ade5..ae2ffdf178 100644
--- a/chrome/locale/ar/zotero/searchbox.dtd
+++ b/chrome/locale/ar/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "الاسم">
 
-<!ENTITY zotero.search.searchInLibrary "البحث في المكتبة:">
-
 <!ENTITY zotero.search.joinMode.prefix "طابق">
 <!ENTITY zotero.search.joinMode.any "أيّاً من">
 <!ENTITY zotero.search.joinMode.all "جميع">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "أيام">
 <!ENTITY zotero.search.date.units.months "شهور">
 <!ENTITY zotero.search.date.units.years "سنوات">
-
-<!ENTITY zotero.search.search "بحث">
-<!ENTITY zotero.search.clear "مسح">
-<!ENTITY zotero.search.saveSearch "حفظ البحث">
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index 507f641bdf..5cd2bdb516 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "ازالة العنصر...">
 <!ENTITY zotero.toolbar.newGroup "مجموعة مشاركة جديدة...">
 <!ENTITY zotero.toolbar.newSubcollection.label "مجموعة عناصر فرعية جديدة...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "بحث محفوظ جديد...">
 <!ENTITY zotero.toolbar.emptyTrash.label "افراغ سلة المحذوفات">
 <!ENTITY zotero.toolbar.tagSelector.label "عرض/اخفاء محدد الأوسمة">
 <!ENTITY zotero.toolbar.actions.label "عمليات">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "التفضيلات...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "الدعم و الوثائق">
 <!ENTITY zotero.toolbar.about.label "حول زوتيرو">
-<!ENTITY zotero.toolbar.advancedSearch "البحث المتقدم">
 <!ENTITY zotero.toolbar.openURL.label "تحديد موقع العنصر">
 <!ENTITY zotero.toolbar.openURL.tooltip "البحث في مكتبتك المحلية">
 
diff --git a/chrome/locale/ar/zotero/zotero.ftl b/chrome/locale/ar/zotero/zotero.ftl
index dcbda1f388..709fad1835 100644
--- a/chrome/locale/ar/zotero/zotero.ftl
+++ b/chrome/locale/ar/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = طباعة
 general-remove = إزالة
 general-add = اضافة
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = عرض تعليمات استكشاف
 general-go-back = ارجع
 general-accept = قبول
 general-cancel = إلغاء
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = عرض في المكتبة
 general-restartApp = إعادة تشغيل { -app-name }
 general-restartInTroubleshootingMode = إعادة التشغيل في وضع استكشاف الأخطاء وإصلاحها
 general-save = حفظ
 general-clear = تفريغ
+clear-button =
+    .label = { general-clear }
 general-update = تحديث
 general-back = ارجع
 general-edit = تحرير
@@ -76,6 +86,8 @@ general-maroon = كستنائي
 general-gray = رمادي
 general-black = أسود
 general-loading = التحميل
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = نمط الاستشهاد:
 language-label = اللغة
 menu-custom-group-submenu =
@@ -166,14 +178,114 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = إعادة تسمية المجموعة
-collections-menu-edit-saved-search =
-    .label = تحرير البحث المخزن
+items-section-collections-selected =
+    { $count ->
+        [zero] { $count } مجموعة مختارة
+        [one] { $count } مجموعة مختارة
+        [two] { $count } مجموعتان مختارتان
+        [few] { $count } مجموعات مختارة
+        [many] { $count } مجموعات مختارة
+       *[other] { $count } مجموعات مختارة
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = تحرير البحث المخزن
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = الانتقال إلى
 collections-menu-copy-collection =
     .label = النسخ إلى
+collections-menu-export =
+    .label = تصدير...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = تحريك لأسفل
 item-creator-moveToTop =
@@ -286,6 +398,7 @@ import-online-relink-only =
     .label = إعادة ربط استشهادات مندلي المكتبية
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = تعذر على { -app-name } الاتصال ب { $targetApp }. يرجى التحقق من اتصالك بالإنترنت والمحاولة مرة أخرى.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -649,6 +762,18 @@ quicksearch-input =
     .aria-label = البحث السريع
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = البحث المتقدم
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = عرض كـ
 item-pane-header-none =
@@ -724,9 +849,64 @@ architecture-x64-on-arm64-action = قم بتنزيل  { -app-name } ل ARM64
 first-run-guidance-authorMenu = { -app-name } يتيح لك تحديد المحررين والمترجمين أيضًا. يمكنك تحويل المؤلف إلى محرر أو مترجم عن طريق التحديد من هذه القائمة.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = اعثر
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = تعليقات توضيحية
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = شرط البحث
     .label = { $label }
@@ -736,11 +916,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = القيمة
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = الحقول:
 search-conditions-collection = مجموعة العناصر
 search-conditions-savedSearch = بحث مخزن
 search-conditions-itemTypeID = نوع العنصر
 search-conditions-tag = وسم
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = ملاحظة
 search-conditions-childNote = ملحوظة فرعية
 search-conditions-creator = المؤلف
@@ -759,10 +945,26 @@ search-conditions-dateModified = تاريخ التعديل
 search-conditions-fulltextContent = محتويات المرفق
 search-conditions-programmingLanguage = لغة البرمجة
 search-conditions-fileTypeID = نوع الملف المرفق
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = نص التعليق
 search-conditions-annotationComment = تعليق توضيحي
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = أي حقل
+search-conditions-titleCreatorYear = العنوان، المؤلف، السنة
+search-conditions-submenu-attachment = مُرفق
+search-conditions-submenu-annotation = التعليق التوضيحي
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = نوع الملف الصوتي
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = النوع
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = المؤلف
 find-pdf-files-added =
     { $count ->
         [zero] { $count } ملف مضاف
@@ -806,6 +1008,9 @@ file-type-video = فيديو
 file-type-presentation = عرض تقديمي
 file-type-document = مستند
 file-type-ebook = الكتاب الإلكتروني
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = لقد تمت ترقيتك إلى <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! تعرف على <a data-l10n-name="new-features-link">ما الجديد</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -814,18 +1019,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = لصق وبحث
 mac-word-plugin-install-message = يحتاج زوتيرو إلى الوصول إلى بيانات وورد لتثبيت إضافة وورد.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = تثبيت مكون وورد إضافي
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = تنصيب
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } يقوم الآن تلقائيًا بمزامنة أسماء ملفات المرفقات عند إجراء تغييرات على العناصر.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = يجب تحديث موصل { -app-name } لكي يعمل مع هذا الإصدار من { -app-name }.
 userjs-pref-warning = تم تجاوز بعض إعدادات { -app-name } باستخدام طريقة غير مدعومة. سيقوم { -app-name } بإعادتها وإعادة التشغيل.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = علامات التقسيم
 long-tag-fixer-button-dont-split =
@@ -844,3 +1054,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = بحث
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = حفظ
+save-search-name-title = حفظ البحث
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = إعادة تسمية المجموعة
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = تحرير ملاحظة
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = تغيير نوع العنصر
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index 164ae3348f..3f26d1844d 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=مضت سنة واحدة
 date.relative.yearsAgo.multiple=مضت %S سنة
 
 pane.collections.title=المجموعات
-pane.collections.delete.title=حذف المجموعة
-pane.collections.delete=هل ترغب في حذف مجموعة العناصر المحددة؟
-pane.collections.delete.keepItems=لن يتم حذف العناصر الموجودة ضمن هذه المجموعة.
-pane.collections.deleteWithItems.title=حذف المجموعة والعناصر
-pane.collections.deleteWithItems=هل أنت متأكد من رغبتك في حذف المجموعة المحددة ونقل جميع العناصر الموجودة بها إلى سلة المهملات؟
 pane.feed.deleteWithItems.title=إلغاء الاشتراك
 pane.feed.deleteWithItems=هل أنت متأكد من رغبتك في إلغاء اشتراكك من هذه الخلاصة؟
 
-pane.collections.deleteSearch.title=حذف البحث
-pane.collections.deleteSearch=هل ترغب في حذف البحث المحدد؟
 pane.collections.emptyTrash=هل ترغب في الإزالة النهائية للعناصر في سلة المحذوفات؟
 pane.collections.newSavedSeach=بحث مخزن جديد
 pane.collections.savedSearchName=أدخل اسماً لهذا البحث المخزن:
@@ -277,24 +270,9 @@ pane.collections.duplicate=العناصر المكررة
 pane.collections.removeLibrary=أزل المكتبة
 pane.collections.removeLibrary.text=هل تريد بالتأكيد إزالة ”%S“ بشكل دائم من هذا الحاسوب؟
 
-pane.collections.menu.duplicate.savedSearch=تكرار البحث المحفوظ
 pane.collections.menu.remove.library=إزالة المكتبة...
-pane.collections.menu.delete.collection=امسح مجموعة العناصر...
-pane.collections.menu.delete.collectionAndItems=حذف المجموعة والعناصر...
-pane.collections.menu.delete.savedSearch=امسح البحث المخزن...
-pane.collections.menu.delete.feedAndItems=إلغاء الاشتراك من الخلاصة...
-pane.collections.menu.export.collection=تصدير مجموعة العناصر...
-pane.collections.menu.export.savedSearch=تصدير البحث المخزن...
-pane.collections.menu.export.feed=تصدير الخلاصة...
-pane.collections.menu.createBib.collection=إنشاء قائمة المراجع من المجموعة...
-pane.collections.menu.createBib.savedSearch=إنشاء قائمة مراجع من البحث المحفوظ...
-pane.collections.menu.createBib.feed=إنشاء قائمة مراجع من الخلاصة...
 pane.collections.showCollectionInLibrary=عرض مجموعة العناصر في المكتبة
 
-pane.collections.menu.generateReport.collection=انتاج تقرير من مجموعة العناصر...
-pane.collections.menu.generateReport.savedSearch=انتاج تقرير من البحث المخزن...
-pane.collections.menu.generateReport.feed=إنشاء تقرير من الخلاصة...
-
 pane.collections.menu.refresh.feed=تحديث الخلاصة
 pane.collections.menu.refresh.allFeeds=تحديث جميع الخلاصات
 pane.collections.menu.markAsRead.feed=علم الخلاصة كمقروءة
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=يجب إعادة تشغيل ف
 zotero.preferences.sync.reset.fileSyncHistory=في المزامنة التالية، سيقوم %1$S بفحص كافة الملفات المرفقة في ”%2$S“ مقابل خدمة التخزين. سيتم تنزيل أي ملفات مرفقات بعيدة مفقودة محلياً، وسيتم تحميل أي ملفات مرفقات محلية مفقودة عن بعد.\n\nهذا الخيار غير ضروري أثناء الاستخدام العادي.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=تم مسح سجل مزامنة الملفات ل ”%S“.
 
-zotero.preferences.search.rebuildIndex=إعادة بناء الكشاف
-zotero.preferences.search.rebuildWarning=هل ترغب في إعادة بناء الكشاف كاملاً؟ قد يستغرق ذلك بعض الوقت.\n\n لتكشيف العناصر التي لم تكشف بعد، استخدم %S.
-zotero.preferences.search.clearIndex=مسح الكشاف
-zotero.preferences.search.clearWarning=بعد مسح الكشاف، لن تصبح محتويات المرفقات قابلة للبحث.\n\nمرفقات روابط الويب لا يمكن إعادة فهرستها بدون إعادة الزيارة للصفحة. لترك الروابط مفهرسة، اختار %S.
-zotero.preferences.search.clearNonLinkedURLs=مسح الكل باستثناء الروابط
-zotero.preferences.search.indexUnindexed=تكشيف العناصر غير المكشفة
 zotero.preferences.export.quickCopy.citationStyles=أنماط الإستشهاد
 zotero.preferences.export.quickCopy.exportFormats=صيغ التصدير
 zotero.preferences.export.quickCopy.instructions=النسخ السريع يسمح لك بتصدير العناصر في صيغة معينة. يمكن أن تنسخ العناصر المختارة إلى الحافظة بضغط %S أو سحب العناصر مباشرة داخل مربع نص في برنامج آخر.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=يجب إدراج الاستشهاد قبل
 integration.error.mustInsertBibliography=يجب إدراج قائمة المراجع قبل تنفيذ هذه العملية.
 integration.error.cannotInsertHere=لا يمكن ادراج حقول زوتيرو هنا.
 integration.error.notInCitation=يجب وضع المؤشر على استشهاد زوتيرو لتحريره.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=النمط الببليوجرافي الحالي لم يقم بعمل قائمة المراجع. الرجاء اختيار نمط آخر، إذا كنت ترغب في إضافة قائمة المراجع.
 integration.error.deletePipe=لا يمكن تهيئة القناة التي يستخدمها زوتيرو للاتصال مع معالج النصوص. هل ترغب من زوتيرو بمحاولة تصحيح هذا الخطأ؟ ستتم مطالبتك بكلمة السر الخاصة بك.
 integration.error.invalidStyle=لنمط الذي حددته يبدو أنه غير صالح. إذا كنت أنشأت هذا النمط بنفسك، الرجاء تأكد من أنه يحقق الوصف الموضح في http://zotero.org/support/dev/citation_styles. أو حاول تحديد نمط آخر.
diff --git a/chrome/locale/bg-BG/zotero/integration.ftl b/chrome/locale/bg-BG/zotero/integration.ftl
index 1d31205f49..9cac409b17 100644
--- a/chrome/locale/bg-BG/zotero/integration.ftl
+++ b/chrome/locale/bg-BG/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Библиотека
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/bg-BG/zotero/preferences.ftl b/chrome/locale/bg-BG/zotero/preferences.ftl
index fa93a127de..fcfda3eadc 100644
--- a/chrome/locale/bg-BG/zotero/preferences.ftl
+++ b/chrome/locale/bg-BG/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Синхронизиране
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/bg-BG/zotero/searchbox.dtd b/chrome/locale/bg-BG/zotero/searchbox.dtd
index b6b02b1982..27b7ab0114 100644
--- a/chrome/locale/bg-BG/zotero/searchbox.dtd
+++ b/chrome/locale/bg-BG/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Име:">
 
-<!ENTITY zotero.search.searchInLibrary "Търсене в библиотеката:">
-
 <!ENTITY zotero.search.joinMode.prefix "Съвпадение с">
 <!ENTITY zotero.search.joinMode.any "каквото и да е">
 <!ENTITY zotero.search.joinMode.all "всички">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "дни">
 <!ENTITY zotero.search.date.units.months "месеци">
 <!ENTITY zotero.search.date.units.years "години">
-
-<!ENTITY zotero.search.search "Търси">
-<!ENTITY zotero.search.clear "Изчисти">
-<!ENTITY zotero.search.saveSearch "Запис на търсенето">
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index 85ccc4ea8a..e227450c66 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Премахване на запис...">
 <!ENTITY zotero.toolbar.newGroup "Нова група...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Нова подколекция...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Ново запазено търсене...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Изпразване на кошчето за боклук">
 <!ENTITY zotero.toolbar.tagSelector.label "Показване/скриване на изборателя на маркери">
 <!ENTITY zotero.toolbar.actions.label "Действия">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Предпочитания...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Подръжка и документация">
 <!ENTITY zotero.toolbar.about.label "За Зотеро">
-<!ENTITY zotero.toolbar.advancedSearch "Сложно търсене">
 <!ENTITY zotero.toolbar.openURL.label "Откриване">
 <!ENTITY zotero.toolbar.openURL.tooltip "Откриване чрез Вашата локална библиотека">
 
diff --git a/chrome/locale/bg-BG/zotero/zotero.ftl b/chrome/locale/bg-BG/zotero/zotero.ftl
index d1976663e9..07fbcc5f45 100644
--- a/chrome/locale/bg-BG/zotero/zotero.ftl
+++ b/chrome/locale/bg-BG/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Отпечатване
 general-remove = Премахване
 general-add = Добавяне
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Отказ
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Показване в библиотеката
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Запазване
 general-clear = Изчисти
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Редактиране
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Зареждане...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Стил на цитиране:
 language-label = Език:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Редактира записаното търсене
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Редактира записаното търсене
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Изнасяне...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Бързо Търсене
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Сложно търсене
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Полета:
 search-conditions-collection = Колекция
 search-conditions-savedSearch = Съхранено търсене
 search-conditions-itemTypeID = Вид запис
 search-conditions-tag = Отметка
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Дъщерна бележка
 search-conditions-creator = Създател
@@ -715,10 +897,26 @@ search-conditions-dateModified = Променен на
 search-conditions-fulltextContent = Съдържание на приложението
 search-conditions-programmingLanguage = Програмен език
 search-conditions-fileTypeID = Вид приложен файл
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Приложение
+search-conditions-submenu-annotation = Анотация
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Вид файл
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Вид
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Автор
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Видео
 file-type-presentation = Презентация
 file-type-document = Документ
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Инсталиране
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Търсене
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Запазване
+save-search-name-title = Запис на търсенето
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Редактира бележка
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Променя типа на записа
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index 3c8738805b..7aa3d9344b 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Преди една година
 date.relative.yearsAgo.multiple=Преди %S години
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Сигурни ли сте, че искате да изтриете избраната колекция?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Сигурни ли сте, че искате да изтриете избраното търсене?
 pane.collections.emptyTrash=Сигурни ли сте, че искате да изтриете завинаги записите в кошчето за боклук?
 pane.collections.newSavedSeach=Ново записано търсене
 pane.collections.savedSearchName=Въведете име за това записано търсене:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Износ на колекция...
-pane.collections.menu.export.savedSearch=Износ на записаното търсене...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Създава отчет от колекцията...
-pane.collections.menu.generateReport.savedSearch=Създава отчет от записаното търсене...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Отбележи емисията като прочетена
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Пресъздава индекс
-zotero.preferences.search.rebuildWarning=Желаете ли индекса да бъде пресъздаден? Това може да отнеме известно време.\n\nЗа индексиране само на записи които не са били индексирани преди, използвайте %S.
-zotero.preferences.search.clearIndex=Изчиства индекс
-zotero.preferences.search.clearWarning=След изчисването на индекса, търсенето в приложенията няма да бъде възможно.\n\n Приложените връзки към интернет страници не могат да бъдат реиндексирани без ново посщение на страницата. За да оставите индексите на интернет връзките, изберете %S.
-zotero.preferences.search.clearNonLinkedURLs=Изчиства всичко с изключение на интернет връзките
-zotero.preferences.search.indexUnindexed=Индексира неиндексираните записи
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Формати за износ
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Трябва да вмъкнете цита
 integration.error.mustInsertBibliography=Трябва да вмъкнете библиография преди да изпълните тази операция.
 integration.error.cannotInsertHere=Полета на Зотеро не могат да бъдат вмъквани тук.
 integration.error.notInCitation=Трябва да поставите курсора в цитат на Зотеро, ако искате да го редактирате.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Настоящият стил не съдържа библиография. Изберете друг стил, ако искате да добавите библиография.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/br/zotero/connector.json b/chrome/locale/br/zotero/connector.json
index 4005f6fbf8..3dfedc1ce7 100644
--- a/chrome/locale/br/zotero/connector.json
+++ b/chrome/locale/br/zotero/connector.json
@@ -68,12 +68,42 @@
   "progressWindow_detailsBtnHide": {
     "message": "Kuzhat ar munudoù"
   },
+  "progressWindow_collectionSelector": {
+    "message": "Diuzer dastumad pal"
+  },
+  "progressWindow_savingItems": {
+    "message": "Oc'h enrollañ $1 a elfennoù. $2"
+  },
+  "progressWindow_savingItem": {
+    "message": "Oc'h enrollañ an elfenn $1"
+  },
   "progressWindow_saveItem": {
     "message": "Elfenn $1: $2"
   },
+  "progressWindow_downloadComplete": {
+    "message": "$1 enrollet"
+  },
+  "progressWindow_downloadCompletePlural": {
+    "message": "$1 enrollet evit an elfenn $2"
+  },
+  "progressWindow_downloadFailed": {
+    "message": "Fazi en ur bellgargañ $1"
+  },
+  "progressWindow_downloadFailedPlural": {
+    "message": "Fazi en ur bellgargañ adalek $1 ar restr $2"
+  },
+  "progressWindow_allDone": {
+    "message": "Enrollañ echuet. Ar prenestr zo o vont da serriñ bremañ."
+  },
+  "progressWindow_alreadySaved": {
+    "message": "Elfennoù a zo bet enrollet endeo diouzh ar bajenn web-mañ."
+  },
   "progressWindow_tagPlaceholder": {
     "message": "Balizoù (skejet gant virgulennoù)"
   },
+  "progressWindow_filterPlaceholder": {
+    "message": "Silañ an dastumadegoù"
+  },
   "progressWindow_error_translation": {
     "message": "Ur fazi a zo c'hoarvezet en ur enrollañ an elfenn-mañ. Sellit ouzh $1 evit kaout muioc'h a ditouroù."
   },
@@ -95,11 +125,17 @@
   "progressWindow_error_upgradeClient_latestVersion": {
     "message": "stumm diwezhañ"
   },
+  "itemSelector_title": {
+    "message": "Diuzit peseurt elfennoù ho peus c'hoant da ouzhpennañ d'ho levraoueg:"
+  },
   "extensionIsDisabled": {
-    "message": "$1 a zo lazhet"
+    "message": "N'eo ket hegerz ar c'hevreer $1 war ar bajenn-mañ"
+  },
+  "extensionIsDisabled_fileURL": {
+    "message": "N'eo ket hegerz ar c'hevreer $1 evit an URLioù restroù"
   },
   "extensionIsDisabled_extensionPage": {
-    "message": "$1 a zo lazhet war ar pajennoù astenn"
+    "message": "N'eo ket hegerz ar c'hevreer $1 war ar bajenn an astennoù"
   },
   "appConnector": {
     "message": "Kevreer $1"
@@ -110,6 +146,9 @@
   "firstRun_title": {
     "message": "Staliet ho peus ar c'hevreer $1!"
   },
+  "firstRun_text2": {
+    "message": "Ma n'ho peus ket graet c'hoazh, <a href=\"$2\">pellgargit</a> an arload $1 evit kaout ur skiant-prenet eus ar c'hentañ."
+  },
   "firstRun_acceptButton": {
     "message": "Komprenet"
   },
@@ -125,6 +164,9 @@
   "error_connection_enableSavingToOnlineLibrary": {
     "message": "Enaouiñ an enrollañ e-barzh al levraoueg enlinenn"
   },
+  "reports_debug_output_submitted": {
+    "message": "Kaset eo bet ho tanevell diveugiñ.\n\nAn ID diveugiñ zo $1."
+  },
   "integration_error_clientUpgrade": {
     "message": "An arroudennañ diwar ar Web a c'houlenn $1 pe nevesoc'h."
   },
diff --git a/chrome/locale/br/zotero/fileRenaming.ftl b/chrome/locale/br/zotero/fileRenaming.ftl
index f46e417a30..fe3686d1a2 100644
--- a/chrome/locale/br/zotero/fileRenaming.ftl
+++ b/chrome/locale/br/zotero/fileRenaming.ftl
@@ -1,8 +1,8 @@
 file-renaming-settings-window =
-    .title = Configure File Renaming
-file-renaming-settings-library-label = Library:
+    .title = Kefluniañ an adenvel restroù
+file-renaming-settings-library-label = Levreaoueg:
 file-renaming-auto-rename-files =
-    .label = Automatically rename files
+    .label = Em-adenvel ar restroù
 file-renaming-file-types = Rename files of these types:
 file-renaming-file-type-pdf =
     .label = { file-type-pdf }
@@ -15,18 +15,18 @@ file-renaming-file-type-audio =
 file-renaming-file-type-video =
     .label = { file-type-video }
 file-renaming-rename-now =
-    .label = Rename Files…
+    .label = Adenvel ar restroù...
 file-renaming-rename-linked =
     .label = Adenvel ar restroù liammet
-file-renaming-format-title = Filename Format
+file-renaming-format-title = Stumm an anv-restr
 file-renaming-format-instructions = You can customize the filename pattern { -app-name } uses to rename attachment files from parent metadata.
 file-renaming-format-instructions-example = For example, "{ $example }" in this template will be replaced with the title of the parent item, truncated at 50 characters.
 file-renaming-format-instructions-more = See the <label data-l10n-name="file-renaming-format-help-link">documentation</label> for more information.
-file-renaming-format-template = Filename Template:
-file-renaming-format-preview = Preview:
-file-renaming-preview-changes = Preview Changes…
+file-renaming-format-template = Patrom anv-restr:
+file-renaming-format-preview = Rakwel:
+file-renaming-preview-changes = Rakwel ar cheñchamantoù...
 file-renaming-rename-files =
-    .label = Rename Files
+    .label = Adenvel restroù
 file-renaming-done-button =
     .label = { general-done }
 file-renaming-cancel-button =
@@ -35,11 +35,11 @@ file-renaming-auto-rename-prompt-title = Renaming Settings Changed
 file-renaming-auto-rename-prompt-body = Would you like to rename existing files in your library to match the new settings?
 file-renaming-auto-rename-prompt-body-library = Would you like to rename existing files in library "{ $library }" to match the new settings?
 file-renaming-auto-rename-prompt-yes = { file-renaming-preview-changes }
-file-renaming-auto-rename-prompt-no = Keep Existing Filenames
+file-renaming-auto-rename-prompt-no = Mirout an anvioù-restr a zo anezho
 file-renaming-preview-window =
-    .title = Rename Files
+    .title = Adenvel restroù
 file-renaming-preview-window-loading = O kargañ...
 file-renaming-preview-window-intro = { -app-name } will rename the following files in your library to match their parent items:
 file-renaming-preview-window-intro-library = { -app-name } will rename the following files in "{ $library }" to match their parent items:
-file-renaming-preview-window-renaming = Renaming…
+file-renaming-preview-window-renaming = Oc'h adenvel...
 file-renaming-preview-window-no-files = All filenames already match parent items. No changes are required.
diff --git a/chrome/locale/br/zotero/integration.ftl b/chrome/locale/br/zotero/integration.ftl
index 6e591e05bd..bb7821ae11 100644
--- a/chrome/locale/br/zotero/integration.ftl
+++ b/chrome/locale/br/zotero/integration.ftl
@@ -3,7 +3,7 @@ integration-docPrefs-window =
 integration-addEditCitation-window =
     .title = { -app-name } - Add/Edit Citation
 integration-editBibliography-window =
-    .title = { -app-name } - Edit Bibliography
+    .title = { -app-name } - Aozañ al levrlennadur
 integration-editBibliography-add-button =
     .aria-label = { general-add }
 integration-editBibliography-remove-button =
@@ -19,7 +19,7 @@ integration-editBibliography-wrapper =
         { -integration-editBibliography-include-uncited }
         { -integration-editBibliography-exclude-cited }
         { -integration-editBibliography-edit-reference }
-integration-citationDialog = Citation Dialog
+integration-citationDialog = Prenestr arroudenn
 integration-citationDialog-section-open = Open Documents ({ $count })
 integration-citationDialog-section-selected = Selected Items ({ $count }/{ $total })
 integration-citationDialog-section-selectedAnnotations = Selected Annotations
@@ -29,15 +29,16 @@ integration-citationDialog-section-cited =
         [0] Cited Items
        *[other] Cited Items ({ $count })
     }
-integration-citationDialog-details-suffix = Suffix
-integration-citationDialog-details-prefix = Prefix
+integration-citationDialog-details-suffix = Lostger
+integration-citationDialog-details-prefix = Rakger
 integration-citationDialog-details-suppressAuthor = Lezel a-gostez an Aozer
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
     .label = { general-done }
 integration-citationDialog-details-showInLibrary = { general-show-in-library }
-integration-citationDialog-settings-title = Citation Settings
+integration-citationDialog-settings-title = Arventennoù arroudenn
 integration-citationDialog-lib-message-citation =
     { $search ->
         [true] No selected, open, or cited items match the current search
@@ -54,16 +55,20 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Rakwel
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Levraoueg
-integration-citationDialog-mode-list = List
+integration-citationDialog-mode-list = Listenn
 integration-citationDialog-btn-type-citation =
     .title = Ouzhpennañ/aozañ an arroudenn
 integration-citationDialog-btn-type-add-note =
     .title = Ouzhpennañ un notenn
 integration-citationDialog-btn-type-annotations =
-    .title = Add Annotations
+    .title = Ouzhpennañ ennotadurioù
 integration-citationDialog-btn-accept =
     .title = { general-accept }
 integration-citationDialog-btn-cancel =
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -94,13 +104,13 @@ integration-citationDialog-items-table =
     .aria-label = { integration-citationDialog-enter-to-add-item }
 integration-citationDialog-items-table-added =
     .aria-label = This item has been added to the citation. Press { return-or-enter } to add it again or { delete-or-backspace } to remove it.
-integration-citationDialog-add-all = Add all
+integration-citationDialog-add-all = Ouzhpennañ pep-tra
 integration-citationDialog-collapse-section =
-    .title = Collapse section
-integration-citationDialog-bubble-empty = (no title)
-integration-citationDialog-add-to-citation = Add to Citation
+    .title = Bihanañ ar gevrenn
+integration-citationDialog-bubble-empty = (titl ebet)
+integration-citationDialog-add-to-citation = Ouzhpennañ an arroudenn
 integration-citationDialog-annotations-filter =
-    .placeholder = Filter annotations
+    .placeholder = Silañ an ennotadurioù
 integration-citationDialog-annotations-empty = Select an item, attachment, or annotation to view annotation details
 integration-prefs-displayAs-label = Diskouez an arroudennoù evel:
 integration-prefs-footnotes =
@@ -128,11 +138,9 @@ integration-error-unable-to-find-winword = { -app-name } could not find a runnin
 integration-warning-citation-changes-will-be-lost = You have made changes to a citation that will be lost if you continue.
 integration-warning-bibliography-changes-will-be-lost = You have made changes to the bibliography that will be lost if you continue.
 integration-warning-documentPreferences-changes-will-be-lost = You have made changes to the document preferences that will be lost if you continue.
-integration-warning-discard-changes = Discard Changes
+integration-warning-discard-changes = Dilezel ar cheñchamantoù
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/br/zotero/preferences.dtd b/chrome/locale/br/zotero/preferences.dtd
index 9a55b41c41..8d1082eb2c 100644
--- a/chrome/locale/br/zotero/preferences.dtd
+++ b/chrome/locale/br/zotero/preferences.dtd
@@ -78,7 +78,7 @@
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Adloc'hañ roll-istor sinkro ar restroù">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Keñveriañ an holl restroù kenstag gant ar servijer stokañ">
 <!ENTITY zotero.preferences.sync.reset "Adderaouekaat">
-<!ENTITY zotero.preferences.sync.reset.showResetOptions "Show Reset Options…">
+<!ENTITY zotero.preferences.sync.reset.showResetOptions "Diskouez an dibarzhioù adloc'hañ...">
 <!ENTITY zotero.preferences.sync.reset.button "Adderaouekaat...">
 
 
diff --git a/chrome/locale/br/zotero/preferences.ftl b/chrome/locale/br/zotero/preferences.ftl
index 8162b99f93..6b9486d8de 100644
--- a/chrome/locale/br/zotero/preferences.ftl
+++ b/chrome/locale/br/zotero/preferences.ftl
@@ -1,43 +1,43 @@
 preferences-window =
-    .title = { -app-name } Settings
-preferences-appearance-title = Appearance and Language
+    .title = Arventennoù { -app-name }
+preferences-appearance-title = Neuz ha yezh
 preferences-auto-recognize-files =
     .label = Automatically retrieve metadata for PDFs and ebooks
-preferences-file-renaming-title = File Renaming
+preferences-file-renaming-title = Oc'h adenvel restroù
 preferences-file-renaming-intro = { -app-name } can automatically rename files based on the details of the parent item (title, author, etc.) and keep the filenames in sync as you make changes. Downloaded files are always initially named based on the parent item.
 preferences-file-renaming-configure-button =
-    .label = Configure File Renaming…
-preferences-attachment-titles-title = Attachment Titles
+    .label = Kefluniañ an adenvel restroù...
+preferences-attachment-titles-title = Titloù ar stagadennoù
 preferences-attachment-titles-intro = Attachment titles are <label data-l10n-name="wiki-link">different from filenames</label>. To support some workflows, { -app-name } can show filenames instead of attachment titles in the items list.
 preferences-attachment-titles-show-filenames =
     .label = Show attachment filenames in the items list
-preferences-reader-title = Reader
-preferences-reader-open-epubs-using = Open EPUBs using
-preferences-reader-open-snapshots-using = Open snapshots using
+preferences-reader-title = Lenner
+preferences-reader-open-epubs-using = Digeriñ al levrioù elektronek gant
+preferences-reader-open-snapshots-using = Digeriñ an tapadennoù gant
 preferences-reader-open-in-new-window =
-    .label = Open files in new windows instead of tabs
+    .label = Digeriñ ar restroù en ur prenestr nevez e-plas ivinelloù
 preferences-reader-auto-disable-tool =
     .label = Turn off note, text, and image annotation tools after each use
-preferences-reader-ebook-font = Ebook font:
+preferences-reader-ebook-font = Skritur al levrioù elektronek:
 preferences-reader-ebook-hyphenate =
-    .label = Enable automatic hyphenation
+    .label = Enaouiñ an troc'hañ emgefreek
 preferences-note-title = Notennoù
 preferences-note-open-in-new-window =
     .label = Open notes in new windows instead of tabs
-preferences-color-scheme = Color Scheme:
+preferences-color-scheme = Chema al livioù:
 preferences-color-scheme-auto =
     .label = Emgefreek
 preferences-color-scheme-light =
-    .label = Light
+    .label = Gouloù
 preferences-color-scheme-dark =
     .label = Teñval
-preferences-item-pane-header = Item Pane Header:
-preferences-item-pane-header-style = Header Citation Style:
-preferences-item-pane-header-locale = Header Language:
-preferences-item-pane-header-missing-style = Missing style: <{ $shortName }>
+preferences-item-pane-header = Talbenn ar banell elfenn:
+preferences-item-pane-header-style = Stil an arroudenn talbenn:
+preferences-item-pane-header-locale = Yezh an talbenn:
+preferences-item-pane-header-missing-style = Stil a vank: <{ $shortName }>
 preferences-locate-library-lookup-intro = Library Lookup can find a resource online using your library’s OpenURL resolver.
 preferences-locate-resolver = Diskoulmer:
-preferences-locate-base-url = Base URL:
+preferences-locate-base-url = URL diazez:
 preferences-quickCopy-minus =
     .aria-label = { general-remove }
     .label = { $label }
@@ -46,51 +46,53 @@ preferences-quickCopy-plus =
     .label = { $label }
 preferences-styleManager-intro = { -app-name } can generate citations and bibliographies in over 10,000 citation styles. Add styles here to make them available when selecting styles throughout { -app-name }.
 preferences-styleManager-get-additional-styles =
-    .label = Get Additional Styles…
+    .label = Kaout stiloù all...
 preferences-styleManager-restore-default =
-    .label = Restore Default Styles…
+    .label = Adlakaat ar stiloù dre ziouer...
 preferences-styleManager-add-from-file =
-    .tooltiptext = Add a style from a file
-    .label = Add from File…
+    .tooltiptext = Ouzhpennañ ur stil diwar ur restr
+    .label = Ouzhpennañ diwar ur restr...
 preferences-styleManager-remove = Press { delete-or-backspace } to remove this style.
-preferences-citation-dialog = Citation Dialog
+preferences-citation-dialog = Prenestr arroudenn
 preferences-citation-dialog-mode = Citation Dialog Mode:
 preferences-citation-dialog-mode-last-used =
-    .label = Last Used
+    .label = Implijet da ziwezhañ
 preferences-citation-dialog-mode-list =
-    .label = List Mode
+    .label = Mod listenn
 preferences-citation-dialog-mode-library =
-    .label = Library Mode
+    .label = Mod levraoueg
 preferences-advanced-enable-local-api =
     .label = Allow other applications on this computer to communicate with { -app-name }
 preferences-advanced-local-api-available = Available at <code data-l10n-name="url">{ $url }</span>
 preferences-advanced-server-disabled = The { -app-name } HTTP server is disabled.
 preferences-advanced-server-enable-and-restart =
-    .label = Enable and Restart
-preferences-advanced-language-and-region-title = Language and Region
+    .label = Enaouiñ hag adloc'hañ
+preferences-advanced-language-and-region-title = Yezh ha rannvro
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Kavlec'h roadennoù:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
-    .label = Use Custom Location…
+    .label = Implijout ul lec'hiadur personelaet...
 preferences-advanced-default-data-dir =
-    .value = (Default: { $directory })
-    .aria-label = Default location
-preferences-pane-account = Account
+    .value = (Dre ziouer: { $directory })
+    .aria-label = Lec'hiadur dre ziouer
+preferences-pane-account = Kont
 -preferences-sync-data-syncing = Sinkro ar roadennoù
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sinkro
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-reset-heading = Adloc'hañ sinkro
 preferences-sync-fileSyncing-groups =
     .label = Sync attachment files in group libraries using { -app-name } Storage
 preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
 preferences-account-log-out =
-    .label = Log Out…
+    .label = Digevreañ…
 preferences-sync-reset-restore-to-server-body = { -app-name } will replace “{ $libraryName }” on { $domain } with data from this computer.
 preferences-sync-reset-restore-to-server-deleted-items-text =
     { $remoteItemsDeletedCount } { $remoteItemsDeletedCount ->
@@ -108,20 +110,24 @@ preferences-sync-reset-restore-to-server-checkbox-label =
         [one] Delete 1 item
        *[other] Delete { $remoteItemsDeletedCount } items
     }
-preferences-sync-reset-restore-to-server-confirmation-text = delete online library
+preferences-sync-reset-restore-to-server-confirmation-text = dilemel al levraoueg enlinenn
 preferences-sync-reset-restore-to-server-yes = Erlec'hiañ ar roadennoù e-barzh al levraouegoù enlinenn
 preferences-account-log-in =
-    .label = Log In
+    .label = Kevreañ
 preferences-account-waiting-for-login =
-    .value = Waiting for login…
+    .value = O c'hortoz ur gevreadenn…
 preferences-account-cancel-button =
     .label = { general-cancel }
 preferences-account-logged-out-status =
-    .value = (logged out)
+    .value = (digevreet)
 preferences-account-email-label =
-    .value = Email:
+    .value = Postel:
 preferences-account-switch-accounts =
-    .label = Switch Accounts…
+    .label = Cheñch kont…
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
-preferences-account-switch-confirmation-text = remove local data
-preferences-account-switch-accept = Remove Data and Restart
+preferences-account-switch-confirmation-text = dilemel ar roadennoù lec'hel
+preferences-account-switch-accept = Dilemel ar roadennoù hag adloc'hañ
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/br/zotero/reader.ftl b/chrome/locale/br/zotero/reader.ftl
index 4a78512d27..eec4a75662 100644
--- a/chrome/locale/br/zotero/reader.ftl
+++ b/chrome/locale/br/zotero/reader.ftl
@@ -8,7 +8,7 @@ reader-add-comment = Ouzhpennañ un evezhiadenn
 reader-annotation-comment = Evezhiadenn an ennotadur
 reader-annotation-text = Testenn an ennotadur
 reader-manage-tags = Merañ an tikedennoù evit an ennotadur-mañ
-reader-open-menu = Digeriñ lañser an ennotaudurioù
+reader-open-menu = Digeriñ lañser an ennotadurioù
 reader-thumbnails = Skeudennigoù
 reader-tag-selector-message = Silañ an ennotadurioù dre an dikedenn-mañ
 reader-add-tags = Ouzhpennañ tikedennoù...
@@ -18,13 +18,13 @@ reader-add-note = Ouzhpennañ un notenn
 reader-add-text = Ouzhpennañ un destenn
 reader-select-area = Diuzañ ur zonenn
 reader-highlight-annotation = Usskediñ an ennotadurioù
-reader-highlight-annotation-short = Highlight
+reader-highlight-annotation-short = Usskediñ
 reader-underline-annotation = Islinennañ an ennotadur
 reader-underline-annotation-short = Islinennet
-reader-note-annotation = Note Annotation
-reader-text-annotation = Text Annotation
-reader-image-annotation = Image Annotation
-reader-ink-annotation = Ink Annotation
+reader-note-annotation = Ennotadur mod notenn
+reader-text-annotation = Ennotadur mod testenn
+reader-image-annotation = Ennotadur mod skeudenn
+reader-ink-annotation = Ennotadur dornskrivet
 reader-search-result-index = Disoc'hoù an enklask
 reader-search-result-total = Hollad disoc'hoù an enklask
 reader-draw = Tresañ
@@ -53,7 +53,7 @@ reader-prompt-delete-pages-text =
         [one] Are you sure you want to delete { $count } page from the PDF file?
        *[other] Are you sure you want to delete { $count } pages from the PDF file?
     }
-reader-prompt-delete-annotations-title = Delete Annotations
+reader-prompt-delete-annotations-title = Dilemel an ennotadurioù
 reader-prompt-delete-annotations-text =
     { $count ->
         [one] Are you sure you want to delete the selected annotation?
@@ -80,8 +80,8 @@ reader-find = Kavout
 reader-close = Serriñ
 reader-show-thumbnails = Diskouez ar skeudennig
 reader-show-outline = Diskouez ezlinenn
-reader-find-previous = Find the previous occurrence of the phrase
-reader-find-next = Find the next occurrence of the phrase
+reader-find-previous = Kavout okurañs kent ar frazenn
+reader-find-next = Kavout okurañs da-heul ar frazenn
 reader-toggle-sidebar = Diskouez/kuzhat ar varrenn-gostez
 reader-find-in-document = Klask er restr
 reader-toggle-context-pane = Diskouez/kuzhat ar banell gendestenn
@@ -109,9 +109,9 @@ reader-theme-sepia = Sepia
 reader-theme-dark = Teñval
 reader-theme-black = Du
 reader-add-theme = Ouzhpennañ un tem
-reader-theme-invert-images = Invert Images
+reader-theme-invert-images = Eilpennañ ar skeudennoù
 reader-scroll-mode = Dibunañ
-reader-spread-mode = Spreads
+reader-spread-mode = Pajennadoù doubl
 reader-flow-mode = Pajenn aozañ
 reader-columns = Bannoù
 reader-split-view = Rannañ ar gweled
@@ -129,7 +129,7 @@ reader-double = Doubl
 reader-theme-name = Anv an tem:
 reader-background = Drekleur:
 reader-foreground = Rakleur:
-reader-reading-mode = Reading Mode
+reader-reading-mode = Mod lenn
 reader-reading-mode-not-supported = Reading Mode is not supported in this document.
 reader-clear-selection = Dilemel an diuzadenn
 reader-epub-encrypted = This ebook is encrypted and cannot be opened.
@@ -142,8 +142,8 @@ reader-a11y-move-annotation = Use the arrow keys to move the annotation.
 reader-a11y-edit-text-annotation = To move the end of the text annotation, hold { general-key-shift } and use the left/right arrow keys. To move the start of the annotation, hold { general-key-shift }-{ reader-move-annotation-start-key } and use the arrow keys.
 reader-a11y-resize-annotation = To resize the annotation, hold { general-key-shift } and use the arrow keys.
 reader-a11y-annotation-popup-appeared = Use Tab to navigate the annotation popup.
-reader-a11y-annotation-created = { $type } created.
-reader-a11y-annotation-selected = { $type } selected.
+reader-a11y-annotation-created = { $type } krouet.
+reader-a11y-annotation-selected = { $type } diuzet.
 -reader-a11y-textual-annotation-instruction = To annotate text via the keyboard, first use “{ reader-find-in-document }” to locate the phrase, and then press { general-key-control }-{ option-or-alt }-{ $number } to turn the search result into an annotation.
 -reader-a11y-annotation-instruction = To add this annotation into the document, focus the document and press { general-key-control }-{ option-or-alt }-{ $number }.
 reader-toolbar-highlight =
@@ -170,7 +170,7 @@ reader-find-in-document-input =
     .aria-description = To turn a search result into a highlight annotation, press { general-key-control }-{ option-or-alt }-1. To turn a search result into an underline annotation, press { general-key-control }-{ option-or-alt }-2.
 reader-import-from-epub =
     .label = Import Ebook Annotations…
-reader-import-from-epub-prompt-title = Import Ebook Annotations
+reader-import-from-epub-prompt-title = Emporzhiañ ennotadurioù an Ebook
 reader-import-from-epub-prompt-text =
     { -app-name } found { $count ->
         [one] { $count } { $tool } annotation
@@ -186,36 +186,39 @@ reader-import-from-epub-no-annotations-other-file =
     “{ $filename }” does not appear to contain any Calibre or KOReader annotations.
     
     If this ebook has been annotated with KOReader, try selecting a “metadata.epub.lua” file directly.
-reader-import-from-epub-select-other = Select Other File…
+reader-import-from-epub-select-other = Diuzañ ur restr all…
 reader-selected-pages =
     { $count ->
-        [one] 1 page selected
-       *[other] { $count } pages selected
+        [one] 1 bajenn diuzet
+        [two] { $count } bajenn diuzet
+        [few] { $count } a bajennoù diuzet
+        [many] { $count } a bajennoù diuzet
+       *[other] { $count } a bajennoù diuzet
     }
-reader-page-options = Page Options
-reader-read-aloud = Read Aloud
-reader-read-aloud-from-here = Read Aloud from Here
+reader-page-options = Dibarzhioù ar pajennoù
+reader-read-aloud = Lenn a vouezh uhel
+reader-read-aloud-from-here = Lenn a vouezh uhel adalek amañ
 reader-read-aloud-options = Dibarzhioù
-reader-read-aloud-skip-back = Skip Back
-reader-read-aloud-skip-back-sentence = Skip Back by Sentence
+reader-read-aloud-skip-back = Distreiñ prim
+reader-read-aloud-skip-back-sentence = Distreiñ buan dre frazennoù
 reader-read-aloud-skip-ahead = Skip Ahead
 reader-read-aloud-skip-ahead-sentence = Skip Ahead by Sentence
 reader-read-aloud-add-annotation = Annotate Sentence ({ $key1 }/{ $key2 })
-reader-read-aloud-play = Play
-reader-read-aloud-pause = Pause
-reader-read-aloud-speed = Reading Speed
-reader-read-aloud-voice = Voice
-reader-read-aloud-voice-tier = Voice Mode
-reader-read-aloud-voice-tier-local = Local
+reader-read-aloud-play = Lenn
+reader-read-aloud-pause = Ehan
+reader-read-aloud-speed = Tizh al lenn
+reader-read-aloud-voice = Mouezh
+reader-read-aloud-voice-tier = Mod ar vouezh
+reader-read-aloud-voice-tier-local = Lec'hel
 reader-read-aloud-voice-tier-standard = Standard
 reader-read-aloud-voice-tier-premium = Premium
-reader-read-aloud-more-voices = More Voices…
+reader-read-aloud-more-voices = Muioc'h a vouezhioù…
 reader-read-aloud-language = Yezh
-reader-read-aloud-remaining-time = Remaining reading time
+reader-read-aloud-remaining-time = Amzer lenn a chom
 reader-read-aloud-log-in-link = <log-in>Log in</log-in> to access { -app-name } Voices.
-reader-read-aloud-log-in-button = Log In
+reader-read-aloud-log-in-button = Kevreañ
 reader-read-aloud-done-button = { general-done }
-reader-read-aloud-add-more-time = Add more time
+reader-read-aloud-add-more-time = Ouzhpennañ muioc'h a amzer
 reader-read-aloud-quota-exceeded-message =
     <add-more-time>{ reader-read-aloud-add-more-time }</add-more-time> or continue reading with { $tier ->
         [standard] Standard Voices
@@ -225,38 +228,38 @@ reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Ur fazi dianav 'zo c'hoarvezet.
 reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
 reader-read-aloud-error-daily-limit-exceeded = You have exceeded your daily limit for { -app-name } Voices.
-reader-read-aloud-retry = Retry
+reader-read-aloud-retry = Adklask
 reader-read-aloud-first-run-title = Choose your preferred Read Aloud voice:
 reader-read-aloud-first-run-voice-tier-local-bullet-os-provided = Voices provided by your operating system
-reader-read-aloud-first-run-voice-tier-local-bullet-offline = Available without an internet connection
-reader-read-aloud-first-run-voice-tier-local-bullet-no-account = Available without a { -app-name } account
-reader-read-aloud-first-run-voice-tier-local-bullet-free = Free to use
-reader-read-aloud-first-run-voice-tier-standard-bullet-natural-sounding = Natural-sounding voices
-reader-read-aloud-first-run-voice-tier-standard-bullet-online-only = Only available with an internet connection
-reader-read-aloud-first-run-voice-tier-standard-bullet-account-required = Requires a { -app-name } account
-reader-read-aloud-first-run-voice-tier-standard-bullet-limited-languages = Limited language selection
+reader-read-aloud-first-run-voice-tier-local-bullet-offline = Hegerz hep kevreadenn ouzh internet
+reader-read-aloud-first-run-voice-tier-local-bullet-no-account = Hegerz hep kont { -app-name }
+reader-read-aloud-first-run-voice-tier-local-bullet-free = Implij digoust
+reader-read-aloud-first-run-voice-tier-standard-bullet-natural-sounding = Mouezh o vezañ naturel
+reader-read-aloud-first-run-voice-tier-standard-bullet-online-only = Hegerz gant ur gevreadenn ouzh internet hepken
+reader-read-aloud-first-run-voice-tier-standard-bullet-account-required = Kont { -app-name } rekiz
+reader-read-aloud-first-run-voice-tier-standard-bullet-limited-languages = Diuzañ yezhoù bevennet
 reader-read-aloud-first-run-voice-tier-standard-bullet-no-multilingual = No multilingual support
 reader-read-aloud-first-run-voice-tier-standard-bullet-internal-processing = Source text doesn’t leave { -app-name } servers
 reader-read-aloud-first-run-voice-tier-standard-bullet-unlimited-with-subscription = Unlimited use with a { -subscription-name } subscription
-reader-read-aloud-first-run-voice-tier-premium-bullet-highest-quality = Highest-quality voices
-reader-read-aloud-first-run-voice-tier-premium-bullet-online-only = Only available with an internet connection
-reader-read-aloud-first-run-voice-tier-premium-bullet-account-required = Requires a { -app-name } account
-reader-read-aloud-first-run-voice-tier-premium-bullet-broad-languages = Broad language selection
+reader-read-aloud-first-run-voice-tier-premium-bullet-highest-quality = Mouezh a galite uhel
+reader-read-aloud-first-run-voice-tier-premium-bullet-online-only = Hegerz gant ur gevreadenn ouzh internet hepken
+reader-read-aloud-first-run-voice-tier-premium-bullet-account-required = Kont { -app-name } rekiz
+reader-read-aloud-first-run-voice-tier-premium-bullet-broad-languages = Choaz bras a yezhoù
 reader-read-aloud-first-run-voice-tier-premium-bullet-multilingual = Multilingual support
 reader-read-aloud-first-run-voice-tier-premium-bullet-external-processing = Source text is processed by external text-to-speech providers
 reader-read-aloud-first-run-voice-tier-premium-bullet-subscription-minutes = { -subscription-name } plans include monthly Premium Voice minutes
 reader-read-aloud-first-run-voice-tier-premium-bullet-beta-credits = Request credits for additional minutes during beta
-reader-read-aloud-sample-text = I am the local voice { $name }
-reader-read-aloud-voices-none-available = No voices available
+reader-read-aloud-sample-text = Me zo mouezh lec'hel { $name }
+reader-read-aloud-voices-none-available = Mouezh ebet hegerz
 reader-read-aloud-first-run-no-voices-for-language = { $tier } Voices do not support { $language }.
-reader-read-aloud-region = Region
+reader-read-aloud-region = Rannvro
 reader-read-aloud-region-auto = Emgefreek
 reader-read-aloud-annotation-popup-move = Move annotation by sentence
-reader-read-aloud-annotation-popup-extend = Extend annotation by sentence
+reader-read-aloud-annotation-popup-extend = Lazhañ an ennotadurioù dre frazennoù
 reader-read-aloud-annotation-popup-delete = Dilemel
 reader-read-aloud-annotation-popup-done = Graet
-reader-read-aloud-annotation-popup-change-color = Change color
-reader-read-aloud-annotation-popup-highlight = Highlight
+reader-read-aloud-annotation-popup-change-color = Cheñch al liv
+reader-read-aloud-annotation-popup-highlight = Usskediñ
 reader-read-aloud-annotation-popup-underline = Islinennet
 reader-tab-audio-play =
     .title = { reader-read-aloud-play }
diff --git a/chrome/locale/br/zotero/scaffold.ftl b/chrome/locale/br/zotero/scaffold.ftl
index 9d6bf757f1..79bb6b022a 100644
--- a/chrome/locale/br/zotero/scaffold.ftl
+++ b/chrome/locale/br/zotero/scaffold.ftl
@@ -1,2 +1,2 @@
 scaffold-translator-output =
-    .aria-label = Console
+    .aria-label = Letrin
diff --git a/chrome/locale/br/zotero/schema.ftl b/chrome/locale/br/zotero/schema.ftl
index 0504d4529a..0c52d9a5ab 100644
--- a/chrome/locale/br/zotero/schema.ftl
+++ b/chrome/locale/br/zotero/schema.ftl
@@ -1,16 +1,16 @@
-itemFields-eventPlace = Event Place
-itemFields-originalDate = Original Date
-itemFields-originalPlace = Original Place
-itemFields-originalPublisher = Original Publisher
-itemFields-partNumber = Part Number
-itemFields-partTitle = Part Title
-itemFields-priorityDate = Priority Date
-itemFields-sessionTitle = Session Title
-creatorTypes-chair = Chair
+itemFields-eventPlace = Lec'h an darvoud
+itemFields-originalDate = Deiziad orin
+itemFields-originalPlace = Lec'h orin
+itemFields-originalPublisher = Embanner orin
+itemFields-partNumber = Niver al lodenn
+itemFields-partTitle = Titl al lodenn
+itemFields-priorityDate = Deiziad ar priorelezh
+itemFields-sessionTitle = Titl an dalc'h
+creatorTypes-chair = Renet
 creatorTypes-creator = Krouer
-creatorTypes-executiveProducer = Executive Producer
-creatorTypes-host = Host
-creatorTypes-narrator = Narrator
-creatorTypes-originalCreator = Original Creator
-creatorTypes-organizer = Organizer
-creatorTypes-seriesCreator = Series Creator
+creatorTypes-executiveProducer = Produer dileuriet
+creatorTypes-host = Herberc'hier
+creatorTypes-narrator = Daneveller
+creatorTypes-originalCreator = Krouer orin
+creatorTypes-organizer = Aozer
+creatorTypes-seriesCreator = Krouer an dastumad
diff --git a/chrome/locale/br/zotero/searchbox.dtd b/chrome/locale/br/zotero/searchbox.dtd
index 48c1faa3e8..8d6f1cabcb 100644
--- a/chrome/locale/br/zotero/searchbox.dtd
+++ b/chrome/locale/br/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Anv:">
 
-<!ENTITY zotero.search.searchInLibrary "Klask el levraoueg:">
-
 <!ENTITY zotero.search.joinMode.prefix "Kenglotus">
 <!ENTITY zotero.search.joinMode.any "unan">
 <!ENTITY zotero.search.joinMode.all "pep-tra">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "devezhioù">
 <!ENTITY zotero.search.date.units.months "mizioù">
 <!ENTITY zotero.search.date.units.years "bloavezhioù">
-
-<!ENTITY zotero.search.search "Klask">
-<!ENTITY zotero.search.clear "Diverkañ">
-<!ENTITY zotero.search.saveSearch "Enrollañ an enklask">
diff --git a/chrome/locale/br/zotero/zotero.dtd b/chrome/locale/br/zotero/zotero.dtd
index 93503ea584..1233c5e71e 100644
--- a/chrome/locale/br/zotero/zotero.dtd
+++ b/chrome/locale/br/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Dilemel an elfenn...">
 <!ENTITY zotero.toolbar.newGroup "Strollad nevez...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Is-dastumadeg nevez...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Klask enrollet nevez...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Goullonderiñ ar pod-lastez">
 <!ENTITY zotero.toolbar.tagSelector.label "Diskouez/Kuzhat an diuzer balizoù">
 <!ENTITY zotero.toolbar.actions.label "Oberioù">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Arventennoù...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Skoazellerezh ha titouroù">
 <!ENTITY zotero.toolbar.about.label "Diwar-benn Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Enklaskoù araokaet">
 <!ENTITY zotero.toolbar.openURL.label "Lec'helaat">
 <!ENTITY zotero.toolbar.openURL.tooltip "Klask e-barzh ho levraoueg lec'hel">
 
diff --git a/chrome/locale/br/zotero/zotero.ftl b/chrome/locale/br/zotero/zotero.ftl
index 8ff99a23bb..be479329aa 100644
--- a/chrome/locale/br/zotero/zotero.ftl
+++ b/chrome/locale/br/zotero/zotero.ftl
@@ -1,9 +1,9 @@
 general-sentence-separator = { " " }
-general-key-control = Control
-general-key-shift = Shift
+general-key-control = Kontrol
+general-key-shift = Pennlizh.
 general-key-alt = Alt
-general-key-option = Option
-general-key-command = Command
+general-key-option = Dibarzhioù
+general-key-command = Urzhiad
 option-or-alt =
     { PLATFORM() ->
         [macos] { general-key-option }
@@ -24,27 +24,37 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Moullañ
 general-remove = Dilemel
 general-add = Ouzhpennañ
 general-remind-me-later = Degas da soñj diwezhatoc'h
 general-dont-ask-again = Na c'houlenn ken
 general-choose-file = Diuzañ ur restr...
-general-open-settings = Open Settings
-general-settings = Settings…
+general-open-settings = Digeriñ an arventennoù
+general-settings = Arventennoù...
 general-help = Sikour
 general-tag = Baliz
-general-got-it = Got It
+general-got-it = Deuet eo ganin
 general-done = Graet
-general-view-troubleshooting-instructions = View Troubleshooting Instructions
-general-go-back = Go Back
-general-accept = Accept
+general-view-troubleshooting-instructions = Diskouez titouroù distankañ
+general-go-back = Distreiñ
+general-accept = Asantiñ
 general-cancel = Nullañ
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Diskouez el levraoueg:
-general-restartApp = Restart { -app-name }
-general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
+general-restartApp = Adloc'hañ { -app-name }
+general-restartInTroubleshootingMode = Adloc'hañ er mod diveugiñ
 general-save = Enrollañ
 general-clear = Diverkañ
+clear-button =
+    .label = { general-clear }
 general-update = Hizivaat
 general-back = Distreiñ
 general-edit = Aozañ
@@ -61,7 +71,7 @@ general-next = Da-heul
 general-learn-more = Gouzout hiroc'h
 general-more-information = Muioc'h a ditouroù
 general-warning = Kemenn-diwall
-general-type-to-continue = Type “{ $text }” to continue.
+general-type-to-continue = Skrivit “{ $text }” da genderc'hel ganti.
 general-continue = Kenderc'hel
 general-red = Ruz
 general-orange = Orañjez
@@ -76,16 +86,18 @@ general-maroon = Gell
 general-gray = Gris
 general-black = Du
 general-loading = O kargañ...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Doare arroudenn:
 language-label = Yezh:
 menu-custom-group-submenu =
-    .label = More Options…
+    .label = Muioc'h a arventennoù...
 menu-file-show-in-finder =
-    .label = Show in Finder
+    .label = Diskouez e Finder
 menu-file-show-file =
     .label = Diskouez ar restr
 menu-file-show-files =
-    .label = Show Files
+    .label = Diskouez ar restroù
 menu-print =
     .label = { general-print }
 menu-density =
@@ -93,83 +105,185 @@ menu-density =
 add-attachment = Ouzhpennañ ur pezh-stag
 new-note = Notenn nevez
 menu-add-by-identifier =
-    .label = Add by Identifier…
+    .label = Ouzhpennañ dre anaouader...
 menu-add-attachment =
     .label = { add-attachment }
 menu-add-standalone-file-attachment =
-    .label = Add File…
+    .label = Ouzhpennañ ur restr...
 menu-add-standalone-linked-file-attachment =
-    .label = Add Link to File…
+    .label = Ouzhpennañ ul liamm davet ur restr...
 menu-add-child-file-attachment =
-    .label = Attach File…
+    .label = Stagañ ur restr...
 menu-add-child-linked-file-attachment =
     .label = Stagañ ul liamm d'ar restr...
 menu-add-child-linked-url-attachment =
-    .label = Attach Web Link…
+    .label = Stagañ ul liamm Web...
 menu-new-note =
     .label = { new-note }
 menu-new-standalone-note =
     .label = Notenn dizalc'h nevez
 menu-new-item-note =
-    .label = New Item Note
+    .label = Notenn elfenn nevez
 menu-restoreToLibrary =
     .label = Adsevel d'al levraoueg
 menu-deletePermanently =
     .label = Dilemel da virviken...
 menu-tools-plugins =
-    .label = Plugins
+    .label = Astennoù
 menu-view-columns-move-left =
-    .label = Move Column Left
+    .label = Dilec'hiañ ar bann a-gleiz
 menu-view-columns-move-right =
-    .label = Move Column Right
+    .label = Dilec'hiañ ar bann a-zehoù
 menu-view-hide-context-annotation-rows =
-    .label = Hide Non-Matching Annotations
+    .label = Kuzhat an ennotadurioù na glotont ket
 menu-view-note-font-size =
     .label = Notenn ment skritur
 menu-view-note-tab-font-size =
-    .label = Note Tab Font Size
+    .label = Ment an arouezioù en ivinelloù notennoù
 menu-show-tabs-menu =
-    .label = Show Tabs Menu
+    .label = Diskouez lañser an ivinelloù
 menu-edit-copy-annotation =
     .label =
         { $count ->
-            [one] Copy Annotation
-           *[other] Copy { $count } Annotations
+            [one] Eilañ { $count } ennotadur
+            [two] Eilañ { $count } ennotadur
+            [few] Eilañ { $count } ennotadur
+            [many] Eilañ { $count } a ennotadurioù
+           *[other] Eilañ { $count } a ennotadurioù
         }
 main-window-command =
     .label = Levraoueg
 main-window-key =
     .key = L
 zotero-toolbar-tabs-menu =
-    .tooltiptext = List all tabs
-filter-collections = Filter Collections
+    .tooltiptext = Listennañ an holl ivinelloù
+filter-collections = Silañ an dastumadegoù
 zotero-collections-search =
     .placeholder = { filter-collections }
 zotero-collections-search-btn =
     .tooltiptext = { filter-collections }
 zotero-tabs-menu-filter =
-    .placeholder = Search Tabs
+    .placeholder = Klask en ivinelloù
 zotero-tabs-menu-close-button =
-    .title = Close Tab
+    .title = Serriñ an ivinell
 zotero-toolbar-tabs-scroll-forwards =
-    .title = Scroll forwards
+    .title = Dibunañ war-raok
 zotero-toolbar-tabs-scroll-backwards =
-    .title = Scroll backwards
+    .title = Dibunañ war-gil
 toolbar-add-attachment =
     .tooltiptext = { add-attachment }
-recently-read = Recently Read
+recently-read = Lennet nevez zo
 collections-menu-show-recently-read =
-    .label = Show { recently-read }
+    .label = Diskouez { recently-read }
 item-menu-remove-from-recently-read =
-    .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+    .label = Dilemel diwar { recently-read }…
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } dastumadeg diuzet
+        [two] { $count } dastumadeg diuzet
+        [few] { $count } a zastumadegoù diuzet
+        [many] { $count } a zastumadegoù diuzet
+       *[other] { $count } a zastumadegoù diuzet
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Aozañ ar c'hlask enrollet
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
-    .label = Move To
+    .label = Fiñval war-zu
 collections-menu-copy-collection =
-    .label = Copy To
+    .label = Eilañ e
+collections-menu-export =
+    .label = Ezporzhiañ...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = War-draoñ
 item-creator-moveToTop =
@@ -203,28 +317,28 @@ item-menu-viewAttachment =
 item-menu-add-file =
     .label = Restr
 item-menu-add-linked-file =
-    .label = Linked File
+    .label = Restr liammet
 item-menu-add-url =
-    .label = Web Link
+    .label = Liamm Web
 item-menu-change-parent-item =
-    .label = Change Parent Item…
+    .label = Cheñch ar restr gar...
 item-menu-relate-items =
-    .label = Relate Items
+    .label = Elfennoù liammet
 view-online = Diskouez enlinenn
 item-menu-option-view-online =
     .label = { view-online }
 item-button-view-online =
     .tooltiptext = { view-online }
-file-renaming-file-renamed-to = File renamed to { $filename }
+file-renaming-file-renamed-to = Restr adanvet e { $filename }
 itembox-button-options =
-    .tooltiptext = Open context menu
+    .tooltiptext = Digeriñ al lañser kendestenn
 itembox-button-merge =
-    .aria-label = Select version of { $field } field
-create-parent-intro = Enter a DOI, ISBN, PMID, arXiv ID, or ADS Bibcode to identify this file:
+    .aria-label = Diuzañ ur stumm eus ar vaezienn { $field }
+create-parent-intro = Skrivit un DOI, ISBN, PMID, arXiv ID, pe ADS Bibcode evit anaout ar restr-mañ:
 reader-use-dark-mode-for-content =
-    .label = Use Dark Mode for Content
-update-updates-found-intro-minor = An update for { -app-name } is available:
-update-updates-found-desc = It is recommended that you apply this update as soon as possible.
+    .label = Ober gant ar stumm teñval evit an endalc'had
+update-updates-found-intro-minor = Un hizivadur eus { -app-name } a zo hegerz:
+update-updates-found-desc = Aliet eo aplikañ an hizivadur-mañ kerkent ha m'eo posupl.
 import-window =
     .title = Emporzhiañ
 import-where-from = Deus pelec'h ho peus c'hoant emporzhiañ?
@@ -234,24 +348,24 @@ import-source-file =
 import-source-folder =
     .label = Un doser gant PDFoù pe restroù all
 import-source-online =
-    .label = { $targetApp } online import
+    .label = Emporzhiañ enlinenn { $targetApp }
 import-options = Dibarzhioù
 import-importing = Oc'h emporzhiañ...
 import-create-collection =
     .label = Plasit an dastumadegoù hag an teuliadoù emporzhiet e-barzh un dastumadeg nevez
 import-recreate-structure =
     .label = Recreate folder structure as collections
-import-fileTypes-header = File Types to Import:
+import-fileTypes-header = Doareoù restroù da emporzhiañ
 import-fileTypes-pdf =
-    .label = PDFs
+    .label = PDFoù
 import-fileTypes-other =
-    .placeholder = Other files by pattern, comma-separated (e.g., *.jpg,*.png)
+    .placeholder = Restroù all war ar patrom, dispartiet gant skejoù (da sk: *.jpg, *.png)
 import-file-handling = Meradur ar restroù
 import-file-handling-store =
-    .label = Copy files to the { -app-name } storage folder
+    .label = Eilañ ar restroù e kavlec'h enderc'hel { -app-name }
 import-file-handling-link =
     .label = Liammañ d'ar restroù el lec'hiadur orin
-import-fileHandling-description = Linked files cannot be synced by { -app-name }.
+import-fileHandling-description = Ar restroù liammet n'hallont ket bezañ sinkronelaet gant { -app-name }.
 import-online-new =
     .label = Pellgargañ an elfennoù nevez hepken; na hizivaat an elfennoù emporzhiet kent
 import-mendeley-username = Anv-implijer
@@ -279,63 +393,67 @@ import-online-form-intro = Please enter your credentials to log in to { $targetA
 import-online-wrong-credentials = Login to { $targetApp } failed. Please re-enter credentials and try again.
 import-online-blocked-by-plugin = The import cannot continue with { $plugin } installed. Please disable this plugin and try again.
 import-online-relink-only =
-    .label = Relink Mendeley Desktop citations
+    .label = Adliammañ arroudennoù Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
-            [one] { $count } Note
-           *[other] { $count } Notes
+            [one] { $count } notenn
+            [two] { $count } notenn
+            [few] { $count } notenn
+            [many] { $count } a notennoù
+           *[other] { $count } a notennoù
         }
-items-column-added-by = Added By
-items-column-modified-by = Modified By
-items-column-last-read = Last Read
+items-column-added-by = Ouzhpennet gant
+items-column-modified-by = Kemmet gant
+items-column-last-read = Lennet da ziwezhañ
 report-error =
     .label = Danevell fazi...
 rtfScan-wizard =
     .title = Skan RTF
 rtfScan-introPage-description = { -app-name } can automatically extract and reformat citations and insert a bibliography into RTF files. It currently supports citations in variations of the following formats:
 rtfScan-introPage-description2 = Evit stagañ ganti, diuzit ur restr RTF enmont hag ur restr ezvont dindan:
-rtfScan-input-file = Input File:
-rtfScan-output-file = Output File:
+rtfScan-input-file = Restr enmont:
+rtfScan-output-file = Restr ezvont:
 rtfScan-no-file-selected = Restr ebet diuzet
 rtfScan-choose-input-file =
     .label = { general-choose-file }
-    .aria-label = Choose Input File
+    .aria-label = Choaz ur restr enmont
 rtfScan-choose-output-file =
     .label = { general-choose-file }
-    .aria-label = Choose Output File
+    .aria-label = Choaz ur restr ezvont
 rtfScan-intro-page = Digoradur
 rtfScan-scan-page = Skanañ evit kavout arroudennoù
-rtfScan-scanPage-description = { -app-name } is scanning your document for citations. Please be patient.
+rtfScan-scanPage-description = { -app-name } zo o skaniñ ho teuliad evit klask arroudennoù. Gortozit mar plij.
 rtfScan-citations-page = Gwiriañ an elfennoù arroudennet
 rtfScan-citations-page-description = Please review the list of recognized citations below to ensure that { -app-name } has selected the corresponding items correctly. Any unmapped or ambiguous citations must be resolved before proceeding to the next step.
 rtfScan-style-page = Teuliad-aozañ
 rtfScan-format-page = Arroudenn-aozañ
-rtfScan-format-page-description = { -app-name } is processing and formatting your RTF file. Please be patient.
+rtfScan-format-page-description = { -app-name } a dret hag a bajennaoz ho restr RTF. Gortozit mar plij.
 rtfScan-complete-page = Skan RTF klokaet
 rtfScan-complete-page-description = Ho teuliad a zo bet skanet ha tretet bremañ. Grit e-seurt da vezañ asur eo bet stummet ez-reizh.
 rtfScan-action-find-match =
-    .title = Select matching item
+    .title = Diuzit ur elfenn kenglotus
 rtfScan-action-accept-match =
-    .title = Accept this match
-runJS-title = Run JavaScript
-runJS-editor-label = Code:
-runJS-run = Run
+    .title = Degemer an okurañs-mañ
+runJS-title = Sekutiñ JavaScript
+runJS-editor-label = Kod:
+runJS-run = Sevenniñ
 runJS-help = { general-help }
-runJS-completed = completed successfully
+runJS-completed = klokaet gant berzh
 runJS-result =
     { $type ->
         [async] Return value:
        *[other] Result:
     }
-runJS-run-async = Run as async function
+runJS-run-async = Sekutiñ evel ur fonksion async
 bibliography-window =
-    .title = { -app-name } - Create Citation/Bibliography
+    .title = { -app-name } - Krouiñ un arroudenn/levrlennadur
 bibliography-style-label = { citation-style-label }
 bibliography-locale-label = { language-label }
-bibliography-displayAs-label = Display citations as:
+bibliography-displayAs-label = Diskouez an arroudennoù evel:
 bibliography-advancedOptions-label = Dibarzhioù araokaet
 bibliography-outputMode-label = Mod ezvont:
 bibliography-outputMode-citations =
@@ -358,14 +476,14 @@ bibliography-outputMethod-print =
     .label = Moullañ
 bibliography-manageStyles-label = Merañ ar stiloù...
 styleEditor-locatorType =
-    .aria-label = Locator type
-styleEditor-locatorInput = Locator input
+    .aria-label = Doare lec'helaer
+styleEditor-locatorInput = Enmont al lec'helaer
 styleEditor-citationStyle = { citation-style-label }
 styleEditor-locale = { language-label }
 styleEditor-editor =
-    .aria-label = Style editor
+    .aria-label = Aozer stil
 styleEditor-preview =
-    .aria-label = Preview
+    .aria-label = Rakwel
 publications-intro-page = Ma Embannadennoù
 publications-intro = Elfennoù da ouzhpennañ D'am Embannadennoù hag a vo diskouezet war pajenn ho profil war zotero.org. Ma tibabit enklozañ restroù-stag, lakaet e vint hegerz en un doare foran dindan al lisañs a vo termenet ganeoc'h. Ouzhpennit labourioù a zo bet krouet ganeoc'h hepken, hag enklozit ar restroù ho peus ar gwir rannañ warno hag ho peus c'hoant d'en ober.
 publications-include-checkbox-files =
@@ -406,7 +524,7 @@ publications-choose-license-commercial-prompt = Aotren implijoù kenwerzhel ho l
 publications-buttons-add-to-my-publications =
     .label = Ouzhpennañ d'Am Embannadennoù
 publications-buttons-next-sharing =
-    .label = Next: Sharing
+    .label = Da-heul: rannañ
 publications-buttons-next-choose-license =
     .label = Dibab ul lisañs
 licenses-cc-0 = CC0 1.0 Universal Public Domain Dedication
@@ -420,27 +538,27 @@ licenses-cc-more-info = Be sure you have read the Creative Commons <a data-l10n-
 licenses-cc0-more-info = Be sure you have read the Creative Commons <a data-l10n-name="license-considerations">CC0 FAQ</a> before applying CC0 to your work. Please note that dedicating your work to the public domain is irreversible, even if you later choose different terms or cease publishing the work.
 debug-output-logging-restart-in-troubleshooting-mode-checkbox = { general-restartInTroubleshootingMode }
 restart-in-troubleshooting-mode-menuitem =
-    .label = Restart in Troubleshooting Mode…
+    .label = Adloc'hañ er mod diveugiñ...
     .accesskey = T
 restart-in-troubleshooting-mode-dialog-title = { general-restartInTroubleshootingMode }
 restart-in-troubleshooting-mode-dialog-description = { -app-name } will restart with all plugins disabled. Some features may not function correctly while Troubleshooting Mode is enabled.
 menu-ui-density =
     .label = Stankded
 menu-ui-density-comfortable =
-    .label = Comfortable
+    .label = Klet
 menu-ui-density-compact =
-    .label = Compact
-pane-item-details = Item Details
+    .label = Stank
+pane-item-details = Munudoù an elfenn
 pane-info = Titou.
 pane-abstract = Berradenn
 pane-attachments = Pezhioù-stag
 pane-notes = Notennoù
-pane-note-info = Note Info
-pane-libraries-collections = Libraries and Collections
+pane-note-info = Titouroù an notenn
+pane-libraries-collections = Levraouegoù ha dastumadegoù
 pane-tags = Balizoù
 pane-related = Kevreet
-pane-attachment-info = Attachment Info
-pane-attachment-preview = Preview
+pane-attachment-info = Titouroù ar stagadenn
+pane-attachment-preview = Rakwel
 pane-attachment-annotations = Ennotadurioù
 pane-header-attachment-associated =
     .label = Adenvel ar restr kevelet
@@ -453,34 +571,46 @@ section-abstract =
 section-attachments =
     .label =
         { $count ->
-            [one] { $count } Attachment
-           *[other] { $count } Attachments
+            [one] { $count } pezhioù-stag
+            [two] { $count } bezh-stag
+            [few] { $count } a bezhioù-stag
+            [many] { $count } a bezhioù-stag
+           *[other] { $count } a bezhioù-stag
         }
 section-attachment-preview =
     .label = { pane-attachment-preview }
 section-attachments-annotations =
     .label =
         { $count ->
-            [one] { $count } Annotation
-           *[other] { $count } Annotations
+            [one] { $count } ennotadur
+            [two] { $count } ennotadur
+            [few] { $count } ennotadur
+            [many] { $count } a ennotadurioù
+           *[other] { $count } a ennotadurioù
         }
-section-attachments-move-to-trash-message = Are you sure you want to move “{ $title }” to the trash?
+section-attachments-move-to-trash-message = Ha fellout a ra deoc'h kas “{ $title }” d'ar pod-lastez?
 section-notes =
     .label =
         { $count ->
-            [one] { $count } Note
-           *[other] { $count } Notes
+            [one] { $count } notenn
+            [two] { $count } notenn
+            [few] { $count } notenn
+            [many] { $count } a notennoù
+           *[other] { $count } a notennoù
         }
 section-libraries-collections =
     .label = { pane-libraries-collections }
 section-tags =
     .label =
         { $count ->
-            [one] { $count } Tag
-           *[other] { $count } Tags
+            [one] { $count } diketenn
+            [two] { $count } diketenn
+            [few] { $count } a diketennoù
+            [many] { $count } a diketennoù
+           *[other] { $count } a diketennoù
         }
 section-related =
-    .label = { $count } Related
+    .label = { $count } liammet
 section-attachment-info =
     .label = { pane-attachment-info }
 section-button-remove =
@@ -488,15 +618,18 @@ section-button-remove =
 section-button-add =
     .tooltiptext = { general-add }
 section-button-expand =
-    .dynamic-tooltiptext = Expand section
-    .label = Expand { $section } section
+    .dynamic-tooltiptext = Brasaat ar gevrenn
+    .label = Brasaat ar gevrenn { $section }
 section-button-collapse =
-    .dynamic-tooltiptext = Collapse section
-    .label = Collapse { $section } section
+    .dynamic-tooltiptext = Bihanañ ar gevrenn
+    .label = Bihanaat ar gevrenn { $section }
 annotations-count =
     { $count ->
-        [one] { $count } Annotation
-       *[other] { $count } Annotations
+        [one] { $count } ennotadur
+        [two] { $count } ennotadur
+        [few] { $count } ennotadur
+        [many] { $count } a ennotadurioù
+       *[other] { $count } a ennotadurioù
     }
 section-button-annotations =
     .title = { annotations-count }
@@ -528,31 +661,31 @@ sidenav-related =
 sidenav-main-btn-grouping =
     .aria-label = { pane-item-details }
 sidenav-reorder-up =
-    .label = Move Section Up
+    .label = Dilec'hiañ war-grec'h ar gevrenn
 sidenav-reorder-down =
-    .label = Move Section Down
+    .label = Dilec'hiañ war-draoñ ar gevrenn
 sidenav-reorder-reset =
-    .label = Reset Section Order
+    .label = Adderaouiñ urzh ar c'hevrennoù
 toggle-item-pane =
-    .tooltiptext = Toggle Item Pane
+    .tooltiptext = Diskouez/kuzhat panell an elfennoù
 toggle-context-pane =
     .tooltiptext = Diskouez/kuzhat ar banell gendestenn
 pin-section =
-    .label = Pin Section
+    .label = Spilhennañ ar gevrenn
 unpin-section =
-    .label = Unpin Section
+    .label = Dispilhennañ ar gevrenn
 collapse-other-sections =
-    .label = Collapse Other Sections
+    .label = Bihanaat ar c'hevrennoù all
 expand-all-sections =
-    .label = Expand All Sections
+    .label = Brasaat an holl gevrennoù
 abstract-field =
-    .placeholder = Add abstract…
+    .placeholder = Ozhpennañ un diverradenn...
 tag-field =
     .aria-label = { general-tag }
 tagselector-search =
-    .placeholder = Filter Tags
+    .placeholder = Silañ an tikedennoù
 context-notes-search =
-    .placeholder = Search Notes
+    .placeholder = Klask en notennoù
 context-notes-return-button =
     .aria-label = { general-go-back }
 new-collection = Dastumadeg nevez...
@@ -562,11 +695,11 @@ toolbar-new-collection =
     .tooltiptext = { new-collection }
 new-collection-dialog =
     .title = Dastumadeg nevez
-    .buttonlabelaccept = Create Collection
+    .buttonlabelaccept = Krouiñ un dastumadeg
 new-collection-name = Anv:
-new-collection-create-in = Create in:
+new-collection-create-in = Krouiñ e:
 show-publications-menuitem =
-    .label = Show My Publications
+    .label = Diskouez ma embannadennoù
 attachment-info-title = Titl
 attachment-info-filename = Anv ar restr
 attachment-info-accessed = Gwelet d'an/ar/al
@@ -584,7 +717,7 @@ attachment-info-convert-note =
 section-note-info =
     .label = { pane-note-info }
 note-info-title = Titl
-note-info-parent-item = Parent Item
+note-info-parent-item = Elfenn gar
 note-info-parent-item-button =
     { $hasParentItem ->
         [true] { $parentItemTitle }
@@ -595,18 +728,18 @@ note-info-parent-item-button =
             [true] View parent item in library
            *[false] View note item in library
         }
-note-info-date-created = Created
+note-info-date-created = Krouet
 note-info-date-modified = Deiziad kemmañ
 note-info-size = Ment
-note-info-word-count = Word Count
-note-info-character-count = Character Count
+note-info-word-count = Niver a c'herioù
+note-info-character-count = Niver a arouezioù
 item-title-empty-note = Notenn hep-titl
-attachment-preview-placeholder = No attachment to preview
+attachment-preview-placeholder = Stagadenn ebet da rakwelet
 attachment-rename-from-parent =
-    .tooltiptext = Rename File to Match Parent Item
-account-log-in = Log In
-account-not-logged-in-text = Log in to your Zotero account to sync your data.
-account-error-login-session-expired = Your login session has expired. Please try again.
+    .tooltiptext = Adenvel ar restr evit kenglotañ gant an elfenn gar
+account-log-in = Kevreañ
+account-not-logged-in-text = Kevreañ ouzh ho kont Zotero evit sinkronelaat ho roadennoù.
+account-error-login-session-expired = Ho talc'h zo diamzeriet. Klaskit en-dro, mar plij.
 toggle-preview =
     .label =
         { $type ->
@@ -614,15 +747,27 @@ toggle-preview =
             [collapsed] Show
            *[unknown] Toggle
         } Attachment Preview
-annotation-image-not-available = [Image not available]
+annotation-image-not-available = [Skeudenn dihegerz]
 quicksearch-mode =
-    .aria-label = Quick Search mode
+    .aria-label = Mod enklask prim
 quicksearch-input =
     .aria-label = Enklask prim
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Enklaskoù araokaet
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
-    .label = View As
+    .label = Gwelet evel
 item-pane-header-none =
     .label = Hini ebet
 item-pane-header-title =
@@ -630,9 +775,9 @@ item-pane-header-title =
 item-pane-header-titleCreatorYear =
     .label = Titl, Krouer, Bloavezh
 item-pane-header-bibEntry =
-    .label = Bibliography Entry
+    .label = Enmont levrlennadur
 item-pane-header-more-options =
-    .label = More Options
+    .label = Muioc'h a zibarzhioù
 item-pane-message-items-selected =
     { $count ->
         [0] No items selected
@@ -641,18 +786,27 @@ item-pane-message-items-selected =
     }
 item-pane-message-collections-selected =
     { $count ->
-        [one] { $count } collection selected
-       *[other] { $count } collections selected
+        [one] { $count } dastumadeg diuzet
+        [two] { $count } dastumadeg diuzet
+        [few] { $count } a zastumadegoù diuzet
+        [many] { $count } a zastumadegoù diuzet
+       *[other] { $count } a zastumadegoù diuzet
     }
 item-pane-message-searches-selected =
     { $count ->
-        [one] { $count } search selected
-       *[other] { $count } searches selected
+        [one] { $count } enklask diuzet
+        [two] { $count } enklask diuzet
+        [few] { $count } a enklaskoù diuzet
+        [many] { $count } a enklaskoù diuzet
+       *[other] { $count } a enklaskoù diuzet
     }
 item-pane-message-objects-selected =
     { $count ->
-        [one] { $count } object selected
-       *[other] { $count } objects selected
+        [one] { $count } objed diuzet
+        [two] { $count } objed diuzet
+        [few] { $count } objed diuzet
+        [many] { $count } a objedoù diuzet
+       *[other] { $count } a objedoù diuzet
     }
 item-pane-message-unselected =
     { $count ->
@@ -669,34 +823,98 @@ item-pane-message-objects-unselected =
 item-pane-duplicates-merge-items =
     .label =
         { $count ->
-            [one] Merge { $count } item
-           *[other] Merge { $count } items
+            [one] Kendeuziñ { $count } elfenn
+            [two] Kendeuziñ { $count } elfenn
+            [few] Kendeuziñ { $count } elfenn
+            [many] Kendeuziñ { $count } a elfennoù
+           *[other] Kendeuziñ { $count } a elfennoù
         }
 locate-library-lookup-no-resolver = You must choose a resolver from the { $pane } pane of the { -app-name } settings.
 architecture-win32-warning-message = Switch to 64-bit { -app-name } for the best performance. Your data won’t be affected.
-architecture-warning-action = Download 64-bit { -app-name }
+architecture-warning-action = Pellgargañ stumm 64-bit { -app-name }
 architecture-x64-on-arm64-message = { -app-name } is running in emulated mode. A native version of { -app-name } will run more efficiently.
-architecture-x64-on-arm64-action = Download { -app-name } for ARM64
+architecture-x64-on-arm64-action = Pellgargañ { -app-name } evit ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Kavout
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = ennotadurioù
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
-    .aria-label = Search condition
+    .aria-label = Koñdision an enklask
     .label = { $label }
 advanced-search-operators-menu =
-    .aria-label = Operator
+    .aria-label = Operataer
     .label = { $label }
 advanced-search-condition-input =
-    .aria-label = Value
+    .aria-label = Talvoudegezh
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Maeziennoù:
 search-conditions-collection = Dastumadeg
 search-conditions-savedSearch = Enklask enrollet
 search-conditions-itemTypeID = Doare elfenn
 search-conditions-tag = Baliz
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notenn
 search-conditions-childNote = Notenn bugel
 search-conditions-creator = Krouer
@@ -715,68 +933,101 @@ search-conditions-dateModified = Deiziad kemmañ
 search-conditions-fulltextContent = Endalc'had ar pezh-stag
 search-conditions-programmingLanguage = Langaj programiñ
 search-conditions-fileTypeID = Doare restr-stag
-search-conditions-lastRead = Attachment Last Read
+search-conditions-attachmentStorageType = Attachment Storage Type
+search-conditions-lastRead = Stagadenn ziwezhañ bet lennet
 search-conditions-annotationText = Testenn ennotadur
 search-conditions-annotationComment = Evezhiadenn an ennotadur
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Froud ebet
+search-conditions-titleCreatorYear = Titl, Krouer, Bloavezh
+search-conditions-submenu-attachment = Pezh-stag
+search-conditions-submenu-annotation = Ennotadur
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Doare restr
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Lennet da ziwezhañ
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Doare
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Aozer
 find-pdf-files-added =
     { $count ->
-        [one] { $count } file added
-       *[other] { $count } files added
+        [one] { $count } restr ouzhpennet
+        [two] { $count } restr ouzhpennet
+        [few] { $count } restr ouzhpennet
+        [many] { $count } a restroù ouzhpennet
+       *[other] { $count } a restroù ouzhpennet
     }
 select-items-window =
     .title = Diuzañ elfennoù
 select-items-dialog =
-    .buttonlabelaccept = Select
+    .buttonlabelaccept = Diuzañ
 select-items-convertToStandalone =
-    .label = Convert to Standalone
+    .label = Emdreiñ en un elfenn emren
 select-items-convertToStandaloneAttachment =
     .label =
         { $count ->
-            [one] Convert to Standalone Attachment
-           *[other] Convert to Standalone Attachments
+            [one] Emdreiñ en ur pezh-stag emren
+            [two] Emdreiñ e pezhioù-stag emren
+            [few] Emdreiñ e pezhioù-stag emren
+            [many] Emdreiñ e pezhioù-stag emren
+           *[other] Emdreiñ e pezhioù-stag emren
         }
 select-items-convertToStandaloneNote =
     .label =
         { $count ->
-            [one] Convert to Standalone Note
-           *[other] Convert to Standalone Notes
+            [one] Emdreiñ en un notenn emren
+            [two] Emdreiñ e notennoù emren
+            [few] Emdreiñ e notennoù emren
+            [many] Emdreiñ e notennoù emren
+           *[other] Emdreiñ e notennoù emren
         }
-file-type-webpage = Webpage
+file-type-webpage = Pajenn web
 file-type-image = Skeudenn
 file-type-pdf = PDF
 file-type-audio = Aodio
 file-type-video = Video
 file-type-presentation = Kinnigadenn
 file-type-document = Teuliad
-file-type-ebook = Ebook
-post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
+file-type-ebook = Levr elektronek
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
+post-upgrade-message = Bez ho peus hizivaet <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Dizoloit petra zo <a data-l10n-name="new-features-link">nevez</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
 post-upgrade-done =
     .label = { general-done }
 text-action-paste-and-search =
-    .label = Paste and Search
-mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+    .label = Pegañ ha klask
+mac-word-plugin-install-message = Zotero en deus da haeziñ ouzh ho roadennoù Word evit gellout staliañ an astenn Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
-    .label = Install Word plugin
+    .label = Staliañ an astenn Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Staliañ
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
-    .title = Split Tags
+    .title = Rannañ an tikedennoù
 long-tag-fixer-button-dont-split =
-    .label = Don’t Split
+    .label = Na rannañ
 menu-normalize-attachment-titles =
-    .label = Normalize Attachment Titles…
-normalize-attachment-titles-title = Normalize Attachment Titles
+    .label = Normalizañ titloù ar stagadennoù...
+normalize-attachment-titles-title = Normalizañ titloù ar stagadennoù
 normalize-attachment-titles-text =
     { -app-name } automatically renames files on disk using parent item metadata, but it uses separate, simpler titles such as “Full Text PDF”, “Preprint PDF”, or “PDF” for primary attachments to keep the items list cleaner and avoid duplicating information.
     
@@ -784,7 +1035,144 @@ normalize-attachment-titles-text =
     
     Would you like to update the selected attachments to use simpler titles? Only primary attachments with titles that match the filename will be changed.
 banner-close-button =
-    .aria-label = Dismiss notification
+    .aria-label = Na ober van eus ar c'hemennoù
 plugins-blocked-plugin =
-    .message = This plugin has been disabled by { -app-name }.
+    .message = Lazhet eo bet an astenn-mañ gant { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Klask
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Enrollañ
+save-search-name-title = Enrollañ an enklask
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Adenvel an dastumadeg
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Aozañ an notenn
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Cheñch an doare teuliad
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/br/zotero/zotero.properties b/chrome/locale/br/zotero/zotero.properties
index ac72e06008..36e3e86f4c 100644
--- a/chrome/locale/br/zotero/zotero.properties
+++ b/chrome/locale/br/zotero/zotero.properties
@@ -61,8 +61,8 @@ general.useDefault=Implijout dre-ziouer
 general.openDocumentation=Digeriñ an titouroù
 general.numMore=%S ouzhpenn...
 general.openPreferences=Digeriñ an arventennoù
-general.keys.ctrlShift=KTRL+LKD+
-general.keys.cmdShift=KMD+LKD+
+general.keys.ctrlShift=KTRL+PENNLIZH+
+general.keys.cmdShift=KMD+PENNLIZH+
 general.dontShowAgain=Chom hep diskouez ken
 general.dontAskAgain=Na c'houlenn ken
 general.remindMeLater=Degas da soñj diwezhatoc'h
@@ -116,11 +116,11 @@ general.operationInProgress.waitUntilFinished=Gortozit betek ma vo echuet.
 general.operationInProgress.waitUntilFinishedAndTryAgain=Gortozit betek ma vo echuet ha klaskit en-dro.
 
 networkError.connectionNotSecure=Kevreañ diasur
-networkError.insecureConnectionTo=%1$S could not make a secure connection to %2$S.
+networkError.insecureConnectionTo=%1$S n'eus ket gellet diazezañ ur gevreadenn sur ouzh %2$S.
 networkError.errorViaProxy=Fazi en ur gevreañ dre ur servijer proksi
-networkError.connectionMonitored=Your connection is likely being monitored, and %S has not been configured to trust the intermediate server.
+networkError.connectionMonitored=Ho kevreadenn zo evezhiet moarvat, ha n'eo ket bet kefluniet %S evit kaout fiziañs er servijour etreat.
 
-about.createdBy=%1$S is a project of %2$S and is developed by a [global community].
+about.createdBy=%1$S a zo ur raktres eus %2$S ha diorroet eo gant ur [global community].
 about.openSource=%S is [open-source software] and depends on many [exceptional open-source projects].
 about.getInvolved=C'hoant ho peus reiñ an dorn? [Kemerit-perzh] bremañ!
 
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 bloavezh 'zo
 date.relative.yearsAgo.multiple=%S bloavezh 'zo
 
 pane.collections.title=Dastumadegoù
-pane.collections.delete.title=Dilemel an dastumadeg
-pane.collections.delete=Ha fellout a ra deoc'h dilemel da vat an dastumadeg diuzet?
-pane.collections.delete.keepItems=An elfennoù e-barzh an dastumadeg-mañ na vint ket dilamet.
-pane.collections.deleteWithItems.title=Dilemel an dastumadegoù hag an elfennoù
-pane.collections.deleteWithItems=Ha sur oc'h ho peus c'hoant dilemel an dastumadeg diuzet ha fiñval an holl elfennoù a zo e-barzh ar pod-lastez?
 pane.feed.deleteWithItems.title=Digoumanantiñ
 pane.feed.deleteWithItems=Ha sur oc'h ho peus c'hoant digoumanantiñ diwar ar froud-mañ?
 
-pane.collections.deleteSearch.title=Dilemel an enklask
-pane.collections.deleteSearch=Ha fellout a ra deoc'h dilemel da vat an enklask diuzet?
 pane.collections.emptyTrash=Ha fellout a ra deoc'h dilemel da virviken an elfennoù diuzet diwar ar pod-lastez?
 pane.collections.newSavedSeach=Enklask nevez enrollet
 pane.collections.savedSearchName=Skrivit un anv evit an enklask enrollet-mañ:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Doublennañ an elfennoù
 pane.collections.removeLibrary=Dilemel al levraoueg
 pane.collections.removeLibrary.text=Ha fellout a ra deoc'h dilemel "%S" da vat diwar an urzhiataer-mañ?
 
-pane.collections.menu.duplicate.savedSearch=Doublennañ an enklask enrollet
 pane.collections.menu.remove.library=Dilemel al levraoueg...
-pane.collections.menu.delete.collection=Dilemel an dastumadeg...
-pane.collections.menu.delete.collectionAndItems=Dilemel an dastumadeg hag hec'h elfennoù...
-pane.collections.menu.delete.savedSearch=Dilemel an enklask enrollet...
-pane.collections.menu.delete.feedAndItems=Digoumanantiñ diwar ar Froud...
-pane.collections.menu.export.collection=Ezporzhiañ an dastumadeg...
-pane.collections.menu.export.savedSearch=Ezporzhiañ an enklaskoù enrollet...
-pane.collections.menu.export.feed=Ezporzhiañ ar froud...
-pane.collections.menu.createBib.collection=Krouiñ ul levrlennadur diwar an dastumadeg...
-pane.collections.menu.createBib.savedSearch=Krouiñ ul levrlennadur diwar an enklask enrollet...
-pane.collections.menu.createBib.feed=Krouiñ ul levrlennadur adalek ar froud...
 pane.collections.showCollectionInLibrary=Diskouez an dastumadeg el levraoueg
 
-pane.collections.menu.generateReport.collection=Genel un danevell diwar an dastumadeg...
-pane.collections.menu.generateReport.savedSearch=Krouiñ un danevell adalek an enklask enrollet...
-pane.collections.menu.generateReport.feed=Genel un danevell diwar ar froud...
-
 pane.collections.menu.refresh.feed=Freskaat ar froud
 pane.collections.menu.refresh.allFeeds=Freskaat an holl froudoù
 pane.collections.menu.markAsRead.feed=Merkañ ar froud evel lennet
@@ -370,7 +348,7 @@ pane.items.menu.createParent.multiple=Krouiñ elfennoù kar
 pane.items.menu.renameAttachments=Adenvel ar restr diwar ar meta-roadenn kar
 pane.items.menu.renameAttachments.multiple=Adenvel ar restroù diwar ar meta-roadenn kar
 pane.items.menu.duplicateAndConvert.toBookSection=Krouiñ ur chabistr levr
-pane.items.menu.duplicateAndConvert.toBook=Create Book from Book Section
+pane.items.menu.duplicateAndConvert.toBook=Krouiñ ul levr diwar ur chabistr levr
 pane.items.menu.showInFeed=Diskouez er froud
 pane.items.showItemInLibrary=Diskouez an elfenn el levraoueg
 
@@ -418,13 +396,13 @@ pane.item.attachments.fileNotFound.text2.stored=Dleout a ra bezañ fiñvet pe di
 pane.item.attachments.fileNotFound.text2.stored.notOnServer=Dleout a ra bezañ fiñvet pe dilamet en diavaez eus %1$S, pe, m'eo bet ouzhpennet war un urzhiataer all, posupl eo ne vefe ket bet sinkroet da %2$S.
 pane.item.attachments.fileNotFound.text2.linked=Dleout a ra bezañ fiñvet pe dilamet er maez eus %1$S, pe ur Stagadenn Kavlec'h Diazez Liammet dleout a ra bezañ diazezet en un doare fall e-diabarzh unan hoc'h urzhiataer.
 pane.item.attachments.delete.confirm=Ha fellout a ra deoc'h dilemel da vat ar pezh-stag-mañ?
-pane.item.attachments.autoRelink.title=File Located Automatically
+pane.item.attachments.autoRelink.title=Restr lec'helaet ent-otomatek
 pane.item.attachments.autoRelink.text1=The file could not be found at the specified location, but a file with the same name was found within your Linked Attachment Base Directory:
 pane.item.attachments.autoRelink.text2=Lec'hiadur kozh: %S
 pane.item.attachments.autoRelink.text3=Lec'hiadur nevez: %S
 pane.item.attachments.autoRelink.text4=%1$S can automatically relink this attachment.
 pane.item.attachments.autoRelink.relink=Adliammañ
-pane.item.attachments.autoRelinkOthers.title=Additional Files Located
+pane.item.attachments.autoRelinkOthers.title=Restroù lec'helaet ouzhpenn
 pane.item.attachments.autoRelinkOthers.text=One other unlinked attachment in this library was found within the same directory. Relink this attachment as well?;%S other unlinked attachments in this library were found within the same directory. Relink all located attachments?
 pane.item.attachments.autoRelink.locateManually=Lec'helaat gant an dorn…
 pane.item.attachments.autoRelink.relinkAll=Adliammañ pep-tra
@@ -720,16 +698,10 @@ zotero.preferences.sync.reset.restartToComplete=Rankout a ra bezañ adloc'het Zo
 zotero.preferences.sync.reset.fileSyncHistory=Da vare ar sinkro da-heul, %1$S a geñverio an holl restroù stag e-barzh "%2$S" gant ar servijoù stokadur. An holl restroù stag a vank en un doare lec'hel a vo pellgarget, hag ar restroù stag lec'hel a vank a-bell a vo pellgaset.\n\nNeket ret an dibarzh-mañ evit un implij boaz.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Roll-istor ar sinkro "%S" a zo bet dilamet.
 
-zotero.preferences.search.rebuildIndex=Adsevel an indeks
-zotero.preferences.search.rebuildWarning=Ha fellout a ra deoc'h adsevel an indeks a-bezh? Kemer a raio amzer d'en ober.\n\nEvit indeksiñ elfennoù ha n'int ket bet indekset, hepken, implijit %S.
-zotero.preferences.search.clearIndex=Diverkañ an indeks
-zotero.preferences.search.clearWarning=Ur wech sklaeraet an indeks, ne vo ket posupl kas da benn enklaskoù war endalc'had ar pezhioù-stag.\n\nNe c'hello ket bezañ ad-indekset al liammoù web e pezh-stag hep mont da adwelet adarre ar bajenn. Evit mirout al liammoù web indekset, dibabit %S.
-zotero.preferences.search.clearNonLinkedURLs=Diverkañ pep-tra paneve al liammoù internet
-zotero.preferences.search.indexUnindexed=Indeksiñ an elfennoù nann-indekset
 zotero.preferences.export.quickCopy.citationStyles=Doare arroudenn
 zotero.preferences.export.quickCopy.exportFormats=Ezporzhiañ ar stummoù
 zotero.preferences.export.quickCopy.instructions=An Eilañ prim a ro an tu deoc'h da ezporzhiañ buan-tre an elfennoù en ur stumm roet. Gellout a rit eilañ an elfennoù diuzet er golver en ur bouezañ war %S pe rinklit an elfennoù war-eeun e-barzh ur voest testenn e-barzh ur program all.
-zotero.preferences.export.quickCopy.citationInstructions=Evit ar stiloù arroudenn e c'hallit eilañ an arroudennoù pe an notennoù-traoñ pajenn en ur bouezañ war %S pe en ur zerc'hel war Linkad a-raok rinklañ-stlejañ elfennoù.
+zotero.preferences.export.quickCopy.citationInstructions=Evit ar stiloù arroudenn e c'hallit eilañ an arroudennoù pe an notennoù-traoñ pajenn en ur bouezañ war %S pe en ur zerc'hel war pennlizh a-raok rinklañ-stlejañ elfennoù.
 zotero.preferences.export.quickCopy.note.htmlOptions.label=Testenn pinvidik/HTML
 
 zotero.preferences.wordProcessors.installationSuccess=Berzh en deus graet ar staliadur.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Rankout a rit enlakaat un arroudenn a-raok
 integration.error.mustInsertBibliography=Ranklout a rit enlakaat ul levrlennadur a-raok kas da benn an oberiadenn-mañ.
 integration.error.cannotInsertHere=N'hall ket bezañ enlakaet maeziennoù Zotero amañ.
 integration.error.notInCitation=Rankout a rit lakaat ar reti e-barzh un arroudenn Zotero evit aozañ anezhi.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Ar stil levrlennadur-mañ a-vremañ na dermen ket e mod ebet ul levrlennadur. Ma fell deoc'h ouzhpennañ ul levrlennadur, diuzit ur stil all mar plij.
 integration.error.deletePipe=Ar ganal implijet gant Zotero evit eskemm gant an treter testennoù n'eus ket gallet bezañ loc'het. Ha fellout a ra deoc'h e vefe klasket diskoulmañ ar gudenn-mañ gant Zotero ? Ho ker-tremen a vo goulennet diganeoc'h.
 integration.error.invalidStyle=Ar stil ho peus diuzet na ziskouez ket bezañ unan mat. M'ho peus krouet ar stil-mañ c'hwi-hoc'h-unan, klaskit gwelet hag-eñ e kenglot gant an termenoù gwiriekaat evel ma vezont deskrivet amañ: https://github.com/citation-style-language/styles/wiki/Validation. Klaskit ober gant ur stil all, mod-all.
@@ -941,9 +914,9 @@ integration.exportDocument.description1=Zotero a emdroio arroudennoù an teuliad
 integration.exportDocument.description2=Rankout a rafec'h ober un enrolladenn eus an teuliad a-raok kenderc'hel.
 integration.importInstructions=An arroudennoù Zotero en teuliad-mañ a zo bet emdroet en ur furmad a c'hall bezañ treuzkaset en un doare sur kenetre an tretourioù testennoù. Digorit an teuliad-mañ e-barzh an treter testennoù kemeret e kont ha pouezit war Freskaat e-barzh al lugant Zotero evit kenderc'hel da labourat gant an arroudennoù.
 integration.upgradeTemplate=The %S plugin for %S is outdated. Reinstall the plugin from Preferences → Cite → Word Processors.
-integration.mendeleyImport.title=Missing Mendeley Data
+integration.mendeleyImport.title=Roadennoù Mendeley a vank
 integration.mendeleyImport.description=%1$S detected that the document you are citing with contains Mendeley citations. %1$S will be able to manage these citations if you import your Mendeley database.
-integration.mendeleyImport.openImporter=Open Mendeley Importer...
+integration.mendeleyImport.openImporter=Digeriñ an emporzhier Mendeley...
 
 styles.install.title=Staliañ ar stil
 styles.install.unexpectedError=Ur fazi dic'hortoz a zo c'hoarvezet en ur staliañ "%1$S"
@@ -1175,7 +1148,7 @@ lookup.failureTooMany.description=Re a anaouadurioù. Ebarzhit un anaouader mar
 
 locate.online.label=Diskouez enlinenn
 locate.pdf.label=Digeriñ ar PDF
-locate.pdfNewWindow.label=Open PDF in New Window
+locate.pdfNewWindow.label=Digeriñ ar PDF en ur prenestr nevez
 locate.pdfNewTab.label=Digeriñ ur PDF en un ivinell nevez
 locate.snapshot.label=Diskouez an dapadenn
 locate.file.label=Diskouez ar restr
@@ -1391,8 +1364,8 @@ pdfReader.find=Kavout
 pdfReader.close=Serriñ
 pdfReader.showThumbnails=Diskouez ar skeudennig
 pdfReader.showOutline=Diskouez ezlinenn
-pdfReader.findPrevious=Find the previous occurrence of the phrase
-pdfReader.findNext=Find the next occurrence of the phrase
+pdfReader.findPrevious=Kavout okurañs kent ar frazenn
+pdfReader.findNext=Kavout okurañs da-heul ar frazenn
 pdfReader.toggleSidebar=Diskouez/kuzhat ar varrenn-gostez
 pdfReader.findInDocument=Klask er restr
 pdfReader.toggleContextPane=Diskouez/kuzhat ar banell gendestenn
@@ -1420,7 +1393,7 @@ pdfReader.theme.sepia=Sepia
 pdfReader.theme.dark=Teñval
 pdfReader.addTheme=Ouzhpennañ un tem
 pdfReader.scrollMode=Dibunañ
-pdfReader.spreadMode=Spreads
+pdfReader.spreadMode=Pajennadoù doubl
 pdfReader.flowMode=Pajenn aozañ
 pdfReader.columns=Bannoù
 pdfReader.splitView=Rannañ ar gweled
@@ -1448,11 +1421,11 @@ spellCheck.dictionaryManager.error.unableToInstall=N'heller ket staliañ “%S
 tabs.move=Fiñval an ivinell
 tabs.moveToStart=Fiñval d'an penn-kentañ
 tabs.moveToEnd=Fiñval d'ar fin
-tabs.moveToWindow=Move to New Window
+tabs.moveToWindow=Fiñval war-du ur prenestr nevez
 tabs.duplicate=Eilañ an ivinell
 tabs.undoClose=Addigeriñ an ivinell serret;Addigeriñ an ivinelloù serret
 tabs.closeOther=Serriñ an holl ivinelloù
 
-addons.emptyListMessage=Download plugins from the [Zotero plugins directory].
+addons.emptyListMessage=Pellgargañ an astennoù diwar [Zotero plugins directory].
 addons.remove.title=Dilemel %S?
 addons.remove.text=Ha sur oc'h ho peus c'hoant da zilemel %1$S diwar %2$S?
diff --git a/chrome/locale/ca-AD/zotero/integration.ftl b/chrome/locale/ca-AD/zotero/integration.ftl
index 8ff0da2ab5..a0d21b3f33 100644
--- a/chrome/locale/ca-AD/zotero/integration.ftl
+++ b/chrome/locale/ca-AD/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Sufix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omet l'autor
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Previsualització
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ca-AD/zotero/preferences.ftl b/chrome/locale/ca-AD/zotero/preferences.ftl
index f108f49233..4bcfb3f5e5 100644
--- a/chrome/locale/ca-AD/zotero/preferences.ftl
+++ b/chrome/locale/ca-AD/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Idioma i regió
 preferences-advanced-enable-bidi-ui =
     .label = Habilita les utilitats d'edició de text bidireccional
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Reverteix a la ubicació per defecte…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sincronitza
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ca-AD/zotero/searchbox.dtd b/chrome/locale/ca-AD/zotero/searchbox.dtd
index 50030c0807..17f95164c3 100644
--- a/chrome/locale/ca-AD/zotero/searchbox.dtd
+++ b/chrome/locale/ca-AD/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nom:">
 
-<!ENTITY zotero.search.searchInLibrary "Cerca a la biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Coincideix">
 <!ENTITY zotero.search.joinMode.any "qualsevol">
 <!ENTITY zotero.search.joinMode.all "totes">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dies">
 <!ENTITY zotero.search.date.units.months "mesos">
 <!ENTITY zotero.search.date.units.years "anys">
-
-<!ENTITY zotero.search.search "Cerca">
-<!ENTITY zotero.search.clear "Neteja">
-<!ENTITY zotero.search.saveSearch "Desa la cerca">
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index 075b8ca381..3f551fe977 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Esborra l'element...">
 <!ENTITY zotero.toolbar.newGroup "Grup nou...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Subcol·lecció nova...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nova cerca desada...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Buida la paperera">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostra/Oculta el selector d&apos;etiquetes">
 <!ENTITY zotero.toolbar.actions.label "Accions">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferències...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Assistència i documentació">
 <!ENTITY zotero.toolbar.about.label "Quant al Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Cerca avançada">
 <!ENTITY zotero.toolbar.openURL.label "Localitza">
 <!ENTITY zotero.toolbar.openURL.tooltip "Cerqueu-lo a la biblioteca local">
 
diff --git a/chrome/locale/ca-AD/zotero/zotero.ftl b/chrome/locale/ca-AD/zotero/zotero.ftl
index 9b55fab4c9..04024a4af4 100644
--- a/chrome/locale/ca-AD/zotero/zotero.ftl
+++ b/chrome/locale/ca-AD/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimeix
 general-remove = Elimina
 general-add = Afegeix
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Mostra les instruccions de resoluci
 general-go-back = Vés enrere
 general-accept = Accepta
 general-cancel = Cancel·la
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Mostra a la biblioteca
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Desa
 general-clear = Neteja
+clear-button =
+    .label = { general-clear }
 general-update = Actualitza
 general-back = Enrere
 general-edit = Edita
@@ -76,6 +86,8 @@ general-maroon = Vermelló
 general-gray = Gris
 general-black = Negre
 general-loading = S'està carregant…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Estil de la cita:
 language-label = Llengua:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Reanomena la col·lecció
-collections-menu-edit-saved-search =
-    .label = Edita la cerca desada
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edita la cerca desada
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Mou a
 collections-menu-copy-collection =
     .label = Copia a
+collections-menu-export =
+    .label = Exporta...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mou avall
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Cerca ràpida
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Cerca avançada
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Mostra com a
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Cerca
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotacions
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Condició de cerca
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valor
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Camps:
 search-conditions-collection = Col·lecció
 search-conditions-savedSearch = Cerca desada
 search-conditions-itemTypeID = Tipus d'element
 search-conditions-tag = Etiqueta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota filla
 search-conditions-creator = Creador
@@ -715,10 +897,26 @@ search-conditions-dateModified = Data de modificació
 search-conditions-fulltextContent = Contingut de l'adjunció
 search-conditions-programmingLanguage = Llengua de programació
 search-conditions-fileTypeID = Tipus de fitxer de l'adjunció
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Text d'anotació
 search-conditions-annotationComment = Comentari d'anotació
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Qualsevol camp
+search-conditions-titleCreatorYear = Títol, autor, any
+search-conditions-submenu-attachment = Adjunció
+search-conditions-submenu-annotation = Anotació
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tipus de fitxer
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tipus
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Vídeo
 file-type-presentation = Presentació
 file-type-document = Document
 file-type-ebook = Llibre electrònic
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Enganxa i cerca
 mac-word-plugin-install-message = El Zotero necessita accés a les dades del Word per a instal·lar el connector de Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Instal·la el connector del Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instal·la
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Cerca
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Desa
+save-search-name-title = Desa la cerca
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Reanomena la col·lecció
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edita la nota
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Canvia el tipus d'element
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 22367c08c0..0cdc979bb4 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Fa 1 any
 date.relative.yearsAgo.multiple=Fa %S anys
 
 pane.collections.title=Col·leccions
-pane.collections.delete.title=Suprimeix la col·lecció
-pane.collections.delete=Segur que voleu eliminar la col·lecció seleccionada?
-pane.collections.delete.keepItems=Els elements d'aquesta col·lecció no s'esborraran
-pane.collections.deleteWithItems.title=Esborra la col·lecció i els elements
-pane.collections.deleteWithItems=Segur que voleu esborrar la col·lecció seleccionada i enviar tots els elements que conté a la paperera?
 pane.feed.deleteWithItems.title=Cancel·la la subscripció
 pane.feed.deleteWithItems=Esteu segur que voleu cancel·lar la subscripció del canal?
 
-pane.collections.deleteSearch.title=Esborra la cerca
-pane.collections.deleteSearch=Segur que voleu eliminar la cerca seleccionada?
 pane.collections.emptyTrash=Segur que vols eliminar permanentment els elements de la paperera?
 pane.collections.newSavedSeach=Nova cerca desada
 pane.collections.savedSearchName=Entra un mom per aquesta cerca desada
@@ -277,24 +270,9 @@ pane.collections.duplicate=Elements duplicats
 pane.collections.removeLibrary=Suprimeix la biblioteca
 pane.collections.removeLibrary.text=Esteu segur que voleu suprimir permanentment el «%S» del vostre ordinador?
 
-pane.collections.menu.duplicate.savedSearch=Duplica la cerca desada
 pane.collections.menu.remove.library=Suprimeix la biblioteca…
-pane.collections.menu.delete.collection=Esborra la col·lecció...
-pane.collections.menu.delete.collectionAndItems=Esborra la col·lecció i els elements...
-pane.collections.menu.delete.savedSearch=Esborra la cerca desada...
-pane.collections.menu.delete.feedAndItems=Cancel·la la subscripció del canal…
-pane.collections.menu.export.collection=Exporta la col·lecció...
-pane.collections.menu.export.savedSearch=Exporta la cerca desada...
-pane.collections.menu.export.feed=Exporta el canal…
-pane.collections.menu.createBib.collection=Crea bibliografia d'una col·lecció…
-pane.collections.menu.createBib.savedSearch=Crea bibliografia d'una cerca desada…
-pane.collections.menu.createBib.feed=Crea bibliografia d'un canal…
 pane.collections.showCollectionInLibrary=Mostra la col·lecció en la biblioteca
 
-pane.collections.menu.generateReport.collection=Genera un informe a partir de la col·lecció...
-pane.collections.menu.generateReport.savedSearch=Genera un informe a partir de la cerca desada...
-pane.collections.menu.generateReport.feed=Genera un informe del canal…
-
 pane.collections.menu.refresh.feed=Refresca el canal
 pane.collections.menu.refresh.allFeeds=Refresca tots els canals
 pane.collections.menu.markAsRead.feed=Marca el canal com a llegit
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=S'ha de reiniciar Firefox per ta
 zotero.preferences.sync.reset.fileSyncHistory=En la sincronització següent, el %1$S comprovarà tots els fitxers adjunts en el «%2$S» respecte al dispositu d'emmagatzematge. Si hi ha cap fitxer d'adjunt remot que no hi sigui localment, es baixarà; i els fitxers adjunts locals que no hi siguin remotament, es pujaran.\n\nAquesta opció no és necessària durant l'ús normal.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=S'ha esborrat l'historial de sincronització de fitxers de «%S».
 
-zotero.preferences.search.rebuildIndex=Reconstrueix l'índex
-zotero.preferences.search.rebuildWarning=Voleu reconstruir l'índex sencer? Això pot tardar una mica.\n\nPer indexar només els elements que no han estat indexats feu servir %S.
-zotero.preferences.search.clearIndex=Neteja l'índex
-zotero.preferences.search.clearWarning=Després de netejar l'índex el contingut dels fitxers adjunts no serà cercable.\n\nEls enllaços web no es poden reindexar sense tornar a visitar la pàgina. Per a deixar els enllaços web indexats escull %S.
-zotero.preferences.search.clearNonLinkedURLs=Neteja-ho to excepte els enllaços web
-zotero.preferences.search.indexUnindexed=Indexa els elements no indexats
 zotero.preferences.export.quickCopy.citationStyles=Estils de cita
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportació
 zotero.preferences.export.quickCopy.instructions=La còpia ràpida us permet exportar elements ràpidament en un format donat. Podeu copiar elements seleccionats al porta-retalls prement %S o arrossegant elements directament en un quatre de text d'un altre programa.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Cal inserir una cita abans de realitzar aqu
 integration.error.mustInsertBibliography=Cal inserir una bibliografia abans de realitzar aquesta operació.
 integration.error.cannotInsertHere=Els camps del Zotero no es poden inserir aquí.
 integration.error.notInCitation=Cal situar el cursor en una cita de Zotero per a editar-la.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=L'estil bibliogràfic actual no defineix una bibliografia. Si voleu afegir una bibliografia, trieu un altre estil.
 integration.error.deletePipe=No s'ha pogut inicialitzar el conducte que Zotero utilitza per comunicar-se amb el processador de textos. Voleu que el Zotero intenti corregir aquest error? Se us demanarà la contrasenya.
 integration.error.invalidStyle=L'estil que heu seleccionat no sembla vàlid. Si heu creat aquest estil, assegureu-vos que passa la validació tal i com es descriu a https://github.com/citation-style-language/styles/wiki/Validation. Com a alternativa, proveu de seleccionar un altre estil.
diff --git a/chrome/locale/cs-CZ/zotero/integration.ftl b/chrome/locale/cs-CZ/zotero/integration.ftl
index 9fa97f38a1..71f678abff 100644
--- a/chrome/locale/cs-CZ/zotero/integration.ftl
+++ b/chrome/locale/cs-CZ/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Vynechat autora
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Náhled
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Knihovna
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/cs-CZ/zotero/preferences.ftl b/chrome/locale/cs-CZ/zotero/preferences.ftl
index 6511f697a0..a1177cf175 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.ftl
+++ b/chrome/locale/cs-CZ/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Jazyk a oblast
 preferences-advanced-enable-bidi-ui =
     .label = Povolit  nástroje pro úpravu obousměrného textu
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Návrat k výchozímu umístění...
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synchronizace
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/cs-CZ/zotero/searchbox.dtd b/chrome/locale/cs-CZ/zotero/searchbox.dtd
index 55fd51d4b3..63c8730cc6 100644
--- a/chrome/locale/cs-CZ/zotero/searchbox.dtd
+++ b/chrome/locale/cs-CZ/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Jméno:">
 
-<!ENTITY zotero.search.searchInLibrary "Hledat v knihovně:">
-
 <!ENTITY zotero.search.joinMode.prefix "Odpovídá">
 <!ENTITY zotero.search.joinMode.any "některému">
 <!ENTITY zotero.search.joinMode.all "všem">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dny">
 <!ENTITY zotero.search.date.units.months "měsíce">
 <!ENTITY zotero.search.date.units.years "roky">
-
-<!ENTITY zotero.search.search "Hledat">
-<!ENTITY zotero.search.clear "Vyčistit">
-<!ENTITY zotero.search.saveSearch "Uložit hledání">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index ed84a417d4..d33177dd95 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Odstranit položku...">
 <!ENTITY zotero.toolbar.newGroup "Nová skupina...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nová podkolekce...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nové Uložené hledání...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Vysypat koš">
 <!ENTITY zotero.toolbar.tagSelector.label "Ukázat/Skrýt Výběr štítků">
 <!ENTITY zotero.toolbar.actions.label "Akce">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Nastavení...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentace">
 <!ENTITY zotero.toolbar.about.label "O Zoteru">
-<!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhledávání">
 <!ENTITY zotero.toolbar.openURL.label "Najít">
 <!ENTITY zotero.toolbar.openURL.tooltip "Najít prostřednictvím vaší místní knihovny">
 
diff --git a/chrome/locale/cs-CZ/zotero/zotero.ftl b/chrome/locale/cs-CZ/zotero/zotero.ftl
index caf4fb5747..9477bdf772 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.ftl
+++ b/chrome/locale/cs-CZ/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Tisknout
 general-remove = Odstranit
 general-add = Přidat
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Zobrazit pokyny k řešení problém
 general-go-back = Vrátit zpět
 general-accept = Accept
 general-cancel = Zrušit
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Ukázat v knihovně
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restartovat v režimu řešení problémů
 general-save = Uložit
 general-clear = Vyčistit
+clear-button =
+    .label = { general-clear }
 general-update = Aktualizovat
 general-back = Zpátky
 general-edit = Upravit
@@ -76,6 +86,8 @@ general-maroon = Kaštanová
 general-gray = Šedá
 general-black = Černá
 general-loading = Nahrává se...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citační styl:
 language-label = Jazyk:
 menu-custom-group-submenu =
@@ -162,14 +174,112 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Přejmenovat kolekci
-collections-menu-edit-saved-search =
-    .label = Editovat Uložené hledání
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } kolekce vybrána
+        [few] { $count } kolekce vybrány
+        [many] { $count } kolekce vybrány
+       *[other] { $count } kolekce vybrány
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editovat Uložené hledání
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Přesunout do
 collections-menu-copy-collection =
     .label = Kopírovat do
+collections-menu-export =
+    .label = Export...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Posunout dolů
 item-creator-moveToTop =
@@ -282,6 +392,7 @@ import-online-relink-only =
     .label = Znovu propojit citace Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } se nepodařilo připojit k { $targetApp }. Zkontrolujte prosím své internetové připojení a zkuste to znovu.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -633,6 +744,18 @@ quicksearch-input =
     .aria-label = Rychlé hledání
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Pokročilé vyhledávání
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Zobrazit jako
 item-pane-header-none =
@@ -700,9 +823,64 @@ architecture-x64-on-arm64-action = Stáhnout { -app-name } pro ARM64
 first-run-guidance-authorMenu = { -app-name } umožňuje zadat také editory a překladatele. Výběrem z této nabídky můžete z autora udělat editora nebo překladatele.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Najít
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotace
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Vyhledávací podmínka
     .label = { $label }
@@ -712,11 +890,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Hodnota
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Pole:
 search-conditions-collection = Kolekce
 search-conditions-savedSearch = Uložené hledání
 search-conditions-itemTypeID = Typ položky
 search-conditions-tag = Štítek
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Poznámka
 search-conditions-childNote = Dceřiná poznámka
 search-conditions-creator = Tvůrce
@@ -735,10 +919,26 @@ search-conditions-dateModified = Upraveno dne
 search-conditions-fulltextContent = Obsah přílohy
 search-conditions-programmingLanguage = Programovací jazyk
 search-conditions-fileTypeID = Typ souboru přílohy
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Anotace text
 search-conditions-annotationComment = Anotace komentář
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Jakékoliv pole
+search-conditions-titleCreatorYear = Název, Tvůrce, Rok
+search-conditions-submenu-attachment = Příloha
+search-conditions-submenu-annotation = Anotace
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Typ souboru
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Typ
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } soubor přidán
@@ -776,6 +976,9 @@ file-type-video = Video
 file-type-presentation = Prezentace
 file-type-document = Dokument
 file-type-ebook = E-kniha
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -784,18 +987,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Vložit a vyhledat
 mac-word-plugin-install-message = K instalaci doplňku pro Word potřebuje Zotero přístup k datům Wordu.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Instalovat doplněk pro Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalovat
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -814,3 +1022,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Hledat
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Uložit
+save-search-name-title = Uložit hledání
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Přejmenovat kolekci
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Upravit poznámku
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Změnit typ položky
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index b076ff8986..3c8d90004c 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=před 1 rokem
 date.relative.yearsAgo.multiple=před %S roky
 
 pane.collections.title=Sbírky
-pane.collections.delete.title=Smazat kolekci
-pane.collections.delete=Chcete opravdu smazat zvolenou kolekci?
-pane.collections.delete.keepItems=Položky v této kolekci nebudou vymazány.
-pane.collections.deleteWithItems.title=Smazat kolekci a položky
-pane.collections.deleteWithItems=Jste si jistý, že chcete smazat vybranou kolekci a přesunout položky jež jsou v ní obsaženy do Koše?
 pane.feed.deleteWithItems.title=Odhlásit
 pane.feed.deleteWithItems=Jste si jisti, že chcete odhlásit z tohoto kanálu?
 
-pane.collections.deleteSearch.title=Smazat hledání
-pane.collections.deleteSearch=Chcete opravdu smazat vybrané vyhledávání?
 pane.collections.emptyTrash=Jste si jistí, že chcete permanentně odstranit položky z koše?
 pane.collections.newSavedSeach=Nové Uložené hledání
 pane.collections.savedSearchName=Zadejte jméno pro toto Uložené hledání:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicitní položky
 pane.collections.removeLibrary=Odstranit knihovnu
 pane.collections.removeLibrary.text=Opravdu chcete trvale odstranit “%S” z tohoto počítače?
 
-pane.collections.menu.duplicate.savedSearch=Duplikovat uložené hledání
 pane.collections.menu.remove.library=Odstranit knihovnu...
-pane.collections.menu.delete.collection=Smazat kolekci
-pane.collections.menu.delete.collectionAndItems=Smazat kolekci a položky
-pane.collections.menu.delete.savedSearch=Smazat uložené hledání...
-pane.collections.menu.delete.feedAndItems=Odhlásit kanál...
-pane.collections.menu.export.collection=Exportovat kolekci...
-pane.collections.menu.export.savedSearch=Exportovat Uložené hledání...
-pane.collections.menu.export.feed=Exportovat kanál...
-pane.collections.menu.createBib.collection=Vytvořit bibliografii z kolekce...
-pane.collections.menu.createBib.savedSearch=Vytvořit bibliografii z uloženého vyhledávání...
-pane.collections.menu.createBib.feed=Vytvořit bibliografii z kanálu...
 pane.collections.showCollectionInLibrary=Zobrazit kolekci v knihovně
 
-pane.collections.menu.generateReport.collection=Vytvořit zprávu z kolekce...
-pane.collections.menu.generateReport.savedSearch=Vytvořit zprávu z Uloženého hledání
-pane.collections.menu.generateReport.feed=Vytvořit zprávu z kanálu...
-
 pane.collections.menu.refresh.feed=Obnovit kanál
 pane.collections.menu.refresh.allFeeds=Obnovit všechny kanály
 pane.collections.menu.markAsRead.feed=Označit vlákno jako přečtené
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox musí být restartován
 zotero.preferences.sync.reset.fileSyncHistory=Při příští synchronizaci zkontroluje %1$S všechny soubory příloh v “%2$S” oproti vzdálenému úložišti. Všechny vzdálené přílohy, které chybí v lokálním úložišti budou staženy a lokální soubory chybějící ve vzdáleném úložišti, budou nahrány do úložiště.\n\nTato volba není nutná při běžném používání.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Historie synchronizace souborů pro “%S” byla vymazána.
 
-zotero.preferences.search.rebuildIndex=Znovu vytvořit celý index
-zotero.preferences.search.rebuildWarning=Chcete znovu vytvořit celý index? To může chvíli trvat.\n\nPro indexování pouze těch položek, které nebyly indexovány, použijte %S.
-zotero.preferences.search.clearIndex=Vymazat index
-zotero.preferences.search.clearWarning=Po vymazání indexu nebude nadále obsah příloh prohledavatelný.\n\nWebové odkazy nemohou být znovu indexovány bez opětovného navštívení stránky. Pro ponechání indexů u webových odkazů zvolte %S.
-zotero.preferences.search.clearNonLinkedURLs=Vymazat vše kromě webových odkazů
-zotero.preferences.search.indexUnindexed=Indexovat neindexované položky
 zotero.preferences.export.quickCopy.citationStyles=Citační styly
 zotero.preferences.export.quickCopy.exportFormats=Formáty exportu
 zotero.preferences.export.quickCopy.instructions=Rychlé kopírování vám umožní jednoduše kopírovat vybrané položky v daném formátu. Vybranou položku zkopírujete do schránky stisknutím %S nebo přetažením položek do textového pole v jiném programu.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Před provedením této operace musíte vlo
 integration.error.mustInsertBibliography=Před provedením této operace musíte vložit bibliografii.
 integration.error.cannotInsertHere=Na toto místo nemohou být vložena pole Zotera.
 integration.error.notInCitation=Abyste mohli editovat citaci Zotera, musíte nad ni umístit kurzor.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Aktuální bibliografický styl nedefinuje bibliografii. Pokud si přejete přidat bibliografii, zvolte prosím jiný styl.
 integration.error.deletePipe=Komponenta, pomocí které Zotero komunikuje s textovým procesorem nemohla být inicializována. Přejete si aby se Zotero pokusilo napravit tuto chybu? Budete požádáni o heslo.
 integration.error.invalidStyle=Zvolený styl zřejmě není platný. Pokud jste ho vytvořili sami, zkontrolujte ho prosím podle postupu z http://zotero.org/support/dev/citation_styles. Můžete také zvolit jiný styl.
diff --git a/chrome/locale/da-DK/zotero/integration.ftl b/chrome/locale/da-DK/zotero/integration.ftl
index 5145f3e46c..7f82402d46 100644
--- a/chrome/locale/da-DK/zotero/integration.ftl
+++ b/chrome/locale/da-DK/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Udelad forfatter/ophav
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/da-DK/zotero/preferences.ftl b/chrome/locale/da-DK/zotero/preferences.ftl
index 3f13807584..227e99791a 100644
--- a/chrome/locale/da-DK/zotero/preferences.ftl
+++ b/chrome/locale/da-DK/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synkronisér
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/da-DK/zotero/searchbox.dtd b/chrome/locale/da-DK/zotero/searchbox.dtd
index e6f543e6a8..32e957f918 100644
--- a/chrome/locale/da-DK/zotero/searchbox.dtd
+++ b/chrome/locale/da-DK/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Navn:">
 
-<!ENTITY zotero.search.searchInLibrary "Søg i bibliotek:">
-
 <!ENTITY zotero.search.joinMode.prefix "Match">
 <!ENTITY zotero.search.joinMode.any "enhver">
 <!ENTITY zotero.search.joinMode.all "alle">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dage">
 <!ENTITY zotero.search.date.units.months "måneder">
 <!ENTITY zotero.search.date.units.years "år">
-
-<!ENTITY zotero.search.search "Søg">
-<!ENTITY zotero.search.clear "Ryd">
-<!ENTITY zotero.search.saveSearch "Gem søgning">
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index d5ebe539b0..547e6604cf 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Fjern ...">
 <!ENTITY zotero.toolbar.newGroup "Ny Gruppe ...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Ny delsamling">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Ny gemt Søgning ...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Tøm papirkurv">
 <!ENTITY zotero.toolbar.tagSelector.label "Vis/skjul søgning på mærker">
 <!ENTITY zotero.toolbar.actions.label "Handlinger">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Indstillinger...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support og dokumentation">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Avanceret søgning">
 <!ENTITY zotero.toolbar.openURL.label "Find">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find gennem dit lokale bibliotek">
 
diff --git a/chrome/locale/da-DK/zotero/zotero.ftl b/chrome/locale/da-DK/zotero/zotero.ftl
index 88714d8893..97c74370f3 100644
--- a/chrome/locale/da-DK/zotero/zotero.ftl
+++ b/chrome/locale/da-DK/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Udskrift
 general-remove = Fjern
 general-add = Tilføj
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Annullér
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Vis i bibliotek
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Gem
 general-clear = Ryd
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Tilbage
 general-edit = Rediger
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Indlæser...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Reference-stil:
 language-label = Sprog:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Rediger gemt søgning
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Rediger gemt søgning
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Eksportér...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Flyt ned
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Hurtigsøgning
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Avanceret søgning
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Felter:
 search-conditions-collection = Samling
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Item Type
 search-conditions-tag = Mærke
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Underordnet note
 search-conditions-creator = Ophav
@@ -715,10 +897,26 @@ search-conditions-dateModified = Date Modified
 search-conditions-fulltextContent = Indhold i Vedhæftning
 search-conditions-programmingLanguage = Programmeringssprog
 search-conditions-fileTypeID = Filtype (vedhæftn.)
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Titel, Ophav, År
+search-conditions-submenu-attachment = Vedhæftning
+search-conditions-submenu-annotation = Annotering
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Filtype
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Forfatter/Ophav
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Præsentation
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Installér
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Søg
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Gem
+save-search-name-title = Gem søgning
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Redigér note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Change Item Type
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 806dd0bfd4..ddffbef2cf 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=for 1 år siden
 date.relative.yearsAgo.multiple=for %S år siden
 
 pane.collections.title=Collections
-pane.collections.delete.title=Slet samling
-pane.collections.delete=Er du sikker på, du vil slette den valgte samling?
-pane.collections.delete.keepItems=Elementer i denne samling vil ikke blive slettet.
-pane.collections.deleteWithItems.title=Slet samling og elementer
-pane.collections.deleteWithItems=Er du sikker på, du ønsker at slette den valgte samling og flytte alle elementer i den til papirkurven?
 pane.feed.deleteWithItems.title=Afmeld
 pane.feed.deleteWithItems=Er du sikker på, du vil afmeldes denne nyhedsstrøm?
 
-pane.collections.deleteSearch.title=Slet søgning
-pane.collections.deleteSearch=Er du sikker på, du vil slette den valgte søgning?
 pane.collections.emptyTrash=Er du sikker på, du vil slette elementerne i papirkurven permanent?
 pane.collections.newSavedSeach=Ny gemt søgning
 pane.collections.savedSearchName=Giv den gemte søgning et navn:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Dublet-elementer
 pane.collections.removeLibrary=Fjern bibliotek
 pane.collections.removeLibrary.text=Er du sikker på, du vil fjerne "%S" fra denne computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplikér gemt søgning
 pane.collections.menu.remove.library=Fjern bibliotek...
-pane.collections.menu.delete.collection=Slet samling...
-pane.collections.menu.delete.collectionAndItems=Slet samling og elementer...
-pane.collections.menu.delete.savedSearch=Slet gemt søgning...
-pane.collections.menu.delete.feedAndItems=Afmeld nyhedsstrøm...
-pane.collections.menu.export.collection=Eksportér en samling...
-pane.collections.menu.export.savedSearch=Eksportér en gemt søgning...
-pane.collections.menu.export.feed=Eksportér nyhedsstrøm...
-pane.collections.menu.createBib.collection=Opret referenceliste ud fra samling...
-pane.collections.menu.createBib.savedSearch=Opret referenceliste ud fra gemt søgning...
-pane.collections.menu.createBib.feed=Opret referenceliste ud fra nyhedsstrøm...
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Vis posterne i en samling...
-pane.collections.menu.generateReport.savedSearch=Vis posterne i en gemt søgning...
-pane.collections.menu.generateReport.feed=Opret rapport ud fra nyhedsstrøm...
-
 pane.collections.menu.refresh.feed=Opdatér nyhedsstrøm
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Markér nyhedsstrøm som læst
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox skal genstartes for at f
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Genopbyg indeks
-zotero.preferences.search.rebuildWarning=Ønsker du at gendanne det samlede indeks? Dette kan tage nogen tid.\n\nBrug %S for kun at indeksere de elementer, som ikke er indekseret.
-zotero.preferences.search.clearIndex=Ryd indeks
-zotero.preferences.search.clearWarning=Efter nulstilling af indekset vil indhold fra vedhæftede filer ikke længere være søgbare.\n\nWebhenvisningsvedhæftninger kan ikke genindekseres uden at besøge siden igen. For at lade webhenvisninger være indekserede skal du vælge %S.
-zotero.preferences.search.clearNonLinkedURLs=Fjern alle undtagen webhenvisninger
-zotero.preferences.search.indexUnindexed=Indeksér ikke-indekserede elementer
 zotero.preferences.export.quickCopy.citationStyles=Referenceformater
 zotero.preferences.export.quickCopy.exportFormats=Eksport-formater
 zotero.preferences.export.quickCopy.instructions=Med hurtigkopiering kan du eksportere elementer i et givent format. Du kan kopiere valgte elementer til udklipsholderen ved at trykke %S eller trække dem til en tekstboks i et andet program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Du skal indsætte en henvisning for at kunn
 integration.error.mustInsertBibliography=Du skal indsætte en referenceliste for at kunne udføre denne handling.
 integration.error.cannotInsertHere=Zotero-felter kan ikke sættes ind her.
 integration.error.notInCitation=Du må anbringe markøren i en Zotero-henvisning for at kunne redigere den.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Det nuværende bibliografiske format definerer ikke en referenceliste. Vælg et andet bibliografisk format for at tilføje en referenceliste.
 integration.error.deletePipe=Kanalen, som Zotero bruger til at kommunikere med tekstbehandlingsprogrammet, kunne ikke initialiseres. Vil du lade Zotero forsøge at rette fejlen? Du vil blive bedt om din adgangskode.
 integration.error.invalidStyle=Det bibliografiske format, som du har valgt, ser ikke ud til at være gyldigt. Hvis du har udarbejdet det selv, skal du sikre dig, at det lever op til kravene som beskrevet på https://github.com/citation-style-language/styles/wiki/Validation. Ellers må du vælge at andet format.
diff --git a/chrome/locale/de/zotero/fileRenaming.ftl b/chrome/locale/de/zotero/fileRenaming.ftl
index bc1a56f11b..600f4232b6 100644
--- a/chrome/locale/de/zotero/fileRenaming.ftl
+++ b/chrome/locale/de/zotero/fileRenaming.ftl
@@ -33,13 +33,13 @@ file-renaming-cancel-button =
     .label = { general-cancel }
 file-renaming-auto-rename-prompt-title = Einstellungen für Umbenennung wurde geändert
 file-renaming-auto-rename-prompt-body = Möchten Sie existierende Dateien in ihrer Bibliothek umbenennen, um sie an die neuen Einstellungen anzupassen?
-file-renaming-auto-rename-prompt-body-library = Would you like to rename existing files in library "{ $library }" to match the new settings?
+file-renaming-auto-rename-prompt-body-library = Sollen bestehende Dateien in der Bibliothek "{ $library }" umgenannt werden, um den neuen Einstellungen zu entsprechen?
 file-renaming-auto-rename-prompt-yes = { file-renaming-preview-changes }
 file-renaming-auto-rename-prompt-no = Existierende Dateinamen behalten
 file-renaming-preview-window =
     .title = Datei umbenennen
 file-renaming-preview-window-loading = Lädt...
 file-renaming-preview-window-intro = { -app-name } wird die folgenden Dateien in Ihrer Bibliothek umbenennen, um sie an deren übergeordneten Einträge anzupassen:
-file-renaming-preview-window-intro-library = { -app-name } will rename the following files in "{ $library }" to match their parent items:
+file-renaming-preview-window-intro-library = { -app-name } wird die folgenden Dateien in Ihrer "{ $library }" umbenennen, um sie an deren übergeordneten Einträge anzupassen:
 file-renaming-preview-window-renaming = Umbenennung…
 file-renaming-preview-window-no-files = Alle Dateinamen entsprechen bereits den übergeordneten Einträgen. Es sind keine Änderungen notwendig.
diff --git a/chrome/locale/de/zotero/integration.ftl b/chrome/locale/de/zotero/integration.ftl
index 19a7b86acd..7a517f5d74 100644
--- a/chrome/locale/de/zotero/integration.ftl
+++ b/chrome/locale/de/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Präfix
 integration-citationDialog-details-suppressAuthor = Autor auslassen
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Kommentare miteinbeziehen
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -40,8 +41,8 @@ integration-citationDialog-details-showInLibrary = { general-show-in-library }
 integration-citationDialog-settings-title = Zitationseinstellungen
 integration-citationDialog-lib-message-citation =
     { $search ->
-        [true] No selected, open, or cited items match the current search
-       *[other] No selected or open items
+        [true] Kein ausgewählter, geöffneter oder zitierter Eintrag entspricht der aktuellen Suche
+       *[other] Keine Einträge ausgewählt oder geöffnet
     }
 integration-citationDialog-lib-message-add-note =
     { $search ->
@@ -50,10 +51,14 @@ integration-citationDialog-lib-message-add-note =
     }
 integration-citationDialog-lib-message-annotations =
     { $search ->
-        [true] No items with annotations match the current search
-       *[other] No selected or open items with annotations
+        [true] Kein Eintrag mit Anmerkungen entspricht der aktuellen Suche
+       *[other] Kein Eintrag mit Anmerkungen ausgewählt oder geöffnet
     }
 integration-citationDialog-settings-keepSorted = Quellen sortiert lassen
+integration-citationDialog-preview-empty = Vorschau
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliothek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Drücken Sie die Tabulatortaste, um Elemente auszuwählen, die Sie zu diesem Zitat hinzufügen möchten. Drücken Sie die Escape-Taste, um die Änderungen zu verwerfen und das Dialogfeld zu schließen.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -101,7 +111,7 @@ integration-citationDialog-bubble-empty = (Kein Titel)
 integration-citationDialog-add-to-citation = Zur Zitation hinzufügen
 integration-citationDialog-annotations-filter =
     .placeholder = Anmerkungen filtern
-integration-citationDialog-annotations-empty = Select an item, attachment, or annotation to view annotation details
+integration-citationDialog-annotations-empty = Wählen Sie ein Element, einen Anhang oder eine Anmerkung aus, um die Details der Anmerkung anzuzeigen
 integration-prefs-displayAs-label = Literaturangaben anzeigen als:
 integration-prefs-footnotes =
     .label = Fußnoten
@@ -131,7 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = An den Dokumenten
 integration-warning-discard-changes = Änderungen verwerfen
 integration-warning-command-is-running = Ein Befehl der Integration des Textverarbeitungsprogramms wird bereits ausgeführt.
 first-run-guidance-citationDialog =
-    Geben Sie einen Titel, einen Autor und/oder ein Jahr ein, um nach einer Referenz zu suchen.
-    Nachdem Sie Ihre Auswahl getroffen haben, klicken Sie auf die Blase oder wählen Sie sie über die Tastatur aus und drücken Sie ↓/Leertaste, um Zitieroptionen wie Seitenzahl, Präfix und Suffix anzuzeigen.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Sie können auch eine Seitenzahl oder einen anderen Ortungsbegriff hinzufügen, indem Sie diesen in Ihre Suchbegriffe einfügen (z. B. „Geschichte { $locator }“) oder indem Sie ihn nach der Sprechblase eingeben und die Taste { return-or-enter } drücken.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/de/zotero/preferences.ftl b/chrome/locale/de/zotero/preferences.ftl
index a39ccc0a8a..4d9173db6a 100644
--- a/chrome/locale/de/zotero/preferences.ftl
+++ b/chrome/locale/de/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Sprache und Region
 preferences-advanced-enable-bidi-ui =
     .label = Werkzeuge für das Arbeiten mit bidirektionalem Text aktivieren
+preferences-advanced-data-dir =
+    .value = Datenverzeichnis:
 preferences-advanced-reset-data-dir =
     .label = Auf Standardverzeichnis zurücksetzen…
 preferences-advanced-custom-data-dir =
@@ -77,18 +79,18 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Standard: { $directory })
     .aria-label = Standardverzeichnis
-preferences-pane-account = Account
+preferences-pane-account = Benutzerkonto
 -preferences-sync-data-syncing = Daten-Synchronisierung
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
-preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
+preferences-sync-data-syncing-description = Mit Ihrem { -app-name }-Account einloggen, um Ihre Daten zwischen verschiedenen Geräten zu synchronisieren, mit Anderen zusammenzuarbeiten und mehr.
 preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
+preferences-sync-settings-intro = { -app-name } kann Ihre Bibliotheksdaten und Dateien zwischen Geräten synchronisieren. <label data-l10n-name="sync-link"> Mehr erfahren </label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Dateianhänge in Gruppen-Bibliotheken mit { -app-name } Storage synchronisieren
+preferences-sync-fileSyncing-tos = Durch die Benutzung von { -app-name } Storage, stimmen Sie den <label data-l10n-name="terms-link">Nutzungsbedingungen zu</label>.
 preferences-account-log-out =
     .label = Abmelden…
 preferences-sync-reset-restore-to-server-body = { -app-name } wird “{ $libraryName }” auf { $domain } mit Daten von diesem Computer ersetzen.
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = Lokale Daten entfernen
 preferences-account-switch-accept = Daten entfernen und neu starten.
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/de/zotero/reader.ftl b/chrome/locale/de/zotero/reader.ftl
index d77a31c556..928c363120 100644
--- a/chrome/locale/de/zotero/reader.ftl
+++ b/chrome/locale/de/zotero/reader.ftl
@@ -223,8 +223,8 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Ein unbekannter Fehler ist aufgetreten.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
-reader-read-aloud-error-daily-limit-exceeded = You have exceeded your daily limit for { -app-name } Voices.
+reader-read-aloud-error-network = Keine Verbindung zum Vorlese-Dienst möglich. Bitte überprüfen Sie die Internetverbindung.
+reader-read-aloud-error-daily-limit-exceeded = Du hast das Tageslimit für { -app-name } Voices überstiegen.
 reader-read-aloud-retry = Erneut versuchen
 reader-read-aloud-first-run-title = Wählen Sie Ihre bevorzugte Vorlese-Stimme:
 reader-read-aloud-first-run-voice-tier-local-bullet-os-provided = Stimmen, die von Ihrem Betriebssystem bereitgestellt werden
@@ -235,7 +235,7 @@ reader-read-aloud-first-run-voice-tier-standard-bullet-natural-sounding = Natür
 reader-read-aloud-first-run-voice-tier-standard-bullet-online-only = Nur mit einer Internetverbindung verfügbar
 reader-read-aloud-first-run-voice-tier-standard-bullet-account-required = Benötigt ein { -app-name }-Konto.
 reader-read-aloud-first-run-voice-tier-standard-bullet-limited-languages = Beschränkte Sprachauswahl
-reader-read-aloud-first-run-voice-tier-standard-bullet-no-multilingual = No multilingual support
+reader-read-aloud-first-run-voice-tier-standard-bullet-no-multilingual = Keine Mehrsprachigkeits-Unterstützung
 reader-read-aloud-first-run-voice-tier-standard-bullet-internal-processing = Der Ursprungstext verlässt die { -app-name }-Server nicht.
 reader-read-aloud-first-run-voice-tier-standard-bullet-unlimited-with-subscription = Unbegrenzte Nutzung mit einem { -subscription-name }-Abonnement.
 reader-read-aloud-first-run-voice-tier-premium-bullet-highest-quality = Hochwertigste Stimmen
@@ -245,10 +245,10 @@ reader-read-aloud-first-run-voice-tier-premium-bullet-broad-languages = Große S
 reader-read-aloud-first-run-voice-tier-premium-bullet-multilingual = Mehrsprachigkeits-Unterstützung
 reader-read-aloud-first-run-voice-tier-premium-bullet-external-processing = Der Ausgangstext wird von externen Text-to-Speech-Anbietern verarbeitet
 reader-read-aloud-first-run-voice-tier-premium-bullet-subscription-minutes = { -subscription-name }-Abonnements enthalten monatliche Kontingente für Premiumstimmen.
-reader-read-aloud-first-run-voice-tier-premium-bullet-beta-credits = Request credits for additional minutes during beta
-reader-read-aloud-sample-text = I am the local voice { $name }
+reader-read-aloud-first-run-voice-tier-premium-bullet-beta-credits = Während der Beta Credits für zusätzliche Minuten beantragen
+reader-read-aloud-sample-text = Ich bin die lokale Sprache  { $name }
 reader-read-aloud-voices-none-available = Keine Stimmen verfügbar
-reader-read-aloud-first-run-no-voices-for-language = { $tier } Voices do not support { $language }.
+reader-read-aloud-first-run-no-voices-for-language = { $tier } Voices unterstützt { $language } nicht.
 reader-read-aloud-region = Region
 reader-read-aloud-region-auto = Automatisch
 reader-read-aloud-annotation-popup-move = Anmerkung satzweise verschieben
diff --git a/chrome/locale/de/zotero/searchbox.dtd b/chrome/locale/de/zotero/searchbox.dtd
index 4426076605..2fcdde4493 100644
--- a/chrome/locale/de/zotero/searchbox.dtd
+++ b/chrome/locale/de/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Name:">
 
-<!ENTITY zotero.search.searchInLibrary "In Bibliothek suchen:">
-
 <!ENTITY zotero.search.joinMode.prefix "Ergebnisse finden mit">
 <!ENTITY zotero.search.joinMode.any "beliebigem">
 <!ENTITY zotero.search.joinMode.all "allen">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "Tage">
 <!ENTITY zotero.search.date.units.months "Monate">
 <!ENTITY zotero.search.date.units.years "Jahre">
-
-<!ENTITY zotero.search.search "Suchen">
-<!ENTITY zotero.search.clear "Zurücksetzen">
-<!ENTITY zotero.search.saveSearch "Suche speichern">
diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd
index e7dceb4879..aab8b04863 100644
--- a/chrome/locale/de/zotero/zotero.dtd
+++ b/chrome/locale/de/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Eintrag entfernen...">
 <!ENTITY zotero.toolbar.newGroup "Neue Gruppe...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Neue Untersammlung...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Neue gespeicherte Suche...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Papierkorb leeren">
 <!ENTITY zotero.toolbar.tagSelector.label "Tag-Auswahl anzeigen/ausblenden">
 <!ENTITY zotero.toolbar.actions.label "Aktionen">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Einstellungen...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hilfe und Dokumentation">
 <!ENTITY zotero.toolbar.about.label "Über Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Erweiterte Suche">
 <!ENTITY zotero.toolbar.openURL.label "Finden">
 <!ENTITY zotero.toolbar.openURL.tooltip "In lokaler Bibliothek finden">
 
diff --git a/chrome/locale/de/zotero/zotero.ftl b/chrome/locale/de/zotero/zotero.ftl
index 95c964dfef..ec202b6054 100644
--- a/chrome/locale/de/zotero/zotero.ftl
+++ b/chrome/locale/de/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Drucken
 general-remove = Entfernen
 general-add = Hinzufügen
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Anleitung zur Problembehebung anzeig
 general-go-back = Zurück
 general-accept = Akzeptieren
 general-cancel = Abbrechen
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = In Bibliothek anzeigen
 general-restartApp = { -app-name } neustarten
 general-restartInTroubleshootingMode = Im Problembehebungsmodus neustarten
 general-save = Speichern
 general-clear = Zurücksetzen
+clear-button =
+    .label = { general-clear }
 general-update = Aktualisieren
 general-back = Zurück
 general-edit = Bearbeiten
@@ -76,6 +86,8 @@ general-maroon = Braun
 general-gray = Grau
 general-black = Schwarz
 general-loading = Lädt...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Zitierstil:
 language-label = Sprache:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = { recently-read } anzeigen
 item-menu-remove-from-recently-read =
     .label = Aus { recently-read } entfernen…
-collections-menu-rename-collection =
-    .label = Sammlung umbenennen
-collections-menu-edit-saved-search =
-    .label = Gespeicherte Suche bearbeiten
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } Sammlung ausgewählt
+       *[other] { $count } Sammlungen ausgewählt
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Gespeicherte Suche bearbeiten
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Verschieben nach
 collections-menu-copy-collection =
     .label = Kopieren nach
+collections-menu-export =
+    .label = Exportieren...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Nach unten verschieben
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Zitationen aus Mendeley Desktop erneut vernküfen
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } konnte sich nicht mit { $targetApp } verbinden. Bitte überprüfen Sie Ihre Internetverbindung und wiederholen Sie den Vorgang.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Schnellsuche
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Erweiterte Suche
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Ansehen als
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = { -app-name } für ARM64 herunterladen
 first-run-guidance-authorMenu = { -app-name } ermöglicht es Ihnen, auch Herausgeber und Übersetzer anzugeben. Sie können einen Autor zum Übersetzer machen, indem Sie in diesem Menü die entsprechende Auswahl treffen.
 first-run-guidance-readAloud = { -app-name } kann jetzt Ihre Dokumente mit natürlich klingenden Stimmen vorlesen.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Suchen
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = Anmerkungen
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Suchbedingung
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Wert
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Felder:
 search-conditions-collection = Sammlung
 search-conditions-savedSearch = Gespeicherte Suche
 search-conditions-itemTypeID = Eintragsart
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Fußnote
 search-conditions-childNote = Unter-Notiz
 search-conditions-creator = Ersteller
@@ -715,10 +897,26 @@ search-conditions-dateModified = geändert am
 search-conditions-fulltextContent = Inhalt des Anhangs
 search-conditions-programmingLanguage = Programmiersprache
 search-conditions-fileTypeID = Dateityp des Anhangs
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Zuletzt gelesener Anhang
 search-conditions-annotationText = Text der Anmerkung
 search-conditions-annotationComment = Kommentar zur Anmerkung
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Beliebiges Feld
+search-conditions-titleCreatorYear = Titel, Verfasser, Jahr
+search-conditions-submenu-attachment = Anhang
+search-conditions-submenu-annotation = Anmerkung
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Dateityp
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Zuletzt gelesen
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Art
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } Datei hinzugefügt
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Vortrag
 file-type-document = Dokument
 file-type-ebook = eBook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Es wurde ein Update auf <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span> vorgenommen! Erfahren Sie mehr über die <a data-l10n-name="new-features-link">Änderungen</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Einfügen und suchen
 mac-word-plugin-install-message = Zotero muss auf die Daten von Word zugreifen, um das Word-Plugin zu installieren.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Word-Plugin installieren
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Installieren
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } synchronisiert nun automatisch die Dateinamen von angehängten Dateien mit den Einträgen, wenn diese geändert werden.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = Der { -app-name } Connector muss aktualisiert werden um mit dieser Version von { -app-name } zu funktionieren.
 userjs-pref-warning = Einige Einstellungen von { -app-name } wurden mit einer nicht unterstützten Methode überschrieben. { -app-name } wird diese zurücksetzen und neu starten.
 migrate-extra-fields-progress-message = Daten aus dem Extra-Feld in neue Felder migrieren
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Tags aufteilen
 long-tag-fixer-button-dont-split =
@@ -787,4 +993,141 @@ banner-close-button =
     .aria-label = Benachrichtigung verwerfen
 plugins-blocked-plugin =
     .message = Dieses Plugin wurde durch { -app-name } deaktiviert.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Das kann passieren, wenn das { -app-name } Datenverzeichnis in einem Cloudspeicher-Ordner (OneDrive, Dropbox etc.) oder in einem Netzwerkverzeichnis liegt.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Suche
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Speichern
+save-search-name-title = Suche speichern
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Sammlung umbenennen
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Notiz bearbeiten
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Eintragsart ändern
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index 70e6bf634f..bba19c6943 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=vor einem Jahr
 date.relative.yearsAgo.multiple=vor %S Jahren
 
 pane.collections.title=Sammlungen
-pane.collections.delete.title=Sammlung löschen
-pane.collections.delete=Sind Sie sicher, dass Sie die ausgewählte Sammlung löschen möchten?
-pane.collections.delete.keepItems=Einträge in dieser Sammlung werden nicht gelöscht.
-pane.collections.deleteWithItems.title=Sammlung und Einträge löschen
-pane.collections.deleteWithItems=Sind Sie sicher, dass Sie die ausgewählte Sammlung löschen und alle Einträge in den Papierkorb verschieben möchten.
 pane.feed.deleteWithItems.title=Abbestellen
 pane.feed.deleteWithItems=Sind Sie sicher, dass Sie diesen Feed abbestellen wollen?
 
-pane.collections.deleteSearch.title=Suche löschen
-pane.collections.deleteSearch=Sind Sie sicher, dass Sie die ausgewählte Suche löschen möchten?
 pane.collections.emptyTrash=Sind Sie sicher, dass Sie die Einträge endgültig aus dem Papierkorb löschen wollen?`
 pane.collections.newSavedSeach=Neue gespeicherte Suche
 pane.collections.savedSearchName=Geben Sie einen Namen für diese gespeicherte Suche an:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Eintragsdubletten
 pane.collections.removeLibrary=Lösche Bibliothek
 pane.collections.removeLibrary.text=Sind Sie sicher, dass Sie "%S" endgültig von diesem Computer löschen wollen?
 
-pane.collections.menu.duplicate.savedSearch=Doppelte gespeicherte Suche
 pane.collections.menu.remove.library=Lösche Bibliothek...
-pane.collections.menu.delete.collection=Sammlung löschen...
-pane.collections.menu.delete.collectionAndItems=Sammlung und Einträge löschen...
-pane.collections.menu.delete.savedSearch=Gespeicherte Suche löschen
-pane.collections.menu.delete.feedAndItems=Feed abbestellen...
-pane.collections.menu.export.collection=Sammlung exportieren...
-pane.collections.menu.export.savedSearch=Gespeicherte Suche exportieren...
-pane.collections.menu.export.feed=Feed exportieren...
-pane.collections.menu.createBib.collection=Bibliografie aus Sammlung erstellen...
-pane.collections.menu.createBib.savedSearch=Literaturverzeichnis aus gespeicherter Suche erstellen...
-pane.collections.menu.createBib.feed=Literaturverzeichnis aus Feed erstellen...
 pane.collections.showCollectionInLibrary=Sammlung in Bibliothek anzeigen
 
-pane.collections.menu.generateReport.collection=Bericht aus Sammlung erstellen...
-pane.collections.menu.generateReport.savedSearch=Bericht aus gespeicherter Suche erstellen...
-pane.collections.menu.generateReport.feed=Bericht aus Feed erstellen...
-
 pane.collections.menu.refresh.feed=Feed aktualisieren
 pane.collections.menu.refresh.allFeeds=Alle Feeds aktualisieren
 pane.collections.menu.markAsRead.feed=Feed as gelesen markieren
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox muss neugestartet werden
 zotero.preferences.sync.reset.fileSyncHistory=Bei der nächsten Synchronisation wird %1$S alle Dateianhänge in "%2$S" mit dem Speicherdienst vergleichen. Alle Dateianhänge auf dem entfernten Speicher die auf dem lokalen System fehlen werden heruntergeladen, alle lokal vorhandenen Dateianhänge die auf dem entfernten Speicher fehlen werden hochgeladen.\n\nDiese Option ist im normalen Betrieb nicht erforderlich.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Die Verlaufsgeschichte der Dateisynchronisierung von "%S" wurde zurückgesetzt
 
-zotero.preferences.search.rebuildIndex=Index neu aufbauen
-zotero.preferences.search.rebuildWarning=Wollen Sie den gesamten Index neu aufbauen? Dies kann eine Weile dauern.\n\nUm nur die noch nicht indizierten Einträge zu indizieren, verwenden Sie %S.
-zotero.preferences.search.clearIndex=Index löschen
-zotero.preferences.search.clearWarning=Nach dem Löschen des Indizes wird der Inhalt von Anhängen nicht mehr länger durchsuchbar sein.\n\nAnhänge aus Webseiten können neu indiziert werden, ohne die Seite neu aufzurufen. Um Weblinks indiziert zu belassen, wählen Sie %S.
-zotero.preferences.search.clearNonLinkedURLs=Alles außer Weblinks löschen
-zotero.preferences.search.indexUnindexed=Nicht-indizierte Einträge indizieren
 zotero.preferences.export.quickCopy.citationStyles=Zitierstile
 zotero.preferences.export.quickCopy.exportFormats=Export-Formate
 zotero.preferences.export.quickCopy.instructions=Schnelles Kopieren ermöglicht Ihnen, Einträge schnell in einem vorgegebenen Format zu exportieren. Sie können die ausgewählten Einträge durch Drücken von %S in die Zwischenablage kopieren oder Einträge direkt in ein Textfeld eines anderen Programms ziehen.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Sie müssen eine Zitation einfügen, bevor
 integration.error.mustInsertBibliography=Sie müssen ein Literaturverzeichnis einfügen, bevor Sie diese Operation durchführen.
 integration.error.cannotInsertHere=Zotero-Felder können hier nicht eingefügt werden.
 integration.error.notInCitation=Sie müssen den Cursor in einer Zotero-Zitation positionieren, um sie zu bearbeiten.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Der aktuelle Zitierstil definiert kein Literaturverzeichnis. Wenn Sie ein Literaturverzeichnis hinzufügen wollen, wählen Sie bitte einen anderen Stil aus.
 integration.error.deletePipe=Die Pipeline, durch die Zotero mit der Textverarbeitung kommuniziert konnte nicht initialisiert werden. Möchten Sie, dass Zotero versucht, den Fehler zu beheben? Sie müssen dazu Ihr Passwort eingeben.
 integration.error.invalidStyle=Der ausgewählte Stil scheint nicht gültig zu sein. Wenn Sie diesen Stil selbst erstellt haben, stellen Sie bitte sicher, dass er die unter http://zotero.org/support/dev/citation_styles beschriebene Validierung besteht. Ansonsten wählen Sie bitte einen anderen Stil.
diff --git a/chrome/locale/el-GR/zotero/integration.ftl b/chrome/locale/el-GR/zotero/integration.ftl
index 5c7676812e..ff1c7db172 100644
--- a/chrome/locale/el-GR/zotero/integration.ftl
+++ b/chrome/locale/el-GR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Βιβλιοθήκη
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/el-GR/zotero/preferences.ftl b/chrome/locale/el-GR/zotero/preferences.ftl
index 582f315dfe..86823408b2 100644
--- a/chrome/locale/el-GR/zotero/preferences.ftl
+++ b/chrome/locale/el-GR/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Συγχρονισμός
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/el-GR/zotero/searchbox.dtd b/chrome/locale/el-GR/zotero/searchbox.dtd
index 857fc0326e..33c7a0504d 100644
--- a/chrome/locale/el-GR/zotero/searchbox.dtd
+++ b/chrome/locale/el-GR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Όνομα:">
 
-<!ENTITY zotero.search.searchInLibrary "Αναζήτηση στην βιβλιοθήκη:">
-
 <!ENTITY zotero.search.joinMode.prefix "Ταίριασμα">
 <!ENTITY zotero.search.joinMode.any "οποιαδήποτε">
 <!ENTITY zotero.search.joinMode.all "όλες">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "ημέρες">
 <!ENTITY zotero.search.date.units.months "μήνες">
 <!ENTITY zotero.search.date.units.years "έτη">
-
-<!ENTITY zotero.search.search "Αναζήτηση">
-<!ENTITY zotero.search.clear "Καθαρισμός">
-<!ENTITY zotero.search.saveSearch "Αποθήκευση αναζήτησης">
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index 7021b1bbe4..79962da1fb 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Απομάκρυνση στοιχείου...">
 <!ENTITY zotero.toolbar.newGroup "Νέα ομάδα...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Νέα δευτερεύουσα συλλογή...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Νέα αποθηκευμένη αναζήτηση...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Άδειασμα κάδου ανακύκλωσης...">
 <!ENTITY zotero.toolbar.tagSelector.label "Εμφάνιση/Απόκρυψη επιλογέα ετικετών">
 <!ENTITY zotero.toolbar.actions.label "Ενέργειες">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Προτιμήσεις...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Υποστήριξη και Τεκμηρίωση">
 <!ENTITY zotero.toolbar.about.label "Σχετικά με το Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Προχωρημένη αναζήτηση">
 <!ENTITY zotero.toolbar.openURL.label "Εντοπισμός">
 <!ENTITY zotero.toolbar.openURL.tooltip "Αναζήτηση μέσα από την τοπική βιβλιοθήκη σας">
 
diff --git a/chrome/locale/el-GR/zotero/zotero.ftl b/chrome/locale/el-GR/zotero/zotero.ftl
index 0fb4da8311..4848f5dd54 100644
--- a/chrome/locale/el-GR/zotero/zotero.ftl
+++ b/chrome/locale/el-GR/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Εκτύπωση
 general-remove = Απομάκρυνση
 general-add = Προσθήκη
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Άκυρο
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Εμφάνιση στην Βιβλιοθήκη
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Αποθήκευση
 general-clear = Καθαρισμός
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Επιστροφή
 general-edit = Επεξεργασία
@@ -76,6 +86,8 @@ general-maroon = Μπορντό
 general-gray = Γκρι
 general-black = Μαύρο
 general-loading = Φόρτωση...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Στυλ παραπομπής:
 language-label = Γλώσσα:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Εξαγωγή...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Μετακίνηση Κάτω
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Γρήγορη αναζήτηση
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Προχωρημένη αναζήτηση
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Εύρεση
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = σχολιασμοί
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Πεδία:
 search-conditions-collection = Συλλογή
 search-conditions-savedSearch = Αποθηκευμένη Αναζήτηση
 search-conditions-itemTypeID = Τύπος Στοιχείου
 search-conditions-tag = Ετικέτα
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Σημείωση
 search-conditions-childNote = Θυγατρική Σημείωση
 search-conditions-creator = Δημιουργός
@@ -715,10 +897,26 @@ search-conditions-dateModified = Ημερομηνία Τροποποίησης
 search-conditions-fulltextContent = Attachment Content
 search-conditions-programmingLanguage = Γλώσσα προγραμματισμού
 search-conditions-fileTypeID = Attachment File Type
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Συνημμένο
+search-conditions-submenu-annotation = Annotation
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Τύπος Αρχείου
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Τύπος
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Συγγραφέας
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Βίντεο
 file-type-presentation = Παρουσίαση
 file-type-document = Έγγραφο
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Εγκατάσταση
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Αναζήτηση
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Αποθήκευση
+save-search-name-title = Αποθήκευση αναζήτησης
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Επεξεργασία Σημείωσης
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Αλλαγή Τύπου Στοιχείου
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index 2369d1405c..04d792681d 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Πριν από 1 έτος
 date.relative.yearsAgo.multiple=Πριν από %S έτη
 
 pane.collections.title=Συλλογές
-pane.collections.delete.title=Διαγραφή συλλογής
-pane.collections.delete=Είστε βέβαιοι ότι θέλετε να διαγράψετε την επιλεγμένη συλλογή;
-pane.collections.delete.keepItems=Τα στοιχεία αυτής της συλλογής δεν θα διαγραφούν.
-pane.collections.deleteWithItems.title=Διαγραφή Συλλογής και Αντικειμένων
-pane.collections.deleteWithItems=Είστε βέβαιοι ότι θέλετε να διαγράψετε την επιλεγμένη συλλογή και να μετακινήσετε όλα τα αντικείμενα μέσα σε αυτόν στον Κάδο Απορριμμάτων;
 pane.feed.deleteWithItems.title=Κατάργηση εγγραφής
 pane.feed.deleteWithItems=Είστε βέβαιοι ότι θέλετε να διαγραφείτε από αυτήν τη ροή;
 
-pane.collections.deleteSearch.title=Διαγραφή Αναζήτησης
-pane.collections.deleteSearch=Είστε βέβαιοι ότι θέλετε να διαγράψετε την επιλεγμένη αναζήτηση;
 pane.collections.emptyTrash=Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά στοιχεία στον Κάδο Απορριμμάτων;
 pane.collections.newSavedSeach=Νέα Αποθηκευμένη Αναζήτηση
 pane.collections.savedSearchName=Εισαγάγετε ένα όνομα για αυτήν την αποθηκευμένη αναζήτηση:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Διπλότυπα Στοιχεία
 pane.collections.removeLibrary=Κατάργηση Βιβλιοθήκης
 pane.collections.removeLibrary.text=Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά το "%S" από αυτόν τον υπολογιστή;
 
-pane.collections.menu.duplicate.savedSearch=Αποθηκευμένη Αναζήτηση Διπλότυπων
 pane.collections.menu.remove.library=Κατάργηση Βιβλιοθήκης...
-pane.collections.menu.delete.collection=Διαγραφή Συλλογής…
-pane.collections.menu.delete.collectionAndItems=Διαγραφή Συλλογής και Στοιχείων…
-pane.collections.menu.delete.savedSearch=Διαγραφή Αποθηκευμένης Αναζήτησης…
-pane.collections.menu.delete.feedAndItems=Κατάργηση εγγραφής από τη Ροή…
-pane.collections.menu.export.collection=Export Collection...
-pane.collections.menu.export.savedSearch=Export Saved Search...
-pane.collections.menu.export.feed=Εξαγωγή Ροής…
-pane.collections.menu.createBib.collection=Δημιουργία Βιβλιογραφίας από τη Συλλογή…
-pane.collections.menu.createBib.savedSearch=Δημιουργία Βιβλιογραφίας από την Αποθηκευμένη Αναζήτηση…
-pane.collections.menu.createBib.feed=Δημιουργία Βιβλιογραφίας από τη Ροή…
 pane.collections.showCollectionInLibrary=Εμφάνιση Συλλογής στη Βιβλιοθήκη
 
-pane.collections.menu.generateReport.collection=Generate Report from Collection...
-pane.collections.menu.generateReport.savedSearch=Generate Report from Saved Search...
-pane.collections.menu.generateReport.feed=Δημιουργία Αναφοράς από τη Ροή…
-
 pane.collections.menu.refresh.feed=Ανανέωση Ροής
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Σημείωση τροφοδοσίας ως αναγνωσμένης
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Rebuild Index
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Clear Index
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Clear All Except Web Links
-zotero.preferences.search.indexUnindexed=Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Πρέπει να εισαγάγετε μι
 integration.error.mustInsertBibliography=Πρέπει να εισαγάγετε μια βιβλιογραφία πριν από την εκτέλεση αυτής της λειτουργίας.
 integration.error.cannotInsertHere=Δεν είναι δυνατή η εισαγωγή πεδίων Zotero εδώ.
 integration.error.notInCitation=Πρέπει να τοποθετήσετε το δρομέα σας σε μια αναφορά Zotero για να την επεξεργαστείτε.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Το τρέχον βιβλιογραφικό στυλ δεν καθορίζει μία βιβλιογραφία. Εάν θέλετε να προσθέσετε μια βιβλιογραφία, επιλέξτε άλλο στυλ.
 integration.error.deletePipe=Δεν ήταν δυνατή η προετοιμασία της διόδου που χρησιμοποιεί το Zotero για να επικοινωνήσει με τον επεξεργαστή κειμένου. Θέλετε το Zotero να προσπαθήσει να διορθώσει αυτό το σφάλμα; Θα σας ζητηθεί ο κωδικός πρόσβασης.
 integration.error.invalidStyle=Το στυλ που έχετε επιλέξει δεν φαίνεται να είναι έγκυρο. Εάν έχετε δημιουργήσει αυτό το στυλ μόνοι σας, βεβαιωθείτε ότι περνά την επικύρωση όπως περιγράφεται στη διεύθυνση https://github.com/citation-style-language/styles/wiki/Validation. Εναλλακτικά, δοκιμάστε να επιλέξετε άλλο στυλ.
diff --git a/chrome/locale/en-GB/zotero/integration.ftl b/chrome/locale/en-GB/zotero/integration.ftl
index bd11f34c77..af962f6a05 100644
--- a/chrome/locale/en-GB/zotero/integration.ftl
+++ b/chrome/locale/en-GB/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Library
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/en-GB/zotero/preferences.ftl b/chrome/locale/en-GB/zotero/preferences.ftl
index cd0824ac10..7b8fa1b222 100644
--- a/chrome/locale/en-GB/zotero/preferences.ftl
+++ b/chrome/locale/en-GB/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/en-GB/zotero/searchbox.dtd b/chrome/locale/en-GB/zotero/searchbox.dtd
index 359a16d930..a25e0959ac 100644
--- a/chrome/locale/en-GB/zotero/searchbox.dtd
+++ b/chrome/locale/en-GB/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Name:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "Match">
 <!ENTITY zotero.search.joinMode.any "any">
 <!ENTITY zotero.search.joinMode.all "all">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "days">
 <!ENTITY zotero.search.date.units.months "months">
 <!ENTITY zotero.search.date.units.years "years">
-
-<!ENTITY zotero.search.search "Search">
-<!ENTITY zotero.search.clear "Clear">
-<!ENTITY zotero.search.saveSearch "Save Search">
diff --git a/chrome/locale/en-GB/zotero/zotero.dtd b/chrome/locale/en-GB/zotero/zotero.dtd
index 2be6f86bf9..9192b9c8e7 100644
--- a/chrome/locale/en-GB/zotero/zotero.dtd
+++ b/chrome/locale/en-GB/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item…">
 <!ENTITY zotero.toolbar.newGroup "New Group…">
 <!ENTITY zotero.toolbar.newSubcollection.label "New Subcollection…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "New Saved Search…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Empty Bin">
 <!ENTITY zotero.toolbar.tagSelector.label "Show/Hide Tag Selector">
 <!ENTITY zotero.toolbar.actions.label "Actions">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferences…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/en-GB/zotero/zotero.ftl b/chrome/locale/en-GB/zotero/zotero.ftl
index c6568a3164..f7f2a66349 100644
--- a/chrome/locale/en-GB/zotero/zotero.ftl
+++ b/chrome/locale/en-GB/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Print
 general-remove = Remove
 general-add = Add
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Cancel
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Show in Library
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = Clear
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Edit
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Loading…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citation Style:
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Quick Search
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Advanced Search
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Fields:
 search-conditions-collection = Collection
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Item Type
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Child Note
 search-conditions-creator = Creator
@@ -715,10 +897,26 @@ search-conditions-dateModified = Date Modified
 search-conditions-fulltextContent = Attachment Content
 search-conditions-programmingLanguage = Programming Language
 search-conditions-fileTypeID = Attachment File Type
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Attachment
+search-conditions-submenu-annotation = Annotation
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = File Type
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Author
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentation
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Install
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Search
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = Save Search
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Change Item Type
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/en-GB/zotero/zotero.properties b/chrome/locale/en-GB/zotero/zotero.properties
index e74d4b0e6a..301704788b 100644
--- a/chrome/locale/en-GB/zotero/zotero.properties
+++ b/chrome/locale/en-GB/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 year ago
 date.relative.yearsAgo.multiple=%S years ago
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Are you sure you want to delete the selected collection?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Bin?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Are you sure you want to delete the selected search?
 pane.collections.emptyTrash=Are you sure you want to permanently remove items in the Bin?
 pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Export Collection…
-pane.collections.menu.export.savedSearch=Export Saved Search…
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Generate Report from Collection…
-pane.collections.menu.generateReport.savedSearch=Generate Report from Saved Search…
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Rebuild Index
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Clear Index
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Clear All Except Web Links
-zotero.preferences.search.indexUnindexed=Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialised. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/en-US/zotero/fileRenaming.ftl b/chrome/locale/en-US/zotero/fileRenaming.ftl
index 7d71f5f1be..2a2f8bb64a 100644
--- a/chrome/locale/en-US/zotero/fileRenaming.ftl
+++ b/chrome/locale/en-US/zotero/fileRenaming.ftl
@@ -24,6 +24,7 @@ file-renaming-format-instructions-example = For example, "{ $example }" in this
 file-renaming-format-instructions-more = See the <label data-l10n-name="file-renaming-format-help-link">documentation</label> for more information.
 file-renaming-format-template = Filename Template:
 file-renaming-format-preview = Preview:
+file-renaming-template-invalid = This filename template contains a syntax error and won’t be used.
 file-renaming-preview-changes = Preview Changes…
 file-renaming-rename-files =
     .label = Rename Files
@@ -36,6 +37,9 @@ file-renaming-auto-rename-prompt-body = Would you like to rename existing files
 file-renaming-auto-rename-prompt-body-library = Would you like to rename existing files in library "{ $library }" to match the new settings?
 file-renaming-auto-rename-prompt-yes = { file-renaming-preview-changes }
 file-renaming-auto-rename-prompt-no = Keep Existing Filenames
+file-renaming-invalid-template-prompt-title = Invalid Filename Template
+file-renaming-invalid-template-prompt-body = The filename template contains a syntax error and cannot be saved. Would you like to reset it to the default template?
+file-renaming-invalid-template-prompt-body-library = The filename template for “{ $library }” contains a syntax error and cannot be saved. Would you like to reset it to the default template?
 file-renaming-preview-window =
     .title = Rename Files
 file-renaming-preview-window-loading = Loading…
diff --git a/chrome/locale/en-US/zotero/integration.ftl b/chrome/locale/en-US/zotero/integration.ftl
index 36b8d0b9a0..cd1142ae5c 100644
--- a/chrome/locale/en-US/zotero/integration.ftl
+++ b/chrome/locale/en-US/zotero/integration.ftl
@@ -30,6 +30,7 @@ integration-citationDialog-section-cited = { $count ->
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -41,14 +42,17 @@ integration-citationDialog-lib-message-citation = { $search ->
    *[other] No selected or open items
 }
 integration-citationDialog-lib-message-add-note = { $search ->
-    [true] No selected notes match the current search
-   *[other] No notes are selected
+    [true] No selected or open notes match the current search
+   *[other] No selected or open notes
 }
 integration-citationDialog-lib-message-annotations = { $search ->
     [true] No items with annotations match the current search
    *[other] No selected or open items with annotations
 }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Library
@@ -74,6 +78,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -89,9 +98,16 @@ integration-citationDialog-collections-table =
     .aria-label = Collections.
     .aria-description = Select a collection and press Tab to navigate its items.
 integration-citationDialog-items-table =
+    .title = { integration-citationDialog-add-to-citation-tooltip }
     .aria-label = { integration-citationDialog-enter-to-add-item }
 integration-citationDialog-items-table-added =
+    .title = { integration-citationDialog-add-to-citation-tooltip }
     .aria-label = This item has been added to the citation. Press { return-or-enter } to add it again or { delete-or-backspace } to remove it.
+integration-citationDialog-add-to-citation-tooltip =
+    { $count ->
+        [one] Add to Citation
+       *[other] Add { $count } Items to Citation
+    }
 integration-citationDialog-add-all = Add all
 integration-citationDialog-collapse-section =
     .title = Collapse section
diff --git a/chrome/locale/en-US/zotero/mozilla/menubar.ftl b/chrome/locale/en-US/zotero/mozilla/menubar.ftl
index abb880d901..9bdd78bbb0 100644
--- a/chrome/locale/en-US/zotero/mozilla/menubar.ftl
+++ b/chrome/locale/en-US/zotero/mozilla/menubar.ftl
@@ -11,6 +11,9 @@
 
 menu-application-preferences =
     .label = Preferences
+# Starting with macOS Ventura (13), the name of the "Preferences" menu item changed to "Settings".
+menu-application-settings =
+    .label = Settings…
 menu-application-services =
     .label = Services
 menu-application-hide-this =
diff --git a/chrome/locale/en-US/zotero/note-editor.ftl b/chrome/locale/en-US/zotero/note-editor.ftl
index da2db4c47d..1031b7e27a 100644
--- a/chrome/locale/en-US/zotero/note-editor.ftl
+++ b/chrome/locale/en-US/zotero/note-editor.ftl
@@ -35,6 +35,8 @@ note-editor-align = Align
 note-editor-align-left = Align Left
 note-editor-align-center = Align Center
 note-editor-align-right = Align Right
+note-editor-decrease-indent = Decrease Indent
+note-editor-increase-indent = Increase Indent
 note-editor-insert-citation = Insert Citation
 note-editor-go-to-page = Go to Page
 note-editor-show-item = Show Item
diff --git a/chrome/locale/en-US/zotero/preferences.ftl b/chrome/locale/en-US/zotero/preferences.ftl
index bb4d619697..a9ae6dbf8f 100644
--- a/chrome/locale/en-US/zotero/preferences.ftl
+++ b/chrome/locale/en-US/zotero/preferences.ftl
@@ -28,6 +28,15 @@ preferences-reader-ebook-font = Ebook font:
 preferences-reader-ebook-hyphenate =
     .label = Enable automatic hyphenation
 
+preferences-read-aloud-title = Read Aloud
+preferences-read-aloud-highlight-granularity = Highlight current
+preferences-read-aloud-highlight-granularity-paragraph =
+    .label = paragraph
+preferences-read-aloud-highlight-granularity-sentence =
+    .label = sentence
+preferences-read-aloud-highlight-granularity-word =
+    .label = word
+
 preferences-note-title = Notes
 preferences-note-open-in-new-window =
     .label = Open notes in new windows instead of tabs
@@ -77,6 +86,8 @@ preferences-citation-dialog-mode-library =
 preferences-advanced-enable-local-api =
     .label = Allow other applications on this computer to communicate with { -app-name }
 preferences-advanced-local-api-available = Available at <code data-l10n-name="url">{ $url }</span>
+preferences-advanced-local-api-clear-authorizations =
+    .label = Clear Write Authorizations
 preferences-advanced-server-disabled = The { -app-name } HTTP server is disabled.
 preferences-advanced-server-enable-and-restart =
     .label = Enable and Restart
@@ -145,3 +156,10 @@ preferences-account-switch-text =
     Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-attachments-indexed = Attachments indexed:
+fulltext-stats-partially-indexed = Partially indexed:
+fulltext-stats-not-available = Full-text content or file not available:
+fulltext-stats-notes-indexed = Notes indexed:
diff --git a/chrome/locale/en-US/zotero/reader.ftl b/chrome/locale/en-US/zotero/reader.ftl
index 5861fb133a..9dbc769ff9 100644
--- a/chrome/locale/en-US/zotero/reader.ftl
+++ b/chrome/locale/en-US/zotero/reader.ftl
@@ -22,9 +22,13 @@ reader-highlight-annotation-short = Highlight
 reader-underline-annotation = Underline annotation
 reader-underline-annotation-short = Underline
 reader-note-annotation = Note Annotation
+reader-note-annotation-short = Note
 reader-text-annotation = Text Annotation
+reader-text-annotation-short = Text
 reader-image-annotation = Image Annotation
+reader-image-annotation-short = Image
 reader-ink-annotation = Ink Annotation
+reader-ink-annotation-short = Ink
 reader-search-result-index = Search result
 reader-search-result-total = Total search results
 reader-draw = Draw
@@ -203,10 +207,10 @@ reader-page-options = Page Options
 reader-read-aloud = Read Aloud
 reader-read-aloud-from-here = Read Aloud from Here
 reader-read-aloud-options = Options
-reader-read-aloud-skip-back = Skip Back
-reader-read-aloud-skip-back-sentence = Skip Back by Sentence
-reader-read-aloud-skip-ahead = Skip Ahead
-reader-read-aloud-skip-ahead-sentence = Skip Ahead by Sentence
+reader-read-aloud-skip-back = Skip to Previous Paragraph
+reader-read-aloud-skip-back-sentence = Skip to Previous Sentence
+reader-read-aloud-skip-ahead = Skip to Next Paragraph
+reader-read-aloud-skip-ahead-sentence = Skip to Next Sentence
 reader-read-aloud-add-annotation = Annotate Sentence ({ $key1 }/{ $key2 })
 reader-read-aloud-play = Play
 reader-read-aloud-pause = Pause
diff --git a/chrome/locale/en-US/zotero/searchbox.dtd b/chrome/locale/en-US/zotero/searchbox.dtd
index f01c0d13bc..3c1deb7ff4 100644
--- a/chrome/locale/en-US/zotero/searchbox.dtd
+++ b/chrome/locale/en-US/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name				"Name:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix		"Match">
 <!ENTITY zotero.search.joinMode.any		"any">
 <!ENTITY zotero.search.joinMode.all		"all">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days		"days">
 <!ENTITY zotero.search.date.units.months	"months">
 <!ENTITY zotero.search.date.units.years	"years">
-
-<!ENTITY zotero.search.search				"Search">
-<!ENTITY zotero.search.clear					"Clear">
-<!ENTITY zotero.search.saveSearch			"Save Search">
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index e07c5fd99c..bde238d75e 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -82,7 +82,6 @@
 <!ENTITY zotero.toolbar.removeItem.label				"Remove Item…">
 <!ENTITY zotero.toolbar.newGroup						"New Group…">
 <!ENTITY zotero.toolbar.newSubcollection.label			"New Subcollection…">
-<!ENTITY zotero.toolbar.newSavedSearch.label			"New Saved Search…">
 <!ENTITY zotero.toolbar.emptyTrash.label				"Empty Trash">
 <!ENTITY zotero.toolbar.tagSelector.label			"Show/Hide Tag Selector">
 <!ENTITY zotero.toolbar.actions.label					"Actions">
@@ -93,7 +92,6 @@
 <!ENTITY zotero.toolbar.preferences.label				"Preferences…">
 <!ENTITY zotero.toolbar.supportAndDocumentation		"Support and Documentation">
 <!ENTITY zotero.toolbar.about.label					"About Zotero">
-<!ENTITY zotero.toolbar.advancedSearch				"Advanced Search">
 <!ENTITY zotero.toolbar.openURL.label					"Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip				"Find through your local library">
 
diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl
index df65a30cbf..0bad3e2b73 100644
--- a/chrome/locale/en-US/zotero/zotero.ftl
+++ b/chrome/locale/en-US/zotero/zotero.ftl
@@ -25,6 +25,12 @@ delete-or-backspace =
         [macos] Delete
         *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 
 general-print = Print
 general-remove = Remove
@@ -42,12 +48,17 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Cancel
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Show in Library
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = Clear
+clear-button =
+    .label = { general-clear }
 general-update = Update
+general-reset-to-default = Reset to Default
 general-back = Back
 general-edit = Edit
 general-cut = Cut
@@ -65,6 +76,9 @@ general-more-information = More Information
 general-warning = Warning
 general-type-to-continue = Type “{ $text }” to continue.
 general-continue = Continue
+general-allow = Allow
+general-always-allow = Always Allow
+general-deny = Deny
 
 general-red = Red
 general-orange = Orange
@@ -81,6 +95,9 @@ general-black = Black
 
 general-loading = Loading…
 
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
+
 citation-style-label = Citation Style:
 language-label = Language:
 
@@ -185,14 +202,116 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+collections-menu-clear-all-last-read =
+    .label = Clear All Last Read Dates…
+recently-read-clear-all-confirm = All Last Read dates in this library will be erased.
+
+items-list-load-error-plugin = Error loading items list. Disabling the “{ $plugin }” plugin and restarting { -app-name } may fix this.
+
+# Item list section headers for a multiple-row collection-tree selection within one library
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+# Item list section headers for a selection spanning multiple libraries, one per library
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label = { $count ->
+        [one] Delete Collection…
+       *[other] Delete Collections…
+    }
+collections-menu-delete-with-items =
+    .label = { $count ->
+        [one] Delete Collection and Items…
+       *[other] Delete Collections and Items…
+    }
+collections-menu-delete-search =
+    .label = { $count ->
+        [one] Delete Search…
+       *[other] Delete Searches…
+    }
+
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 
 item-creator-moveDown =
     .label = Move Down
@@ -243,6 +362,8 @@ item-button-view-online =
 
 file-renaming-file-renamed-to = File renamed to { $filename }
 
+file-access-error-fs-corrupted = { -os-name } reported that the file or disk is corrupted. Run a disk check on the drive containing the file.
+
 itembox-button-options =
     .tooltiptext = Open context menu
 itembox-button-merge =
@@ -313,7 +434,9 @@ file-interface-items-were-relinked = { $numRelinked ->
     *[other] { $numRelinked } items were relinked
     }
 
-import-mendeley-encrypted = The selected Mendeley database cannot be read, likely because it is encrypted. See <a data-l10n-name="mendeley-import-kb">How do I import a Mendeley library into Zotero?</a> for more information.
+import-mendeley-cannot-decrypt = The selected Mendeley database could not be decrypted. This can happen if the database file has been renamed. See <a data-l10n-name="mendeley-import-kb">How do I import a Mendeley library into Zotero?</a> for more information.
+import-mendeley-unsupported = The selected file does not appear to be a Mendeley database. See <a data-l10n-name="mendeley-import-kb">How do I import a Mendeley library into Zotero?</a> for more information.
+import-mendeley-db-in-use = The selected Mendeley database is in use. Please quit Mendeley Desktop and try again.
                             
 file-interface-import-error-translator = An error occurred importing the selected file with “{ $translator }”. Please ensure that the file is valid and try again.
 
@@ -327,6 +450,8 @@ import-online-relink-only =
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
 
+tab-title-multiple-collections = Multiple
+
 items-table-cell-notes =
     .aria-label = { $count ->
         [one] { $count } Note
@@ -431,6 +556,8 @@ styleEditor-editor =
 styleEditor-preview = 
     .aria-label = Preview
 
+stylePreview-generating = Generating previews…
+
 publications-intro-page = My Publications
 
 publications-intro = Items you add to My Publications will be shown on your profile page on zotero.org. If you choose to include attached files, they will be made publicly available under the license you specify. Only add work you yourself have created, and only include files if you have the rights to distribute them and wish to do so.
@@ -719,6 +846,19 @@ quicksearch-input =
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
 
+advanced-search = Advanced Search
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
+
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -780,9 +920,66 @@ first-run-guidance-authorMenu = { -app-name } lets you specify editors and trans
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+# Shown before the binding menu so a bound group reads "Match all of the following in the same
+# annotation" (the legacy "of the following:" -- with the colon -- is kept for a plain group)
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -793,11 +990,67 @@ advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
 
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
+
 search-conditions-tooltip-fields = Fields:
 search-conditions-collection = Collection
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Item Type
+
+# Words that can be typed before a colon in the search box to search a
+# particular field, as in "by:smith" or "year:2020". Comma-separated; keep them
+# short and lowercase, and don't reuse a word that means something else here.
+search-query-keyword-creator = by
+search-query-keyword-publication = in, publication, journal
+search-query-keyword-item-type = type
+search-query-keyword-language = lang
+search-query-keyword-abstract = abstract
+search-query-keyword-fulltext = fulltext, text
+search-query-keyword-date = year
+# Typed as "before:2020", meaning items dated before 2020
+search-query-keyword-date-before = before
+# Typed as "after:2020" or "since:2020", meaning items dated after 2020
+search-query-keyword-date-after = after, since
+# Typed as "added:", meaning when the item was saved to the library
+search-query-keyword-date-added = added
+search-query-keyword-date-modified = modified
+# Whole phrases that can be typed to find items that have none or some of
+# something. Each is a comma-separated list, and the phrases are matched
+# exactly as written, so include every form someone would type.
+search-query-keyword-no-annotations = no annotations
+search-query-keyword-has-annotations = has annotations
+search-query-keyword-no-notes = no notes
+search-query-keyword-has-notes = has notes
+search-query-keyword-no-tags = no tags
+search-query-keyword-has-tags = has tags
+search-query-keyword-no-attachments = no attachments
+search-query-keyword-has-attachments = has attachments
+# Words that join conditions typed in the search box, as in "tag:foo or
+# tag:bar", and that go before a condition to find items with or without
+# something, as in "no doi". Each is a comma-separated list of single words.
+search-query-keyword-and = and
+search-query-keyword-or = or
+search-query-keyword-no = no
+search-query-keyword-has = has
+# Units of time that can be typed after a number, as in "added in the last 3
+# days". Each is a comma-separated list; include every form someone would type.
+search-query-keyword-days = day, days
+search-query-keyword-weeks = week, weeks
+search-query-keyword-months = month, months
+search-query-keyword-years = year, years
+# Ways to type a range of dates or numbers in the search box, given as examples
+# with the two ends of the range filled in. Translate each example the way the
+# range is said, leaving the numbers where they belong in that phrasing.
+# Comma-separated, and each phrasing has to keep its own words: a range opened
+# with one word can't be finished with another one's.
+search-query-keyword-range = between 2020 and 2025, from 2020 to 2025, 2020 to 2025
+search-query-keyword-range-excluded = not between 2020 and 2025
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Child Note
 search-conditions-creator = Creator
@@ -816,10 +1069,32 @@ search-conditions-dateModified = Date Modified
 search-conditions-fulltextContent = Attachment Content
 search-conditions-programmingLanguage = Programming Language
 search-conditions-fileTypeID = Attachment File Type
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+
+# Submenu headings grouping the attachment- and annotation-level conditions
+search-conditions-submenu-attachment = Attachment
+search-conditions-submenu-annotation = Annotation
+
+# Labels for conditions shown within the Attachment and Annotation submenus,
+# where the submenu heading already supplies the "Attachment"/"Annotation"
+# context. The full names above are still shown once a condition is selected.
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = File Type
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Author
 
 find-pdf-files-added = { $count ->
     [one] { $count } file added
@@ -852,6 +1127,10 @@ file-type-presentation = Presentation
 file-type-document = Document
 file-type-ebook = Ebook
 
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
+
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -862,12 +1141,16 @@ text-action-paste-and-search =
     .label = Paste and Search
     
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Install
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
@@ -877,8 +1160,12 @@ connector-version-warning = The { -app-name } Connector must be updated to work
 
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 
+migrate-extra-fields-progress-headline = Updating Items…
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
 
+fulltext-indexing-progress-title = Indexing
+fulltext-indexing-progress-message = Full-text search results may be incomplete until indexing finishes.
+
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -900,3 +1187,158 @@ plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+
+login-manager-open-profile-directory = Open Profile Directory
+
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t use { -os-name } Credential Manager to securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service such as GNOME Keyring or KWallet is installed and running, and try again.
+    }
+
+os-keystore-read-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to read your saved credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t use { -os-name } Credential Manager to read your saved credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to read your saved credentials. Make sure a keyring service such as GNOME Keyring or KWallet is installed and running, and try again.
+    }
+
+os-keystore-read-unrecoverable =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t read your saved credentials from the { -os-name } Keychain.
+        [windows] { -app-name } couldn’t read your saved credentials from { -os-name } Credential Manager.
+       *[other] { -app-name } couldn’t read your saved credentials from your { -os-name } keyring.
+    } You’ll need to set up syncing again in the { -app-name } settings.
+
+os-keystore-save-unencrypted = { -app-name } can save your credentials unencrypted instead. Anyone with access to your { -app-name } profile folder would then be able to read them.
+
+os-keystore-save-unencrypted-button = Save Anyway
+
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service such as GNOME Keyring or KWallet is installed and running, and restart { -app-name }.
+    }
+
+search-button =
+    .label = Search
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+
+save-search-name-title = Save Search
+save-search-name-message = Enter a name for the saved search:
+
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+
+item-pane-batch-editing-clear-values = Clear all values
+
+item-pane-batch-editing-header = { $count ->
+    [one] Editing { $count } item
+   *[other] Editing { $count } items
+}
+
+item-pane-batch-editing-done =
+    .label = { general-done }
+
+undo-action-edit-metadata = { $count ->
+    [one] Edit Metadata
+   *[other] Edit Metadata for { $count } Items
+}
+undo-action-edit-field = { $count ->
+    [one] Edit of “{ $field }”
+   *[other] Edit of “{ $field }” for { $count } Items
+}
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash = { $count ->
+    [one] Trash Item
+   *[other] Trash { $count } Items
+}
+undo-action-restore-items = { $count ->
+    [one] Restore Item
+   *[other] Restore { $count } Items
+}
+undo-action-trash-collection = { $count ->
+    [one] Trash Collection
+   *[other] Trash { $count } Collections
+}
+undo-action-trash-search = { $count ->
+    [one] Trash Saved Search
+   *[other] Trash { $count } Saved Searches
+}
+undo-action-restore-collection = { $count ->
+    [one] Restore Collection
+   *[other] Restore { $count } Collections
+}
+undo-action-restore-objects = { $count ->
+    [one] Restore Object
+   *[other] Restore { $count } Objects
+}
+undo-action-add-to-collection = { $count ->
+    [one] Add to Collection
+   *[other] Add { $count } Items to Collection
+}
+undo-action-remove-from-collection = { $count ->
+    [one] Remove from Collection
+   *[other] Remove { $count } Items from Collection
+}
+undo-action-move-to-collection = { $count ->
+    [one] Move to Collection
+   *[other] Move { $count } Items to Collection
+}
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag = { $count ->
+    [one] Add Tag
+   *[other] Add Tag to { $count } Items
+}
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag = { $count ->
+    [one] Remove Tag
+   *[other] Remove Tag from { $count } Items
+}
+undo-action-remove-tags-from-item = { $count ->
+    [one] Remove Tag
+   *[other] Remove { $count } Tags
+}
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Change Item Type
+undo-action-change-parent-item = { $count ->
+    [one] Change Parent Item
+   *[other] Change Parent for { $count } Items
+}
+undo-action-convert-to-standalone = { $count ->
+    [one] Convert to Standalone
+   *[other] Convert { $count } Items to Standalone
+}
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items = { $count ->
+    [one] Merge Item
+   *[other] Merge { $count } Items
+}
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
+
+local-api-authorize-title = Local API Authorization
+local-api-authorize-text = “{ $appName }”, an application running on your computer, wants to modify your { -app-name } library.
diff --git a/chrome/locale/en-US/zotero/zotero.json b/chrome/locale/en-US/zotero/zotero.json
index b4bbc982ab..d6d12a04f4 100644
--- a/chrome/locale/en-US/zotero/zotero.json
+++ b/chrome/locale/en-US/zotero/zotero.json
@@ -23,6 +23,9 @@
 	"delete-or-backspace": {
 		"string": "{PLATFORM(), select, macos {Delete} other {Backspace}}"
 	},
+	"-os-name": {
+		"string": "{PLATFORM(), select, macos {macOS} windows {Windows} other {Linux}}"
+	},
 	"general-print": {
 		"string": "Print"
 	},
@@ -89,6 +92,9 @@
 	"general-update": {
 		"string": "Update"
 	},
+	"general-reset-to-default": {
+		"string": "Reset to Default"
+	},
 	"general-back": {
 		"string": "Back"
 	},
@@ -140,6 +146,15 @@
 	"general-continue": {
 		"string": "Continue"
 	},
+	"general-allow": {
+		"string": "Allow"
+	},
+	"general-always-allow": {
+		"string": "Always Allow"
+	},
+	"general-deny": {
+		"string": "Deny"
+	},
 	"general-red": {
 		"string": "Red"
 	},
@@ -179,6 +194,12 @@
 	"general-loading": {
 		"string": "Loading…"
 	},
+	"db-checking-integrity": {
+		"string": "Checking database integrity…"
+	},
+	"db-repairing": {
+		"string": "Repairing database…"
+	},
 	"citation-style-label": {
 		"string": "Citation Style:"
 	},
@@ -293,18 +314,93 @@
 	"item-menu-remove-from-recently-read.label": {
 		"string": "Remove from { recently-read }…"
 	},
-	"collections-menu-rename-collection.label": {
-		"string": "Rename Collection"
+	"collections-menu-clear-all-last-read.label": {
+		"string": "Clear All Last Read Dates…"
 	},
-	"collections-menu-edit-saved-search.label": {
+	"recently-read-clear-all-confirm": {
+		"string": "All Last Read dates in this library will be erased."
+	},
+	"items-section-collections-selected": {
+		"string": "{count, plural, one {{ count } collection selected} other {{ count } collections selected}}"
+	},
+	"items-section-searches-selected": {
+		"string": "{count, plural, one {{ count } saved search selected} other {{ count } saved searches selected}}"
+	},
+	"items-section-sources-selected": {
+		"string": "{count, plural, one {{ count } source selected} other {{ count } sources selected}}"
+	},
+	"items-section-library-collections": {
+		"string": "{count, plural, one {{ library } ({ count } collection selected)} other {{ library } ({ count } collections selected)}}"
+	},
+	"items-section-library-searches": {
+		"string": "{count, plural, one {{ library } ({ count } saved search selected)} other {{ library } ({ count } saved searches selected)}}"
+	},
+	"items-section-library-sources": {
+		"string": "{count, plural, one {{ library } ({ count } source selected)} other {{ library } ({ count } sources selected)}}"
+	},
+	"items-section-library-recently-read": {
+		"string": "{ library } ({ recently-read })"
+	},
+	"collections-menu-rename.label": {
+		"string": "Rename"
+	},
+	"edit-saved-search": {
 		"string": "Edit Saved Search"
 	},
+	"collections-menu-edit-search.label": {
+		"string": "Edit Search"
+	},
+	"collections-menu-duplicate-search.label": {
+		"string": "Duplicate Search"
+	},
 	"collections-menu-move-collection.label": {
 		"string": "Move To"
 	},
 	"collections-menu-copy-collection.label": {
 		"string": "Copy To"
 	},
+	"collections-menu-export.label": {
+		"string": "Export…"
+	},
+	"collections-menu-generate-report.label": {
+		"string": "Generate Report…"
+	},
+	"collections-menu-create-bibliography.label": {
+		"string": "Create Bibliography…"
+	},
+	"collections-menu-unsubscribe.label": {
+		"string": "Unsubscribe…"
+	},
+	"collections-menu-delete.label": {
+		"string": "{count, plural, one {Delete Collection…} other {Delete Collections…}}"
+	},
+	"collections-menu-delete-with-items.label": {
+		"string": "{count, plural, one {Delete Collection and Items…} other {Delete Collections and Items…}}"
+	},
+	"collections-menu-delete-search.label": {
+		"string": "{count, plural, one {Delete Search…} other {Delete Searches…}}"
+	},
+	"collections-delete-title": {
+		"string": "{count, plural, one {Delete Collection} other {Delete Collections}}"
+	},
+	"collections-delete-message": {
+		"string": "{count, plural, one {Are you sure you want to delete this collection?} other {Are you sure you want to delete { count } collections?}}"
+	},
+	"collections-delete-keep-items": {
+		"string": "{count, plural, one {Items within this collection will not be deleted.} other {Items within these collections will not be deleted.}}"
+	},
+	"collections-delete-with-items-title": {
+		"string": "{count, plural, one {Delete Collection and Items} other {Delete Collections and Items}}"
+	},
+	"collections-delete-with-items-message": {
+		"string": "{count, plural, one {Are you sure you want to delete this collection and move all items within it to the Trash?} other {Are you sure you want to delete { count } collections and move all items within them to the Trash?}}"
+	},
+	"collections-delete-search-title": {
+		"string": "{count, plural, one {Delete Search} other {Delete Searches}}"
+	},
+	"collections-delete-search-message": {
+		"string": "{count, plural, one {Are you sure you want to delete this search?} other {Are you sure you want to delete { count } searches?}}"
+	},
 	"item-creator-moveDown.label": {
 		"string": "Move Down"
 	},
@@ -458,6 +554,9 @@
 	"import-online-connection-error": {
 		"string": "{ app-name } could not connect to { targetApp }. Please check your internet connection and try again."
 	},
+	"tab-title-multiple-collections": {
+		"string": "Multiple"
+	},
 	"items-table-cell-notes.aria-label": {
 		"string": "{count, plural, one {{ count } Note} other {{ count } Notes}}"
 	},
@@ -935,6 +1034,18 @@
 	"quicksearch-input.aria-label": {
 		"string": "Quick Search"
 	},
+	"advanced-search": {
+		"string": "Advanced Search"
+	},
+	"advanced-search-close.tooltiptext": {
+		"string": "Close Advanced Search"
+	},
+	"advanced-search-expand.tooltiptext": {
+		"string": "Expand Advanced Search"
+	},
+	"advanced-search-collapse.tooltiptext": {
+		"string": "Collapse Advanced Search"
+	},
 	"item-pane-header-view-as.label": {
 		"string": "View As"
 	},
@@ -995,6 +1106,93 @@
 	"first-run-guidance-readAloud": {
 		"string": "{ app-name } can now read your documents to you using natural-sounding voices."
 	},
+	"advanced-search-remove-btn.tooltiptext": {
+		"string": "Remove Condition"
+	},
+	"advanced-search-add-btn.tooltiptext": {
+		"string": "Add Condition"
+	},
+	"advanced-search-group-btn.tooltiptext": {
+		"string": "Add Condition Group"
+	},
+	"advanced-search-remove-group-btn.tooltiptext": {
+		"string": "Remove Group"
+	},
+	"advanced-search-ungroup-btn.tooltiptext": {
+		"string": "Ungroup Conditions"
+	},
+	"advanced-search-result-level-menu.aria-label": {
+		"string": "Result type"
+	},
+	"advanced-search-result-level-prefix-root.value": {
+		"string": "Find"
+	},
+	"advanced-search-join-prefix-root.value": {
+		"string": "matching"
+	},
+	"advanced-search-result-level-any.label": {
+		"string": "any items"
+	},
+	"advanced-search-result-level-item.label": {
+		"string": "top-level items"
+	},
+	"advanced-search-result-level-attachment.label": {
+		"string": "attachments"
+	},
+	"advanced-search-result-level-note.label": {
+		"string": "notes"
+	},
+	"advanced-search-result-level-annotation.label": {
+		"string": "annotations"
+	},
+	"advanced-search-binding-menu.aria-label": {
+		"string": "Match against the same item"
+	},
+	"advanced-search-binding-separate.label": {
+		"string": "separately"
+	},
+	"advanced-search-binding-same-attachment.label": {
+		"string": "in the same attachment"
+	},
+	"advanced-search-binding-same-note.label": {
+		"string": "in the same note"
+	},
+	"advanced-search-binding-same-annotation.label": {
+		"string": "in the same annotation"
+	},
+	"advanced-search-of-the-following.value": {
+		"string": "of the following"
+	},
+	"advanced-search-binding-hint-attachment.value": {
+		"string": "These conditions can match separate attachments."
+	},
+	"advanced-search-binding-hint-note.value": {
+		"string": "These conditions can match separate notes."
+	},
+	"advanced-search-binding-hint-annotation.value": {
+		"string": "These conditions can match separate annotations."
+	},
+	"advanced-search-level-warning-mixed": {
+		"string": "These conditions cannot all match the same item, so this search will never return results. Try matching “{ matchAny }” of them, or set the result type to “{ topLevelItems }”."
+	},
+	"advanced-search-level-warning-unreachable": {
+		"string": "This search has a condition that cannot apply to the chosen result type. Set the result type to “{ topLevelItems }” or remove the incompatible condition."
+	},
+	"advanced-search-group-warning-unreachable": {
+		"string": "A condition here cannot be in the same {entity, select, attachment {attachment} note {note} annotation {annotation}}. Match these separately or remove the incompatible condition."
+	},
+	"advanced-search-group-warning-mixed": {
+		"string": "These conditions cannot all match the same item, so this group will never match. Try matching “{ matchAny }” of them, or set the result type to “{ topLevelItems }”."
+	},
+	"advanced-search-bind-same-attachment.label": {
+		"string": "Match the same attachment"
+	},
+	"advanced-search-bind-same-note.label": {
+		"string": "Match the same note"
+	},
+	"advanced-search-bind-same-annotation.label": {
+		"string": "Match the same annotation"
+	},
 	"advanced-search-conditions-menu.aria-label": {
 		"string": "Search condition"
 	},
@@ -1004,6 +1202,12 @@
 	"advanced-search-condition-input.aria-label": {
 		"string": "Value"
 	},
+	"search-operator-isEmpty": {
+		"string": "is empty"
+	},
+	"search-operator-isNotEmpty": {
+		"string": "is not empty"
+	},
 	"search-conditions-tooltip-fields": {
 		"string": "Fields:"
 	},
@@ -1019,6 +1223,18 @@
 	"search-conditions-tag": {
 		"string": "Tag"
 	},
+	"search-conditions-numTags": {
+		"string": "# of Tags"
+	},
+	"search-conditions-numNotes": {
+		"string": "# of Notes"
+	},
+	"search-conditions-numAttachments": {
+		"string": "# of Attachments"
+	},
+	"search-conditions-numAnnotations": {
+		"string": "# of Annotations"
+	},
 	"search-conditions-note": {
 		"string": "Note"
 	},
@@ -1073,6 +1289,9 @@
 	"search-conditions-fileTypeID": {
 		"string": "Attachment File Type"
 	},
+	"search-conditions-attachmentStorageType": {
+		"string": "Attachment Storage Type"
+	},
 	"search-conditions-lastRead": {
 		"string": "Attachment Last Read"
 	},
@@ -1082,9 +1301,54 @@
 	"search-conditions-annotationComment": {
 		"string": "Annotation Comment"
 	},
+	"search-conditions-annotationType": {
+		"string": "Annotation Type"
+	},
+	"search-conditions-annotationColor": {
+		"string": "Annotation Color"
+	},
+	"search-conditions-annotationAuthor": {
+		"string": "Annotation Author"
+	},
 	"search-conditions-anyField": {
 		"string": "Any Field"
 	},
+	"search-conditions-titleCreatorYear": {
+		"string": "Title, Creator, Year"
+	},
+	"search-conditions-submenu-attachment": {
+		"string": "Attachment"
+	},
+	"search-conditions-submenu-annotation": {
+		"string": "Annotation"
+	},
+	"search-conditions-short-fulltextContent": {
+		"string": "Content"
+	},
+	"search-conditions-short-fileTypeID": {
+		"string": "File Type"
+	},
+	"search-conditions-short-attachmentStorageType": {
+		"string": "Storage Type"
+	},
+	"search-conditions-short-lastRead": {
+		"string": "Last Read"
+	},
+	"search-conditions-short-annotationText": {
+		"string": "Text"
+	},
+	"search-conditions-short-annotationComment": {
+		"string": "Comment"
+	},
+	"search-conditions-short-annotationType": {
+		"string": "Type"
+	},
+	"search-conditions-short-annotationColor": {
+		"string": "Color"
+	},
+	"search-conditions-short-annotationAuthor": {
+		"string": "Author"
+	},
 	"find-pdf-files-added": {
 		"string": "{count, plural, one {{ count } file added} other {{ count } files added}}"
 	},
@@ -1127,6 +1391,15 @@
 	"file-type-ebook": {
 		"string": "Ebook"
 	},
+	"attachment-storage-type-storedFile": {
+		"string": "Stored File"
+	},
+	"attachment-storage-type-linkedFile": {
+		"string": "Linked File"
+	},
+	"attachment-storage-type-webLink": {
+		"string": "Web Link"
+	},
 	"post-upgrade-message": {
 		"string": "You’ve been upgraded to <span data-l10n-name=\"post-upgrade-appver\">{ app-name } { version }</span>! Learn about <a data-l10n-name=\"new-features-link\">what’s new</a>."
 	},
@@ -1136,9 +1409,21 @@
 	"mac-word-plugin-install-message": {
 		"string": "Zotero needs access to Word data to install the Word plugin."
 	},
+	"mac-word-plugin-install-folder-message": {
+		"string": "{ app-name } needs access to Word’s startup folder to install the Word plugin."
+	},
 	"mac-word-plugin-install-action-button.label": {
 		"string": "Install Word plugin"
 	},
+	"mac-word-plugin-install-folder-dialog-title": {
+		"string": "Install the plugin in the Word startup folder"
+	},
+	"mac-word-plugin-install-folder-dialog-button": {
+		"string": "Install"
+	},
+	"mac-word-plugin-install-wrong-folder-selected": {
+		"string": "The suggested folder must be selected. Please try again without choosing a different folder."
+	},
 	"file-renaming-banner-message": {
 		"string": "{ app-name } now automatically keeps attachment filenames in sync as you make changes to items."
 	},
@@ -1148,9 +1433,18 @@
 	"userjs-pref-warning": {
 		"string": "Some { app-name } settings have been overridden using an unsupported method. { app-name } will revert them and restart."
 	},
+	"migrate-extra-fields-progress-headline": {
+		"string": "Updating Items…"
+	},
 	"migrate-extra-fields-progress-message": {
 		"string": "Migrating new fields from Extra field"
 	},
+	"fulltext-indexing-progress-title": {
+		"string": "Indexing"
+	},
+	"fulltext-indexing-progress-message": {
+		"string": "Full-text search results may be incomplete until indexing finishes."
+	},
 	"long-tag-fixer-window-title.title": {
 		"string": "Split Tags"
 	},
@@ -1175,6 +1469,156 @@
 	"data-dir-unsupported-storage": {
 		"string": "This can happen if the { app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share."
 	},
+	"login-manager-reset": {
+		"string": "{ app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { app-name } settings."
+	},
+	"os-keystore-save-failed": {
+		"string": "{PLATFORM(), select, macos {{ app-name } couldn’t access the { os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.} windows {{ app-name } couldn’t securely save your credentials. Try again or restart { app-name }.} other {{ app-name } couldn’t access your { os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.}}"
+	},
+	"os-keystore-migrate-failed": {
+		"string": "{PLATFORM(), select, macos {{ app-name } couldn’t access the { os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { app-name }.} windows {{ app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { app-name } and try again.} other {{ app-name } couldn’t access your { os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { app-name }.}}"
+	},
+	"search-button.label": {
+		"string": "Search"
+	},
+	"save-search-new-button.label": {
+		"string": "Save Search…"
+	},
+	"save-search-edit-button.label": {
+		"string": "Save"
+	},
+	"save-search-name-title": {
+		"string": "Save Search"
+	},
+	"save-search-name-message": {
+		"string": "Enter a name for the saved search:"
+	},
+	"saved-search-close-confirmation-title": {
+		"string": "Editing Saved Search"
+	},
+	"saved-search-close-confirmation-body": {
+		"string": "Do you want to save changes you made to this saved search?"
+	},
+	"item-pane-batch-editing-prompt.aria-label": {
+		"string": "Batch editing"
+	},
+	"item-pane-batch-editing-enable.label": {
+		"string": "Edit Multiple Items…"
+	},
+	"item-pane-batch-editing-multiple-values-placeholder": {
+		"string": "Multiple"
+	},
+	"item-pane-batch-editing-clear-values": {
+		"string": "Clear all values"
+	},
+	"item-pane-batch-editing-header": {
+		"string": "{count, plural, one {Editing { count } item} other {Editing { count } items}}"
+	},
+	"undo-action-edit-metadata": {
+		"string": "{count, plural, one {Edit Metadata} other {Edit Metadata for { count } Items}}"
+	},
+	"undo-action-edit-field": {
+		"string": "{count, plural, one {Edit of “{ field }”} other {Edit of “{ field }” for { count } Items}}"
+	},
+	"undo-action-normalize-attachment-titles": {
+		"string": "Normalize Attachment Title"
+	},
+	"undo-action-trash": {
+		"string": "{count, plural, one {Trash Item} other {Trash { count } Items}}"
+	},
+	"undo-action-restore-items": {
+		"string": "{count, plural, one {Restore Item} other {Restore { count } Items}}"
+	},
+	"undo-action-trash-collection": {
+		"string": "{count, plural, one {Trash Collection} other {Trash { count } Collections}}"
+	},
+	"undo-action-trash-search": {
+		"string": "{count, plural, one {Trash Saved Search} other {Trash { count } Saved Searches}}"
+	},
+	"undo-action-restore-collection": {
+		"string": "{count, plural, one {Restore Collection} other {Restore { count } Collections}}"
+	},
+	"undo-action-restore-objects": {
+		"string": "{count, plural, one {Restore Object} other {Restore { count } Objects}}"
+	},
+	"undo-action-add-to-collection": {
+		"string": "{count, plural, one {Add to Collection} other {Add { count } Items to Collection}}"
+	},
+	"undo-action-remove-from-collection": {
+		"string": "{count, plural, one {Remove from Collection} other {Remove { count } Items from Collection}}"
+	},
+	"undo-action-move-to-collection": {
+		"string": "{count, plural, one {Move to Collection} other {Move { count } Items to Collection}}"
+	},
+	"undo-action-rename-collection": {
+		"string": "Rename Collection"
+	},
+	"undo-action-move-collection": {
+		"string": "Move Collection"
+	},
+	"undo-action-add-tag": {
+		"string": "{count, plural, one {Add Tag} other {Add Tag to { count } Items}}"
+	},
+	"undo-action-change-tag": {
+		"string": "Change Tag"
+	},
+	"undo-action-split-tag": {
+		"string": "Split Tag"
+	},
+	"undo-action-remove-tag": {
+		"string": "{count, plural, one {Remove Tag} other {Remove Tag from { count } Items}}"
+	},
+	"undo-action-remove-tags-from-item": {
+		"string": "{count, plural, one {Remove Tag} other {Remove { count } Tags}}"
+	},
+	"undo-action-remove-all-tags": {
+		"string": "Remove All Tags"
+	},
+	"undo-action-edit-note": {
+		"string": "Edit Note"
+	},
+	"undo-action-add-creator": {
+		"string": "Add Creator"
+	},
+	"undo-action-remove-creator": {
+		"string": "Remove Creator"
+	},
+	"undo-action-edit-creator": {
+		"string": "Edit Creator"
+	},
+	"undo-action-reorder-creator": {
+		"string": "Reorder Creator"
+	},
+	"undo-action-change-type": {
+		"string": "Change Item Type"
+	},
+	"undo-action-change-parent-item": {
+		"string": "{count, plural, one {Change Parent Item} other {Change Parent for { count } Items}}"
+	},
+	"undo-action-convert-to-standalone": {
+		"string": "{count, plural, one {Convert to Standalone} other {Convert { count } Items to Standalone}}"
+	},
+	"undo-action-add-related": {
+		"string": "Add Related"
+	},
+	"undo-action-remove-related": {
+		"string": "Remove Related"
+	},
+	"undo-action-merge-items": {
+		"string": "{count, plural, one {Merge Item} other {Merge { count } Items}}"
+	},
+	"menu-edit-undo-action": {
+		"string": "Undo { action }"
+	},
+	"menu-edit-redo-action": {
+		"string": "Redo { action }"
+	},
+	"local-api-authorize-title": {
+		"string": "Local API Authorization"
+	},
+	"local-api-authorize-text": {
+		"string": "“{ appName }”, an application running on your computer, wants to modify your { app-name } library."
+	},
 	"preferences-window.title": {
 		"string": "{ app-name } Settings"
 	},
@@ -1223,6 +1667,21 @@
 	"preferences-reader-ebook-hyphenate.label": {
 		"string": "Enable automatic hyphenation"
 	},
+	"preferences-read-aloud-title": {
+		"string": "Read Aloud"
+	},
+	"preferences-read-aloud-highlight-granularity": {
+		"string": "Highlight current"
+	},
+	"preferences-read-aloud-highlight-granularity-paragraph.label": {
+		"string": "paragraph"
+	},
+	"preferences-read-aloud-highlight-granularity-sentence.label": {
+		"string": "sentence"
+	},
+	"preferences-read-aloud-highlight-granularity-word.label": {
+		"string": "word"
+	},
 	"preferences-note-title": {
 		"string": "Notes"
 	},
@@ -1301,6 +1760,9 @@
 	"preferences-advanced-local-api-available": {
 		"string": "Available at <code data-l10n-name=\"url\">{ url }</span>"
 	},
+	"preferences-advanced-local-api-clear-authorizations.label": {
+		"string": "Clear Write Authorizations"
+	},
 	"preferences-advanced-server-disabled": {
 		"string": "The { app-name } HTTP server is disabled."
 	},
@@ -1397,6 +1859,24 @@
 	"preferences-account-switch-accept": {
 		"string": "Remove Data and Restart"
 	},
+	"fulltext-index-status-indexing": {
+		"string": "Indexing { indexed } of { total }…"
+	},
+	"fulltext-index-status-complete": {
+		"string": "Search index is up to date"
+	},
+	"fulltext-stats-attachments-indexed": {
+		"string": "Attachments indexed:"
+	},
+	"fulltext-stats-partially-indexed": {
+		"string": "Partially indexed:"
+	},
+	"fulltext-stats-not-available": {
+		"string": "Full-text content or file not available:"
+	},
+	"fulltext-stats-notes-indexed": {
+		"string": "Notes indexed:"
+	},
 	"scaffold-translator-output.aria-label": {
 		"string": "Console"
 	},
@@ -1848,16 +2328,16 @@
 		"string": "Options"
 	},
 	"reader-read-aloud-skip-back": {
-		"string": "Skip Back"
+		"string": "Skip to Previous Paragraph"
 	},
 	"reader-read-aloud-skip-back-sentence": {
-		"string": "Skip Back by Sentence"
+		"string": "Skip to Previous Sentence"
 	},
 	"reader-read-aloud-skip-ahead": {
-		"string": "Skip Ahead"
+		"string": "Skip to Next Paragraph"
 	},
 	"reader-read-aloud-skip-ahead-sentence": {
-		"string": "Skip Ahead by Sentence"
+		"string": "Skip to Next Sentence"
 	},
 	"reader-read-aloud-add-annotation": {
 		"string": "Annotate Sentence ({ key1 }/{ key2 })"
@@ -2069,6 +2549,9 @@
 	"integration-citationDialog-details-suppressAuthor": {
 		"string": "Omit Author"
 	},
+	"integration-citationDialog-details-locator-info": {
+		"string": "Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name=\"docs-link\">Learn more</a>"
+	},
 	"integration-citationDialog-details-includeComments": {
 		"string": "Include Comments"
 	},
@@ -2079,7 +2562,7 @@
 		"string": "{search, select, true {No selected, open, or cited items match the current search} other {No selected or open items}}"
 	},
 	"integration-citationDialog-lib-message-add-note": {
-		"string": "{search, select, true {No selected notes match the current search} other {No notes are selected}}"
+		"string": "{search, select, true {No selected or open notes match the current search} other {No selected or open notes}}"
 	},
 	"integration-citationDialog-lib-message-annotations": {
 		"string": "{search, select, true {No items with annotations match the current search} other {No selected or open items with annotations}}"
@@ -2087,6 +2570,12 @@
 	"integration-citationDialog-settings-keepSorted": {
 		"string": "Keep sources sorted"
 	},
+	"integration-citationDialog-preview-error": {
+		"string": "Preview unavailable"
+	},
+	"integration-citationDialog-btn-displayPreview.title": {
+		"string": "Display citation preview"
+	},
 	"integration-citationDialog-mode-library": {
 		"string": "Library"
 	},
@@ -2117,6 +2606,9 @@
 	"integration-citationDialog-single-input-citation.aria-description": {
 		"string": "Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog."
 	},
+	"integration-citationDialog-just-added-input-placeholder": {
+		"string": "Type “10-15” to cite pages, or search for items"
+	},
 	"integration-citationDialog-single-input-add-note.placeholder": {
 		"string": "Search for a note to insert into the document"
 	},
@@ -2138,6 +2630,9 @@
 	"integration-citationDialog-items-table-added.aria-label": {
 		"string": "This item has been added to the citation. Press { return-or-enter } to add it again or { delete-or-backspace } to remove it."
 	},
+	"integration-citationDialog-add-to-citation-tooltip": {
+		"string": "{count, plural, one {Add to Citation} other {Add { count } Items to Citation}}"
+	},
 	"integration-citationDialog-add-all": {
 		"string": "Add all"
 	},
@@ -2211,7 +2706,7 @@
 		"string": "A word processor integration command is already running."
 	},
 	"first-run-guidance-citationDialog": {
-		"string": "Type a title, author, and/or year to search for a reference.\n\nAfter you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.\n\nYou can also add a page number or other locator by including it with your search terms (e.g., “history { locator }”) or by typing it after the bubble and pressing { return-or-enter }."
+		"string": "Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.\n\nYou can also add a page number or other locator by including it with your search terms (e.g., “history { locator }”) or by typing it after the bubble and pressing { return-or-enter }."
 	},
 	"note-editor-set": {
 		"string": "Set"
@@ -2489,6 +2984,9 @@
 	"file-renaming-format-preview": {
 		"string": "Preview:"
 	},
+	"file-renaming-template-invalid": {
+		"string": "This filename template contains a syntax error and won’t be used."
+	},
 	"file-renaming-preview-changes": {
 		"string": "Preview Changes…"
 	},
@@ -2507,6 +3005,15 @@
 	"file-renaming-auto-rename-prompt-no": {
 		"string": "Keep Existing Filenames"
 	},
+	"file-renaming-invalid-template-prompt-title": {
+		"string": "Invalid Filename Template"
+	},
+	"file-renaming-invalid-template-prompt-body": {
+		"string": "The filename template contains a syntax error and cannot be saved. Would you like to reset it to the default template?"
+	},
+	"file-renaming-invalid-template-prompt-body-library": {
+		"string": "The filename template for “{ library }” contains a syntax error and cannot be saved. Would you like to reset it to the default template?"
+	},
 	"file-renaming-preview-window.title": {
 		"string": "Rename Files"
 	},
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 81dff45f67..de5370f78b 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -251,16 +251,9 @@ date.relative.yearsAgo.one				= 1 year ago
 date.relative.yearsAgo.multiple			= %S years ago
 
 pane.collections.title          = Collections
-pane.collections.delete.title    = Delete Collection
-pane.collections.delete			= Are you sure you want to delete the selected collection?
-pane.collections.delete.keepItems = Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title = Delete Collection and Items
-pane.collections.deleteWithItems = Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title = Unsubscribe
 pane.feed.deleteWithItems = Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title = Delete Search
-pane.collections.deleteSearch    = Are you sure you want to delete the selected search?
 pane.collections.emptyTrash		= Are you sure you want to permanently remove items in the Trash?
 pane.collections.newSavedSeach	= New Saved Search
 pane.collections.savedSearchName = Enter a name for this saved search:
@@ -278,24 +271,9 @@ pane.collections.duplicate		= Duplicate Items
 pane.collections.removeLibrary = Remove Library
 pane.collections.removeLibrary.text = Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch       = Duplicate Saved Search
 pane.collections.menu.remove.library = Remove Library…
-pane.collections.menu.delete.collection			= Delete Collection…
-pane.collections.menu.delete.collectionAndItems	= Delete Collection and Items…
-pane.collections.menu.delete.savedSearch			= Delete Saved Search…
-pane.collections.menu.delete.feedAndItems			= Unsubscribe from Feed…
-pane.collections.menu.export.collection			= Export Collection…
-pane.collections.menu.export.savedSearch			= Export Saved Search…
-pane.collections.menu.export.feed			= Export Feed…
-pane.collections.menu.createBib.collection		= Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch		= Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed		= Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary = Show Collection in Library
 
-pane.collections.menu.generateReport.collection	= Generate Report from Collection…
-pane.collections.menu.generateReport.savedSearch	= Generate Report from Saved Search…
-pane.collections.menu.generateReport.feed	= Generate Report from Feed…
-
 pane.collections.menu.refresh.feed			= Refresh Feed
 pane.collections.menu.refresh.allFeeds = Refresh All Feeds
 pane.collections.menu.markAsRead.feed = Mark Feed as Read
@@ -721,12 +699,6 @@ zotero.preferences.sync.reset.restartToComplete			= Firefox must be restarted to
 zotero.preferences.sync.reset.fileSyncHistory          = On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared  = The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex						= Rebuild Index
-zotero.preferences.search.rebuildWarning					= Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex						= Clear Index
-zotero.preferences.search.clearWarning						= After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs				= Clear All Except Web Links
-zotero.preferences.search.indexUnindexed					= Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles        = Citation Styles
 zotero.preferences.export.quickCopy.exportFormats			= Export Formats
 zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -801,7 +773,6 @@ quickSearch.mode.titleCreatorYear	= Title, Creator, Year
 quickSearch.mode.fieldsAndTags 		= All Fields & Tags
 quickSearch.mode.everything 		= Everything
 
-advancedSearchMode				= Advanced search mode — press Enter to search.
 searchInProgress					= Search in progress — please wait.
 
 searchOperator.is				= is
diff --git a/chrome/locale/es-ES/zotero/integration.ftl b/chrome/locale/es-ES/zotero/integration.ftl
index 32a9cc047d..5584f5e3c7 100644
--- a/chrome/locale/es-ES/zotero/integration.ftl
+++ b/chrome/locale/es-ES/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Sufijo
 integration-citationDialog-details-prefix = Prefijo
 integration-citationDialog-details-suppressAuthor = Omitir autor
+integration-citationDialog-details-locator-info = Consejo: También puede escribir números de página y otros datos de localización directamente en el campo principal. <a data-l10n-name="docs-link">Más información</a>
 integration-citationDialog-details-includeComments = Incluir comentarios
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No hay elementos seleccionados ni abiertos con anotaciones
     }
 integration-citationDialog-settings-keepSorted = Mantener las fuentes ordenadas.
+integration-citationDialog-preview-empty = Previsualizar
+integration-citationDialog-preview-error = Vista previa no disponible
+integration-citationDialog-btn-displayPreview =
+    .title = Mostrar vista previa de la cita
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Presione la tecla Tab para seleccionar los elementos que desea añadir a esta cita. Presione la tecla Escape para descartar los cambios y cerrar el cuadro de diálogo.
+integration-citationDialog-just-added-input-placeholder = Escribe «10-15» para citar páginas o buscar elementos
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Ha realizado camb
 integration-warning-discard-changes = Descartar cambios
 integration-warning-command-is-running = Ya se está ejecutando un comando de integración del procesador de textos.
 first-run-guidance-citationDialog =
-    Escriba un título, autor o año para buscar una referencia.
+    Haga clic en el globo o utilice las teclas ← y ↓  para ver los detalles de la cita y personalizar opciones como el número de página, el prefijo y el sufijo.
     
-    Una vez realizada la selección, haga clic en la burbuja o selecciónela con el teclado y pulse ↓/Espacio para mostrar las opciones de cita, como el número de página, el prefijo y el sufijo.
-    
-    También puede añadir un número de página u otro localizador incluyéndolo en los términos de búsqueda (p. ej., «historia { $locator }») o escribiéndolo después de la burbuja y pulsando { return-or-enter }.
+    También puede añadir un número de página u otro identificador incluyéndolo entre los términos de búsqueda (p. ej., «historia { $locator }») o escribiéndolo después del globo y pulsando { return-or-enter }.
diff --git a/chrome/locale/es-ES/zotero/preferences.ftl b/chrome/locale/es-ES/zotero/preferences.ftl
index 393cfc5688..f2c8dcd26f 100644
--- a/chrome/locale/es-ES/zotero/preferences.ftl
+++ b/chrome/locale/es-ES/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Idioma y región
 preferences-advanced-enable-bidi-ui =
     .label = Habilitar utilidades bidireccionales de edición de texto
+preferences-advanced-data-dir =
+    .value = Directoria de datos:
 preferences-advanced-reset-data-dir =
     .label = Volver a la ubicación predeterminada…
 preferences-advanced-custom-data-dir =
@@ -77,18 +79,18 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Predeterminado: { $directory })
     .aria-label = Ubicación predeterminada
-preferences-pane-account = Account
+preferences-pane-account = Cuenta
 -preferences-sync-data-syncing = Sincronizando datos
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Inicie sesión con su cuenta de { -app-name } para sincronizar sus datos entre dispositivos, colaborar con otras personas y mucho más.
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = Sincronizar
+preferences-sync-settings-intro = { -app-name } puede sincronizar los datos y archivos de tu biblioteca entre dispositivos.  <label data-l10n-name="sync-link">Más información</label>
+preferences-sync-reset-heading = Restablecer sincronización
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Sincronizar los archivos adjuntos en las bibliotecas de grupo mediante { -app-name } Storage
+preferences-sync-fileSyncing-tos = Al utilizar { -app-name } Storage, aceptas quedar sujeto a sus  <label data-l10n-name="terms-link">términos y condiciones</label>.
 preferences-account-log-out =
     .label = Cerrar sesión…
 preferences-sync-reset-restore-to-server-body = { -app-name } reemplazará “{ $libraryName }” en { $domain } con datos de este equipo.
@@ -126,3 +128,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Si cambia a otra cuenta, se eliminarán todos los datos de { -app-name } de este equipo. Antes de continuar, asegúrese de que todos los datos y archivos que desea conservar se hayan sincronizado con la cuenta «{ $username }» o de que tenga una copia de seguridad del directorio de datos de { -app-name }.
 preferences-account-switch-confirmation-text = borrar los datos locales
 preferences-account-switch-accept = Borrar datos y reiniciar
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/es-ES/zotero/reader.ftl b/chrome/locale/es-ES/zotero/reader.ftl
index a17809338c..f6d326664e 100644
--- a/chrome/locale/es-ES/zotero/reader.ftl
+++ b/chrome/locale/es-ES/zotero/reader.ftl
@@ -226,7 +226,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Ha ocurrido un error desconocido.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = No se puede conectar al servicio «Leer en voz alta». Compruebe su conexión a Internet.
 reader-read-aloud-error-daily-limit-exceeded = Has superado su límite diario de Voices en { -app-name }.
 reader-read-aloud-retry = Reintentar
 reader-read-aloud-first-run-title = Elija su voz preferida para la lectura en voz alta:
diff --git a/chrome/locale/es-ES/zotero/searchbox.dtd b/chrome/locale/es-ES/zotero/searchbox.dtd
index d604431879..755cfcd35a 100644
--- a/chrome/locale/es-ES/zotero/searchbox.dtd
+++ b/chrome/locale/es-ES/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nombre:">
 
-<!ENTITY zotero.search.searchInLibrary "Buscar en biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Patrón">
 <!ENTITY zotero.search.joinMode.any "cualquiera de">
 <!ENTITY zotero.search.joinMode.all "todos">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "días">
 <!ENTITY zotero.search.date.units.months "meses">
 <!ENTITY zotero.search.date.units.years "años">
-
-<!ENTITY zotero.search.search "Buscar">
-<!ENTITY zotero.search.clear "Borrar">
-<!ENTITY zotero.search.saveSearch "Guardar búsqueda">
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index 493688945d..a3ca2902c7 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Eliminar elemento...">
 <!ENTITY zotero.toolbar.newGroup "Nuevo grupo...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nueva subcolección...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nueva búsqueda guardada...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Vaciar la papelera">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostar/ocultar el selector de etiquetas">
 <!ENTITY zotero.toolbar.actions.label "Acciones">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferencias...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Soporte y documentación">
 <!ENTITY zotero.toolbar.about.label "Acerca de Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Búsqueda avanzada">
 <!ENTITY zotero.toolbar.openURL.label "Buscar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar a través de su biblioteca local">
 
diff --git a/chrome/locale/es-ES/zotero/zotero.ftl b/chrome/locale/es-ES/zotero/zotero.ftl
index eca4828713..39d31b1177 100644
--- a/chrome/locale/es-ES/zotero/zotero.ftl
+++ b/chrome/locale/es-ES/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Suprimir
        *[other] Retroceso
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimir
 general-remove = Eliminar
 general-add = Añadir
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Ver las instrucciones de solución d
 general-go-back = Volver atrás
 general-accept = Aceptar
 general-cancel = Cancelar
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Mostrar en la biblioteca
 general-restartApp = Reiniciar { -app-name }
 general-restartInTroubleshootingMode = Reiniciar en modo de solución de problemas
 general-save = Guardar
 general-clear = Limpiar
+clear-button =
+    .label = { general-clear }
 general-update = Actualizar
 general-back = Atrás
 general-edit = Editar
@@ -76,6 +86,8 @@ general-maroon = Granate
 general-gray = Gris
 general-black = Negro
 general-loading = Cargando...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Estilo de cita:
 language-label = Idioma:
 menu-custom-group-submenu =
@@ -163,14 +175,126 @@ collections-menu-show-recently-read =
     .label = Mostrar { recently-read }
 item-menu-remove-from-recently-read =
     .label = Eliminar de { recently-read }…
-collections-menu-rename-collection =
-    .label = Renombrar colección
-collections-menu-edit-saved-search =
-    .label = Modificar la carpeta de búsqueda
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } colección seleccionada
+        [many] { $count } colecciones seleccionadas
+       *[other] { $count } colecciones seleccionadas
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] Se han seleccionado { $count } búsqueda guardada
+        [many] Se han seleccionado { $count } búsquedas guardadas
+       *[other] Se han seleccionado { $count } búsquedas guardadas
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } fuente seleccionada
+        [many] { $count } fuentes seleccionadas
+       *[other] { $count } fuentes seleccionadas
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } colección seleccionada)
+        [many] { $library } ({ $count } colecciones seleccionadas)
+       *[other] { $library } ({ $count } colecciones seleccionadas)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } (se ha seleccionado { $count } búsqueda guardada)
+        [many] { $library } (se han seleccionado { $count } búsquedas guardadas)
+       *[other] { $library } (se han seleccionado { $count } búsquedas guardadas)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } fuente seleccionada)
+        [many] { $library } ({ $count } fuentes seleccionadas)
+       *[other] { $library } ({ $count } fuentes seleccionadas)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Renombrar
+edit-saved-search = Editar búsqueda guardada
+collections-menu-edit-search =
+    .label = Editar búsqueda
+collections-menu-duplicate-search =
+    .label = Búsqueda de duplicados
 collections-menu-move-collection =
     .label = Mover a
 collections-menu-copy-collection =
     .label = Copiar a
+collections-menu-export =
+    .label = Exportar...
+collections-menu-generate-report =
+    .label = Generar informe...
+collections-menu-create-bibliography =
+    .label = Crear bibliografía
+collections-menu-unsubscribe =
+    .label = Darse de baja…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Eliminar colección...
+            [many] Eliminar colecciones…
+           *[other] Eliminar colecciones…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Eliminar colección y elementos…
+            [many] Eliminar colecciones y elementos…
+           *[other] Eliminar colecciones y elementos…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Eliminar búsqueda…
+            [many] Eliminar búsquedas…
+           *[other] Eliminar búsquedas…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Eliminar colección
+        [many] Eliminar colecciones
+       *[other] Eliminar colecciones
+    }
+collections-delete-message =
+    { $count ->
+        [one] ¿Está seguro de que quiere eliminar esta colección?
+        [many] ¿Está seguro de que quiere eliminar { $count } colecciones?
+       *[other] ¿Está seguro de que quiere eliminar { $count } colecciones?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Los elementos de esta colección no se eliminarán.
+        [many] Los elementos de estas colecciones no se eliminarán.
+       *[other] Los elementos de estas colecciones no se eliminarán.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Eliminar colección y elementos
+        [many] Eliminar colecciones y elementos
+       *[other] Eliminar colecciones y elementos
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] ¿Está seguro de que quiere eliminar esta colección y mover todos los elementos que contienen a la papelera?
+        [many] ¿Está seguro de que quiere eliminar { $count } colecciones y mover todos los elementos que contienen a la papelera?
+       *[other] ¿Está seguro de que quiere eliminar { $count } colecciones y mover todos los elementos que contienen a la papelera?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Eliminar búsqueda
+        [many] Eliminar búsquedas
+       *[other] Eliminar búsquedas
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] ¿Está seguro de que quiere eliminar esta búsqueda?
+        [many] ¿Está seguro de que quiere eliminar { $count } búsquedas?
+       *[other] ¿Está seguro de que quiere eliminar { $count } búsquedas?
+    }
 item-creator-moveDown =
     .label = Bajar
 item-creator-moveToTop =
@@ -283,6 +407,7 @@ import-online-relink-only =
     .label = Volver a vincular las citas de Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } no ha podido conectarse a { $targetApp }. Compruebe su conexión a Internet e inténtelo de nuevo.
+tab-title-multiple-collections = Múltiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -628,6 +753,18 @@ quicksearch-input =
     .aria-label = Búsqueda rápida
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Búsqueda avanzada
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Cerrar búsqueda avanzada
+advanced-search-expand =
+    .tooltiptext = Ampliar la búsqueda avanzada
+advanced-search-collapse =
+    .tooltiptext = Ocultar la búsqueda avanzada
 item-pane-header-view-as =
     .label = Ver como
 item-pane-header-none =
@@ -691,9 +828,64 @@ architecture-x64-on-arm64-action = Descargar { -app-name } para ARM64
 first-run-guidance-authorMenu = { -app-name } le permite especificar también editores y traductores. Puede convertir un autor en editor o traductor seleccionándolo en este menú.
 first-run-guidance-readAloud = Ahora { -app-name } puede leerle sus documentos con voces que suenan muy naturales.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Eliminar condición
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Añadir condición
+advanced-search-group-btn =
+    .tooltiptext = Añadir grupo de condiciones
+advanced-search-remove-group-btn =
+    .tooltiptext = Eliminar grupo
+advanced-search-ungroup-btn =
+    .tooltiptext = Desagrupar condiciones
+advanced-search-result-level-menu =
+    .aria-label = Tipo de resultado
+advanced-search-result-level-prefix-root =
+    .value = Buscar
+advanced-search-join-prefix-root =
+    .value = coincidente
+advanced-search-result-level-any =
+    .label = cualquier artículo
+advanced-search-result-level-item =
+    .label = elementos de primer nivel
+advanced-search-result-level-attachment =
+    .label = adjuntos
+advanced-search-result-level-note =
+    .label = notas
+advanced-search-result-level-annotation =
+    .label = anotaciones
+advanced-search-binding-menu =
+    .aria-label = Coincidir con el mismo artículo
+advanced-search-binding-separate =
+    .label = por separado
+advanced-search-binding-same-attachment =
+    .label = en el mismo archivo adjunto
+advanced-search-binding-same-note =
+    .label = en la misma nota
+advanced-search-binding-same-annotation =
+    .label = en la misma anotación
+advanced-search-of-the-following =
+    .value = de lo siguiente
+advanced-search-binding-hint-attachment =
+    .value = Estas condiciones pueden coincidir con archivos adjuntos independientes.
+advanced-search-binding-hint-note =
+    .value = Estas condiciones pueden corresponder a notas distintas.
+advanced-search-binding-hint-annotation =
+    .value = Estas condiciones pueden coincidir con anotaciones independientes.
+advanced-search-level-warning-mixed = No es posible que todas estas condiciones coincidan con el mismo elemento, por lo que esta búsqueda nunca arrojará resultados. Intente hacer coincidir «{ $matchAny }» de ellas o configure el tipo de resultado como «{ $topLevelItems }».
+advanced-search-level-warning-unreachable = Esta búsqueda tiene una condición que no se puede aplicar al tipo de resultado seleccionado. Establezca el tipo de resultado en «{ $topLevelItems }» o elimine la condición incompatible.
+advanced-search-group-warning-unreachable =
+    Una condición no puede aparecer aquí en el mismo { $entity ->
+        [adjunto] attachment
+        [nota] note
+       *[n] annotation
+    }. Combínelas por separado o elimine la condición incompatible.
+advanced-search-group-warning-mixed = No es posible que todas estas condiciones coincidan con el mismo elemento, por lo que este grupo nunca coincidirá. Intente buscar coincidencias con «{ $matchAny }» de ellas, o configure el tipo de resultado como «{ $topLevelItems }».
+advanced-search-bind-same-attachment =
+    .label = Empareja el mismo archivo adjunto
+advanced-search-bind-same-note =
+    .label = Empareja las notas iguales
+advanced-search-bind-same-annotation =
+    .label = Busca la misma anotación
 advanced-search-conditions-menu =
     .aria-label = Buscar condición
     .label = { $label }
@@ -703,11 +895,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valor
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Campos:
 search-conditions-collection = Colección
 search-conditions-savedSearch = Búsqueda guardada
 search-conditions-itemTypeID = Tipo de elemento
 search-conditions-tag = Etiqueta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota subordinada
 search-conditions-creator = Creador
@@ -726,10 +924,26 @@ search-conditions-dateModified = Fecha de modificación
 search-conditions-fulltextContent = Contenido del adjunto
 search-conditions-programmingLanguage = Lenguage de programación
 search-conditions-fileTypeID = Tipo de fichero adjunto
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Última lectura del archivo adjunto
 search-conditions-annotationText = Texto de la anotación
 search-conditions-annotationComment = Comentario de la anotación
+search-conditions-annotationType = Tipo de anotación
+search-conditions-annotationColor = Color de anotación
+search-conditions-annotationAuthor = Autor de anotación
 search-conditions-anyField = Cualquier campo
+search-conditions-titleCreatorYear = Título, Creador, Año
+search-conditions-submenu-attachment = Adjunto
+search-conditions-submenu-annotation = Anotación
+search-conditions-short-fulltextContent = Contenido
+search-conditions-short-fileTypeID = Tipo de archivo
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Última lectura
+search-conditions-short-annotationText = Texto
+search-conditions-short-annotationComment = Comentario
+search-conditions-short-annotationType = Tipo
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } archivo añadido
@@ -764,6 +978,9 @@ file-type-video = Vídeo
 file-type-presentation = Presentación
 file-type-document = Documento
 file-type-ebook = Libro electrónico
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = ¡Se le ha actualizado a <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Descubra <a data-l10n-name="new-features-link">las novedades</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -772,18 +989,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Pegar y buscar
 mac-word-plugin-install-message = Zotero necesita acceder a los datos de Word para instalar la extensión de Word
+mac-word-plugin-install-folder-message = { -app-name } necesita acceder a la carpeta de inicio de Word para instalar el complemento de Word.
 mac-word-plugin-install-action-button =
     .label = Instalar extensión de Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Instala el complemento en la carpeta de inicio de Word
+mac-word-plugin-install-folder-dialog-button = Instalar
+mac-word-plugin-install-wrong-folder-selected = Debe seleccionarse la carpeta sugerida. Inténtelo de nuevo sin elegir otra carpeta.
 file-renaming-banner-message = { -app-name } ahora sincroniza automáticamente los nombres de los archivos adjuntos a medida que realizas cambios en los elementos.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = El conector { -app-name } debe actualizarse para funcionar con esta versión de { -app-name }.
 userjs-pref-warning = Algunos ajustes de { -app-name } se han sobrescrito usando un método no compatible. { -app-name } lo revertirá y se reiniciará.
 migrate-extra-fields-progress-message = Migración de nuevos campos desde el campo adicional
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Dividir etiquetas
 long-tag-fixer-button-dont-split =
@@ -796,4 +1018,159 @@ banner-close-button =
     .aria-label = Descartar notificación
 plugins-blocked-plugin =
     .message = Este complemento ha sido desactivado por { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Esto puede ocurrir si el directorio de datos de { -app-name } se encuentra en una carpeta de almacenamiento en la nube (OneDrive, Dropbox, etc.) o en un recurso compartido de red.
+login-manager-reset = { -app-name } no ha podido leer sus datos de inicio de sesión guardados, por lo que se han restablecido. Inicie sesión de nuevo en el panel { preferences-pane-account } de los ajustes de { -app-name }.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macOS] { -app-name } no ha podido acceder al llavero de { -os-name } para guardar sus credenciales de forma segura. Asegúrese de que el llavero esté accesible e inténtelo de nuevo.
+        [windows] { -app-name } no ha podido guardar sus credenciales de forma segura. Inténtelo de nuevo o reinicia { -app-name }.
+       *[other] { -app-name } no ha podido acceder a su llavero de { -os-name } para guardar sus credenciales de forma segura. Asegúrese de que el servicio de llavero esté en ejecución e inténtelo de nuevo.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } no ha podido acceder al llavero de { -os-name } para cifrar tus credenciales almacenadas. Sus credenciales permanecen almacenadas sin cifrar en el disco. Asegúrese de que se pueda acceder al llavero y reinicia { -app-name }.
+        [windows] { -app-name } no ha podido cifrar tus credenciales almacenadas. Sus credenciales permanecen almacenadas sin cifrar en el disco. Reinicie { -app-name } e inténtalo de nuevo.
+       *[other] { -app-name } no ha podido acceder a su llavero de { -os-name } para cifrar sus credenciales almacenadas. Sus credenciales permanecen almacenadas sin cifrar en el disco. Asegúrese de que el servicio de llavero esté en ejecución y reinicia { -app-name }.
+    }
+search-button =
+    .label = Buscar
+save-search-new-button =
+    .label = Guardar búsqueda…
+save-search-edit-button =
+    .label = Guardar
+save-search-name-title = Guardar búsqueda
+save-search-name-message = Introduce un nombre para la búsqueda guardada:
+saved-search-close-confirmation-title = Editar una búsqueda guardada
+saved-search-close-confirmation-body = ¿Quieres guardar los cambios que has realizado en esta búsqueda guardada?
+item-pane-batch-editing-prompt =
+    .aria-label = Edición por lotes
+item-pane-batch-editing-enable =
+    .label = Editar varios elementos…
+item-pane-batch-editing-multiple-values-placeholder = Múltiple
+item-pane-batch-editing-clear-values = Borrar todos los valores
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editando { $count } elemento
+        [many] Editando { $count } elementos
+       *[other] Editando { $count } elementos
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Editar metadatos
+        [many] Editar metadatos de { $count } elementos
+       *[other] Editar metadatos de { $count } elementos
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edición de «{ $field }»
+        [many] Edición de «{ $field }» para { $count } elementos
+       *[other] Edición de «{ $field }» para { $count } elementos
+    }
+undo-action-normalize-attachment-titles = Normalizar el título del archivo adjunto
+undo-action-trash =
+    { $count ->
+        [one] Elemento de la papelera
+        [many] { $count } elementos de la papelera
+       *[other] { $count } elementos de la papelera
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restaurar elemento
+        [many] Restaurar { $count } elementos
+       *[other] Restaurar { $count } elementos
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Colección de la papelera
+        [many] { $count } colecciones de la papelera
+       *[other] { $count } colecciones de la papelera
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Búsqueda guardada de la papelera
+        [many] { $count } búsquedas guardadas de la papelera
+       *[other] { $count } búsquedas guardadas de la papelera
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restaurar colección
+        [many] Restaurar { $count } colecciones
+       *[other] Restaurar { $count } colecciones
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restaurar objeto
+        [many] Restaurar { $count } objetos
+       *[other] Restaurar { $count } objetos
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Añadir a la colección
+        [many] Añadir { $count } elementos a la colección
+       *[other] Añadir { $count } elementos a la colección
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Eliminar de la colección
+        [many] Eliminar { $count } elementos de la colección
+       *[other] Eliminar { $count } elementos de la colección
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Mover a la colección
+        [many] Mover { $count } elementos a la colección
+       *[other] Mover { $count } elementos a la colección
+    }
+undo-action-rename-collection = Renombrar colección
+undo-action-move-collection = Mover colección
+undo-action-add-tag =
+    { $count ->
+        [one] Añadir etiqueta
+        [many] Añadir etiqueta a { $count } elementos
+       *[other] Añadir etiqueta a { $count } elementos
+    }
+undo-action-change-tag = Cambiar etiqueta
+undo-action-split-tag = Dividir etiqueta
+undo-action-remove-tag =
+    { $count ->
+        [one] Eliminar etiqueta
+        [many] Eliminar la etiqueta de { $count } elementos
+       *[other] Eliminar la etiqueta de { $count } elementos
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Eliminar etiqueta
+        [many] Eliminar { $count } etiquetas
+       *[other] Eliminar { $count } etiquetas
+    }
+undo-action-remove-all-tags = Eliminar todas las etiquetas
+undo-action-edit-note = Editar nota
+undo-action-add-creator = Añadir creador
+undo-action-remove-creator = Eliminar creador
+undo-action-edit-creator = Editar creador
+undo-action-reorder-creator = Reordenar creador
+undo-action-change-type = Cambiar el tipo de elemento
+undo-action-change-parent-item =
+    { $count ->
+        [one] Cambiar elemento principal
+        [many] Cambiar el elemento principal de { $count } elementos
+       *[other] Cambiar el elemento principal de { $count } elementos
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convertir en independientes
+        [many] Convertir { $count } elementos en independientes
+       *[other] Convertir { $count } elementos en independientes
+    }
+undo-action-add-related = Añadir elemento relacionado
+undo-action-remove-related = Eliminar elemento relacionado
+undo-action-merge-items =
+    { $count ->
+        [one] Combinar elemento
+        [many] Combinar { $count } elementos
+       *[other] Combinar { $count } elementos
+    }
+menu-edit-undo-action = Deshacer { $action }
+menu-edit-redo-action = Rehacer { $action }
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index f6dde11969..a17ba3f82c 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Hace 1 año
 date.relative.yearsAgo.multiple=Hace %S años
 
 pane.collections.title=Colecciones
-pane.collections.delete.title=Borrar colección
-pane.collections.delete=¿Está seguro de que quiere borrar la colección seleccionada?
-pane.collections.delete.keepItems=Los elementos dentro de esta colección no se borrarán.
-pane.collections.deleteWithItems.title=Borrar colección y elementos
-pane.collections.deleteWithItems=¿Está seguro de que quiere borrar la colección seleccionada y mover todos sus elementos a la Papelera?
 pane.feed.deleteWithItems.title=Desuscribirse
 pane.feed.deleteWithItems=¿Está seguro de que quiere desuscribirte de este canal?
 
-pane.collections.deleteSearch.title=Borrar búsqueda
-pane.collections.deleteSearch=¿Está seguro de que quiere borrar la búsqueda seleccionada?
 pane.collections.emptyTrash=¿Está seguro de que quiere eliminar permanentemente los elementos de papelera?
 pane.collections.newSavedSeach=Nueva búsqueda guardada
 pane.collections.savedSearchName=Introduzca un nombre para esta búsqueda guardada:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Elementos duplicados
 pane.collections.removeLibrary=Borrar biblioteca...
 pane.collections.removeLibrary.text=¿Está seguro de que quiere eliminar permanentemente “%S” de este equipo?
 
-pane.collections.menu.duplicate.savedSearch=Duplicar búsqueda guardada
 pane.collections.menu.remove.library=Borrar biblioteca...
-pane.collections.menu.delete.collection=Borrar colección...
-pane.collections.menu.delete.collectionAndItems=Borrar colección y elementos...
-pane.collections.menu.delete.savedSearch=Borrar búsqueda guardada...
-pane.collections.menu.delete.feedAndItems=Desuscribirse del canal...
-pane.collections.menu.export.collection=Exportar colección...
-pane.collections.menu.export.savedSearch=Exportar búsqueda guardada...
-pane.collections.menu.export.feed=Exportar canal...
-pane.collections.menu.createBib.collection=Crear bibliografía a partir de la colección...
-pane.collections.menu.createBib.savedSearch=Crear bibliografía a partir de la búsqueda guardada...
-pane.collections.menu.createBib.feed=Crear bibliografía a partir del canal...
 pane.collections.showCollectionInLibrary=Mostrar colección en biblioteca
 
-pane.collections.menu.generateReport.collection=Generar un informe a partir de la colección...
-pane.collections.menu.generateReport.savedSearch=Generar un informe a partir la búsqueda guardada...
-pane.collections.menu.generateReport.feed=Generar informe a partir del canal...
-
 pane.collections.menu.refresh.feed=Actualizar canal
 pane.collections.menu.refresh.allFeeds=Actualizar todos los canales
 pane.collections.menu.markAsRead.feed=Marcar canal como leído
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox debe reiniciarse para co
 zotero.preferences.sync.reset.fileSyncHistory=En la próxima sincronización, %1$S comprobará todos los archivos adjuntos en “%2$S” con los alojados en el servicio de almacenamiento remoto. Cualquier archivo adjunto remoto que no se encuentre localmente será descargado, y los archivos adjuntos locales que no se encuentren remotamente serán subidos.\n\nEsta opción no es necesaria durante el uso normal.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Se borró el historial de sincronización de archivos para “%S”.
 
-zotero.preferences.search.rebuildIndex=Reconstruir índice
-zotero.preferences.search.rebuildWarning=¿Quiere reconstruir el índice entero? Puede tardar un rato.\n\nPara indexar solo elementos que no hayan sido indexados, usa %S.
-zotero.preferences.search.clearIndex=Vaciar el índice
-zotero.preferences.search.clearWarning=Tras vaciar el índice, no se podrá buscar más en el contenido de los adjuntos.\n\nLos adjuntos de enlaces webs no se pueden reindexar sin revisitar de nuevo la página. Para dejar indexados los enlaces webs, escoge %S.
-zotero.preferences.search.clearNonLinkedURLs=Vaciar todo excepto los enlaces webs
-zotero.preferences.search.indexUnindexed=Indexar los elementos no indexados
 zotero.preferences.export.quickCopy.citationStyles=Estilos de citas
 zotero.preferences.export.quickCopy.exportFormats=Formatos de exportación
 zotero.preferences.export.quickCopy.instructions=La copia rápida le permite exportar rápidamente elementos en un formato determinado. Puede copiar los elementos seleccionados al portapapeles pulsando %S o arrastrar elementos directamente a un campo de texto en otro programa.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Debes insertar una cita antes de realizar e
 integration.error.mustInsertBibliography=Debes insertar una bibliografía antes de realizar esta operación.
 integration.error.cannotInsertHere=No se pueden insertar campos de Zotero aquí.
 integration.error.notInCitation=Debes colocar el cursor en una cita de Zotero para editarla.
+integration.error.inBibliography=Para insertar una referencia, coloca el cursor en el cuerpo del texto. Para editar la bibliografía directamente, utiliza %S.
 integration.error.noBibliography=El estilo bibliográfico actual no define una bibliografía. Si desea añadir una bibliografía, por favor, elija otro estilo.
 integration.error.deletePipe=El conducto que Zotero usa para comunicarse con el procesador de texto no se pudo inicializar. ¿Le gustaría que Zotero intentase corregir este error? Se le pedirá su contraseña.
 integration.error.invalidStyle=El estilo que ha seleccionado no parece ser válido. Si ha creado este estilo usted mismo, por favor, asegúrese de que pasa la validación como se describe en http://zotero.org/support/dev/citation_styles. Alternativamente, intente seleccionar otro estilo.
diff --git a/chrome/locale/et-EE/zotero/integration.ftl b/chrome/locale/et-EE/zotero/integration.ftl
index c3b61f2152..4f8bbb9f27 100644
--- a/chrome/locale/et-EE/zotero/integration.ftl
+++ b/chrome/locale/et-EE/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Raamatukogu
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/et-EE/zotero/preferences.ftl b/chrome/locale/et-EE/zotero/preferences.ftl
index 74a58e6af1..bd9cb8ad71 100644
--- a/chrome/locale/et-EE/zotero/preferences.ftl
+++ b/chrome/locale/et-EE/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sünkroonimine
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/et-EE/zotero/searchbox.dtd b/chrome/locale/et-EE/zotero/searchbox.dtd
index f6a46bd272..929c715830 100644
--- a/chrome/locale/et-EE/zotero/searchbox.dtd
+++ b/chrome/locale/et-EE/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nimi:">
 
-<!ENTITY zotero.search.searchInLibrary "Otsing kataloogist:">
-
 <!ENTITY zotero.search.joinMode.prefix "Valik">
 <!ENTITY zotero.search.joinMode.any "üks">
 <!ENTITY zotero.search.joinMode.all "kõik">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "päevi">
 <!ENTITY zotero.search.date.units.months "kuid">
 <!ENTITY zotero.search.date.units.years "aastaid">
-
-<!ENTITY zotero.search.search "Otsing">
-<!ENTITY zotero.search.clear "Tühjendada">
-<!ENTITY zotero.search.saveSearch "Otsing salvestada">
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index f8768293ac..2c0a14b545 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Kirje eemaldamine...">
 <!ENTITY zotero.toolbar.newGroup "Uus grupp...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Uus alamteema...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Uus salvestatud otsing...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Prügikasti tühjendamine">
 <!ENTITY zotero.toolbar.tagSelector.label "Lipikusirvija olek">
 <!ENTITY zotero.toolbar.actions.label "Tegevused">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Eelistused...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Abi ja dokumentatsioon">
 <!ENTITY zotero.toolbar.about.label "Zotero kohta">
-<!ENTITY zotero.toolbar.advancedSearch "Täpsem otsing">
 <!ENTITY zotero.toolbar.openURL.label "Otsida">
 <!ENTITY zotero.toolbar.openURL.tooltip "Otsida kohalikus raamatukogus">
 
diff --git a/chrome/locale/et-EE/zotero/zotero.ftl b/chrome/locale/et-EE/zotero/zotero.ftl
index f8f99c37a3..d67feefc5a 100644
--- a/chrome/locale/et-EE/zotero/zotero.ftl
+++ b/chrome/locale/et-EE/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Trükkida
 general-remove = Eemaldada
 general-add = Lisada
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Mine tagasi
 general-accept = Accept
 general-cancel = Tühistada
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Näidata raamatukogus
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Salvesta
 general-clear = Tühjendada
+clear-button =
+    .label = { general-clear }
 general-update = Uuenda
 general-back = Tagasi
 general-edit = Toimetada
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Hall
 general-black = Must
 general-loading = Laadimine...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Viite stiil:
 language-label = Keel
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Salvestatud otsingu toimetamine
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Salvestatud otsingu toimetamine
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Eksport...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Liigutada alla
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Kiirotsing
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Täpsem otsing
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Otsida
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Väljad:
 search-conditions-collection = Teema
 search-conditions-savedSearch = Salvestatud otsing
 search-conditions-itemTypeID = Kirje tüüp
 search-conditions-tag = Lipik
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Märkus
 search-conditions-childNote = Alammärkus
 search-conditions-creator = Autor
@@ -715,10 +897,26 @@ search-conditions-dateModified = Muutmise kuupäev
 search-conditions-fulltextContent = Manuse sisu
 search-conditions-programmingLanguage = Programmeerimiskeel
 search-conditions-fileTypeID = Manuse failiformaat
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Manus
+search-conditions-submenu-annotation = Annotatsioon
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Faili tüüp
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tüüp
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentatsioon
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Paigaldus
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Otsing
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Salvesta
+save-search-name-title = Otsing salvestada
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Märkuse toimetamine
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Kirje tüübi muutmine
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index 3332133bff..bc8211f11a 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 aasta tagasi
 date.relative.yearsAgo.multiple=%S aastat tagasi
 
 pane.collections.title=Kogud
-pane.collections.delete.title=Kustuta kogu
-pane.collections.delete=Soovite kindlasti seda teemat kustutada?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Tühista tellimus
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Kustuta otsing
-pane.collections.deleteSearch=Soovite kindlasti seda otsingut kustutada?
 pane.collections.emptyTrash=Soovite kindlasti Prahi hulgast kirjed lõplikult kustutada?
 pane.collections.newSavedSeach=Uus salvestatud otsing
 pane.collections.savedSearchName=Pange salvestatud otsingule nimi:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplikaadid
 pane.collections.removeLibrary=Eemalda teek
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Eemalda teek...
-pane.collections.menu.delete.collection=Kustuta kogu...
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Teema eksport...
-pane.collections.menu.export.savedSearch=Salvestatud otsingu eksport...
-pane.collections.menu.export.feed=Ekspordi voog...
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Teemast raporti loomine...
-pane.collections.menu.generateReport.savedSearch=Salvestatud otsingust raporti loomine...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Märgi uudisvoog loetuks
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Indeksi taasloomine
-zotero.preferences.search.rebuildWarning=Soovite kogu indeksi taasluua? See võib võtta aega.\n\nEt indekseerida vaid kirjed, mis on indekseerimata, kasutage %S.
-zotero.preferences.search.clearIndex=Indeksi tühjendamine
-zotero.preferences.search.clearWarning=Pärast indeksi tühjendamist ei ole manused enam otsitavad.\n\nVeebilehekülgedest tehtud manused ei ole ilma vastavat lehekülge külastamata indekseeritavad. Et jätta need indekseerituks, valige %S.
-zotero.preferences.search.clearNonLinkedURLs=Tühjendada kõik välja arvatud veebilehekülgedest tehtud manused
-zotero.preferences.search.indexUnindexed=Indekseerimata kirjete indekseerimne
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Eksprodiformaadid
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Enne seda toimingut peate lisama viite.
 integration.error.mustInsertBibliography=Enne seda toimingut peate lisama bibliograafia.
 integration.error.cannotInsertHere=Zotero väljasid ei saa siia lisada.
 integration.error.notInCitation=Selleks, et viidet toimetada, peab kursor peab olema Zotero poolt lisatud viites.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Praegune viite stiil ei defineeri bibliograafiat. Kui soovite lisada bibliograafiat, siis valige teine stiil.
 integration.error.deletePipe=Kanalit, millega Zotero suhtleb tekstiredaktoriga, ei õnnestunud kätte saada. Kas soovite, et Zotero üritaks seda viga parandada (nõuab autoriseerimist)?
 integration.error.invalidStyle=Valitud stiil ei vasta standardile. Kui lõite selle stiili ise, palun kontrollige, et see ühildub standardiga (vt http://zotero.org/support/dev/citation_styles). Teiseks võimaluseks on valida mõni teine stiil.
diff --git a/chrome/locale/eu-ES/zotero/integration.ftl b/chrome/locale/eu-ES/zotero/integration.ftl
index 9e89412a64..fba1a52098 100644
--- a/chrome/locale/eu-ES/zotero/integration.ftl
+++ b/chrome/locale/eu-ES/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Egilerik ez aipatu
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Liburutegia
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/eu-ES/zotero/preferences.ftl b/chrome/locale/eu-ES/zotero/preferences.ftl
index 11c4ed5695..8847e5100d 100644
--- a/chrome/locale/eu-ES/zotero/preferences.ftl
+++ b/chrome/locale/eu-ES/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sinkronizatu
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/eu-ES/zotero/searchbox.dtd b/chrome/locale/eu-ES/zotero/searchbox.dtd
index a40a224aeb..e5f5947512 100644
--- a/chrome/locale/eu-ES/zotero/searchbox.dtd
+++ b/chrome/locale/eu-ES/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Izena:">
 
-<!ENTITY zotero.search.searchInLibrary "Liburutegian bilatu:">
-
 <!ENTITY zotero.search.joinMode.prefix "Bat etortzea">
 <!ENTITY zotero.search.joinMode.any "edozein">
 <!ENTITY zotero.search.joinMode.all "guztiak">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "egun">
 <!ENTITY zotero.search.date.units.months "hilabete">
 <!ENTITY zotero.search.date.units.years "urte">
-
-<!ENTITY zotero.search.search "Bilatu">
-<!ENTITY zotero.search.clear "Garbitu">
-<!ENTITY zotero.search.saveSearch "Bilaketa gorde">
diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd
index 560efd7c21..e095ac3c34 100644
--- a/chrome/locale/eu-ES/zotero/zotero.dtd
+++ b/chrome/locale/eu-ES/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Elementua kendu...">
 <!ENTITY zotero.toolbar.newGroup "Talde berria...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Azpi-bilduma berria...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Gordetako bilaketa berria...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Paperontzia hustu">
 <!ENTITY zotero.toolbar.tagSelector.label "Erakutsi/ezkutatu etiketa hautatzailea">
 <!ENTITY zotero.toolbar.actions.label "Ekintzak">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Hobespenak...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Laguntza eta dokumentazioa">
 <!ENTITY zotero.toolbar.about.label "Zotero-ri buruz">
-<!ENTITY zotero.toolbar.advancedSearch "Bilaketa aurreratua">
 <!ENTITY zotero.toolbar.openURL.label "Aurkitu">
 <!ENTITY zotero.toolbar.openURL.tooltip "Zure tokiko liburutegiaren bitartez bilatu">
 
diff --git a/chrome/locale/eu-ES/zotero/zotero.ftl b/chrome/locale/eu-ES/zotero/zotero.ftl
index 44b9d70b21..c11725eb29 100644
--- a/chrome/locale/eu-ES/zotero/zotero.ftl
+++ b/chrome/locale/eu-ES/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Inprimatu
 general-remove = Ezabatu
 general-add = Gehitu
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Ezeztatu
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Erakutsi liburutegian
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Gorde
 general-clear = Garbitu
+clear-button =
+    .label = { general-clear }
 general-update = Eguneratu
 general-back = Atzera
 general-edit = Editatu
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Grisa
 general-black = Black
 general-loading = Kargatzen...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Aipu estiloa:
 language-label = Hizkuntza:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Editatu gordetako bilaketa
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editatu gordetako bilaketa
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Esportatu...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mugitu behera
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Bilatu:
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Bilaketa aurreratua
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Aurkitu
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = oharpenak
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Eremuak:
 search-conditions-collection = Bilduma
 search-conditions-savedSearch = Gordetako bilaketa
 search-conditions-itemTypeID = Elementu mota
 search-conditions-tag = Etiketa
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Oharra
 search-conditions-childNote = Ohar umea
 search-conditions-creator = Sortzailea
@@ -715,10 +897,26 @@ search-conditions-dateModified = Aldatutako data
 search-conditions-fulltextContent = Eranskinen edukia
 search-conditions-programmingLanguage = Hizkuntza
 search-conditions-fileTypeID = Eranskin fitxategi mota
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Oharpenaren testua
 search-conditions-annotationComment = Oharpenaren iruzkina
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Edozein eremu
+search-conditions-titleCreatorYear = Izenburua, sortzailea, urtea
+search-conditions-submenu-attachment = Eranskina
+search-conditions-submenu-annotation = Oharpena
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Fitxategi mota
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Mota
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autorea
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Bideoa
 file-type-presentation = Aurkezpen
 file-type-document = Dokumentua
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalatu
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Bilatu
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Gorde
+save-search-name-title = Bilaketa gorde
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Editatu oharra
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Aldatu elementu mota
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index d984cf7a25..c4c8ccadf4 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=orain dela urte bat
 date.relative.yearsAgo.multiple=orain dela %S urte
 
 pane.collections.title=Bildumak
-pane.collections.delete.title=Bilduma ezabatu
-pane.collections.delete=Ziur zaude hautatutako bilduma ezabatu nahi duzula?
-pane.collections.delete.keepItems=Bilduma honetako elementuak ez dira ezabatuko.
-pane.collections.deleteWithItems.title=Ezabatu bilduma eta elementuak
-pane.collections.deleteWithItems=Ziur zaude hautatutako bilduma ezabatu nahi duzula eta barne dituen elementu guztiak zakarrontzira bota?
 pane.feed.deleteWithItems.title=Harpidetza kendu
 pane.feed.deleteWithItems=Ziur zaude jario honetako harpidetza bertan behera utzi nahi duzula?
 
-pane.collections.deleteSearch.title=Ezabatu bilaketa
-pane.collections.deleteSearch=Ziur zaude hautatutako bilaketa ezabatu nahi duzula?
 pane.collections.emptyTrash=Ziur zaude paperontziko elementuak betirako ezabatu nahi dituzula?
 pane.collections.newSavedSeach=Gordetako bilaketa berria
 pane.collections.savedSearchName=Sartu gordetako bilaketaren izena:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Bikoiztutako elementuak
 pane.collections.removeLibrary=Liburutegiak ezabatu
 pane.collections.removeLibrary.text=Ziur zaude "%S"  betirako ezabatu nahi duzula ordenagailu honetatik?
 
-pane.collections.menu.duplicate.savedSearch=Gordetako bilaketa bikoiztu
 pane.collections.menu.remove.library=Liburutegia ezabatu...
-pane.collections.menu.delete.collection=Bilduma ezabatu...
-pane.collections.menu.delete.collectionAndItems=Ezabatu bilduma eta elementuak...
-pane.collections.menu.delete.savedSearch=Ezabatu gordetako bilaketa...
-pane.collections.menu.delete.feedAndItems=Jarioko harpidetza kendu...
-pane.collections.menu.export.collection=Esportatu bilduma...
-pane.collections.menu.export.savedSearch=Esportatu gordetako bilaketa...
-pane.collections.menu.export.feed=Esportatu jarioa...
-pane.collections.menu.createBib.collection=Sortu bibliografia bildumatik...
-pane.collections.menu.createBib.savedSearch=Sortu bibliografia gordetako bilaketatik...
-pane.collections.menu.createBib.feed=Sortu bibliografia jariotik...
 pane.collections.showCollectionInLibrary=Erakutsi bilduma liburutegian
 
-pane.collections.menu.generateReport.collection=Sortu txostena bildumatik...
-pane.collections.menu.generateReport.savedSearch=Sortu txostena gordetako bilaketatik...
-pane.collections.menu.generateReport.feed=Sortu txostena jariotik...
-
 pane.collections.menu.refresh.feed=Freskatu jarioa
 pane.collections.menu.refresh.allFeeds=Freskatu jario guztiak
 pane.collections.menu.markAsRead.feed=Jarioa irakurritzat eman
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox berrabiarazi beharra dag
 zotero.preferences.sync.reset.fileSyncHistory=Hurrengo sinkronizazioan, %1$S(e)k "%2$S"(e)ko erantsitako fitxategiak alderatuko ditu biltegi zerbitzukoekin. Lokalean aurkitzen ez den urruneko edozein erantsitako fitxategi deskargatuko da, eta urrunekoan aurkitzen ez diren erantsitako fitxategi lokalak igo egingo dira.\n\nAukera hau ez da beharrezkoa erabilera normalerako.
 zotero.preferences.sync.reset.fileSyncHistory.cleared="%S"(r)en fitxategien sinkronizazioaren historia garbitu egin da.
 
-zotero.preferences.search.rebuildIndex=Indizea berreraiki
-zotero.preferences.search.rebuildWarning=Indize osoa berreraiki nahi al duzu? Honek denbora hartu dezake.\n\nIndexatu gabeko elementuak soilik indexatzeko, erabili %S.
-zotero.preferences.search.clearIndex=Indizea garbitu
-zotero.preferences.search.clearWarning=Indizea garbitu ondoren, eranskinen edukia ez da gehiago bilagarria izango.\n\nErantsitako web estekak ezin dira berrindexatu weborria berriz ere bisitatu gabe. Web estekak indexatuta uzteko, aukeratu %S.
-zotero.preferences.search.clearNonLinkedURLs=Garbitu guztiak web estekak izan ezik
-zotero.preferences.search.indexUnindexed=Indexatu gabeko elementuak indexatu 
 zotero.preferences.export.quickCopy.citationStyles=Aipu estiloak
 zotero.preferences.export.quickCopy.exportFormats=Esportatu formatuak
 zotero.preferences.export.quickCopy.instructions=Kopia azkarrak elementu bat emandako formatuan era azkarrean esportatzeko aukera ematen dizu. Hautatutako elementuak arbelean kopia ditzakezu %S sakatuz ala zuzenean arrastatuz beste programa bateko testu kutxara.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Aipu bat sartu behar duzu ekintza honekin j
 integration.error.mustInsertBibliography=Lehenik, Bibliografiaren kokalekua hautatu behar da
 integration.error.cannotInsertHere=Zotero data-eremuak hemen ezin dira sartu.
 integration.error.notInCitation=Ipini ezazu kurtsorea editatu nahi duzun aipuan.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Uneko bibliografia estiloak ez dauka bibliografia bat definituta. Bibliografia bat gehitu nahi baduzu, aukera ezazu beste estilo bat.
 integration.error.deletePipe=Baliteke Zoterok testu prozesatzailearekin komunikatzeko erabiltzen duen kanalizazioa abiatuta ez egotea. Nahi al duzu Zotero errore hau konpontzen saiatzea? Zure pasahitza eskatuko zaizu.
 integration.error.invalidStyle=Badirudi hautatu duzun estiloa ez dela baliozkoa. Estilo hau zuk zeuk sortu baduzu, mesedez ziurtatu https://github.com/citation-style-language/styles/wiki/Validation helbidean deskribatutako balidazioa pasatzen duela. Bestela, saia zaitez beste estilo bat hautatuz.
diff --git a/chrome/locale/fa/zotero/integration.ftl b/chrome/locale/fa/zotero/integration.ftl
index 5ce5e435a0..d9226abea7 100644
--- a/chrome/locale/fa/zotero/integration.ftl
+++ b/chrome/locale/fa/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = کتابخانه
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/fa/zotero/preferences.ftl b/chrome/locale/fa/zotero/preferences.ftl
index 944d5ec6ac..231cca8755 100644
--- a/chrome/locale/fa/zotero/preferences.ftl
+++ b/chrome/locale/fa/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = همگام‌سازی
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/fa/zotero/searchbox.dtd b/chrome/locale/fa/zotero/searchbox.dtd
index 482b9ccd59..923dbe140f 100644
--- a/chrome/locale/fa/zotero/searchbox.dtd
+++ b/chrome/locale/fa/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "نام:">
 
-<!ENTITY zotero.search.searchInLibrary "جستجو در کتابخانه:">
-
 <!ENTITY zotero.search.joinMode.prefix "مطابقت با">
 <!ENTITY zotero.search.joinMode.any "حداقل یکی از">
 <!ENTITY zotero.search.joinMode.all "همه">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "روز">
 <!ENTITY zotero.search.date.units.months "ماه">
 <!ENTITY zotero.search.date.units.years "سال">
-
-<!ENTITY zotero.search.search "جستجو">
-<!ENTITY zotero.search.clear "پاک کردن">
-<!ENTITY zotero.search.saveSearch "ذخیره جستجو">
diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd
index 581815dfbd..ce21333082 100644
--- a/chrome/locale/fa/zotero/zotero.dtd
+++ b/chrome/locale/fa/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "حذف آیتم‌...">
 <!ENTITY zotero.toolbar.newGroup "گروه جدید...">
 <!ENTITY zotero.toolbar.newSubcollection.label "زیرمجموعه جدید...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "جستجوی ذخیره‌شده جدید...">
 <!ENTITY zotero.toolbar.emptyTrash.label "خالی کردن سطل بازیافت">
 <!ENTITY zotero.toolbar.tagSelector.label "نمایش/نهفتن انتخاب‌گر برچسب">
 <!ENTITY zotero.toolbar.actions.label "کارها">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "تنظیمات...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "پشتیبانی و راهنما">
 <!ENTITY zotero.toolbar.about.label "درباره زوترو">
-<!ENTITY zotero.toolbar.advancedSearch "جستجوی پیشرفته">
 <!ENTITY zotero.toolbar.openURL.label "مکان‌یابی">
 <!ENTITY zotero.toolbar.openURL.tooltip "یافتن از طریق کتابخانه محلی">
 
diff --git a/chrome/locale/fa/zotero/zotero.ftl b/chrome/locale/fa/zotero/zotero.ftl
index 32cff284eb..f5dd93bc8b 100644
--- a/chrome/locale/fa/zotero/zotero.ftl
+++ b/chrome/locale/fa/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = چاپ
 general-remove = حذف
 general-add = افزودن
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = انصراف
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = نمایش در کتابخانه
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = پاک کردن
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = ویرایش
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Loading…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = شیوه‌نامه
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = ویرایش جستجوی ذخیره شده
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = ویرایش جستجوی ذخیره شده
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = صدور...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = حرکت به پایین
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = جستجوی سریع
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = جستجوی پیشرفته
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = یافتن
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = فیلدها:
 search-conditions-collection = مجموعه
 search-conditions-savedSearch = جستجوی ذخیره شده
 search-conditions-itemTypeID = نوع آیتم
 search-conditions-tag = برچسب
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = یادداشت
 search-conditions-childNote = یادداشت پیوست
 search-conditions-creator = پدیدآورنده
@@ -715,10 +897,26 @@ search-conditions-dateModified = تاریخ تغییر
 search-conditions-fulltextContent = محتوای پیوست
 search-conditions-programmingLanguage = زبان برنامه‌نویسی
 search-conditions-fileTypeID = نوع پرونده پیوست
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = پیوست
+search-conditions-submenu-annotation = حاشیه‌نویسی
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = نوع پرونده
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = نوع
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = نویسنده
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = ویدئو
 file-type-presentation = ارائه
 file-type-document = سند
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = نصب
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = جستجو
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = ذخیره جستجو
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = ویرایش یادداشت
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = تغییر نوع آیتم‌
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index 424dabf7fd..c89c257bee 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=یک سال پیش
 date.relative.yearsAgo.multiple=%S سال پیش
 
 pane.collections.title=Collections
-pane.collections.delete.title=حذف مجموعه
-pane.collections.delete=آیا واقعا می‌خواهید مجموعه انتخاب شده پاک شود؟
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=حذف مجموعه و آیتم‌های آن
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=حذف جستجو
-pane.collections.deleteSearch=آیا واقعا می‌خواهید جستجوی انتخاب شده پاک شود؟
 pane.collections.emptyTrash=آیا واقعا می‌خواهید آیتم‌های موجود در سطل بازیافت به طور دائمی حذف شوند؟
 pane.collections.newSavedSeach=جستجوی ذخیره شده جدید
 pane.collections.savedSearchName=یک نام برای این جستجوی ذخیره شده وارد کنید:
@@ -277,24 +270,9 @@ pane.collections.duplicate=موارد تکراری
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=حذف مجموعه
-pane.collections.menu.delete.collectionAndItems=حذف مجموعه و آیتم‌های آن...
-pane.collections.menu.delete.savedSearch=حذف جستجوی ذخیره‌شده...
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=صدور مجموعه...
-pane.collections.menu.export.savedSearch=صدور جستجوی ذخیره شده...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=ساخت گزارش از مجموعه...
-pane.collections.menu.generateReport.savedSearch=ساخت گزارش از جستجوی ذخیره شده...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=نوسازی نمایه
-zotero.preferences.search.rebuildWarning=آیا می‌خواهید تمام نمایه را نوسازی کنید؟ این کار احتمالا مدتی طول خواهد کشید. \n\n برای محدود کردن نمایه‌سازی به آیتم‌هایی که هنوز نمایه نشده‌اند، می‌توانید از %S استفاده کنید.
-zotero.preferences.search.clearIndex=پاک کردن نمایه
-zotero.preferences.search.clearWarning=بعد از پاک کردن نمایه، محتوای پیوست‌ها، قابل جستجو نخواهد بود.\n\nنمایه‌سازی دوباره پیوندهای وب، بدون بازدید دوباره صفحه امکان پذیر نخواهد بود. برای حفظ نمایه پیوندهای وب، %S را انتخاب کنید.
-zotero.preferences.search.clearNonLinkedURLs=پاک کردن همه به جز پیوندهای وب
-zotero.preferences.search.indexUnindexed=ساخت نمایه برای آیتم‌های بدون نمایه
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=قالب‌های صدور
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=قبل از انجام این کار، با
 integration.error.mustInsertBibliography=قبل از انجام این کار، باید کتابنامه را وارد کنید.‏
 integration.error.cannotInsertHere=فیلدهای زوترو در اینجا قابل درج نیستند.‏
 integration.error.notInCitation=برای ویرایش یک یادکرد، مکان‌نما باید داخل یادکرد قرار گیرد.‏
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=این شیوه مرجع‌نگاری هیچ کتابنامه‌ای تعریف نمی‌کند. اگر می‌خواهید یک کتابنامه بیفزایید، لطفا شیوه دیگری را انتخاب کنید.‏
 integration.error.deletePipe=مسیری (pipe) که زوترو برای ارتباط با واژه‌پرداز از آن استفاده می‌کند، راه‌اندازی نشد. آیا می‌خواهید زوترو برای اصلاح این خطا کوشش کند؟ گذرواژه از شما پرسیده خواهد شد.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/fi-FI/zotero/integration.ftl b/chrome/locale/fi-FI/zotero/integration.ftl
index ff30e5d509..6a6a68b186 100644
--- a/chrome/locale/fi-FI/zotero/integration.ftl
+++ b/chrome/locale/fi-FI/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Jälkiliite
 integration-citationDialog-details-prefix = Etuliite
 integration-citationDialog-details-suppressAuthor = Piilota tekijä
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Sisällytä kommentit
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] Ei valittuja eikä avoimia nimikkeitä joissa on huomautuksia
     }
 integration-citationDialog-settings-keepSorted = Pidä lähteet lajiteltuna
+integration-citationDialog-preview-empty = Esikatselu
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Kirjasto
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Paina sarkainnäppäintä valitaksesi nimikkeitä tähän viittaukseen lisättävaäksi. Paina Esc hylätäksesi muutokset ja sulkeaksesi valintaikkunan.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Asiakirjan ominai
 integration-warning-discard-changes = Hylkää muutokset
 integration-warning-command-is-running = Tekstinkäsittelyohjelman integrointikomento on jo käynnissä.
 first-run-guidance-citationDialog =
-    Hae lähdettä kirjoittamalla otsikko, tekijä tai vuosi.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Kun olet tehnyt valintasi, klikkaa kuplaa tai valitse se näppäimistöllä ja paina ↓ tai välilyönti niin näet viittausvaihtoehdot kuten sivunumeron ja etu- tai jälkiliitteet.
-    
-    Voit myös lisätä sivunumeron tai toisen paikannuskriteerin lisäämällä sen hakutermeihin (esimerkiksi “historia { $locator }”) tai kirjoittamalla sen kuplan jälkeen ja painamalla { return-or-enter }.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/fi-FI/zotero/preferences.ftl b/chrome/locale/fi-FI/zotero/preferences.ftl
index 874ac00254..2307c82139 100644
--- a/chrome/locale/fi-FI/zotero/preferences.ftl
+++ b/chrome/locale/fi-FI/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Kieli ja alue
 preferences-advanced-enable-bidi-ui =
     .label = Käytä kaksisuuntaisen tekstin editointiohjelmia
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Palauta vakiosijaintiin…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Kirjaudu { -app-name }-tililläsi niin voit synkronoida tietosi laitteiden välillä ja muun muassa tehdä yhteistyötä muiden kanssa.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synkronointi
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Toiseen tiliin vaihtaminen poistaa kaiken { -app-name }n datan tältä tietokoneelta. Ennen kuin jatkat, tarkista että kaikki tärkeä data ja tiedostot on synkronoitu tilillä “{ $username }” tai sinulla on varmuuskopio { -app-name }n datakansiosta.
 preferences-account-switch-confirmation-text = poista paikalliset tiedot
 preferences-account-switch-accept = Poista tiedot ja käynnistä uudelleen
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/fi-FI/zotero/reader.ftl b/chrome/locale/fi-FI/zotero/reader.ftl
index 5842f06d3d..4ecf62ef94 100644
--- a/chrome/locale/fi-FI/zotero/reader.ftl
+++ b/chrome/locale/fi-FI/zotero/reader.ftl
@@ -223,7 +223,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Tapahtui tuntematon virhe.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Virhe yhdistettäessä ääneenlukupalveluun. Tarkista internet-yhteytesi.
 reader-read-aloud-error-daily-limit-exceeded = Päivittäinen { -app-name }n lukuäänten aikaraja on saavutettu.
 reader-read-aloud-retry = Yritä uudelleen
 reader-read-aloud-first-run-title = Valitse suosikkilukuäänesi:
diff --git a/chrome/locale/fi-FI/zotero/searchbox.dtd b/chrome/locale/fi-FI/zotero/searchbox.dtd
index 598c572815..a8afdc1248 100644
--- a/chrome/locale/fi-FI/zotero/searchbox.dtd
+++ b/chrome/locale/fi-FI/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nimi:">
 
-<!ENTITY zotero.search.searchInLibrary "Etsi kirjastosta:">
-
 <!ENTITY zotero.search.joinMode.prefix "Vertaa">
 <!ENTITY zotero.search.joinMode.any "mikä tahansa">
 <!ENTITY zotero.search.joinMode.all "kaikki">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "päivää">
 <!ENTITY zotero.search.date.units.months "kuukautta">
 <!ENTITY zotero.search.date.units.years "vuotta">
-
-<!ENTITY zotero.search.search "Hae">
-<!ENTITY zotero.search.clear "Tyhjennä">
-<!ENTITY zotero.search.saveSearch "Tallenna haku">
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index 6a3c216857..7364b6457f 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Poista nimike...">
 <!ENTITY zotero.toolbar.newGroup "Uusi ryhmä...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Uusi alakokoelma...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Uusi tallennettu haku...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Tyhjennä roskakori">
 <!ENTITY zotero.toolbar.tagSelector.label "Näytä/piilota merkkivalitsin">
 <!ENTITY zotero.toolbar.actions.label "Toiminnot">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Asetukset...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Ohjeet ja tuki">
 <!ENTITY zotero.toolbar.about.label "Tietoja Zoterosta">
-<!ENTITY zotero.toolbar.advancedSearch "Tarkennettu haku">
 <!ENTITY zotero.toolbar.openURL.label "Paikanna">
 <!ENTITY zotero.toolbar.openURL.tooltip "Etsi paikallisen kirjaston kautta">
 
diff --git a/chrome/locale/fi-FI/zotero/zotero.ftl b/chrome/locale/fi-FI/zotero/zotero.ftl
index 61cae3e587..7e51471dbe 100644
--- a/chrome/locale/fi-FI/zotero/zotero.ftl
+++ b/chrome/locale/fi-FI/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Palauta
        *[other] Syötä
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Tulosta
 general-remove = Poista
 general-add = Lisää
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Katso vianhakuohjeet
 general-go-back = Siirry takaisinpäin
 general-accept = Hyväksy
 general-cancel = Peruuta
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Näytä kirjastossa
 general-restartApp = Uudelleenkäynnistä { -app-name }
 general-restartInTroubleshootingMode = Käynnistä uudelleen virheenjäljitystilassa
 general-save = Tallenna
 general-clear = Tyhjennä
+clear-button =
+    .label = { general-clear }
 general-update = Päivitä
 general-back = Takaisin
 general-edit = Muokkaa
@@ -76,6 +86,8 @@ general-maroon = Kastanjanruskea
 general-gray = Harmaa
 general-black = Musta
 general-loading = Ladataan...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Viittaustyyli:
 language-label = Kieli:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Näytä { recently-read }
 item-menu-remove-from-recently-read =
     .label = Poista listalta { recently-read }…
-collections-menu-rename-collection =
-    .label = Nimeä kokoelma uudelleen
-collections-menu-edit-saved-search =
-    .label = Muokkaa tallennettua hakua
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } kokoelma valittu
+       *[other] { $count } kokoelmaa valittu
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Muokkaa tallennettua hakua
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Siirrä kohteeseen
 collections-menu-copy-collection =
     .label = Kopioi kohteeseen
+collections-menu-export =
+    .label = Vie...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Siirrä alas
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Linkitä uudelleen Mendeley Desktopin viittaukset
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } ei saanut yhteyttä sovellukseen { $targetApp }. Tarkista internet-yhteytesi ja yritä uudelleen.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Pikahaku
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Tarkennettu haku
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Näytä muodossa
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Lataa { -app-name } ARM64-prosessorille
 first-run-guidance-authorMenu = { -app-name } antaa sinun määritellä myös toimittajat ja kääntäjät. Voit tehdä kirjoittajasta toimittajan tai kääntäjän tästä valikosta.
 first-run-guidance-readAloud = { -app-name } osaa nyt lukea asiakirjasi ääneen luonnolliselta kuulostavalla äänellä.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Etsi
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = huomautukset
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Hakuehto
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Arvo
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Kentät:
 search-conditions-collection = Kokoelma
 search-conditions-savedSearch = Tallennettu haku
 search-conditions-itemTypeID = Nimikkeen tyyppi
 search-conditions-tag = Merkki
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Muistiinpano
 search-conditions-childNote = Alimuistiinpano
 search-conditions-creator = Tekijä
@@ -715,10 +897,26 @@ search-conditions-dateModified = Muokattu
 search-conditions-fulltextContent = Liitteen sisältö
 search-conditions-programmingLanguage = Ohjelmointikieli
 search-conditions-fileTypeID = Liitetiedoston tyyppi
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Viimeksi luettu liite
 search-conditions-annotationText = Huomautusteksti
 search-conditions-annotationComment = Huomautuskommentti
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Mikä tahansa kenttä
+search-conditions-titleCreatorYear = Otsikko, kirjoittaja, vuosi
+search-conditions-submenu-attachment = Liite
+search-conditions-submenu-annotation = Huomautus
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tiedostomuoto
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Viimeksi luettu
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tyyppi
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Tekijä
 find-pdf-files-added =
     { $count ->
         [one] { $count } tiedosto lisätty
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Esitelmä
 file-type-document = Asiakirja
 file-type-ebook = E-kirja
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Olet päivittänyt versioon <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Tutustu <a data-l10n-name="new-features-link">uusiin ominaisuuksiin </a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Liitä ja etsi
 mac-word-plugin-install-message = Zotero vaatii pääsyn Wordin tietoihin jotta lisäosa voidaan asentaa
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Asenna Word-lisäosa
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Asenna
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } pitää nyt automaattisesti tiedostonnimet ajan tasalla kun teet muutoksia nimikkeisiin.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = { -app-name } Connector jotta se toimii tämän { -app-name }n version kanssa.
 userjs-pref-warning = Jotkus { -app-name }n asetukset on ohitettu käyttämällä ei-tuettua menetelmää. { -app-name } palauttaa ne ja käynnistyy uudelleen.
 migrate-extra-fields-progress-message = Uusien kenttien tuominen Ylim. -kentästä
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Jaa avainsanat
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = { -app-name } on kytkenyt tämän lisäosan pois päältä.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Haku
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Tallenna
+save-search-name-title = Tallenna haku
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Nimeä kokoelma uudelleen
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Muokkaa muistiinpanoa
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Vaihda kohteen tyyppi
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 3acb96c074..830d8de525 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 vuosi sitten
 date.relative.yearsAgo.multiple=%S vuotta sitten
 
 pane.collections.title=Kokoelmat
-pane.collections.delete.title=Poista kokoelma
-pane.collections.delete=Haluatko varmasti poistaa valitun kokoelman?
-pane.collections.delete.keepItems=Tässä kokoelmassa olevia nimikkeitä ei poisteta.
-pane.collections.deleteWithItems.title=Poista kokoelma ja nimikkeet
-pane.collections.deleteWithItems=Haluatko varmasti poistaa valitun kokoelman ja siirtää kaikki siihen kuuluvat nimikkeet roskakoriin?
 pane.feed.deleteWithItems.title=Poistu listalta
 pane.feed.deleteWithItems=Haluatko varmasti peruuttaa tämän syötteen tilauksen?
 
-pane.collections.deleteSearch.title=Poista haku
-pane.collections.deleteSearch=Haluatko varmasti poistaa valitun haun?
 pane.collections.emptyTrash=Haluatko varmasti poistaa roskakorissa olevat nimikkeet pysyvästi?
 pane.collections.newSavedSeach=Uusi tallennettu haku
 pane.collections.savedSearchName=Anna tälle tallennetulle haulle nimi:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Kaksoiskappaleet
 pane.collections.removeLibrary=Poista kirjasto
 pane.collections.removeLibrary.text=Haluatko varmasti poistaa “%S”:n pysyvästi tältä tietokoneelta?
 
-pane.collections.menu.duplicate.savedSearch=Monista tallennettu haku
 pane.collections.menu.remove.library=Poista kirjasto...
-pane.collections.menu.delete.collection=Poista kokoelma...
-pane.collections.menu.delete.collectionAndItems=Poista kokoelma ja nimikkeet..
-pane.collections.menu.delete.savedSearch=Poista tallennettu haku...
-pane.collections.menu.delete.feedAndItems=Lopeta syötteen tilaus...
-pane.collections.menu.export.collection=Vie kokoelma...
-pane.collections.menu.export.savedSearch=Vie tallennettu haku...
-pane.collections.menu.export.feed=Vie syöte...
-pane.collections.menu.createBib.collection=Luo kirjallisuusluettelo kokoelmasta...
-pane.collections.menu.createBib.savedSearch=Luo kirjallisuusluettelo tallennetusta hausta...
-pane.collections.menu.createBib.feed=Luo kirjallisuusluettelo valitusta syötteestä...
 pane.collections.showCollectionInLibrary=Näytä kokoelma kirjastossa
 
-pane.collections.menu.generateReport.collection=Luo raportti kokoelmasta...
-pane.collections.menu.generateReport.savedSearch=Luo raportti tallennetusta hausta...
-pane.collections.menu.generateReport.feed=Luo raportti syötteestä…
-
 pane.collections.menu.refresh.feed=Päivitä syöte
 pane.collections.menu.refresh.allFeeds=Päivitä kaikki syötteet
 pane.collections.menu.markAsRead.feed=Merkitse syöte luetuksi
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox pitää käynnistää uu
 zotero.preferences.sync.reset.fileSyncHistory=Seuraavalla synkronointikerralla %1$S tarkistaa kaikki liitetiedostot “%2$S”:ssa ja ja vertaa niitä tallennuspalvelussa oleviin. Kaikki etäpalvelimella olevat liitetiedostot jotka puuttuvat omalta koneeltasi ladataan koneellesi, ja koneellasi olevat tiedostot jotka puuttuvat palvelimelta, ladataan sinne.\n\nTämä toimenpide ei ole tarpeellinen normaalikäytössä.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S”:n tiedostosynkronointihistoria on tyhjennetty.
 
-zotero.preferences.search.rebuildIndex=Luo indeksi uudelleen
-zotero.preferences.search.rebuildWarning=Haluatko luoda koko indeksin uudelleen? Tämä saattaa kestää hetken.\n\nIndeksoidaksesi vain aiemmin indeksoimattomat nimikkeet käytä toimintoa %S.
-zotero.preferences.search.clearIndex=Tyhjennä indeksi
-zotero.preferences.search.clearWarning=Indeksin tyhjentämisen jälkeen liitteiden sisällöstä ei enää voi suorittaa hakuja.\n\nLiitteinä olevia web-linkkejä ei voi indeksoida uudelleen käytämällä ko. sivuilla. Jos haluat jättää web-linkit indeksoimatta, valitse %S.
-zotero.preferences.search.clearNonLinkedURLs=Tyhjennä kaikki paitsi web-linkit
-zotero.preferences.search.indexUnindexed=Indeksoi indeksoimattomat nimikkeet
 zotero.preferences.export.quickCopy.citationStyles=Viittaustyylit
 zotero.preferences.export.quickCopy.exportFormats=Vientimuodot
 zotero.preferences.export.quickCopy.instructions=Pikakopiointi mahdollistaa nimikkeiden nopean viennin haluamassasi muodossa. Voit kopioida valitut nimikkeet leikepöydälle painamalla %S tai vetämällä nimikkeet suoraan tekstikenttään toisessa ohjelmassa.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Sinun täytyy lisätä viite ennen tämän
 integration.error.mustInsertBibliography=Sinun täytyy lisätä lähdeluettelo ennen tämän toiminnon suorittamista
 integration.error.cannotInsertHere=Zotero-kenttiä ei voi lisätä tähän.
 integration.error.notInCitation=Sinun täytyy sijoittaa kursori Zotero-viitteeseen muokataksesi sitä.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Nykyinen lähdeluettelotyyli ei määrittele lähdeluetteloa. Jos haluat lisätä lähdeluettelon, valitse jokin toinen tyyli.
 integration.error.deletePipe=Kommunikaatioputkea Zoteron ja tekstinkäsittelyohjelman välille ei voitu muodostaa. Haluatko, että Zotero yrittää korjata tämän virheen? Sinulta kysytään salasanaa.
 integration.error.invalidStyle=Valitsemasi tyyli vaikuttaa olevan epäkelpo. Jos olet luonut tyylin itse, varmista, että se läpäisee validoinnin, joka selitetään osoitteessa https://github.com/citation-style-language/styles/wiki/Validation. Vaihtoehtoisesti voit valita jonkin toisen tyylin.
diff --git a/chrome/locale/fr-FR/zotero/integration.ftl b/chrome/locale/fr-FR/zotero/integration.ftl
index b3919e9320..f22b8442c8 100644
--- a/chrome/locale/fr-FR/zotero/integration.ftl
+++ b/chrome/locale/fr-FR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffixe
 integration-citationDialog-details-prefix = Préfixe
 integration-citationDialog-details-suppressAuthor = Ignorer l'auteur
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Inclure les commentaires
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] Aucun document avec annotations n'est ouvert ou sélectionné
     }
 integration-citationDialog-settings-keepSorted = Trier les sources automatiquement
+integration-citationDialog-preview-empty = Aperçu
+integration-citationDialog-preview-error = Aperçu indisponible
+integration-citationDialog-btn-displayPreview =
+    .title = Afficher l'aperçu de la citation
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliothèque
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Appuyer sur Tab pour sélectionner les documents à ajouter à cette citation. Appuyer sur Échap pour ignorer les changements et fermer la fenêtre.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Certaines des mod
 integration-warning-discard-changes = Ignorer les modifications
 integration-warning-command-is-running = Une commande de l'intégration de traitement de texte est déjà en cours d'exécution.
 first-run-guidance-citationDialog =
-    Tapez un titre, un auteur et/ou une année pour rechercher une référence.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Une fois votre sélection effectuée, cliquez sur la bulle ou sélectionnez-la à l'aide du clavier, puis appuyez sur ↓/Espace pour afficher les options de citation telles que le numéro de page, le préfixe et le suffixe.
-    
-    Vous pouvez aussi ajouter un numéro de page ou un autre localisateur en l'incluant dans vos termes de recherche (par exemple, "histoire { $locator }") ou en le saisissant après la bulle et en appuyant sur { return-or-enter }.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/fr-FR/zotero/preferences.ftl b/chrome/locale/fr-FR/zotero/preferences.ftl
index ad75d7d25e..4489e301eb 100644
--- a/chrome/locale/fr-FR/zotero/preferences.ftl
+++ b/chrome/locale/fr-FR/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Langue et zone géographique
 preferences-advanced-enable-bidi-ui =
     .label = Activer les utilitaires d'édition de texte bidirectionnel
+preferences-advanced-data-dir =
+    .value = Répertoire de données :
 preferences-advanced-reset-data-dir =
     .label = Revenir à l'emplacement par défaut...
 preferences-advanced-custom-data-dir =
@@ -77,18 +79,18 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Par défaut : { $directory })
     .aria-label = Emplacement par défaut
-preferences-pane-account = Account
+preferences-pane-account = Compte
 -preferences-sync-data-syncing = Synchronisation des données
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Connectez-vous avec votre compte { -app-name } pour synchroniser vos données entre vos appareils, collaborer avec d'autres personnes, et bien plus encore.
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = Synchronisation
+preferences-sync-settings-intro = { -app-name } peut synchroniser les données et les fichiers de votre bibliothèque entre plusieurs appareils. <label data-l10n-name="sync-link">En savoir plus</label>
+preferences-sync-reset-heading = Réinitialisation de la synchronisation
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Synchroniser les fichiers joints dans les bibliothèques de groupe en utilisant le stockage de { -app-name }
+preferences-sync-fileSyncing-tos = En utilisant le stockage de { -app-name }, vous acceptez d'être lié par ses <label data-l10n-name="terms-link">conditions générales</label>.
 preferences-account-log-out =
     .label = Se déconnecter...
 preferences-sync-reset-restore-to-server-body = { -app-name } remplacera “{ $libraryName }” sur { $domain } par les données de cet ordinateur.
@@ -126,3 +128,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Le passage à un autre compte entraînera la suppression de toutes les données de { -app-name } sur cet ordinateur. Avant de continuer, assurez-vous que toutes les données et tous les fichiers que vous souhaitez conserver ont été synchronisés avec le compte "{ $username }" ou que vous disposez d'une sauvegarde du répertoire de données de { -app-name }.
 preferences-account-switch-confirmation-text = supprimer les données locales
 preferences-account-switch-accept = Supprimer les données et redémarrer
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/fr-FR/zotero/reader.ftl b/chrome/locale/fr-FR/zotero/reader.ftl
index 32448fb2dd..f44becb923 100644
--- a/chrome/locale/fr-FR/zotero/reader.ftl
+++ b/chrome/locale/fr-FR/zotero/reader.ftl
@@ -226,7 +226,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Une erreur indéterminée est survenue.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Impossible de se connecter au service de lecture à haute voix. Veuillez vérifier votre connexion Internet.
 reader-read-aloud-error-daily-limit-exceeded = Vous avez dépassé votre limite quotidienne pour les voix de { -app-name }.
 reader-read-aloud-retry = Essayer à nouveau
 reader-read-aloud-first-run-title = Choisissez la voix de lecture à haute voix que vous préférez :
diff --git a/chrome/locale/fr-FR/zotero/searchbox.dtd b/chrome/locale/fr-FR/zotero/searchbox.dtd
index 564fe20c01..22b8c92775 100644
--- a/chrome/locale/fr-FR/zotero/searchbox.dtd
+++ b/chrome/locale/fr-FR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nom :">
 
-<!ENTITY zotero.search.searchInLibrary "Rechercher dans la bibliothèque :">
-
 <!ENTITY zotero.search.joinMode.prefix "Correspond">
 <!ENTITY zotero.search.joinMode.any "au moins à une">
 <!ENTITY zotero.search.joinMode.all "à toutes les">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "jours">
 <!ENTITY zotero.search.date.units.months "mois">
 <!ENTITY zotero.search.date.units.years "années">
-
-<!ENTITY zotero.search.search "Rechercher">
-<!ENTITY zotero.search.clear "Effacer">
-<!ENTITY zotero.search.saveSearch "Enregistrer la recherche">
diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd
index c420294148..c99ae305c4 100644
--- a/chrome/locale/fr-FR/zotero/zotero.dtd
+++ b/chrome/locale/fr-FR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Supprimer le document…">
 <!ENTITY zotero.toolbar.newGroup "Nouveau groupe…">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nouvelle sous-collection…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nouvelle recherche enregistrée…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Vider la corbeille">
 <!ENTITY zotero.toolbar.tagSelector.label "Afficher / Cacher le sélecteur de marqueurs">
 <!ENTITY zotero.toolbar.actions.label "Actions">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Préférences…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Assistance et documentation">
 <!ENTITY zotero.toolbar.about.label "À propos de Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Recherche avancée">
 <!ENTITY zotero.toolbar.openURL.label "Localiser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Chercher dans votre bibliothèque locale">
 
diff --git a/chrome/locale/fr-FR/zotero/zotero.ftl b/chrome/locale/fr-FR/zotero/zotero.ftl
index 419ee9f4f4..92d93c1207 100644
--- a/chrome/locale/fr-FR/zotero/zotero.ftl
+++ b/chrome/locale/fr-FR/zotero/zotero.ftl
@@ -16,13 +16,19 @@ command-or-control =
     }
 return-or-enter =
     { PLATFORM() ->
-        [macos] Return
-       *[other] Enter
+        [macos] Retour
+       *[other] Entrée
     }
 delete-or-backspace =
     { PLATFORM() ->
-        [macos] Delete
-       *[other] Backspace
+        [macos] Supprimer
+       *[other] Supprimer
+    }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
     }
 general-print = Imprimer
 general-remove = Supprimer
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Afficher les instructions de dépann
 general-go-back = Revenir en arrière
 general-accept = Accepter
 general-cancel = Annuler
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Montrer dans la bibliothèque
 general-restartApp = Redémarrer { -app-name }
 general-restartInTroubleshootingMode = Redémarrer en mode dépannage
 general-save = Enregistrer
 general-clear = Effacer
+clear-button =
+    .label = { general-clear }
 general-update = Mettre à jour
 general-back = Page précédente
 general-edit = Modifier
@@ -76,6 +86,8 @@ general-maroon = Bordeaux
 general-gray = Gris
 general-black = Noir
 general-loading = Chargement...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Style de citation :
 language-label = Langue :
 menu-custom-group-submenu =
@@ -163,14 +175,125 @@ collections-menu-show-recently-read =
     .label = Afficher { recently-read }
 item-menu-remove-from-recently-read =
     .label = Retirer de { recently-read }…
-collections-menu-rename-collection =
-    .label = Renommer la collection
-collections-menu-edit-saved-search =
-    .label = Modifier la recherche enregistrée
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection sélectionnée
+        [many] { $count } collections sélectionnées
+       *[other] { $count } collections sélectionnées
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } recherche enregistrée sélectionnée
+        [many] { $count }  recherches enregistrées sélectionnées
+       *[other] { $count }  recherches enregistrées sélectionnées
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source sélectionnée
+        [many] { $count } sources sélectionnées
+       *[other] { $count } sources sélectionnées
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection sélectionnée)
+        [many] { $library } ({ $count } collections sélectionnées)
+       *[other] { $library } ({ $count } collections sélectionnées)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count }  recherche enregistrée sélectionnée)
+        [many] { $library } ({ $count }  recherches enregistrées sélectionnées)
+       *[other] { $library } ({ $count }  recherches enregistrées sélectionnées)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source sélectionnée)
+        [many] { $library } ({ $count } sources sélectionnées)
+       *[other] { $library } ({ $count } sources sélectionnées)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Renommer
+edit-saved-search = Modifier la recherche enregistrée
+collections-menu-edit-search =
+    .label = Modifier la recherche
+collections-menu-duplicate-search =
+    .label = Dupliquer la recherche
 collections-menu-move-collection =
     .label = Déplacer vers
 collections-menu-copy-collection =
     .label = Copier vers
+collections-menu-export =
+    .label = Exporter…
+collections-menu-generate-report =
+    .label = Établir un rapport...
+collections-menu-create-bibliography =
+    .label = Créer une bibliographie…
+collections-menu-unsubscribe =
+    .label = Se désabonner...
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Supprimer la collection…
+            [many] Supprimer les collections…
+           *[other] Supprimer les collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Supprimer la collection et ses documents…
+            [many] Supprimer les collections et leurs documents…
+           *[other] Supprimer les collections et leurs documents…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Supprimer la recherche...
+            [many] Supprimer les recherches...
+           *[other] Supprimer les recherches...
+        }
+collections-delete-title =
+    { $count ->
+        [one] Supprimer la collection
+        [many] Supprimer les collections
+       *[other] Supprimer les collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Voulez-vous vraiment supprimer cette collection?
+        [many] Voulez-vous vraiment supprimer { $count } collections?
+       *[other] Voulez-vous vraiment supprimer { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Les documents contenus dans cette collection ne seront pas supprimés.
+        [many] Les documents contenus dans ces collections ne seront pas supprimés.
+       *[other] Les documents contenus dans ces collections ne seront pas supprimés.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Supprimer la collection et ses documents
+        [many] Supprimer les collections et leurs documents
+       *[other] Supprimer les collections et leurs documents
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Voulez-vous vraiment supprimer cette collection et déplacer tous les documents qu'elle contient vers la Corbeille?
+        [many] Voulez-vous vraiment supprimer { $count } collections et déplacer tous les documents qu'elles contiennent vers la Corbeille?
+       *[other] Voulez-vous vraiment supprimer { $count } collections et déplacer tous les documents qu'elles contiennent vers la Corbeille?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Supprimer la recherche
+        [many] Supprimer les recherches
+       *[other] Supprimer les recherches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Descendre
 item-creator-moveToTop =
@@ -283,6 +406,7 @@ import-online-relink-only =
     .label = Lier à nouveau les citations de Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } n'a pas pu se connecter à { $targetApp }. Veuillez vérifier votre connexion Internet et réessayer.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -628,6 +752,18 @@ quicksearch-input =
     .aria-label = Recherche rapide
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Recherche avancée
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Fermer la recherche avancée
+advanced-search-expand =
+    .tooltiptext = Développer la recherche avancée
+advanced-search-collapse =
+    .tooltiptext = Compacter la recherche avancée
 item-pane-header-view-as =
     .label = Voir en tant que
 item-pane-header-none =
@@ -691,9 +827,64 @@ architecture-x64-on-arm64-action = Télécharger { -app-name } pour ARM64
 first-run-guidance-authorMenu = { -app-name } vous permet aussi d'indiquer des éditeurs et des traducteurs. Vous pouvez changer un auteur en éditeur ou en traducteur par une sélection dans ce menu.
 first-run-guidance-readAloud = { -app-name } peut désormais vous lire vos documents à haute voix en utilisant des voix au son naturel.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Supprimer la condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Ajouter une condition
+advanced-search-group-btn =
+    .tooltiptext = Ajouter un groupe de conditions
+advanced-search-remove-group-btn =
+    .tooltiptext = Supprimer le groupe
+advanced-search-ungroup-btn =
+    .tooltiptext = Dégrouper les conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Rechercher
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = tous les documents
+advanced-search-result-level-item =
+    .label = documents de niveau supérieur
+advanced-search-result-level-attachment =
+    .label = fichiers joints
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = séparément
+advanced-search-binding-same-attachment =
+    .label = dans le même fichier joint
+advanced-search-binding-same-note =
+    .label = dans la même note
+advanced-search-binding-same-annotation =
+    .label = dans la même annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = Ces conditions peuvent correspondre à des fichiers joints distincts.
+advanced-search-binding-hint-note =
+    .value = Ces conditions peuvent correspondre à des notes distinctes.
+advanced-search-binding-hint-annotation =
+    .value = Ces conditions peuvent correspondre à des annotations distinctes.
+advanced-search-level-warning-mixed = Ces conditions ne peuvent pas toutes correspondre au même document, cette recherche ne trouvera donc jamais aucun résultat. Essayez de faire correspondre “{ $matchAny }” de ces conditions, ou choisissez le type de résultat “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = Cette recherche contient une condition incompatible avec le type de résultat choisi. Sélectionnez le type de résultat “{ $topLevelItems }” ou supprimez la condition incompatible.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Correspondre au même fichier joint
+advanced-search-bind-same-note =
+    .label = Correspondre à la même note.
+advanced-search-bind-same-annotation =
+    .label = Correspondre à la même annotation
 advanced-search-conditions-menu =
     .aria-label = Condition de recherche
     .label = { $label }
@@ -703,11 +894,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valeur
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Champs :
 search-conditions-collection = Collection (de Zotero)
 search-conditions-savedSearch = Recherche enregistrée
 search-conditions-itemTypeID = Type de document
 search-conditions-tag = Marqueur
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Note fille
 search-conditions-creator = Créateur
@@ -726,10 +923,26 @@ search-conditions-dateModified = Date de modification
 search-conditions-fulltextContent = Contenu de la pièce jointe
 search-conditions-programmingLanguage = Langage de programmation
 search-conditions-fileTypeID = Type de fichier joint
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Dernière pièce jointe lue
 search-conditions-annotationText = Texte de l'annotation
 search-conditions-annotationComment = Commentaire de l'annotation
+search-conditions-annotationType = Type d'annotation
+search-conditions-annotationColor = Couleur d'annotation
+search-conditions-annotationAuthor = Auteur de l'annotation
 search-conditions-anyField = N’importe quel champ
+search-conditions-titleCreatorYear = Titre, Créateur, Année
+search-conditions-submenu-attachment = Pièce jointe
+search-conditions-submenu-annotation = Annotation
+search-conditions-short-fulltextContent = Contenu
+search-conditions-short-fileTypeID = Type de fichier
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Dernière lecture
+search-conditions-short-annotationText = Texte
+search-conditions-short-annotationComment = Commentaire
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Couleur
+search-conditions-short-annotationAuthor = Auteur
 find-pdf-files-added =
     { $count ->
         [one] { $count } fichier ajouté
@@ -764,6 +977,9 @@ file-type-video = Vidéo
 file-type-presentation = Présentation
 file-type-document = Document
 file-type-ebook = Livre numérique
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Vous avez été mis à niveau vers <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Découvrez <a data-l10n-name="new-features-link">les nouveautés</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -772,18 +988,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Coller et rechercher
 mac-word-plugin-install-message = Zotero doit avoir accès aux données de Word pour installer l'extension Word.
+mac-word-plugin-install-folder-message = { -app-name } a besoin d'accéder au dossier de démarrage de Word pour installer l'extension Word.
 mac-word-plugin-install-action-button =
     .label = Installer l'extension Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Installez l'extension dans le dossier de démarrage de Word
+mac-word-plugin-install-folder-dialog-button = Installer
+mac-word-plugin-install-wrong-folder-selected = Le dossier proposé doit être sélectionné. Veuillez réessayer sans choisir un autre dossier.
 file-renaming-banner-message = { -app-name } synchronise désormais automatiquement les noms des fichiers joints lorsque vous modifiez des documents.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = Le connecteur { -app-name } doit être mis à jour pour fonctionner avec cette version de { -app-name }.
 userjs-pref-warning = Certains paramètres de { -app-name } ont été modifiés à l'aide d'une méthode non prise en charge. { -app-name } va les rétablir et redémarrer.
 migrate-extra-fields-progress-message = Migration des nouveaux champs depuis le champ Extra
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Scinder les marqueurs
 long-tag-fixer-button-dont-split =
@@ -796,4 +1017,156 @@ banner-close-button =
     .aria-label = Ignorer la notification
 plugins-blocked-plugin =
     .message = Cette extension a été désactivée par { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Cela peut se produire si le répertoire de données de { -app-name } se trouve dans un dossier de stockage en nuage (OneDrive, Dropbox, etc.) ou sur un partage réseau.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Rechercher
+save-search-new-button =
+    .label = Enregistrer la recherche...
+save-search-edit-button =
+    .label = Enregistrer
+save-search-name-title = Enregistrer la recherche
+save-search-name-message = Saisissez un nom pour la recherche enregistrée :
+saved-search-close-confirmation-title = Modification de la recherche enregistrée
+saved-search-close-confirmation-body = Souhaitez-vous enregistrer les modifications que vous avez apportées à cette recherche enregistrée ?
+item-pane-batch-editing-prompt =
+    .aria-label = Modification groupée
+item-pane-batch-editing-enable =
+    .label = Modifier plusieurs documents...
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Effacer toutes les valeurs
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Modifier les métadonnées
+        [many] Modifier les métadonnées pour { $count } documents
+       *[other] Modifier les métadonnées pour { $count } documents
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normaliser le titre de la pièce jointe
+undo-action-trash =
+    { $count ->
+        [one] Mettre à la corbeille le document
+        [many] Mettre à la corbeille { $count } documents
+       *[other] Mettre à la corbeille { $count } documents
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restaurer le document
+        [many] Restaurer { $count } documents
+       *[other] Restaurer { $count } documents
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Mettre à la corbeille la collection
+        [many] Mettre à la corbeille { $count } collections
+       *[other] Mettre à la corbeille { $count } collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Mettre à la corbeille la recherche enregistrée
+        [many] Mettre à la corbeille { $count } recherches enregistrées
+       *[other] Mettre à la corbeille { $count } recherches enregistrées
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restaurer la collection
+        [many] Restaurer { $count } collections
+       *[other] Restaurer { $count } collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restaurer l'objet
+        [many] Restaurer { $count } objets
+       *[other] Restaurer { $count } objets
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Ajouter à la collection
+        [many] Ajouter { $count } documents à la collection
+       *[other] Ajouter { $count } documents à la collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Retirer de la collection
+        [many] Retirer { $count } documents de la collection
+       *[other] Retirer { $count } documents de la collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Déplacer vers la collection
+        [many] Déplacer { $count } documents vers la collection.
+       *[other] Déplacer { $count } documents vers la collection.
+    }
+undo-action-rename-collection = Renommer la collection
+undo-action-move-collection = Déplacer la collection
+undo-action-add-tag =
+    { $count ->
+        [one] Ajouter le marqueur
+        [many] Ajouter le marqueur à { $count } documents
+       *[other] Ajouter le marqueur à { $count } documents
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Scinder le marqueur
+undo-action-remove-tag =
+    { $count ->
+        [one] Retirer le marqueur
+        [many] Retirer le marqueur de { $count } documents
+       *[other] Retirer le marqueur de { $count } documents
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Retirer le marqueur
+        [many] Retirer { $count } marqueurs
+       *[other] Retirer { $count } marqueurs
+    }
+undo-action-remove-all-tags = Retirer tous les marqueurs
+undo-action-edit-note = Modifier la note
+undo-action-add-creator = Ajouter un auteur
+undo-action-remove-creator = Supprimer un auteur
+undo-action-edit-creator = Editer un auteur
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Changer le type du document
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convertir en document indépendant
+        [many] Convertir { $count } éléments en document indépendants
+       *[other] Convertir { $count } éléments en documents indépendants
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Fusionner le document
+        [many] Fusionner { $count } documents
+       *[other] Fusionner { $count } documents
+    }
+menu-edit-undo-action = Annuler { $action }
+menu-edit-redo-action = Répéter { $action }
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index f42d107c1d..79f5930322 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=il y a 1 an
 date.relative.yearsAgo.multiple=il y a %S ans
 
 pane.collections.title=Collections
-pane.collections.delete.title=Supprimer la collection
-pane.collections.delete=Voulez-vous vraiment supprimer la collection sélectionnée ?
-pane.collections.delete.keepItems=Les documents de cette collection ne seront pas supprimés.
-pane.collections.deleteWithItems.title=Supprimer la collection et les documents
-pane.collections.deleteWithItems=Voulez-vous vraiment supprimer la collection sélectionnée et mettre tous ses documents à la corbeille ?
 pane.feed.deleteWithItems.title=Se désabonner
 pane.feed.deleteWithItems=Voulez-vous vraiment vous désinscrire de ce flux ?
 
-pane.collections.deleteSearch.title=Supprimer la recherche
-pane.collections.deleteSearch=Voulez-vous vraiment supprimer la recherche sélectionnée ?
 pane.collections.emptyTrash=Voulez-vous vraiment supprimer définitivement les documents de la corbeille ?
 pane.collections.newSavedSeach=Nouvelle recherche enregistrée
 pane.collections.savedSearchName=Saisissez un nom pour cette recherche enregistrée :
@@ -277,24 +270,9 @@ pane.collections.duplicate=Doublons
 pane.collections.removeLibrary=Supprimer la bibliothèque
 pane.collections.removeLibrary.text=Voulez-vous vraiment supprimer définitivement "%S" de cet ordinateur ?
 
-pane.collections.menu.duplicate.savedSearch=Dupliquer la recherche enregistrée
 pane.collections.menu.remove.library=Supprimer la bibliothèque…
-pane.collections.menu.delete.collection=Supprimer la collection…
-pane.collections.menu.delete.collectionAndItems=Supprimer la collection et ses documents…
-pane.collections.menu.delete.savedSearch=Supprimer la recherche enregistrée…
-pane.collections.menu.delete.feedAndItems=Se désabonner du flux…
-pane.collections.menu.export.collection=Exporter la collection…
-pane.collections.menu.export.savedSearch=Exporter la recherche enregistrée…
-pane.collections.menu.export.feed=Exporter le flux…
-pane.collections.menu.createBib.collection=Créer une bibliographie à partir de la collection…
-pane.collections.menu.createBib.savedSearch=Créer une bibliographie à partir de la recherche enregistrée…
-pane.collections.menu.createBib.feed=Créer une bibliographie à partir du flux…
 pane.collections.showCollectionInLibrary=Afficher la collection dans la bibliothèque
 
-pane.collections.menu.generateReport.collection=Établir un rapport à partir de la collection…
-pane.collections.menu.generateReport.savedSearch=Établir un rapport à partir de la recherche enregistrée…
-pane.collections.menu.generateReport.feed=Établir un rapport à partir du flux…
-
 pane.collections.menu.refresh.feed=Actualiser le flux
 pane.collections.menu.refresh.allFeeds=Actualiser tous les flux
 pane.collections.menu.markAsRead.feed=Marquer le flux comme lu
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox doit être redémarré p
 zotero.preferences.sync.reset.fileSyncHistory=Lors de la prochaine synchronisation, %1$S comparera tous les fichiers joints dans “%2$S” avec le serveur de stockage. Tous les fichiers joints qui manquent localement seront téléchargés, et les fichiers joints locaux qui manquent sur le serveur distant seront téléversés.\n\nLors d'une utilisation normale, cette option n'est pas nécessaire.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=L'historique de synchronisation de “%S” a été effacé
 
-zotero.preferences.search.rebuildIndex=Reconstruire l'index
-zotero.preferences.search.rebuildWarning=Voulez-vous reconstruire l'index entier ? Cela peut prendre un moment.\n\nPour n'indexer que les documents non indexés, utilisez %S.
-zotero.preferences.search.clearIndex=Effacer l'index
-zotero.preferences.search.clearWarning=Après effacement de l'index, il n'y aura plus de recherche sur le contenu des pièces jointes.\n\nLes liens Internet en pièce jointe ne peuvent pas être réindexés sans visiter à nouveau la page. Pour conserver l'indexation des liens Internet, choisissez %S.
-zotero.preferences.search.clearNonLinkedURLs=Tout effacer sauf les liens Internet
-zotero.preferences.search.indexUnindexed=Indexer les documents non indexés
 zotero.preferences.export.quickCopy.citationStyles=Styles de citation
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportation
 zotero.preferences.export.quickCopy.instructions=La Copie rapide vous permet d'exporter en un geste des documents dans le format choisi ci-dessous. Vous pouvez copier les documents sélectionnés en appuyant sur %S ou les glisser-déposer directement dans la zone de texte d'un autre logiciel.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Vous devez insérer une citation avant d'ef
 integration.error.mustInsertBibliography=Vous devez insérer une bibliographie avant d'effectuer cette opération.
 integration.error.cannotInsertHere=Des champs Zotero ne peuvent pas être insérés ici.
 integration.error.notInCitation=Vous devez disposer le curseur dans une citation Zotero pour la modifier.
+integration.error.inBibliography=Pour insérer une citation, placer le curseur dans le corps du texte. Pour éditer la bibliographie directement, utiliser %S.
 integration.error.noBibliography=Ce style bibliographique ne définit pas une bibliographie. Si vous souhaitez ajouter une bibliographie, veuillez sélectionner un autre style.
 integration.error.deletePipe=Le canal utilisé par Zotero pour communiquer avec le traitement de texte n'a pas pu être initialisé. Voulez-vous que Zotero essaie de corriger cette erreur ? Votre mot de passe vous sera demandé.
 integration.error.invalidStyle=Le style que vous avez sélectionné ne semble pas valide. Si vous l'avez créé vous-même, assurez-vous qu'il satisfait les conditions de validation décrites sur https://github.com/citation-style-language/styles/wiki/Validation. Autrement, essayez de sélectionner un autre style.
diff --git a/chrome/locale/gl-ES/zotero/connector.json b/chrome/locale/gl-ES/zotero/connector.json
index 2451f3a6a5..4c242bffa3 100644
--- a/chrome/locale/gl-ES/zotero/connector.json
+++ b/chrome/locale/gl-ES/zotero/connector.json
@@ -41,18 +41,60 @@
   "general_copyToClipboard": {
     "message": "Copiar no portaretallos"
   },
+  "itemType_pdf": {
+    "message": "Anexo PDF"
+  },
+  "itemType_epub": {
+    "message": "Anexo EPUB"
+  },
+  "itemType_snapshot": {
+    "message": "Captura"
+  },
   "itemType_note": {
     "message": "Nota"
   },
+  "itemType_link": {
+    "message": "Ligazón web"
+  },
   "itemType_attachment": {
     "message": "Anexo"
   },
   "progressWindow_savingTo": {
     "message": "Gardando en"
   },
+  "progressWindow_detailsBtnView": {
+    "message": "Ver detalles"
+  },
+  "progressWindow_detailsBtnHide": {
+    "message": "Agochar detalles"
+  },
+  "progressWindow_savingItems": {
+    "message": "Gardando $1 elementos. $2"
+  },
+  "progressWindow_savingItem": {
+    "message": "Gardando o elemento $1"
+  },
+  "progressWindow_saveItem": {
+    "message": "Elemento $1: $2"
+  },
+  "progressWindow_downloadComplete": {
+    "message": "Gardouse $1"
+  },
+  "progressWindow_downloadCompletePlural": {
+    "message": "Gardouse $1 para o elemento $2"
+  },
+  "progressWindow_downloadFailed": {
+    "message": "Non se puido descargar $1"
+  },
+  "progressWindow_downloadFailedPlural": {
+    "message": "Non se puido descargar $1 para o elemento $2"
+  },
   "progressWindow_tagPlaceholder": {
     "message": "Etiquetas (separadas por comas)"
   },
+  "progressWindow_filterPlaceholder": {
+    "message": "Filtrar coleccións"
+  },
   "progressWindow_error_translation": {
     "message": "Ocorreu un erro gardando este elemento. Véxase$1 para ter máis información."
   },
@@ -74,12 +116,6 @@
   "progressWindow_error_upgradeClient_latestVersion": {
     "message": "última versión"
   },
-  "extensionIsDisabled": {
-    "message": "$1 está desactivado"
-  },
-  "extensionIsDisabled_extensionPage": {
-    "message": "$1 está desactivado para páxinas de extensión"
-  },
   "appConnector": {
     "message": "Conector $1"
   },
@@ -92,9 +128,6 @@
   "firstRun_text1": {
     "message": "O Conector $1 permite que <a href=\"$2\">se garden elementos en $1</a> desde o navegador facendo un só clic."
   },
-  "firstRun_text2": {
-    "message": "Se aínda non o fixo, coa <a href=\"$2\">descarga</a> da aplicación separada $1 obtense a mellor experiencia."
-  },
   "firstRun_acceptButton": {
     "message": "Enténdoo."
   },
diff --git a/chrome/locale/gl-ES/zotero/fileRenaming.ftl b/chrome/locale/gl-ES/zotero/fileRenaming.ftl
index c26cd3e84f..8d6bc2daac 100644
--- a/chrome/locale/gl-ES/zotero/fileRenaming.ftl
+++ b/chrome/locale/gl-ES/zotero/fileRenaming.ftl
@@ -1,9 +1,9 @@
 file-renaming-settings-window =
     .title = Configure File Renaming
-file-renaming-settings-library-label = Library:
+file-renaming-settings-library-label = Biblioteca:
 file-renaming-auto-rename-files =
-    .label = Automatically rename files
-file-renaming-file-types = Rename files of these types:
+    .label = Renomear ficheiros automaticamente
+file-renaming-file-types = Renomear os ficheiros destes tipos:
 file-renaming-file-type-pdf =
     .label = { file-type-pdf }
 file-renaming-file-type-epub =
@@ -15,7 +15,7 @@ file-renaming-file-type-audio =
 file-renaming-file-type-video =
     .label = { file-type-video }
 file-renaming-rename-now =
-    .label = Rename Files…
+    .label = Renomear ficheiros...
 file-renaming-rename-linked =
     .label = Renomear os ficheiros ligados
 file-renaming-format-title = Formato do nome do ficheiro
@@ -24,9 +24,9 @@ file-renaming-format-instructions-example = For example, "{ $example }" in this
 file-renaming-format-instructions-more = See the <label data-l10n-name="file-renaming-format-help-link">documentation</label> for more information.
 file-renaming-format-template = Filename Template:
 file-renaming-format-preview = Previsualizar:
-file-renaming-preview-changes = Preview Changes…
+file-renaming-preview-changes = Previsualizar cambios...
 file-renaming-rename-files =
-    .label = Rename Files
+    .label = Renomear ficheiros
 file-renaming-done-button =
     .label = { general-done }
 file-renaming-cancel-button =
@@ -37,9 +37,9 @@ file-renaming-auto-rename-prompt-body-library = Would you like to rename existin
 file-renaming-auto-rename-prompt-yes = { file-renaming-preview-changes }
 file-renaming-auto-rename-prompt-no = Keep Existing Filenames
 file-renaming-preview-window =
-    .title = Rename Files
+    .title = Renomear ficheiros
 file-renaming-preview-window-loading = Cargando...
 file-renaming-preview-window-intro = { -app-name } will rename the following files in your library to match their parent items:
 file-renaming-preview-window-intro-library = { -app-name } will rename the following files in "{ $library }" to match their parent items:
-file-renaming-preview-window-renaming = Renaming…
+file-renaming-preview-window-renaming = Renomeando...
 file-renaming-preview-window-no-files = All filenames already match parent items. No changes are required.
diff --git a/chrome/locale/gl-ES/zotero/integration.ftl b/chrome/locale/gl-ES/zotero/integration.ftl
index ae9cb6bbb3..c376fbf664 100644
--- a/chrome/locale/gl-ES/zotero/integration.ftl
+++ b/chrome/locale/gl-ES/zotero/integration.ftl
@@ -21,9 +21,9 @@ integration-editBibliography-wrapper =
         { -integration-editBibliography-edit-reference }
 integration-citationDialog = Citation Dialog
 integration-citationDialog-section-open = Open Documents ({ $count })
-integration-citationDialog-section-selected = Selected Items ({ $count }/{ $total })
+integration-citationDialog-section-selected = Elementos seleccionados ({ $count }/{ $total })
 integration-citationDialog-section-selectedAnnotations = Selected Annotations
-integration-citationDialog-section-selectedItems = Selected Items
+integration-citationDialog-section-selectedItems = Elementos seleccionados
 integration-citationDialog-section-cited =
     { $count ->
         [0] Cited Items
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Obviar autor
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Vista previa
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -96,11 +106,11 @@ integration-citationDialog-items-table-added =
     .aria-label = This item has been added to the citation. Press { return-or-enter } to add it again or { delete-or-backspace } to remove it.
 integration-citationDialog-add-all = Add all
 integration-citationDialog-collapse-section =
-    .title = Collapse section
+    .title = Colapsar sección
 integration-citationDialog-bubble-empty = (no title)
 integration-citationDialog-add-to-citation = Add to Citation
 integration-citationDialog-annotations-filter =
-    .placeholder = Filter annotations
+    .placeholder = Filtrar anotacións
 integration-citationDialog-annotations-empty = Select an item, attachment, or annotation to view annotation details
 integration-prefs-displayAs-label = Mostrar as citas como:
 integration-prefs-footnotes =
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/gl-ES/zotero/note-editor.ftl b/chrome/locale/gl-ES/zotero/note-editor.ftl
index 24bf133b66..007b9c8212 100644
--- a/chrome/locale/gl-ES/zotero/note-editor.ftl
+++ b/chrome/locale/gl-ES/zotero/note-editor.ftl
@@ -63,4 +63,4 @@ note-editor-delete-column = Eliminar columna
 note-editor-delete-table = Eliminar táboa
 note-editor-link-popup-appeared = Link popup appeared. Use Shift-Tab to navigate it.
 note-editor-citation-popup-appeared = Citation popup appeared. Use Shift-Tab to navigate it.
-note-editor-toggle-context-pane = Toggle Context Pane
+note-editor-toggle-context-pane = Alternar panel de contexto
diff --git a/chrome/locale/gl-ES/zotero/preferences.ftl b/chrome/locale/gl-ES/zotero/preferences.ftl
index c274683df3..c6357518ca 100644
--- a/chrome/locale/gl-ES/zotero/preferences.ftl
+++ b/chrome/locale/gl-ES/zotero/preferences.ftl
@@ -1,13 +1,13 @@
 preferences-window =
     .title = { -app-name } Axustes
-preferences-appearance-title = Appearance and Language
+preferences-appearance-title = Aparencia e idioma
 preferences-auto-recognize-files =
     .label = Automatically retrieve metadata for PDFs and ebooks
 preferences-file-renaming-title = Renomeamento de ficheiro
 preferences-file-renaming-intro = { -app-name } can automatically rename files based on the details of the parent item (title, author, etc.) and keep the filenames in sync as you make changes. Downloaded files are always initially named based on the parent item.
 preferences-file-renaming-configure-button =
     .label = Configure File Renaming…
-preferences-attachment-titles-title = Attachment Titles
+preferences-attachment-titles-title = Títulos dos anexos
 preferences-attachment-titles-intro = Attachment titles are <label data-l10n-name="wiki-link">different from filenames</label>. To support some workflows, { -app-name } can show filenames instead of attachment titles in the items list.
 preferences-attachment-titles-show-filenames =
     .label = Show attachment filenames in the items list
@@ -51,7 +51,7 @@ preferences-styleManager-restore-default =
     .label = Restore Default Styles…
 preferences-styleManager-add-from-file =
     .tooltiptext = Add a style from a file
-    .label = Add from File…
+    .label = Engadir desde un ficheiro...
 preferences-styleManager-remove = Press { delete-or-backspace } to remove this style.
 preferences-citation-dialog = Citation Dialog
 preferences-citation-dialog-mode = Citation Dialog Mode:
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Lingua e rexión
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -77,20 +79,20 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Default: { $directory })
     .aria-label = Default location
-preferences-pane-account = Account
+preferences-pane-account = Conta
 -preferences-sync-data-syncing = Sincronización de datos
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sincronizar
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
     .label = Sync attachment files in group libraries using { -app-name } Storage
 preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
 preferences-account-log-out =
-    .label = Log Out…
+    .label = Pechar sesión...
 preferences-sync-reset-restore-to-server-body = { -app-name } will replace “{ $libraryName }” on { $domain } with data from this computer.
 preferences-sync-reset-restore-to-server-deleted-items-text =
     { $remoteItemsDeletedCount } { $remoteItemsDeletedCount ->
@@ -105,13 +107,13 @@ preferences-sync-reset-restore-to-server-remaining-items-text =
     }
 preferences-sync-reset-restore-to-server-checkbox-label =
     { $remoteItemsDeletedCount ->
-        [one] Delete 1 item
-       *[other] Delete { $remoteItemsDeletedCount } items
+        [one] Eliminar 1 elemento
+       *[other] Eliminar { $remoteItemsDeletedCount } elementos
     }
 preferences-sync-reset-restore-to-server-confirmation-text = delete online library
 preferences-sync-reset-restore-to-server-yes = Substituír datos na biblioteca en liña
 preferences-account-log-in =
-    .label = Log In
+    .label = Iniciar sesión
 preferences-account-waiting-for-login =
     .value = Waiting for login…
 preferences-account-cancel-button =
@@ -119,9 +121,13 @@ preferences-account-cancel-button =
 preferences-account-logged-out-status =
     .value = (logged out)
 preferences-account-email-label =
-    .value = Email:
+    .value = Correo electrónico:
 preferences-account-switch-accounts =
-    .label = Switch Accounts…
+    .label = Trocar de conta...
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/gl-ES/zotero/reader.ftl b/chrome/locale/gl-ES/zotero/reader.ftl
index 4523668ff9..ee07e20998 100644
--- a/chrome/locale/gl-ES/zotero/reader.ftl
+++ b/chrome/locale/gl-ES/zotero/reader.ftl
@@ -1,24 +1,24 @@
 reader-annotations = Anotacións
 reader-show-annotations = Amosar anotacións
 reader-search-annotations = Buscar anotacións
-reader-search-outline = Search Outline
+reader-search-outline = Buscar no esquema
 reader-no-annotations = Crear unha anotación para vela na barra lateral
 reader-no-extracted-text = Sen texto extraído
 reader-add-comment = Engadir comentario
-reader-annotation-comment = Annotation comment
-reader-annotation-text = Annotation text
-reader-manage-tags = Manage tags for this annotation
-reader-open-menu = Open annotation menu
+reader-annotation-comment = Comentario da anotación
+reader-annotation-text = Texto da anotación
+reader-manage-tags = Xestionar etiquetas para esta anotación
+reader-open-menu = Abrir menú da anotación
 reader-thumbnails = Thumbnails
-reader-tag-selector-message = Filter annotations by this tag
+reader-tag-selector-message = Filtrar anotacións por esta etiqueta
 reader-add-tags = Engadir etiquetas...
 reader-highlight-text = Resaltar texto
-reader-underline-text = Subliñar Texto
+reader-underline-text = Subliñar texto
 reader-add-note = Engadir nota
 reader-add-text = Engadir Texto
 reader-select-area = Seleccionar área
-reader-highlight-annotation = Highlight annotation
-reader-highlight-annotation-short = Highlight
+reader-highlight-annotation = Resaltar anotación
+reader-highlight-annotation-short = Resaltar
 reader-underline-annotation = Underline annotation
 reader-underline-annotation-short = Subliñar
 reader-note-annotation = Note Annotation
@@ -32,7 +32,7 @@ reader-eraser = Eraser
 reader-pick-color = Escoller unha cor
 reader-add-to-note = Engadir nota
 reader-zoom-in = Ampliar
-reader-zoom-out = Alonxar
+reader-zoom-out = Afastar
 reader-zoom-reset = Restablecer ampliación
 reader-zoom-auto = Axuste automático
 reader-zoom-page-width = Ampliar ao ancho de páxina
@@ -79,54 +79,54 @@ reader-phrase-not-found = Frase non atopada
 reader-find = Procurar
 reader-close = Pechar
 reader-show-thumbnails = Show Thumbnails
-reader-show-outline = Show Outline
+reader-show-outline = Amosar esquema
 reader-find-previous = Find the previous occurrence of the phrase
 reader-find-next = Find the next occurrence of the phrase
-reader-toggle-sidebar = Toggle Sidebar
-reader-find-in-document = Find in Document
-reader-toggle-context-pane = Toggle Context Pane
-reader-highlight-all = Highlight all
+reader-toggle-sidebar = Alternar barra lateral
+reader-find-in-document = Atopar no documento
+reader-toggle-context-pane = Alternar panel de contexto
+reader-highlight-all = Resaltar todo
 reader-match-case = Match case
 reader-whole-words = Whole words
-reader-appearance = Appearance
-reader-epub-appearance-line-height = Line height
-reader-epub-appearance-word-spacing = Word spacing
-reader-epub-appearance-letter-spacing = Letter spacing
+reader-appearance = Aparencia
+reader-epub-appearance-line-height = Altura da liña
+reader-epub-appearance-word-spacing = Espazado entre palabras
+reader-epub-appearance-letter-spacing = Espazado entre letras
 reader-epub-appearance-page-width = Page width
-reader-epub-appearance-use-original-font = Use original font
+reader-epub-appearance-use-original-font = Usar o tipo de letra orixinal
 reader-epub-appearance-line-height-revert = Use default line height
-reader-epub-appearance-word-spacing-revert = Use default word spacing
-reader-epub-appearance-letter-spacing-revert = Use default letter spacing
+reader-epub-appearance-word-spacing-revert = Usar o espazado entre palabras predeterminado
+reader-epub-appearance-letter-spacing-revert = Usar o espazado entre letras predeterminado
 reader-epub-appearance-page-width-revert = Use default page width
-reader-convert-to-highlight = Convert to Highlight
-reader-convert-to-underline = Convert to Underline
+reader-convert-to-highlight = Converter a resaltado
+reader-convert-to-underline = Converter a subliñado
 reader-size = Tamaño
-reader-merge = Merge
+reader-merge = Combinar
 reader-copy-link = Copiar ligazón
-reader-theme-original = Original
+reader-theme-original = Orixinal
 reader-theme-snow = Snow
 reader-theme-sepia = Sepia
 reader-theme-dark = Escuro
 reader-theme-black = Negro
-reader-add-theme = Add Theme
+reader-add-theme = Engadir tema
 reader-theme-invert-images = Invert Images
 reader-scroll-mode = Scrolling
 reader-spread-mode = Spreads
 reader-flow-mode = Page Layout
-reader-columns = Columns
-reader-split-view = Split View
-reader-themes = Themes
+reader-columns = Columnas
+reader-split-view = Dividir vista
+reader-themes = Temas
 reader-vertical = Vertical
 reader-horizontal = Horizontal
 reader-wrapped = Wrapped
 reader-none = Ningún
-reader-odd = Odd
-reader-even = Even
+reader-odd = Impar
+reader-even = Par
 reader-paginated = Paxinado
 reader-scrolled = Desprazado
 reader-single = Single
 reader-double = Double
-reader-theme-name = Theme Name:
+reader-theme-name = Nome do tema:
 reader-background = Background:
 reader-foreground = Foreground:
 reader-reading-mode = Reading Mode
@@ -144,7 +144,7 @@ reader-a11y-resize-annotation = To resize the annotation, hold { general-key-shi
 reader-a11y-annotation-popup-appeared = Use Tab to navigate the annotation popup.
 reader-a11y-annotation-created = { $type } created.
 reader-a11y-annotation-selected = { $type } selected.
--reader-a11y-textual-annotation-instruction = To annotate text via the keyboard, first use “{ reader-find-in-document }” to locate the phrase, and then press { general-key-control }-{ option-or-alt }-{ $number } to turn the search result into an annotation.
+-reader-a11y-textual-annotation-instruction = Para anotar texto co teclado, primeiro usa  «{ reader-find-in-document }» para atopar a frase e logo preme { general-key-control }-{ option-or-alt }-{ $number } para converter o resultado da busca nunha anotación.
 -reader-a11y-annotation-instruction = To add this annotation into the document, focus the document and press { general-key-control }-{ option-or-alt }-{ $number }.
 reader-toolbar-highlight =
     .aria-description = { -reader-a11y-textual-annotation-instruction(number: 1) }
@@ -189,12 +189,12 @@ reader-import-from-epub-no-annotations-other-file =
 reader-import-from-epub-select-other = Select Other File…
 reader-selected-pages =
     { $count ->
-        [one] 1 page selected
-       *[other] { $count } pages selected
+        [one] 1 páxina seleccionada
+       *[other] { $count } páxinas seleccionadas
     }
 reader-page-options = Page Options
-reader-read-aloud = Read Aloud
-reader-read-aloud-from-here = Read Aloud from Here
+reader-read-aloud = Ler en voz alta
+reader-read-aloud-from-here = Ler en voz alta desde aquí
 reader-read-aloud-options = Opcións
 reader-read-aloud-skip-back = Skip Back
 reader-read-aloud-skip-back-sentence = Skip Back by Sentence
@@ -213,7 +213,7 @@ reader-read-aloud-more-voices = More Voices…
 reader-read-aloud-language = Lingua
 reader-read-aloud-remaining-time = Remaining reading time
 reader-read-aloud-log-in-link = <log-in>Log in</log-in> to access { -app-name } Voices.
-reader-read-aloud-log-in-button = Log In
+reader-read-aloud-log-in-button = Iniciar sesión
 reader-read-aloud-done-button = { general-done }
 reader-read-aloud-add-more-time = Add more time
 reader-read-aloud-quota-exceeded-message =
@@ -223,10 +223,10 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Produciuse un erro descoñecido.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Non se puido conectar co servizo de Ler en voz alta. Comproba a conexión á internet.
 reader-read-aloud-error-daily-limit-exceeded = You have exceeded your daily limit for { -app-name } Voices.
 reader-read-aloud-retry = Retry
-reader-read-aloud-first-run-title = Choose your preferred Read Aloud voice:
+reader-read-aloud-first-run-title = Escolle a túa voz preferida para a lectura en voz alta:
 reader-read-aloud-first-run-voice-tier-local-bullet-os-provided = Voices provided by your operating system
 reader-read-aloud-first-run-voice-tier-local-bullet-offline = Available without an internet connection
 reader-read-aloud-first-run-voice-tier-local-bullet-no-account = Available without a { -app-name } account
@@ -256,7 +256,7 @@ reader-read-aloud-annotation-popup-extend = Extend annotation by sentence
 reader-read-aloud-annotation-popup-delete = Eliminar
 reader-read-aloud-annotation-popup-done = Feito
 reader-read-aloud-annotation-popup-change-color = Change color
-reader-read-aloud-annotation-popup-highlight = Highlight
+reader-read-aloud-annotation-popup-highlight = Resaltar
 reader-read-aloud-annotation-popup-underline = Subliñar
 reader-tab-audio-play =
     .title = { reader-read-aloud-play }
diff --git a/chrome/locale/gl-ES/zotero/searchbox.dtd b/chrome/locale/gl-ES/zotero/searchbox.dtd
index 627ac03ff7..cc026b4dd9 100644
--- a/chrome/locale/gl-ES/zotero/searchbox.dtd
+++ b/chrome/locale/gl-ES/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nome:">
 
-<!ENTITY zotero.search.searchInLibrary "Buscar na biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Comparar con">
 <!ENTITY zotero.search.joinMode.any "calquera">
 <!ENTITY zotero.search.joinMode.all "todos">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "días">
 <!ENTITY zotero.search.date.units.months "meses">
 <!ENTITY zotero.search.date.units.years "anos">
-
-<!ENTITY zotero.search.search "Buscar">
-<!ENTITY zotero.search.clear "Borrar">
-<!ENTITY zotero.search.saveSearch "Gardar a busca">
diff --git a/chrome/locale/gl-ES/zotero/standalone.dtd b/chrome/locale/gl-ES/zotero/standalone.dtd
index 51e0fc01fa..ac43134017 100644
--- a/chrome/locale/gl-ES/zotero/standalone.dtd
+++ b/chrome/locale/gl-ES/zotero/standalone.dtd
@@ -56,12 +56,12 @@
 <!ENTITY recursiveCollections.label "Amosar os elementos das subcolecións">
 <!ENTITY fontSize.label "Tamaño da tipografía:">
 <!ENTITY noteFontSize.label "Tamaño tipográfico das notas">
-<!ENTITY columns.label "Columns">
-<!ENTITY sortBy.label "Sort By">
+<!ENTITY columns.label "Columnas">
+<!ENTITY sortBy.label "Ordenar por">
 
 <!ENTITY toolsMenu.label "Ferramentas">
 <!ENTITY toolsMenu.accesskey "F">
-<!ENTITY installConnector.label "Install Browser Connector…">
+<!ENTITY installConnector.label "Instalar Connector para o navegador...">
 <!ENTITY installConnector.accesskey "C">
 <!ENTITY addons.label "Engadidos">
 <!ENTITY developer.label "Desenvolvedor">
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index e2f0b23868..a01166e9c2 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Eliminar...">
 <!ENTITY zotero.toolbar.newGroup "Grupo novo...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Subcolección nova">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nova busca gardada...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Baleirar o lixo">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostrar/Agochar o selector de etiquetas">
 <!ENTITY zotero.toolbar.actions.label "Accións">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferencias...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Axuda e documentación">
 <!ENTITY zotero.toolbar.about.label "Acerca de Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Busca avanzada">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Atopar na súa biblioteca local">
 
diff --git a/chrome/locale/gl-ES/zotero/zotero.ftl b/chrome/locale/gl-ES/zotero/zotero.ftl
index fbaec31bc4..2d4638740e 100644
--- a/chrome/locale/gl-ES/zotero/zotero.ftl
+++ b/chrome/locale/gl-ES/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimir
 general-remove = Remove
 general-add = Engadir
@@ -31,20 +37,24 @@ general-remind-me-later = Acórdamo despois
 general-dont-ask-again = Non preguntar de novo
 general-choose-file = Escoller ficheiro...
 general-open-settings = Abrir axustes
-general-settings = Settings…
+general-settings = Axustes...
 general-help = Axuda
 general-tag = Etiqueta
 general-got-it = Got It
 general-done = Feito
-general-view-troubleshooting-instructions = View Troubleshooting Instructions
-general-go-back = Go Back
-general-accept = Accept
+general-view-troubleshooting-instructions = Ver instrucións para solución de problemas
+general-go-back = Voltar
+general-accept = Aceptar
 general-cancel = Cancelar
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Amosar na biblioteca
-general-restartApp = Restart { -app-name }
-general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
+general-restartApp = Reiniciar { -app-name }
+general-restartInTroubleshootingMode = Reiniciar en modo solución de erros
 general-save = Gardar
 general-clear = Borrar
+clear-button =
+    .label = { general-clear }
 general-update = Actualizar
 general-back = Atrás
 general-edit = Editar
@@ -61,7 +71,7 @@ general-next = Seguinte
 general-learn-more = Saber máis
 general-more-information = Máis información
 general-warning = Advertencia
-general-type-to-continue = Type “{ $text }” to continue.
+general-type-to-continue = Escribe “{ $text }” para continuar.
 general-continue = Continuar
 general-red = Vermello
 general-orange = Laranxa
@@ -76,10 +86,12 @@ general-maroon = Marrón
 general-gray = Gris
 general-black = Negro
 general-loading = Cargando...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Estilo de cita:
 language-label = Lingua:
 menu-custom-group-submenu =
-    .label = More Options…
+    .label = Máis opcións...
 menu-file-show-in-finder =
     .label = Show in Finder
 menu-file-show-file =
@@ -101,23 +113,23 @@ menu-add-standalone-file-attachment =
 menu-add-standalone-linked-file-attachment =
     .label = Engadir ligazón a un ficheiro...
 menu-add-child-file-attachment =
-    .label = Attach File…
+    .label = Anexar ficheiro...
 menu-add-child-linked-file-attachment =
     .label = Anexar a ligazón do ficheiro...
 menu-add-child-linked-url-attachment =
-    .label = Attach Web Link…
+    .label = Anexar ligazón web...
 menu-new-note =
     .label = { new-note }
 menu-new-standalone-note =
     .label = Nova nota independente
 menu-new-item-note =
-    .label = New Item Note
+    .label = Nova nota de elemento
 menu-restoreToLibrary =
     .label = Restaurar na biblioteca
 menu-deletePermanently =
     .label = Borrar permanentemente
 menu-tools-plugins =
-    .label = Plugins
+    .label = Complementos
 menu-view-columns-move-left =
     .label = Move Column Left
 menu-view-columns-move-right =
@@ -129,47 +141,143 @@ menu-view-note-font-size =
 menu-view-note-tab-font-size =
     .label = Note Tab Font Size
 menu-show-tabs-menu =
-    .label = Show Tabs Menu
+    .label = Amosar menú das lapelas
 menu-edit-copy-annotation =
     .label =
         { $count ->
-            [one] Copy Annotation
-           *[other] Copy { $count } Annotations
+            [one] Copiar anotación
+           *[other] Copiar { $count } anotacións
         }
 main-window-command =
     .label = Biblioteca
 main-window-key =
     .key = L
 zotero-toolbar-tabs-menu =
-    .tooltiptext = List all tabs
-filter-collections = Filter Collections
+    .tooltiptext = Listar todas as lapelas
+filter-collections = Filtrar coleccións
 zotero-collections-search =
     .placeholder = { filter-collections }
 zotero-collections-search-btn =
     .tooltiptext = { filter-collections }
 zotero-tabs-menu-filter =
-    .placeholder = Search Tabs
+    .placeholder = Buscar lapelas
 zotero-tabs-menu-close-button =
-    .title = Close Tab
+    .title = Pechar lapela
 zotero-toolbar-tabs-scroll-forwards =
     .title = Scroll forwards
 zotero-toolbar-tabs-scroll-backwards =
     .title = Scroll backwards
 toolbar-add-attachment =
     .tooltiptext = { add-attachment }
-recently-read = Recently Read
+recently-read = Lido recentemente
 collections-menu-show-recently-read =
-    .label = Show { recently-read }
+    .label = Amosar { recently-read }
 item-menu-remove-from-recently-read =
-    .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Editar Procura Gravada
+    .label = Eliminar de { recently-read }
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } colección seleccionada
+       *[other] { $count } coleccións seleccionadas
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editar Procura Gravada
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
-    .label = Move To
+    .label = Mover a
 collections-menu-copy-collection =
-    .label = Copy To
+    .label = Copiar a
+collections-menu-export =
+    .label = Exportar...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Baixar
 item-creator-moveToTop =
@@ -282,30 +390,31 @@ import-online-relink-only =
     .label = Volver a ligar as citas de Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } non puido conectar con { $targetApp }. Por favor, comprobe a súa conexión a internet e vólvao intentar.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
-            [one] { $count } Note
-           *[other] { $count } Notes
+            [one] { $count } nota
+           *[other] { $count } notas
         }
-items-column-added-by = Added By
-items-column-modified-by = Modified By
-items-column-last-read = Last Read
+items-column-added-by = Engadido por
+items-column-modified-by = Modificado por
+items-column-last-read = Lido por última vez
 report-error =
     .label = Informar dun erro ...
 rtfScan-wizard =
     .title = Esculcar RTF
 rtfScan-introPage-description = { -app-name } can automatically extract and reformat citations and insert a bibliography into RTF files. It currently supports citations in variations of the following formats:
 rtfScan-introPage-description2 = Para comezar escolla abaixo un ficheiro RTF de entrada e un ficheiro de saída:
-rtfScan-input-file = Input File:
-rtfScan-output-file = Output File:
+rtfScan-input-file = Ficheiro de entrada:
+rtfScan-output-file = Ficheiro de saída:
 rtfScan-no-file-selected = Ningún ficheiro seleccionado
 rtfScan-choose-input-file =
     .label = { general-choose-file }
-    .aria-label = Choose Input File
+    .aria-label = Escoller ficheiro de entrada
 rtfScan-choose-output-file =
     .label = { general-choose-file }
-    .aria-label = Choose Output File
+    .aria-label = Escoller ficheiro de saída
 rtfScan-intro-page = Introdución
 rtfScan-scan-page = Esculcando as citas
 rtfScan-scanPage-description = { -app-name } is scanning your document for citations. Please be patient.
@@ -420,7 +529,7 @@ licenses-cc-more-info = Be sure you have read the Creative Commons <a data-l10n-
 licenses-cc0-more-info = Be sure you have read the Creative Commons <a data-l10n-name="license-considerations">CC0 FAQ</a> before applying CC0 to your work. Please note that dedicating your work to the public domain is irreversible, even if you later choose different terms or cease publishing the work.
 debug-output-logging-restart-in-troubleshooting-mode-checkbox = { general-restartInTroubleshootingMode }
 restart-in-troubleshooting-mode-menuitem =
-    .label = Restart in Troubleshooting Mode…
+    .label = Reiniciar en modo solución de erros...
     .accesskey = P
 restart-in-troubleshooting-mode-dialog-title = { general-restartInTroubleshootingMode }
 restart-in-troubleshooting-mode-dialog-description = { -app-name } will restart with all plugins disabled. Some features may not function correctly while Troubleshooting Mode is enabled.
@@ -436,7 +545,7 @@ pane-abstract = Resumen
 pane-attachments = Anexos
 pane-notes = Notas
 pane-note-info = Note Info
-pane-libraries-collections = Libraries and Collections
+pane-libraries-collections = Bibliotecas e coleccións
 pane-tags = Etiquetas
 pane-related = Relacionados
 pane-attachment-info = Información do anexo
@@ -453,34 +562,34 @@ section-abstract =
 section-attachments =
     .label =
         { $count ->
-            [one] { $count } Attachment
-           *[other] { $count } Attachments
+            [one] { $count } anexo
+           *[other] { $count } anexos
         }
 section-attachment-preview =
     .label = { pane-attachment-preview }
 section-attachments-annotations =
     .label =
         { $count ->
-            [one] { $count } Annotation
-           *[other] { $count } Annotations
+            [one] { $count } anotación
+           *[other] { $count } anotacións
         }
 section-attachments-move-to-trash-message = Are you sure you want to move “{ $title }” to the trash?
 section-notes =
     .label =
         { $count ->
-            [one] { $count } Note
-           *[other] { $count } Notes
+            [one] { $count } nota
+           *[other] { $count } notas
         }
 section-libraries-collections =
     .label = { pane-libraries-collections }
 section-tags =
     .label =
         { $count ->
-            [one] { $count } Tag
-           *[other] { $count } Tags
+            [one] { $count } etiqueta
+           *[other] { $count } etiquetas
         }
 section-related =
-    .label = { $count } Related
+    .label = { $count } relacionados
 section-attachment-info =
     .label = { pane-attachment-info }
 section-button-remove =
@@ -488,15 +597,15 @@ section-button-remove =
 section-button-add =
     .tooltiptext = { general-add }
 section-button-expand =
-    .dynamic-tooltiptext = Expand section
-    .label = Expand { $section } section
+    .dynamic-tooltiptext = Expandir sección
+    .label = Expandir a sección { $section }
 section-button-collapse =
-    .dynamic-tooltiptext = Collapse section
-    .label = Collapse { $section } section
+    .dynamic-tooltiptext = Colapsar sección
+    .label = Colapsar a sección { $section }
 annotations-count =
     { $count ->
-        [one] { $count } Annotation
-       *[other] { $count } Annotations
+        [one] { $count } anotación
+       *[other] { $count } anotacións
     }
 section-button-annotations =
     .title = { annotations-count }
@@ -534,23 +643,23 @@ sidenav-reorder-down =
 sidenav-reorder-reset =
     .label = Reset Section Order
 toggle-item-pane =
-    .tooltiptext = Toggle Item Pane
+    .tooltiptext = Alternar panel de elementos
 toggle-context-pane =
-    .tooltiptext = Toggle Context Pane
+    .tooltiptext = Alternar panel de contexto
 pin-section =
     .label = Fixar sección
 unpin-section =
     .label = Desfixar sección
 collapse-other-sections =
-    .label = Collapse Other Sections
+    .label = Colapsar outras seccións
 expand-all-sections =
-    .label = Expand All Sections
+    .label = Expandir todas as seccións
 abstract-field =
     .placeholder = Engadir resumo
 tag-field =
     .aria-label = { general-tag }
 tagselector-search =
-    .placeholder = Filter Tags
+    .placeholder = Filtrar etiquetas
 context-notes-search =
     .placeholder = Buscar notas
 context-notes-return-button =
@@ -598,22 +707,22 @@ note-info-parent-item-button =
 note-info-date-created = Created
 note-info-date-modified = Modificado
 note-info-size = Tamaño
-note-info-word-count = Word Count
-note-info-character-count = Character Count
+note-info-word-count = Número de palabras
+note-info-character-count = Número de caracteres
 item-title-empty-note = Nota sen título
-attachment-preview-placeholder = No attachment to preview
+attachment-preview-placeholder = Non hai anexos para previsualizar
 attachment-rename-from-parent =
     .tooltiptext = Rename File to Match Parent Item
-account-log-in = Log In
+account-log-in = Iniciar sesión
 account-not-logged-in-text = Log in to your Zotero account to sync your data.
 account-error-login-session-expired = Your login session has expired. Please try again.
 toggle-preview =
     .label =
         { $type ->
-            [open] Hide
-            [collapsed] Show
-           *[unknown] Toggle
-        } Attachment Preview
+            [open] Agochar
+            [collapsed] Mostrar
+           *[unknown] Alternar
+        } previsualización de anexos
 annotation-image-not-available = [Image not available]
 quicksearch-mode =
     .aria-label = Quick Search mode
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Busca rápida
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Busca avanzada
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Ver como
 item-pane-header-none =
@@ -641,36 +762,36 @@ item-pane-message-items-selected =
     }
 item-pane-message-collections-selected =
     { $count ->
-        [one] { $count } collection selected
-       *[other] { $count } collections selected
+        [one] { $count } colección seleccionada
+       *[other] { $count } coleccións seleccionadas
     }
 item-pane-message-searches-selected =
     { $count ->
-        [one] { $count } search selected
-       *[other] { $count } searches selected
+        [one] { $count } busca seleccionada
+       *[other] { $count } buscas seleccionadas
     }
 item-pane-message-objects-selected =
     { $count ->
-        [one] { $count } object selected
-       *[other] { $count } objects selected
+        [one] { $count } obxecto seleccionado
+       *[other] { $count } obxectos seleccionados
     }
 item-pane-message-unselected =
     { $count ->
-        [0] No items in this view
-        [one] { $count } item in this view
-       *[other] { $count } items in this view
+        [0] Non hai elementos nesta vista
+        [one] { $count } elemento nesta vista
+       *[other] { $count } elementos nesta vista
     }
 item-pane-message-objects-unselected =
     { $count ->
-        [0] No objects in this view
-        [one] { $count } object in this view
-       *[other] { $count } objects in this view
+        [0] Non hai obxectos nesta vista
+        [one] { $count } obxecto nesta vista
+       *[other] { $count } obxectos nesta vista
     }
 item-pane-duplicates-merge-items =
     .label =
         { $count ->
-            [one] Merge { $count } item
-           *[other] Merge { $count } items
+            [one] Combinar { $count } elemento
+           *[other] Combinar { $count } elementos
         }
 locate-library-lookup-no-resolver = You must choose a resolver from the { $pane } pane of the { -app-name } settings.
 architecture-win32-warning-message = Switch to 64-bit { -app-name } for the best performance. Your data won’t be affected.
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Procurar
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = apuntamentos
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Buscar condición
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valor
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Campos:
 search-conditions-collection = Colección:
 search-conditions-savedSearch = Busca gardada
 search-conditions-itemTypeID = Tipo de elemento
 search-conditions-tag = Etiqueta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota filla
 search-conditions-creator = Creador
@@ -715,14 +897,30 @@ search-conditions-dateModified = Data na que se modificou
 search-conditions-fulltextContent = Contido do adxunto
 search-conditions-programmingLanguage = Linguaxe de programación
 search-conditions-fileTypeID = Tipo de ficheiro adxunto
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Texto da nota
 search-conditions-annotationComment = Comentario da nota
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Calquera campo
+search-conditions-titleCreatorYear = Título, creador, ano
+search-conditions-submenu-attachment = Anexo
+search-conditions-submenu-annotation = Anotación
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tipo de ficheiro
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Lido por última vez
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tipo
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
-        [one] { $count } file added
-       *[other] { $count } files added
+        [one] { $count } ficheiro engadido
+       *[other] { $count } ficheiros engadidos
     }
 select-items-window =
     .title = Seleccionar elementos
@@ -742,7 +940,7 @@ select-items-convertToStandaloneNote =
             [one] Convert to Standalone Note
            *[other] Convert to Standalone Notes
         }
-file-type-webpage = Webpage
+file-type-webpage = Páxina web
 file-type-image = Imaxe
 file-type-pdf = PDF
 file-type-audio = Son
@@ -750,30 +948,38 @@ file-type-video = Vídeo
 file-type-presentation = Presentación
 file-type-document = Documento
 file-type-ebook = Libro electrónico
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
 post-upgrade-done =
     .label = { general-done }
 text-action-paste-and-search =
-    .label = Paste and Search
+    .label = Pegar e buscar
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalar
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
-    .title = Split Tags
+    .title = Dividir etiquetas
 long-tag-fixer-button-dont-split =
-    .label = Don’t Split
+    .label = Non dividir
 menu-normalize-attachment-titles =
     .label = Normalize Attachment Titles…
 normalize-attachment-titles-title = Normalize Attachment Titles
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Buscar
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Gardar
+save-search-name-title = Gardar a busca
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Editar a nota
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Cambiar o tipo de elemento
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index c16ee6e1d1..5f60580c9e 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -115,7 +115,7 @@ general.operationInProgress=Está en marcha unha operación Zotero
 general.operationInProgress.waitUntilFinished=Agarde ata que teña acabado.
 general.operationInProgress.waitUntilFinishedAndTryAgain=Agarde ata que teña acabado e ténteo de novo.
 
-networkError.connectionNotSecure=Insecure Connection
+networkError.connectionNotSecure=Conexión non segura
 networkError.insecureConnectionTo=%1$S could not make a secure connection to %2$S.
 networkError.errorViaProxy=Erro conectándose a través do servidor proxy
 networkError.connectionMonitored=Semella que a túa conexión está monitorizada e que %S non foi configurado para confiar no servidor intermedio.
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 año atrás
 date.relative.yearsAgo.multiple=%S años atrás
 
 pane.collections.title=Coleccións
-pane.collections.delete.title=Eliminar a colección
-pane.collections.delete=Seguro que queres eliminar a colección seleccionada?
-pane.collections.delete.keepItems=O elementos dentro desta colección non se eliminarán.
-pane.collections.deleteWithItems.title=Eliminar colección e elementos
-pane.collections.deleteWithItems=Seguro que queres eliminar a colección seleccionada e mover todos eses elementos ao lixo?
 pane.feed.deleteWithItems.title=Saír da subscrición
 pane.feed.deleteWithItems=Seguro que queres borrar a subscrición a esta fonte de novas?
 
-pane.collections.deleteSearch.title=Eliminar a busca
-pane.collections.deleteSearch=Seguro que queres eliminar a busca seleccionada?
 pane.collections.emptyTrash=Seguro que queres eliminar permanentemente os elementos do lixo?
 pane.collections.newSavedSeach=Nova busca gardada
 pane.collections.savedSearchName=Introduza un nome para esta procura gardada:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Elementos duplicados
 pane.collections.removeLibrary=Eliminar a biblioteca
 pane.collections.removeLibrary.text=Seguro que queres eliminar para sempre a "%S" do computador?
 
-pane.collections.menu.duplicate.savedSearch=Busca de duplicados gardada
 pane.collections.menu.remove.library=Eliminar a biblioteca...
-pane.collections.menu.delete.collection=Eliminar a colección...
-pane.collections.menu.delete.collectionAndItems=Eliminar a colección e os elementos...
-pane.collections.menu.delete.savedSearch=Eliminar as buscas gardadas...
-pane.collections.menu.delete.feedAndItems=Saír da subscrición...
-pane.collections.menu.export.collection=Exportar a colección...
-pane.collections.menu.export.savedSearch=Exportar a busca gardada...
-pane.collections.menu.export.feed=Exportar a fonte de novas...
-pane.collections.menu.createBib.collection=Crear unha bibliografía a partir dunha colección...
-pane.collections.menu.createBib.savedSearch=Crear unha bibliografía a partir dunha busca gardada...
-pane.collections.menu.createBib.feed=Crear unha bibliografía a partir da fonte de novas....
 pane.collections.showCollectionInLibrary=Mostrar a colección na biblioteca
 
-pane.collections.menu.generateReport.collection=Xerar un informe a partir da colección...
-pane.collections.menu.generateReport.savedSearch=Xerar un informe a partir da busca gardada...
-pane.collections.menu.generateReport.feed=Xerar un informe a partir da fonte de novas...
-
 pane.collections.menu.refresh.feed=Actualizar a fonte
 pane.collections.menu.refresh.allFeeds=Actualizar todas as fontes
 pane.collections.menu.markAsRead.feed=Marcar a fonte de novas como lida
@@ -429,11 +407,11 @@ pane.item.attachments.autoRelinkOthers.text=Atopouse outro anexo máis sen anexa
 pane.item.attachments.autoRelink.locateManually=Localizar a man...
 pane.item.attachments.autoRelink.relinkAll=Ligar de novo todo
 pane.item.attachments.has=Ten anexo
-pane.item.attachments.hasPDF=Ten PDF anexo
+pane.item.attachments.hasPDF=Ten anexo PDF
 pane.item.attachments.hasSnapshot=Ten copia de pantalla
-pane.item.attachments.hasEPUB=Has EPUB attachment
-pane.item.attachments.hasImage=Has image attachment
-pane.item.attachments.hasVideo=Has video attachment
+pane.item.attachments.hasEPUB=Ten anexo EPUB
+pane.item.attachments.hasImage=Ten imaxe anexada
+pane.item.attachments.hasVideo=Ten vídeo anexado
 pane.item.attachments.hasLink=Ten ligazón
 pane.item.attachments.select=Escolla un ficheiro
 pane.item.attachments.PDF.installTools.title=PDF Tools non está instalado
@@ -446,7 +424,7 @@ pane.item.tags.removeAll=Retirar todas as etiquetas desde elemento?
 pane.item.parentItem=Elemento parental:
 
 pane.context.noParent=Ten elemento parental
-pane.context.itemNotes=Elemento notas
+pane.context.itemNotes=Notas de elemento
 pane.context.allNotes=Todas as notas
 
 itemTypes.note=Nota
@@ -500,7 +478,7 @@ itemFields.tags=Etiquetas
 itemFields.attachments=Anexos
 itemFields.related=Relacionado
 itemFields.url=URL
-itemFields.rights=License
+itemFields.rights=Licenza
 itemFields.series=Serie
 itemFields.volume=Tomo
 itemFields.issue=Número
@@ -668,8 +646,8 @@ findPDF.searchingForAvailableFiles=Searching for available files…
 findPDF.checkingItems=Comprobando %1$S elemento;Comprobando %1$S elementos
 findPDF.openAccessPDF=PDF de acceso aberto
 findPDF.pdfWithMethod=PDF (%S)
-findPDF.noFilesFound=No files found
-findPDF.noFileFound=No file found
+findPDF.noFilesFound=Non se atoparon ficheiros
+findPDF.noFileFound=Non se atopou ningún ficheiro
 
 attachment.fullText=Texto completo
 attachment.acceptedVersion=Versión aceptada
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Hai que reiniciar Firefox para p
 zotero.preferences.sync.reset.fileSyncHistory=Na proxima sincronización %1$S comparará os ficheiros anexos de "%2$S" cos do servizo de almacenamento. Calquera ficheiro anexo que falte descargarase e calquera ficheiro local restante enviarase ao servizo remoto.\nEsta opción non é necesaria nos usos de almacenamentos habituais.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=O historial de sincronización de "%S" limpouse.
 
-zotero.preferences.search.rebuildIndex=Reconstruír o Índice
-zotero.preferences.search.rebuildWarning=Quere reconstruír todo o índice? Pode tardar.\n\nPara engadir só os elementos novos use %S.
-zotero.preferences.search.clearIndex=Borrar o índice
-zotero.preferences.search.clearWarning=Ao borrar o índice os adxuntos non se atoparán nas buscas.\n\nAs ligazóns web non se reindexarán sen volver a visitar as páxinas. Para conservar as ligazóns presentes no índice escolla %S.
-zotero.preferences.search.clearNonLinkedURLs=Borrar todo excepto as ligazóns
-zotero.preferences.search.indexUnindexed=Engadir de novo os elementos ao índice
 zotero.preferences.export.quickCopy.citationStyles=Estilo de cita
 zotero.preferences.export.quickCopy.exportFormats=Formatos de exportación
 zotero.preferences.export.quickCopy.instructions=A Copia Rápida permíteche exportar facilmente elementos nun formato concreto. Podes gardar os elementos seleccionados no portarretallos premendo %S ou arrastrándoos directamente á caixa de texto da outra aplicación.
@@ -878,8 +850,8 @@ integration.removeBibEntry.body=Seguro que queres omitilas da bibliografía?
 
 integration.cited=Citado
 integration.cited.loading=Cargando os elementos citados...
-integration.openTabs=Open Documents
-integration.selectedItems=Selected Items
+integration.openTabs=Abrir documentos
+integration.selectedItems=Elementos seleccionados
 integration.ibid=ibid
 integration.emptyCitationWarning.title=Cita en branco
 integration.emptyCitationWarning.body=A cita indicada quedaría baleira empregando o estilo que está seleccionado agora mesmo. Seguro que queres engadila?
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Ten que introducir unha cita antes de reali
 integration.error.mustInsertBibliography=Ten que introducir unha bibliografía antes de realizar esta operación.
 integration.error.cannotInsertHere=Non se poden inserir aquí campos de Zotero.
 integration.error.notInCitation=Ten que poñer o cursor nunha cita de Zotero para editala.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=O estilo bibliográfico actual non define unha bibliografía. Se quere engadir unha bibliografía, por favor escolla outro estilo.
 integration.error.deletePipe=Non se puido inicializar a canle que Zotero emprega para comunicarse co procesador de texto. Quere que Zotero intente corrixir o erro? Pediráselle o seu contrasinal.
 integration.error.invalidStyle=O estilo que escolle non semella ser válido. Se creou vostede o estilo asegúrese de que pasa a validación tal e como se indica en http://zotero.org/support/dev/citation_styles. Como alternativa, pode escoller outro estilo.
@@ -1007,7 +980,7 @@ sync.error.invalidDataError.otherData=Os demais datos seguiranse sincronizando.
 
 account.unlinkWarning=Logging out will prevent %S from syncing your data.
 account.unlinkWarning.removeData=Eliminar os datos de «%S» deste ordenador
-account.unlinkWarning.button=Log Out
+account.unlinkWarning.button=Pechar sesión
 account.warning.emptyLibrary=Estás a piques de sincronizar nunha base de datos de %1$S baleira. Isto pode darse cando se borran accidentalmente o ficheiro %2$S do  cartafol %1$S ou se a posición do cartafol de datos muda.
 account.warning.emptyLibrary.dataWillBeDownloaded=Se continuas os datos da conta ‘%1$S’  descargaranse para este computador. Non se cambiará nada na libraría en liña.
 account.warning.existingDataElsewhere=Se os teus datos %S están noutro lugar do teu computador deberías mover primeiro os datos a ese cartafol ou cambiar a opción de cartafol de datos para que sexa o cartafol que se está empregando agora.
@@ -1328,19 +1301,19 @@ noteEditor.deleteTable=Eliminar táboa
 pdfReader.annotations=Anotacións
 pdfReader.showAnnotations=Amosar anotacións
 pdfReader.searchAnnotations=Buscar anotacións
-pdfReader.searchOutline=Search Outline
+pdfReader.searchOutline=Buscar no esquema
 pdfReader.noAnnotations=Crear unha anotación para vela na barra lateral
 pdfReader.noExtractedText=Sen texto extraído
 pdfReader.addComment=Engadir comentario
-pdfReader.annotationComment=Annotation comment
-pdfReader.annotationText=Annotation text
-pdfReader.manageTags=Manage tags for this annotation
-pdfReader.openMenu=Open annotation menu
+pdfReader.annotationComment=Comentario da anotación
+pdfReader.annotationText=Texto da anotación
+pdfReader.manageTags=Xestionar etiquetas para esta anotación
+pdfReader.openMenu=Abrir menú da anotación
 pdfReader.thumbnails=Thumbnails
-pdfReader.tagSelectorMessage=Filter annotations by this tag
+pdfReader.tagSelectorMessage=Filtrar anotacións por esta etiqueta
 pdfReader.addTags=Engadir etiquetas...
 pdfReader.highlightText=Resaltar texto
-pdfReader.underlineText=Subliñar Texto
+pdfReader.underlineText=Subliñar texto
 pdfReader.addNote=Engadir nota
 pdfReader.addText=Engadir Texto
 pdfReader.selectArea=Seleccionar área
@@ -1390,52 +1363,52 @@ pdfReader.phraseNotFound=Frase non atopada
 pdfReader.find=Procurar
 pdfReader.close=Pechar
 pdfReader.showThumbnails=Show Thumbnails
-pdfReader.showOutline=Show Outline
+pdfReader.showOutline=Amosar esquema
 pdfReader.findPrevious=Find the previous occurrence of the phrase
 pdfReader.findNext=Find the next occurrence of the phrase
-pdfReader.toggleSidebar=Toggle Sidebar
-pdfReader.findInDocument=Find in Document
-pdfReader.toggleContextPane=Toggle Context Pane
-pdfReader.highlightAll=Highlight all
+pdfReader.toggleSidebar=Alternar barra lateral
+pdfReader.findInDocument=Atopar no documento
+pdfReader.toggleContextPane=Alternar panel de contexto
+pdfReader.highlightAll=Resaltar todo
 pdfReader.matchCase=Match case
 pdfReader.wholeWords=Whole words
-pdfReader.appearance=Appearance
-pdfReader.epubAppearance.lineHeight=Line height
-pdfReader.epubAppearance.wordSpacing=Word spacing
-pdfReader.epubAppearance.letterSpacing=Letter spacing
+pdfReader.appearance=Aparencia
+pdfReader.epubAppearance.lineHeight=Altura da liña
+pdfReader.epubAppearance.wordSpacing=Espazado entre palabras
+pdfReader.epubAppearance.letterSpacing=Espazado entre letras
 pdfReader.epubAppearance.pageWidth=Page width
-pdfReader.epubAppearance.useOriginalFont=Use original font
+pdfReader.epubAppearance.useOriginalFont=Usar o tipo de letra orixinal
 pdfReader.epubAppearance.lineHeight.revert=Use default line height
-pdfReader.epubAppearance.wordSpacing.revert=Use default word spacing
-pdfReader.epubAppearance.letterSpacing.revert=Use default letter spacing
+pdfReader.epubAppearance.wordSpacing.revert=Usar o espazado entre palabras predeterminado
+pdfReader.epubAppearance.letterSpacing.revert=Usar o espazado entre letras predeterminado
 pdfReader.epubAppearance.pageWidth.revert=Use default page width
-pdfReader.convertToHighlight=Convert to Highlight
-pdfReader.convertToUnderline=Convert to Underline
+pdfReader.convertToHighlight=Converter a resaltado
+pdfReader.convertToUnderline=Converter a subliñado
 pdfReader.size=Tamaño
-pdfReader.merge=Merge
+pdfReader.merge=Combinar
 pdfReader.copyLink=Copiar ligazón
-pdfReader.theme.original=Original
+pdfReader.theme.original=Orixinal
 pdfReader.theme.snow=Snow
 pdfReader.theme.sepia=Sepia
 pdfReader.theme.dark=Escuro
-pdfReader.addTheme=Add Theme
+pdfReader.addTheme=Engadir tema
 pdfReader.scrollMode=Scrolling
 pdfReader.spreadMode=Spreads
 pdfReader.flowMode=Page Layout
-pdfReader.columns=Columns
-pdfReader.splitView=Split View
-pdfReader.themes=Themes
+pdfReader.columns=Columnas
+pdfReader.splitView=Dividir vista
+pdfReader.themes=Temas
 pdfReader.vertical=Vertical
 pdfReader.horizontal=Horizontal
 pdfReader.wrapped=Wrapped
 pdfReader.none=Ningún
-pdfReader.odd=Odd
-pdfReader.even=Even
+pdfReader.odd=Impar
+pdfReader.even=Par
 pdfReader.paginated=Paxinado
 pdfReader.scrolled=Desprazado
 pdfReader.single=Single
 pdfReader.double=Double
-pdfReader.themeName=Theme Name:
+pdfReader.themeName=Nome do tema:
 pdfReader.background=Background:
 pdfReader.foreground=Foreground:
 
diff --git a/chrome/locale/he-IL/zotero/integration.ftl b/chrome/locale/he-IL/zotero/integration.ftl
index e7b9cc958b..0495925120 100644
--- a/chrome/locale/he-IL/zotero/integration.ftl
+++ b/chrome/locale/he-IL/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = השמטת המחבר
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = ספרייה
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/he-IL/zotero/preferences.ftl b/chrome/locale/he-IL/zotero/preferences.ftl
index fe135c4a74..8b50a1c6ef 100644
--- a/chrome/locale/he-IL/zotero/preferences.ftl
+++ b/chrome/locale/he-IL/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = סנכרון
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/he-IL/zotero/searchbox.dtd b/chrome/locale/he-IL/zotero/searchbox.dtd
index 989008fef1..074e8e4fd6 100644
--- a/chrome/locale/he-IL/zotero/searchbox.dtd
+++ b/chrome/locale/he-IL/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "שם:">
 
-<!ENTITY zotero.search.searchInLibrary "חיפוש בספרייה:">
-
 <!ENTITY zotero.search.joinMode.prefix "התאמה">
 <!ENTITY zotero.search.joinMode.any "כלשהו">
 <!ENTITY zotero.search.joinMode.all "הכול">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "ימים">
 <!ENTITY zotero.search.date.units.months "חודשים">
 <!ENTITY zotero.search.date.units.years "שנים">
-
-<!ENTITY zotero.search.search "חיפוש">
-<!ENTITY zotero.search.clear "פינוי">
-<!ENTITY zotero.search.saveSearch "שמירת החיפוש">
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index 6916ca12db..ba45de98c2 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "הסרת פריט…">
 <!ENTITY zotero.toolbar.newGroup "קבוצה חדשה…">
 <!ENTITY zotero.toolbar.newSubcollection.label "תת־אוסף חדש…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "חיפוש שמור חדש…">
 <!ENTITY zotero.toolbar.emptyTrash.label "פינוי האשפה">
 <!ENTITY zotero.toolbar.tagSelector.label "הצגת/הסתרת בורר התגיות">
 <!ENTITY zotero.toolbar.actions.label "פעולות">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "העדפות…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "תמיכה ותיעוד">
 <!ENTITY zotero.toolbar.about.label "על Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "חיפוש מתקדם">
 <!ENTITY zotero.toolbar.openURL.label "חיפוש">
 <!ENTITY zotero.toolbar.openURL.tooltip "חיפוש בספרייה המקומית שלך">
 
diff --git a/chrome/locale/he-IL/zotero/zotero.ftl b/chrome/locale/he-IL/zotero/zotero.ftl
index 143a0049a6..5594982844 100644
--- a/chrome/locale/he-IL/zotero/zotero.ftl
+++ b/chrome/locale/he-IL/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = הדפסה
 general-remove = הסרה
 general-add = הוספה
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = הצגת הנחיות טיפול ב
 general-go-back = חזרה
 general-accept = Accept
 general-cancel = ביטול
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = הצגה בספרייה
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = שמירה
 general-clear = פינוי
+clear-button =
+    .label = { general-clear }
 general-update = עדכון
 general-back = אחורה
 general-edit = עריכה
@@ -76,6 +86,8 @@ general-maroon = ערמון
 general-gray = אפור
 general-black = שחור
 general-loading = בטעינה…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = סגנון ציטוט:
 language-label = שפה:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = שינוי שם אוסף
-collections-menu-edit-saved-search =
-    .label = ערוך חיפושים שמורים
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = ערוך חיפושים שמורים
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = העברה אל
 collections-menu-copy-collection =
     .label = העתקה אל
+collections-menu-export =
+    .label = ייצוא…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = הורדה באחד
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = חיפוש מהיר
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = חיפוש מתקדם
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = איתור
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = הסברים
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = שדות
 search-conditions-collection = אוסף
 search-conditions-savedSearch = חיפוש שמור
 search-conditions-itemTypeID = סוג פריט
 search-conditions-tag = תגית
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = הערה
 search-conditions-childNote = הערת צאצא
 search-conditions-creator = יוצר
@@ -715,10 +897,26 @@ search-conditions-dateModified = תאריך שינוי
 search-conditions-fulltextContent = תוכן מצורף
 search-conditions-programmingLanguage = שפת תכנות
 search-conditions-fileTypeID = סוג קובץ מצורף
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = טקסט הסבר
 search-conditions-annotationComment = הערת הסבר
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = כותרת, יוצר/ת, שנה
+search-conditions-submenu-attachment = קובץ מצורף
+search-conditions-submenu-annotation = הסבר
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = סוג קובץ
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = סוג
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = מחבר
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = וידאו
 file-type-presentation = מצגת
 file-type-document = מסמך
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = התקנה
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = חיפוש
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = שמירה
+save-search-name-title = שמירת החיפוש
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = שינוי שם אוסף
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = ערוך הערה
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = החלפת סוג פריט
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index 5121fa5a37..7dc07181cc 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=לפני שנה
 date.relative.yearsAgo.multiple=לפני %S שנים
 
 pane.collections.title=אוספים
-pane.collections.delete.title=מחיקת אוסף
-pane.collections.delete=למחוק את האוסף הנבחר?
-pane.collections.delete.keepItems=פריטים באוסף הזה לא יימחקו.
-pane.collections.deleteWithItems.title=מחיקת אוסף ופריטים
-pane.collections.deleteWithItems=למחוק את האוסף הנבחר ולהעביר את כל הפריטים שבתוכו לאשפה?
 pane.feed.deleteWithItems.title=ביטול מינוי
 pane.feed.deleteWithItems=להפסיק להתעדכן מול ערוצי התוכן האלו?
 
-pane.collections.deleteSearch.title=מחיקת חיפוש
-pane.collections.deleteSearch=למחוק את החיפוש הנבחר?
 pane.collections.emptyTrash=להסיר את הפריטים מהאשפה לצמיתות?
 pane.collections.newSavedSeach=חיפוש שמור חדש
 pane.collections.savedSearchName=נא למלא שם לחיפוש השמור הזה:
@@ -277,24 +270,9 @@ pane.collections.duplicate=פריטים כפולים
 pane.collections.removeLibrary=הסרת ספרייה
 pane.collections.removeLibrary.text=להסיר את „%S” מהמחשב הזה לצמיתות?
 
-pane.collections.menu.duplicate.savedSearch=חיפוש שמור כפול
 pane.collections.menu.remove.library=הסרת ספרייה…
-pane.collections.menu.delete.collection=מחיקת אוסף…
-pane.collections.menu.delete.collectionAndItems=מחיקת אוסף ופריטים…
-pane.collections.menu.delete.savedSearch=מחיקת חיפוש שמור…
-pane.collections.menu.delete.feedAndItems=הפסקת עדכון מול ערוץ תוכן…
-pane.collections.menu.export.collection=ייצוא אוסף…
-pane.collections.menu.export.savedSearch=ייצוא חיפוש שמור…
-pane.collections.menu.export.feed=ייצוא ערוץ תוכן…
-pane.collections.menu.createBib.collection=יצירת ביבליוגרפיה מאוסף…
-pane.collections.menu.createBib.savedSearch=יצירת ביבליוגרפיה מחיפוש שמור…
-pane.collections.menu.createBib.feed=יצירת ביבליוגרפיה מערוץ תוכן…
 pane.collections.showCollectionInLibrary=הצגת אוספים בספרייה
 
-pane.collections.menu.generateReport.collection=יצירת דוח מאוסף…
-pane.collections.menu.generateReport.savedSearch=יצירת דוח מחיפוש שמור…
-pane.collections.menu.generateReport.feed=יצירת דוח מערוץ תוכן…
-
 pane.collections.menu.refresh.feed=רענון ערוץ תוכן
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=סימון ערוץ העדכונים כנקרא
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=יש להפעיל את Firefox 
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=היסטוריית סנכרון הקבצים עבור „%S” נמחקה.
 
-zotero.preferences.search.rebuildIndex=בניית אינדקס מחדש
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Clear Index
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Clear All Except Web Links
-zotero.preferences.search.indexUnindexed=Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles=סגנונות ציטוט
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/hr-HR/zotero/integration.ftl b/chrome/locale/hr-HR/zotero/integration.ftl
index fa0f73c4e8..7bf6e6f581 100644
--- a/chrome/locale/hr-HR/zotero/integration.ftl
+++ b/chrome/locale/hr-HR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Pretpregled
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteka
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/hr-HR/zotero/preferences.ftl b/chrome/locale/hr-HR/zotero/preferences.ftl
index ac8744f92a..d508123dee 100644
--- a/chrome/locale/hr-HR/zotero/preferences.ftl
+++ b/chrome/locale/hr-HR/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Jezik i regija
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sinkroniziraj
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/hr-HR/zotero/searchbox.dtd b/chrome/locale/hr-HR/zotero/searchbox.dtd
index 4e37a08608..f8255145bd 100644
--- a/chrome/locale/hr-HR/zotero/searchbox.dtd
+++ b/chrome/locale/hr-HR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Naziv:">
 
-<!ENTITY zotero.search.searchInLibrary "Traži u biblioteci:">
-
 <!ENTITY zotero.search.joinMode.prefix "Podudaraj">
 <!ENTITY zotero.search.joinMode.any "bilo koji">
 <!ENTITY zotero.search.joinMode.all "sve">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dana">
 <!ENTITY zotero.search.date.units.months "mjeseci">
 <!ENTITY zotero.search.date.units.years "godina">
-
-<!ENTITY zotero.search.search "Pretraživanje">
-<!ENTITY zotero.search.clear "Očisti">
-<!ENTITY zotero.search.saveSearch "Spremi pretraživanje">
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index eae0bd9680..d814e0f273 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Ukloni stavku...">
 <!ENTITY zotero.toolbar.newGroup "Nova grupa...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nova podzbirka...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nova spremljena pretraga...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Isprazni otpad">
 <!ENTITY zotero.toolbar.tagSelector.label "Prikaži/Sakrij birač oznaka">
 <!ENTITY zotero.toolbar.actions.label "Radnje">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Postavke...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podrška i dokumentacija">
 <!ENTITY zotero.toolbar.about.label "O Zoteru">
-<!ENTITY zotero.toolbar.advancedSearch "Napredna pretraga">
 <!ENTITY zotero.toolbar.openURL.label "Lociraj">
 <!ENTITY zotero.toolbar.openURL.tooltip "Pronađi kroz lokalnu knjižnicu">
 
diff --git a/chrome/locale/hr-HR/zotero/zotero.ftl b/chrome/locale/hr-HR/zotero/zotero.ftl
index 0433eec192..48b7246e56 100644
--- a/chrome/locale/hr-HR/zotero/zotero.ftl
+++ b/chrome/locale/hr-HR/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Ispiši
 general-remove = Ukloni
 general-add = Dodaj
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Vidi informacije o rješavanju probl
 general-go-back = Idi natrag
 general-accept = Prihvati
 general-cancel = Otkaži
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Prikaži u biblioteci
 general-restartApp = Ponovno pokreni { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Spremi
 general-clear = Očisti
+clear-button =
+    .label = { general-clear }
 general-update = Ažuriraj
 general-back = Natrag
 general-edit = Uredi
@@ -76,6 +86,8 @@ general-maroon = Bordo
 general-gray = Siva
 general-black = Crna
 general-loading = Učitavanje…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Stil citiranja:
 language-label = Jezik:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Uredi spremljenu pretragu
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Uredi spremljenu pretragu
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Izvoz...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Brza pretraga
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Napredna pretraga
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Pronađi
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotacije
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Polja:
 search-conditions-collection = Zbirka
 search-conditions-savedSearch = Spremljena pretraga
 search-conditions-itemTypeID = Vrsta stavke
 search-conditions-tag = Oznaka
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Bilješka
 search-conditions-childNote = Podređena bilješka
 search-conditions-creator = Stvoritelj
@@ -715,10 +897,26 @@ search-conditions-dateModified = Datum izmjene
 search-conditions-fulltextContent = Sadržaj priloga
 search-conditions-programmingLanguage = Programski jezik
 search-conditions-fileTypeID = Vrsta datoteke priloga
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Tekst anotacija
 search-conditions-annotationComment = Komentar anotacija
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Bilo koje polje
+search-conditions-titleCreatorYear = Naslov, autor, godina
+search-conditions-submenu-attachment = Prilog
+search-conditions-submenu-annotation = Anotacija
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Vrsta datoteke
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Vrsta
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Prezentacija
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instaliraj
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Pretraži
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Spremi
+save-search-name-title = Spremi pretraživanje
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Promijenu vrstu stavke
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index 164bc6bf9e..6551c0d447 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Prije 1 godine
 date.relative.yearsAgo.multiple=Prije %S godine(a)
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Jeste li sigurni da želite izbrisati odabranu zbirku?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Jeste li sigurni da želite izbrisati odabranu pretragu?
 pane.collections.emptyTrash=Jeste li sigurni da želite trajno ukloniti stavke iz otpada?
 pane.collections.newSavedSeach=Nova spremljena pretraga
 pane.collections.savedSearchName=Unesite naziv za ovu spremljenu pretragu:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Izvoz zbirke...
-pane.collections.menu.export.savedSearch=Izvoz spremljene pretrage...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Generiraj izvješće iz zbirke...
-pane.collections.menu.generateReport.savedSearch=Generiraj izvješće iz spremljene pretrage...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Ponovno izgradi indeks
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Očisti indeks
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Očisti sve osim web poveznica
-zotero.preferences.search.indexUnindexed=Indeksiraj neindeksirane stavke
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Format izvoza
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Morate umetnuti citat prije obavljanja ove
 integration.error.mustInsertBibliography=Morate umetnuti bibliografiju prije obavljanja ove radnje.
 integration.error.cannotInsertHere=Zoterova polja se ne mogu umetnuti ovdje.
 integration.error.notInCitation=Morate postaviti kursor u Zoterov citat da biste ga uredili.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Trenutni bibliografski stil ne definira bibliografiju. Ako želite dodati bibliografijum odaberite drugi stil.
 integration.error.deletePipe=Kanal koji Zotero koristi za komunikaciju s programom za obradu teksta nije se mogao inicijalizirati. Želite li da Zotero pokuša ispraviti problem? Bit će zatražen unos lozinke.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/hu-HU/zotero/integration.ftl b/chrome/locale/hu-HU/zotero/integration.ftl
index 1b8c5b5640..12c232ffe5 100644
--- a/chrome/locale/hu-HU/zotero/integration.ftl
+++ b/chrome/locale/hu-HU/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Szerző kihagyása
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Előnézet
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Könyvtár
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/hu-HU/zotero/preferences.ftl b/chrome/locale/hu-HU/zotero/preferences.ftl
index 8aaa0e8788..19a33eb903 100644
--- a/chrome/locale/hu-HU/zotero/preferences.ftl
+++ b/chrome/locale/hu-HU/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Nyelv és régió
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Szinkronizálás
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/hu-HU/zotero/searchbox.dtd b/chrome/locale/hu-HU/zotero/searchbox.dtd
index 581a88d2e2..022705e805 100644
--- a/chrome/locale/hu-HU/zotero/searchbox.dtd
+++ b/chrome/locale/hu-HU/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Név:">
 
-<!ENTITY zotero.search.searchInLibrary "Keresés könyvtárban:">
-
 <!ENTITY zotero.search.joinMode.prefix "Találat">
 <!ENTITY zotero.search.joinMode.any "bármelyik">
 <!ENTITY zotero.search.joinMode.all "összes">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "nap">
 <!ENTITY zotero.search.date.units.months "hónap">
 <!ENTITY zotero.search.date.units.years "év">
-
-<!ENTITY zotero.search.search "Keresés">
-<!ENTITY zotero.search.clear "Törlés">
-<!ENTITY zotero.search.saveSearch "Keresés mentése">
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index bfa574bf09..79343fde8a 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Elem törlése...">
 <!ENTITY zotero.toolbar.newGroup "Új csoport...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Új algyűjtemény...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Új mentett keresés...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Kuka ürítése">
 <!ENTITY zotero.toolbar.tagSelector.label "Címkeválasztó mutatása/elrejtése">
 <!ENTITY zotero.toolbar.actions.label "Műveletek">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Beállítások...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Támogatás és dokumentáció">
 <!ENTITY zotero.toolbar.about.label "Névjegy">
-<!ENTITY zotero.toolbar.advancedSearch "Haladó keresés">
 <!ENTITY zotero.toolbar.openURL.label "Keresés">
 <!ENTITY zotero.toolbar.openURL.tooltip "Hol találom a helyi könyvtárban?">
 
diff --git a/chrome/locale/hu-HU/zotero/zotero.ftl b/chrome/locale/hu-HU/zotero/zotero.ftl
index 3d1857cdc7..0e3d4dced3 100644
--- a/chrome/locale/hu-HU/zotero/zotero.ftl
+++ b/chrome/locale/hu-HU/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Nyomtatás
 general-remove = Eltávolítás
 general-add = Hozzáadás
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Vissza
 general-accept = Beszúrás
 general-cancel = Mégsem
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Megjelenítés a könyvtárban
 general-restartApp = { -app-name } Újraindítása
 general-restartInTroubleshootingMode = Újraindítás hibakereső módban
 general-save = Mentés
 general-clear = Törlés
+clear-button =
+    .label = { general-clear }
 general-update = Frissítés
 general-back = Vissza
 general-edit = Szerkesztés
@@ -76,6 +86,8 @@ general-maroon = Vörösesbarna
 general-gray = Szürke
 general-black = Fekete
 general-loading = Betöltés…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Hivatkozási stílus:
 language-label = Nyelv:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Gyűjtemény átnevezése
-collections-menu-edit-saved-search =
-    .label = Mentett keresés szerkesztése
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Mentett keresés szerkesztése
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Másolás a(z)
+collections-menu-export =
+    .label = Exportálás...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mozgatás lefelé
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } nem tudott csatlakozni { $targetApp }. Kérjük, ellenőrizze az internetkapcsolatot, és próbálja meg újra.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Gyorskeresés
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Haladó keresés
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Megtekintés
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = { -app-name } letöltése ARM64-re
 first-run-guidance-authorMenu = { -app-name } lehetővé teszi szerkesztők és fordítók megadását is. Ebből a menüből kiválasztva a szerzőt szerkesztővé vagy fordítóvá alakíthatja.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Keresés
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = jegyzetek
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Keresési feltételek
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Érték
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Mezők:
 search-conditions-collection = Gyűjtemény
 search-conditions-savedSearch = Mentett keresés
 search-conditions-itemTypeID = Forrás típusa
 search-conditions-tag = Címke
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Jegyzet
 search-conditions-childNote = Ez alá tartozó jegyzet
 search-conditions-creator = Szerző
@@ -715,10 +897,26 @@ search-conditions-dateModified = Módosítás dátuma
 search-conditions-fulltextContent = Csatolmány tartalma
 search-conditions-programmingLanguage = Programozási nyelv
 search-conditions-fileTypeID = Csatolt fájl típusa
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Megjegyzés szövege
 search-conditions-annotationComment = Megjegyzés Jegyzet
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Bármelyik mező
+search-conditions-titleCreatorYear = Cím, Szerző, Év
+search-conditions-submenu-attachment = Csatolmány
+search-conditions-submenu-annotation = Megjegyzés
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Fájl típusa
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Típus
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Szerző
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Videó
 file-type-presentation = Előadás
 file-type-document = Dokumentum
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Frissítve lett a <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span> verzióra! Ismerje meg az <a data-l10n-name="new-features-link">újdonságokat</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Beillesztés és keresés
 mac-word-plugin-install-message = A Zotero a Word bővítmény telepítéséhez hozzáférést igényel a Word-fájlokhoz.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Word plugin telepítése
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Telepítés
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = A { -app-name } mostantól automatikusan szinkronizálja a mellékletek fájlneveit, amikor módosításokat hajt végre az elemekben.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Keresés
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Mentés
+save-search-name-title = Keresés mentése
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Gyűjtemény átnevezése
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Jegyzet szerkesztése
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Elem típusának módosítása
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index f2b6fe6a1a..cda3689d85 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 évvel ezelőtt
 date.relative.yearsAgo.multiple=%S évvel ezelőtt
 
 pane.collections.title=Gyűjtemény
-pane.collections.delete.title=Gyűjtemény törlése
-pane.collections.delete=A kijelölt gyűjtemény törlésének megerősítése?
-pane.collections.delete.keepItems=Az alábbi gyűjtemény elemi nem törlődnek.
-pane.collections.deleteWithItems.title=Gyűjtemény és elemek törlése
-pane.collections.deleteWithItems=Biztos benne, hogy minden kijelölt gyűjtemény és elem áthelyezhető a Kukába?
 pane.feed.deleteWithItems.title=Leiratkozás
 pane.feed.deleteWithItems=Biztos, hogy le akar iratkozni erről a feedről?
 
-pane.collections.deleteSearch.title=Keresés törlése
-pane.collections.deleteSearch=A kijelölt keresés törlésének megerősítése?
 pane.collections.emptyTrash=Biztos benne, hogy végleg törölni akarja az elemeket a Lomtárból?
 pane.collections.newSavedSeach=Új mentett keresés
 pane.collections.savedSearchName=Adjon meg egy új nevet az elmentett keresésnek
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplikált elemek
 pane.collections.removeLibrary=Könyvtár eltávolítása
 pane.collections.removeLibrary.text=Biztos benne, hogy végleg el akarja távolítani a “%S”-t a számítógépéről?
 
-pane.collections.menu.duplicate.savedSearch=Mentett keresés duplikálása
 pane.collections.menu.remove.library=Könyvtár eltávolítása…
-pane.collections.menu.delete.collection=Gyűjtemény törlése…
-pane.collections.menu.delete.collectionAndItems=Gyűjtemény és elemek törlése…
-pane.collections.menu.delete.savedSearch=Mentett keresések törlése…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Gyűjtemény exportálása...
-pane.collections.menu.export.savedSearch=Mentett keresés exportálása...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Bibliográfia létrehozása a gyűjteményből...
-pane.collections.menu.createBib.savedSearch=Bibliográfia létrehozása a mentett keresésből…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=A gyűjtemény megjelenítése könyvtárban
 
-pane.collections.menu.generateReport.collection=Jelentés létrehozása a gyűjteményből
-pane.collections.menu.generateReport.savedSearch=Jelentés létrehozása a mentett keresésből...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=A helyreállítási művelet bef
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=A(z) „%S” fájlszinkronizálási előzményei törölve lettek.
 
-zotero.preferences.search.rebuildIndex=Index újraépítése
-zotero.preferences.search.rebuildWarning=A teljes index újraépítésének megerősítése? Ez időbe telhet.\n\nAz eddig nem indexelt elemek indexeléséhez használja a %S-t.
-zotero.preferences.search.clearIndex=Index törlése
-zotero.preferences.search.clearWarning=Az index törlése után a csatolmányok szövegében nem lehet keresni.\n\nA webhivatkozásokat nem lehet újraindexelni anélkül, hogy újra meglátogatná őket. A webhivatkozások törlésének kihagyásához válassza a %S-t.
-zotero.preferences.search.clearNonLinkedURLs=A webhivatkozások kivételével az összes törlése
-zotero.preferences.search.indexUnindexed=Nem indexelt elemek indexelése
 zotero.preferences.export.quickCopy.citationStyles=Hivatkozási stílusok
 zotero.preferences.export.quickCopy.exportFormats=Exportálási formátumok
 zotero.preferences.export.quickCopy.instructions=A gyorsmásolás lehetővé teszi az elemek gyors exportálását egy adott formátumban. A kiválasztott elemeket a vágólapra másolhatja a %S billentyű lenyomásával, vagy közvetlenül egy másik program szövegmezőjébe húzhatja az elemeket.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Be kell illesztenie egy hivatkozást.
 integration.error.mustInsertBibliography=Be kell illesztenie egy bibliográfiát.
 integration.error.cannotInsertHere=A Zotero nem tudja beilleszteni a hivatkozást.
 integration.error.notInCitation=Helyezze a kurzort a hivatkozásra a szerkesztéshez.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=A jelenlegi hivatkozási stílus nem tartalmaz bibliográfiát. Ha szeretne bibliográfiát hozzáadni, kérem válasszon másik stílust.
 integration.error.deletePipe=A csatorna amit a Zotero a szövegszerkesztővel való kommunikációhoz használ, nem inicializálható. Szeretné ha a Zotero megpróbálná kijavítani ezt a hibát? Kérem majd adja meg a jelszavát.
 integration.error.invalidStyle=A kiválasztott stílus nem tűnük érvényesnek. Amennyiben ez egy saját stílus, úgy győződjön meg, hogy érvényes, melyről leírást a https://github.com/citation-style-language/styles/wiki/Validation talál. Esetleg válasszon másik stílust.
diff --git a/chrome/locale/id-ID/zotero/integration.ftl b/chrome/locale/id-ID/zotero/integration.ftl
index b612521a30..d52be1c105 100644
--- a/chrome/locale/id-ID/zotero/integration.ftl
+++ b/chrome/locale/id-ID/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Perpustakaan
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/id-ID/zotero/preferences.ftl b/chrome/locale/id-ID/zotero/preferences.ftl
index 24b9b98127..a336436973 100644
--- a/chrome/locale/id-ID/zotero/preferences.ftl
+++ b/chrome/locale/id-ID/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sinkronisasi
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/id-ID/zotero/searchbox.dtd b/chrome/locale/id-ID/zotero/searchbox.dtd
index ae7a43fb2f..bfbf73edc1 100644
--- a/chrome/locale/id-ID/zotero/searchbox.dtd
+++ b/chrome/locale/id-ID/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nama:">
 
-<!ENTITY zotero.search.searchInLibrary "Cari di perpustakaan:">
-
 <!ENTITY zotero.search.joinMode.prefix "Cocok">
 <!ENTITY zotero.search.joinMode.any "apapun">
 <!ENTITY zotero.search.joinMode.all "semua">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "hari">
 <!ENTITY zotero.search.date.units.months "bulan">
 <!ENTITY zotero.search.date.units.years "tahun">
-
-<!ENTITY zotero.search.search "Cari">
-<!ENTITY zotero.search.clear "Bersihkan">
-<!ENTITY zotero.search.saveSearch "Simpan pencarian">
diff --git a/chrome/locale/id-ID/zotero/zotero.dtd b/chrome/locale/id-ID/zotero/zotero.dtd
index 1b66602c67..f6fde2835a 100644
--- a/chrome/locale/id-ID/zotero/zotero.dtd
+++ b/chrome/locale/id-ID/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Buang Item...">
 <!ENTITY zotero.toolbar.newGroup "Grup Baru...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Subkoleksi Baru...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Pencarian Tersimpan Baru...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Keranjang Sampah Kosong">
 <!ENTITY zotero.toolbar.tagSelector.label "Tunjukkan/Sembunyikan Selektor Tag">
 <!ENTITY zotero.toolbar.actions.label "Tindakan">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferensi...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Dukungan dan Dokuementasi">
 <!ENTITY zotero.toolbar.about.label "Tentang Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Pencarian Lanjutan">
 <!ENTITY zotero.toolbar.openURL.label "Temukan">
 <!ENTITY zotero.toolbar.openURL.tooltip "Temukan melalui perpustakaan lokal Anda">
 
diff --git a/chrome/locale/id-ID/zotero/zotero.ftl b/chrome/locale/id-ID/zotero/zotero.ftl
index 9baa881cfe..0c1c64c900 100644
--- a/chrome/locale/id-ID/zotero/zotero.ftl
+++ b/chrome/locale/id-ID/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Cetak
 general-remove = Buang
 general-add = Tambahkan
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Kembali
 general-accept = Terima
 general-cancel = Batal
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Tunjukkan dalam Perpustakaan
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Simpan
 general-clear = Bersihkan
+clear-button =
+    .label = { general-clear }
 general-update = Perbarui
 general-back = Kembali
 general-edit = Edit
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Memuat...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Gaya Sitasi:
 language-label = Bahasa:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Ekspor...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Pencarian Cepat
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Pencarian Lanjutan
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Temukan
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotasi
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Isian:
 search-conditions-collection = Koleksi
 search-conditions-savedSearch = Pencarian Tersimpan
 search-conditions-itemTypeID = Jenis Item
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Catatan
 search-conditions-childNote = Catatan Anak
 search-conditions-creator = Penyusun
@@ -715,10 +897,26 @@ search-conditions-dateModified = Tanggal Dimodifikasi
 search-conditions-fulltextContent = Konten Lampiran
 search-conditions-programmingLanguage = Bahasa Pemrograman
 search-conditions-fileTypeID = Jenis Berkas Lampiran
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Lampiran
+search-conditions-submenu-annotation = Anotasi
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Jenis Berkas
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Jenis
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Penulis
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentasi
 file-type-document = Dokumen
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instal
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Cari
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Simpan
+save-search-name-title = Simpan pencarian
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Catatan
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Ubah Jenis Item
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties
index a10f09d417..e1cb60eb3c 100644
--- a/chrome/locale/id-ID/zotero/zotero.properties
+++ b/chrome/locale/id-ID/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 tahun yang lalu
 date.relative.yearsAgo.multiple=%S tahun yang lalu
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Apakah Anda yakin ingin menghapus koleksi terpilih?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Apakah Anda yakin ingin menghapus pencarian terpilih?
 pane.collections.emptyTrash=Apakah Anda yakin ingin membuang secara permanen item-item di dalam Keranjang Sampah?
 pane.collections.newSavedSeach=Pencarian Tersimpan Baru
 pane.collections.savedSearchName=Masukkan nama untuk pencarian tersimpan ini:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Item duplikat
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Ekspor Koleksi...
-pane.collections.menu.export.savedSearch=Ekspor Pencarian Tersimpan...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Buat Bibliografi dari Koleksi...
-pane.collections.menu.createBib.savedSearch=Membuat Bibliografi dari Pencarian Tersimpan...
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Buat Laporan dari Koleksi...
-pane.collections.menu.generateReport.savedSearch=Buat Laporan dari Pencarian Tersimpan...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Tandai umpan sebagai dibaca
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Menyusun Ulang Indeks
-zotero.preferences.search.rebuildWarning=Apakah Anda ingin menyusun ulang kesuluruhan indeks? Hal ini mungkin membutuhkan waktu beberapa lama.\n\nUntuk hanya mengindeks item-item yang belum terindeksi, gunakanlah %S.
-zotero.preferences.search.clearIndex=Bersihkan Indeks
-zotero.preferences.search.clearWarning=Setelah membersihkan indeks, lampiran tidak akan dapat dicari kembali.\n\nLampiran berupa tautan web tidak akan dapat diindeksi ulang tanpa mengunjungi ulang halaman web tersebut. Untuk membiarkan tautan web tetap terindeksi, pilih %S.
-zotero.preferences.search.clearNonLinkedURLs=Bersihkan Semua Kecuali Tautan-tautan Web
-zotero.preferences.search.indexUnindexed=Indeks Item-item yang Belum Terindeksi
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Format Ekspor
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Anda harus memasukkan sitasi sebelum melaku
 integration.error.mustInsertBibliography=Anda harus memasukkan bibliografi sebelum melakukan prosedur ini.
 integration.error.cannotInsertHere=Field Zotero tidak dapat dimasukkan di sini.
 integration.error.notInCitation=Anda harus meletakkan kursor di dalam sitasi Zotero untuk mengeditnya.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Gaya bibliografi saat ini tidak menggambarkan sebuah bibliografi. Jika Anda ingin menambahkan sebuah bibliografi, silakan pilih gaya yang lain.
 integration.error.deletePipe=Jalur yang Zotero gunakan untuk berkomunikasi dengan pengolah kata tidak dapat diinisialisasi. Apakah Anda ingin Zotero mencoba memperbaiki kesalahan ini. Anda akan diminta untuk mengisi password Anda.
 integration.error.invalidStyle=Gaya yang Anda pilih tampaknya tidak valid. Jika Anda membuat gaya ini sendiri, mohon pastikan bahwa gaya ini telah melewati validasi sebagaimana dijelaskan di http://zotero.org/support/dev/citation_styles. Atau cobalah memilih gaya yang lain.
diff --git a/chrome/locale/is-IS/zotero/integration.ftl b/chrome/locale/is-IS/zotero/integration.ftl
index 3868153018..de55901e7f 100644
--- a/chrome/locale/is-IS/zotero/integration.ftl
+++ b/chrome/locale/is-IS/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Færslusafn
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/is-IS/zotero/preferences.ftl b/chrome/locale/is-IS/zotero/preferences.ftl
index 36bd3bd530..d9f7f4f7a5 100644
--- a/chrome/locale/is-IS/zotero/preferences.ftl
+++ b/chrome/locale/is-IS/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Samstilla
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/is-IS/zotero/searchbox.dtd b/chrome/locale/is-IS/zotero/searchbox.dtd
index 1e0d365bc8..ab16b46674 100644
--- a/chrome/locale/is-IS/zotero/searchbox.dtd
+++ b/chrome/locale/is-IS/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nafn:">
 
-<!ENTITY zotero.search.searchInLibrary "Leita í færslusafni:">
-
 <!ENTITY zotero.search.joinMode.prefix "Leita að">
 <!ENTITY zotero.search.joinMode.any "einhverju">
 <!ENTITY zotero.search.joinMode.all "öllum">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dagar">
 <!ENTITY zotero.search.date.units.months "mánuðir">
 <!ENTITY zotero.search.date.units.years "ár">
-
-<!ENTITY zotero.search.search "Leita">
-<!ENTITY zotero.search.clear "Hreinsa">
-<!ENTITY zotero.search.saveSearch "Vista leit">
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index e579ee1141..d735f36c82 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Fjarlægja færslu…">
 <!ENTITY zotero.toolbar.newGroup "Nýr hópur…">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nýtt undirsafn…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Ný vistuð leit…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Tæma ruslið">
 <!ENTITY zotero.toolbar.tagSelector.label "Birta/fela merkjaveljara">
 <!ENTITY zotero.toolbar.actions.label "Aðgerðir">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Kjörstillingar…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Stuðningur og leiðbeiningar">
 <!ENTITY zotero.toolbar.about.label "Um Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Ítarleg leit">
 <!ENTITY zotero.toolbar.openURL.label "Staðsetja">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finna í næsta færslusafni">
 
diff --git a/chrome/locale/is-IS/zotero/zotero.ftl b/chrome/locale/is-IS/zotero/zotero.ftl
index 5e617877f8..4eb669d793 100644
--- a/chrome/locale/is-IS/zotero/zotero.ftl
+++ b/chrome/locale/is-IS/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Prenta
 general-remove = Fjarlægja
 general-add = Bæta við
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Hætta við
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Sýna í færslusafni
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Vista
 general-clear = Hreinsa
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Breyta
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Hleð inn…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Tegund tilvísunar:
 language-label = Tungumál:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Breyta vistaðri leit
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Breyta vistaðri leit
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Flytja út…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Færa niður
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Flýtileit
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Ítarleg leit
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Finna
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = glósur
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Svæði:
 search-conditions-collection = Safn
 search-conditions-savedSearch = Vistaðar leitir
 search-conditions-itemTypeID = Tegund færslu
 search-conditions-tag = Merki
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Athugasemd
 search-conditions-childNote = Undirathugasemd
 search-conditions-creator = Höfundur
@@ -715,10 +897,26 @@ search-conditions-dateModified = Dagsetning breytingar
 search-conditions-fulltextContent = Innihald viðhengis
 search-conditions-programmingLanguage = Forritunarmál
 search-conditions-fileTypeID = Tegund viðhengisskráar
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Titill, höfundur, ár
+search-conditions-submenu-attachment = Viðhengi
+search-conditions-submenu-annotation = Skýring
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Skráartegund
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tegund korts
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Höfundur
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Kvikmynd
 file-type-presentation = Kynning
 file-type-document = Skjal
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Setja upp
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Leita
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Vista
+save-search-name-title = Vista leit
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Lagfæra athugasemd
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Breyta tegund færslu
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 8e9ed78b85..9f29a85fe5 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Fyrir 1 ári síðan
 date.relative.yearsAgo.multiple=Fyrir %S árum síðan
 
 pane.collections.title=Collections
-pane.collections.delete.title=Eyða safni
-pane.collections.delete=Viltu örugglega eyða völdu safni?
-pane.collections.delete.keepItems=Færslum innan þessa safns verður ekki eytt.
-pane.collections.deleteWithItems.title=Eyða safni og færslum
-pane.collections.deleteWithItems=Ertu viss um að þú viljir eyða völdu safni og færa allar færslur innan þess í ruslatunnuna?
 pane.feed.deleteWithItems.title=Hætta áskrift
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Eyða leit
-pane.collections.deleteSearch=Viltu örugglega eyða valdri leit?
 pane.collections.emptyTrash=Ertu viss um að þú viljir endanlega eyða færslum úr ruslakörfunni?
 pane.collections.newSavedSeach=Ný leit vistuð
 pane.collections.savedSearchName=Nafn á leit til vistunar:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Eins færslur
 pane.collections.removeLibrary=Fjarlægja færslusafn
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Fjarlægja færslusafn…
-pane.collections.menu.delete.collection=Eyða safni
-pane.collections.menu.delete.collectionAndItems=Eyða safni og færslum…
-pane.collections.menu.delete.savedSearch=Eyða vistaðri leit…
-pane.collections.menu.delete.feedAndItems=Hætta áskrift að streymi…
-pane.collections.menu.export.collection=Flytja út safn
-pane.collections.menu.export.savedSearch=Flytja út vistaða leit
-pane.collections.menu.export.feed=Flytja út streymi…
-pane.collections.menu.createBib.collection=Útbúa bókaskrá út frá safni…
-pane.collections.menu.createBib.savedSearch=Útbúa bókaskrá út frá vistaðri leit…
-pane.collections.menu.createBib.feed=Útbúa bókaskrá út frá streymi…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Búa til skýrslu úr safni…
-pane.collections.menu.generateReport.savedSearch=Búa til skýrslu úr vistaðri leit…
-pane.collections.menu.generateReport.feed=Útbúa skýrslu út frá streymi…
-
 pane.collections.menu.refresh.feed=Endurnýja streymi
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Merkja streymi sem lesið
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Endurræsa þarf Firefox til þe
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Endurgera færsluskrá
-zotero.preferences.search.rebuildWarning=Viltu endurgera alla færsluskránna? Það gæti tekið dágóða stund.\n\nTil að skrá einungis færslur sem ekki eru í færsluskránni, notið %S.
-zotero.preferences.search.clearIndex=Hreinsa færsluskrá
-zotero.preferences.search.clearWarning=Ef færsluskrá er tæmd verður ekki lengur hægt að leita í viðhengjum.\n\nViðhengi frá vefsíðum er ekki hægt að endurskrá án þess að sækja vefsíðuna að nýju. Ef vefsíður eiga áfram að vera skráðar, veldu %S.
-zotero.preferences.search.clearNonLinkedURLs=Hreinsa allt nema veftengla
-zotero.preferences.search.indexUnindexed=Skrá óskráðar færslur
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Flytja út snið
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Þú verður að setja inn tilvitnun áður
 integration.error.mustInsertBibliography=Þú verður að setja inn heimildaskrá áður en þú framkvæmir þessa aðgerð.
 integration.error.cannotInsertHere=Ekki er hægt að setja hér inn Zotero svæði.
 integration.error.notInCitation=Þú verður að staðsetja bendilinn ofan á Zotero tilvísun til þess að geta breytt henni.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Sá stíll heimildaskrár sem nú er virkur hefur enga bókfræðilega lýsingu. Ef þú vilt bæta við heimildaskrá, veldu þá annan stíl.
 integration.error.deletePipe=Ekki reyndist hægt að koma á tengingu milli Zotero og ritvinnslunnar. Viltu að Zotero reyni að leiðrétta þessa villu? Þú verður beðin(n) um lykilorð.
 integration.error.invalidStyle=Stíllinn sem þú valdir virðist ekki vera nothæfur. Ef þú hefur búið þennan stíl til, gættu þess vandlega að hann fylgi þeirri lýsing sem gefin er á https://github.com/citation-style-language/styles/wiki/Validation. Að öðrum kosti er ráðlagt að velja annan stíl.
diff --git a/chrome/locale/it-IT/zotero/integration.ftl b/chrome/locale/it-IT/zotero/integration.ftl
index 59f1279bcf..ca9c29e0c5 100644
--- a/chrome/locale/it-IT/zotero/integration.ftl
+++ b/chrome/locale/it-IT/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffisso
 integration-citationDialog-details-prefix = Prefisso
 integration-citationDialog-details-suppressAuthor = Ometti l'autore
+integration-citationDialog-details-locator-info = Suggerimento: Puoi anche digitare i numeri di pagina e altri indicatori di posizione nel campo principale. <a data-l10n-name="docs-link">Scopri di più</a>
 integration-citationDialog-details-includeComments = Includi i commenti
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] Nessun elemento con annotazioni selezionato o aperto
     }
 integration-citationDialog-settings-keepSorted = Mantieni l'ordinamento delle fonti
+integration-citationDialog-preview-empty = Anteprima
+integration-citationDialog-preview-error = Anteprima non disponibile
+integration-citationDialog-btn-displayPreview =
+    .title = Mostra anteprima della citazione
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Premi Tab per selezionare gli elementi da aggiungere a questa citazione. Premi Esc per scartare le modifiche e chiudere la finestra
+integration-citationDialog-just-added-input-placeholder = Digita “10-15” per citare delle pagine o cercare elementi
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Se continui le mo
 integration-warning-discard-changes = Scarta modifiche
 integration-warning-command-is-running = Un comando dell'estensione del word processor è già in esecuzione
 first-run-guidance-citationDialog =
-    Digita un titolo, un autore e/o un anno per cercare un riferimento.
+    Fai clic sulla bolla o usa i tasti Freccia sinistra (←) e Freccia giù (↓) per visualizzare i dettagli della citazione e personalizzare opzioni come il numero di pagina, il prefisso e il suffisso. 
     
-    Dopo aver scelto il riferimento desiderato, clicca sulla bolla o selezionala con la tastiere quindi premi ↓/Spazio per mostrare le opzioni di citazione come il numero di pagina, prefisso e suffisso.
-    
-    È anche possibile aggiungere il numero di pagina o un altro locatore  includendolo tra i termini di ricerca (es. “storia { $locator }”) o digitandolo dopo la bolla e premendo { return-or-enter }.
+    Puoi anche aggiungere un numero di pagina o un altro indicatore di posizione includendolo nei termini di ricerca (es. “storia { $locator }”) oppure digitandolo dopo la bolla e premendo { return-or-enter }.
diff --git a/chrome/locale/it-IT/zotero/preferences.ftl b/chrome/locale/it-IT/zotero/preferences.ftl
index 28fcba33b9..abd29a3ca3 100644
--- a/chrome/locale/it-IT/zotero/preferences.ftl
+++ b/chrome/locale/it-IT/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Lingua e impostazioni regionali
 preferences-advanced-enable-bidi-ui =
     .label = Abilita le funzionalità di modifica bidirezionale per il testo
+preferences-advanced-data-dir =
+    .value = Cartella dati:
 preferences-advanced-reset-data-dir =
     .label = Riprista posizione predefinita…
 preferences-advanced-custom-data-dir =
@@ -83,12 +85,12 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Accedi con il tuo account { -app-name } per sincronizzare i dati tra più dispositivi, collaborare con altre persone e molto di più.
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = Sincronizza
+preferences-sync-settings-intro = { -app-name } può sincronizzare i dati e i file della tua biblioteca su più dispositivi. <label data-l10n-name="sync-link">Approfondisci</label>
+preferences-sync-reset-heading = Ripristina la sincronizzazione
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Sincronizza gli allegati nelle biblioteche dei gruppi tramite { -app-name } Storage
+preferences-sync-fileSyncing-tos = Usando { -app-name } Storage, acconsenti ai suoi <label data-l10n-name="terms-link">termini e condizioni</label>.
 preferences-account-log-out =
     .label = Scollega l'account
 preferences-sync-reset-restore-to-server-body = { -app-name } sostituirà “{ $libraryName }” su { $domain } con i dati presenti su questo computer.
@@ -126,3 +128,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Cambiare account eliminerà tutti i dati di { -app-name } su questo computer. Prima di continuare, assicurati che tutti i dati e i file che vuoi mantenere siano sincronizzati con l'account “{ $username }” o di avere un backup della cartella dei dati di { -app-name }.
 preferences-account-switch-confirmation-text = elimina i dati locali
 preferences-account-switch-accept = Rimuovi i dati e riavvia
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/it-IT/zotero/reader.ftl b/chrome/locale/it-IT/zotero/reader.ftl
index c2699c0a42..b5aa07ab70 100644
--- a/chrome/locale/it-IT/zotero/reader.ftl
+++ b/chrome/locale/it-IT/zotero/reader.ftl
@@ -226,7 +226,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Si è verificato un errrore sconosciuto.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Impossibile connetersi al servizio di lettura. Si prega di verificare la connessione a Internet.
 reader-read-aloud-error-daily-limit-exceeded = Hai superato il limite giornaliero per le voci { -app-name }.
 reader-read-aloud-retry = Riprova
 reader-read-aloud-first-run-title = Scegli la voce preferita:
diff --git a/chrome/locale/it-IT/zotero/schema.ftl b/chrome/locale/it-IT/zotero/schema.ftl
index d271127948..f098e19089 100644
--- a/chrome/locale/it-IT/zotero/schema.ftl
+++ b/chrome/locale/it-IT/zotero/schema.ftl
@@ -13,4 +13,4 @@ creatorTypes-host = Conduttore
 creatorTypes-narrator = Narratore
 creatorTypes-originalCreator = Autore originale
 creatorTypes-organizer = Organizzatore
-creatorTypes-seriesCreator = Autore della serie
+creatorTypes-seriesCreator = Responsabile della serie
diff --git a/chrome/locale/it-IT/zotero/searchbox.dtd b/chrome/locale/it-IT/zotero/searchbox.dtd
index df685e11ba..1375ed9c1e 100644
--- a/chrome/locale/it-IT/zotero/searchbox.dtd
+++ b/chrome/locale/it-IT/zotero/searchbox.dtd
@@ -1,11 +1,9 @@
 <!ENTITY zotero.search.name "Nome:">
 
-<!ENTITY zotero.search.searchInLibrary "Cerca nella biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Trova">
-<!ENTITY zotero.search.joinMode.any "uno qualsiasi">
-<!ENTITY zotero.search.joinMode.all "tutti">
-<!ENTITY zotero.search.joinMode.suffix "dei seguenti:">
+<!ENTITY zotero.search.joinMode.any "una qualsiasi">
+<!ENTITY zotero.search.joinMode.all "tutte">
+<!ENTITY zotero.search.joinMode.suffix "tra le seguenti condizioni:">
 
 <!ENTITY zotero.search.recursive.label "Cerca nelle sottocollezioni">
 <!ENTITY zotero.search.noChildren "Mostra solo gli elementi di livello superiore">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "giorni">
 <!ENTITY zotero.search.date.units.months "mesi">
 <!ENTITY zotero.search.date.units.years "anni">
-
-<!ENTITY zotero.search.search "Cerca">
-<!ENTITY zotero.search.clear "Cancella">
-<!ENTITY zotero.search.saveSearch "Salva la ricerca">
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index ba047381d5..6816b6a913 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Elimina l'elemento...">
 <!ENTITY zotero.toolbar.newGroup "Nuovo gruppo...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nuova sottocollezione…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nuova ricerca salvata...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Svuota il cestino">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostra/nascondi il riquadro dei tag">
 <!ENTITY zotero.toolbar.actions.label "Azioni">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferenze…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Supporto e documentazione">
 <!ENTITY zotero.toolbar.about.label "Informazioni su Zotero…">
-<!ENTITY zotero.toolbar.advancedSearch "Ricerca avanzata">
 <!ENTITY zotero.toolbar.openURL.label "Trova">
 <!ENTITY zotero.toolbar.openURL.tooltip "Cerca nella biblioteca personale">
 
diff --git a/chrome/locale/it-IT/zotero/zotero.ftl b/chrome/locale/it-IT/zotero/zotero.ftl
index 081585235b..e11d50fa61 100644
--- a/chrome/locale/it-IT/zotero/zotero.ftl
+++ b/chrome/locale/it-IT/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Invio
        *[other] Invio
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Stampa
 general-remove = Rimuovi
 general-add = Aggiungi
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Vedi le istruzioni di risoluzione de
 general-go-back = Indietro
 general-accept = Accetta
 general-cancel = Annulla
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Mostra nella biblioteca
 general-restartApp = Riavvia { -app-name }
 general-restartInTroubleshootingMode = Riavvia in Modalità Provvisoria
 general-save = Salva
 general-clear = Cancella
+clear-button =
+    .label = { general-clear }
 general-update = Aggiorna
 general-back = Indietro
 general-edit = Modifica
@@ -76,6 +86,8 @@ general-maroon = Bordeaux
 general-gray = Grigio
 general-black = Nero
 general-loading = Caricamento in corso…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Stile di citazione:
 language-label = Lingua:
 menu-custom-group-submenu =
@@ -163,14 +175,126 @@ collections-menu-show-recently-read =
     .label = Mostra { recently-read }
 item-menu-remove-from-recently-read =
     .label = Rimuovi da { recently-read }…
-collections-menu-rename-collection =
-    .label = Rinomina collezione
-collections-menu-edit-saved-search =
-    .label = Modifica ricerca salvata
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collezione selezionata
+        [many] { $count } collezioni selezionate
+       *[other] { $count } collezioni selezionate
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } ricerca salvata selezionata
+        [many] { $count } ricerche salvate selezionate
+       *[other] { $count } ricerche salvate selezionate
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } fonte selezionata
+        [many] { $count } fonti selezionate
+       *[other] { $count } fonti selezionate
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collezione selezionata)
+        [many] { $library } ({ $count } collezioni selezionate)
+       *[other] { $library } ({ $count } collezioni selezionate)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } ricerca salvata selezionata)
+        [many] { $library } ({ $count } ricerche salvate selezionate)
+       *[other] { $library } ({ $count } ricerche salvate selezionate)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } fonte selezionata)
+        [many] { $library } ({ $count } fonti selezionate)
+       *[other] { $library } ({ $count } fonti selezionate)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rinomina
+edit-saved-search = Modifica ricerca salvata
+collections-menu-edit-search =
+    .label = Modifica ricerca
+collections-menu-duplicate-search =
+    .label = Duplica ricerca
 collections-menu-move-collection =
     .label = Sposta in
 collections-menu-copy-collection =
     .label = Copia in
+collections-menu-export =
+    .label = Esporta
+collections-menu-generate-report =
+    .label = Genera Report...
+collections-menu-create-bibliography =
+    .label = Crea bibliografia...
+collections-menu-unsubscribe =
+    .label = Disiscriviti...
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Elimina la collezione…
+            [many] Elimina le collezioni…
+           *[other] Elimina le collezioni…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Elimina la collezione e gli elementi contenuti…
+            [many] Elimina le collezioni e gli elementi contenuti…
+           *[other] Elimina le collezioni e gli elementi contenuti…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Elimina ricerca...
+            [many] Elimina ricerche...
+           *[other] Elimina ricerche...
+        }
+collections-delete-title =
+    { $count ->
+        [one] Elimina la collezione
+        [many] Elimina le collezioni
+       *[other] Elimina le collezioni
+    }
+collections-delete-message =
+    { $count ->
+        [one] Desideri eliminare questa collezione
+        [many] Desideri eliminare { $count } collezioni?
+       *[other] Desideri eliminare { $count } collezioni?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Gli elementi contenuti in questa collezione non verranno eliminati.
+        [many] Gli elementi contenuti in queste collezioni non verranno eliminati.
+       *[other] Gli elementi contenuti in queste collezioni non verranno eliminati.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Elimina la collezione e gli elementi contenuti
+        [many] Elimina le collezioni e gli elementi contenuti
+       *[other] Elimina le collezioni e gli elementi contenuti
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Desideri eliminare questa collezione e spostare tutti gli elementi nel cestino?
+        [many] Desideri eliminare { $count } collezioni  e spostare tutti gli elementi nel cestino?
+       *[other] Desideri eliminare { $count } collezioni e spostare tutti gli elementi nel cestino?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Elimina ricerca
+        [many] Elimina ricerche
+       *[other] Elimina ricerche
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Vuoi eliminare questa ricerca?
+        [many] Desideri eliminare { $count } ricerche?
+       *[other] Desideri eliminare { $count } ricerche?
+    }
 item-creator-moveDown =
     .label = Sposta in basso
 item-creator-moveToTop =
@@ -283,6 +407,7 @@ import-online-relink-only =
     .label = Ricollega le citazioni di Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } non è riuscito a connettersi a { $targetApp }. Si prega di verificare la connessione a Internet e riprovare.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -628,6 +753,18 @@ quicksearch-input =
     .aria-label = Ricerca veloce
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Ricerca avanzata
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Chiudi ricerca avanzata
+advanced-search-expand =
+    .tooltiptext = Espandi ricerca avanzata
+advanced-search-collapse =
+    .tooltiptext = Comprimi ricerca avanzata
 item-pane-header-view-as =
     .label = Visualizza come
 item-pane-header-none =
@@ -691,9 +828,64 @@ architecture-x64-on-arm64-action = Scarica { -app-name } per ARM64
 first-run-guidance-authorMenu = { -app-name } permette di specificare anche i curatori e i traduttori. Puoi convertire un autore in un curatore o un traduttore tramite questo menu.
 first-run-guidance-readAloud = { -app-name } è ora in grado di leggere i documenti con sintesi vocale naturale.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Rimuovi condizione
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Aggiungi condizione
+advanced-search-group-btn =
+    .tooltiptext = Aggiungi gruppo di condizioni
+advanced-search-remove-group-btn =
+    .tooltiptext = Rimuovi gruppo
+advanced-search-ungroup-btn =
+    .tooltiptext = Separa condizioni
+advanced-search-result-level-menu =
+    .aria-label = Tipo dei risultati
+advanced-search-result-level-prefix-root =
+    .value = Trova
+advanced-search-join-prefix-root =
+    .value = che corrispondono a
+advanced-search-result-level-any =
+    .label = qualsiasi elemento
+advanced-search-result-level-item =
+    .label = elementi di livello superiore
+advanced-search-result-level-attachment =
+    .label = allegati
+advanced-search-result-level-note =
+    .label = note
+advanced-search-result-level-annotation =
+    .label = annotazioni
+advanced-search-binding-menu =
+    .aria-label = Trova nello stesso elemento
+advanced-search-binding-separate =
+    .label = separatamente
+advanced-search-binding-same-attachment =
+    .label = nello stesso allegato
+advanced-search-binding-same-note =
+    .label = nella stessa nota
+advanced-search-binding-same-annotation =
+    .label = nella stessa annotazione
+advanced-search-of-the-following =
+    .value = dei seguenti
+advanced-search-binding-hint-attachment =
+    .value = Queste condizioni possono applicarsi ad allegati separati.
+advanced-search-binding-hint-note =
+    .value = Queste condizioni possono applicarsi a note separate.
+advanced-search-binding-hint-annotation =
+    .value = Queste condizioni possono applicarsi ad annotazioni separate.
+advanced-search-level-warning-mixed = Queste condizioni non possono essere soddisfatte tutte dallo stesso elemento, quindi questa ricerca non restituirà mai risultati. Riprova scegliendo “{ $matchAny }” di esse, oppure imposta il tipo di risultato su “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = Questa ricerca ha una condizione che non è applicabile al tipo di risultato selezionato. Seleziona  “{ $topLevelItems }” o rimuovi la condizione incompatibile.
+advanced-search-group-warning-unreachable =
+    Una condizione inserita qui non può trovarsi { $entity ->
+        [attachment] nello stesso allegato
+        [note] nella stessa nota
+       *[annotation] nella stessa annotazione
+    }. Cerca questi elementi separatamente o rimuovi la condizione incompatibile.
+advanced-search-group-warning-mixed = Queste condizioni non possono essere soddisfatte tutte dallo stesso elemento, quindi questo gruppo non restituirà mai risultati. Riprova scegliendo “{ $matchAny }” di esse, oppure imposta il tipo di risultato su “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Trova nello stesso allegato
+advanced-search-bind-same-note =
+    .label = Trova nella stessa nota
+advanced-search-bind-same-annotation =
+    .label = Trova nella stessa annotazione
 advanced-search-conditions-menu =
     .aria-label = Condizioni di ricerca
     .label = { $label }
@@ -703,11 +895,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valore
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Campi:
 search-conditions-collection = Collezione
 search-conditions-savedSearch = Ricerca salvata
 search-conditions-itemTypeID = Tipo di elemento
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota figlia
 search-conditions-creator = Autore
@@ -726,10 +924,26 @@ search-conditions-dateModified = Data ultima modifica
 search-conditions-fulltextContent = Contenuto dell'allegato
 search-conditions-programmingLanguage = Linguaggio di programmazione
 search-conditions-fileTypeID = Tipo di allegato
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Ultima lettura dell'allegato
 search-conditions-annotationText = Testo dell'annotazione
 search-conditions-annotationComment = Commento all'annotazione
+search-conditions-annotationType = Tipo di annotazione
+search-conditions-annotationColor = Colore dell'annotazione
+search-conditions-annotationAuthor = Autore dell'annotazione
 search-conditions-anyField = Qualsiasi campo
+search-conditions-titleCreatorYear = Titolo, Autore, Anno
+search-conditions-submenu-attachment = Allegato
+search-conditions-submenu-annotation = Annotazione
+search-conditions-short-fulltextContent = Contenuto
+search-conditions-short-fileTypeID = Tipo di file
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Ultima lettura
+search-conditions-short-annotationText = Testo
+search-conditions-short-annotationComment = Commento
+search-conditions-short-annotationType = Tipo
+search-conditions-short-annotationColor = Colore
+search-conditions-short-annotationAuthor = Autore
 find-pdf-files-added =
     { $count ->
         [one] { $count } file aggiunto
@@ -764,6 +978,9 @@ file-type-video = File video
 file-type-presentation = Presentazione
 file-type-document = Documento
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = È stato effettuato l'aggiornamento a <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Scopri le <a data-l10n-name="new-features-link">novità</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -772,18 +989,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Incolla e cerca
 mac-word-plugin-install-message = Zotero richiede l'accesso alla cartella dati di Word per installare il plugin.
+mac-word-plugin-install-folder-message = { -app-name } richiede l'accesso alla cartella di avvio di Word per installare il plugin.
 mac-word-plugin-install-action-button =
     .label = Installa il plugin Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Installa il plugin nella cartella di avvio di Word
+mac-word-plugin-install-folder-dialog-button = Installa
+mac-word-plugin-install-wrong-folder-selected = È necessario selezionare la cartella suggerita. Si prega di riprovare senza scegliere una cartella diversa.
 file-renaming-banner-message = { -app-name } ora mantiene automaticamente sincronizzati i nomi degli allegati mentre vengono modificati gli elementi.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = È necessario aggiornare { -app-name } Connector per poter funzionare con questa versione di { -app-name }.
 userjs-pref-warning = Alcune impostazioni di { -app-name } sono state sovrascritte con un metodo sconosciuto. { -app-name } le riprisitinerà e si riavvierà.
 migrate-extra-fields-progress-message = Migrazione dei nuovi campi dal campo Extra
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Dividi tag
 long-tag-fixer-button-dont-split =
@@ -796,4 +1018,159 @@ banner-close-button =
     .aria-label = Chiudi notifica
 plugins-blocked-plugin =
     .message = Questo plugin è stato disabilitato da { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Questo può succedere se la cartella dei dati di { -app-name } si trova in un servizio di storage cloud (OneDrive, Dropbox, ecc.) o su una rete condivisa.
+login-manager-reset = { -app-name } non è riuscito a leggere i dati di accesso salvati, che sono stati quindi azzerati. Accedi nuovamente nel pannello { preferences-pane-account } delle impostazioni di { -app-name }.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } non è riuscito ad accedere al Portachiavi di { -os-name } per salvare in modo sicuro le tue credenziali. Assicurati che il Portachiavi sia accessibile e riprova.
+        [windows] { -app-name } non è riuscito a salvare in modo sicuro le tue credenziali. Riprova o riavvia { -app-name }.
+       *[other] { -app-name } non è riuscito ad accedere al portachiavi di { -os-name } per salvare in modo sicuro le tue credenziali. Assicurati che il servizio di portachiavi sia attivo e riprova.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } non è riuscito ad accedere al Portachiavi di { -os-name } per crittografare le tue credenziali salvate. Le credenziali rimarranno memorizzate sul disco non crittografate. Assicurati che il Portachiavi sia accessibile e riavvia { -app-name }.
+        [windows] { -app-name } non è riuscito a crittografare le tue credenziali salvate. Le credenziali rimarranno memorizzate sul disco non crittografate. Riavvia { -app-name } e riprova.
+       *[other] { -app-name } non è riuscito ad accedere al portachiavi di { -os-name } per crittografare le tue credenziali salvate. Le credenziali rimarranno memorizzate sul disco non crittografate. Assicurati che il servizio di portachiavi sia attivo e riavvia { -app-name }.
+    }
+search-button =
+    .label = Cerca
+save-search-new-button =
+    .label = Salva ricerca...
+save-search-edit-button =
+    .label = Salva
+save-search-name-title = Salva la ricerca
+save-search-name-message = Inserisci un nome per la ricerca salvata:
+saved-search-close-confirmation-title = Modifica della ricerca salvata
+saved-search-close-confirmation-body = Vuoi salvare le modifiche apportate a questa ricerca salvata?
+item-pane-batch-editing-prompt =
+    .aria-label = Modifica in blocco
+item-pane-batch-editing-enable =
+    .label = Modifica elementi selezionati...
+item-pane-batch-editing-multiple-values-placeholder = Dati multipli
+item-pane-batch-editing-clear-values = Cancella tutti i dati
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Modifica { $count } elemento
+        [many] Modifica { $count } elementi
+       *[other] Modifica { $count } elementi
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Modifica i metadati
+        [many] Modifica i metadati di { $count } elementi
+       *[other] Modifica i metadati di { $count } elementi
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Modifica del campo“{ $field }”
+        [many] Modifica del campo“{ $field }” per { $count } elementi
+       *[other] Modifica del campo“{ $field }” per { $count } elementi
+    }
+undo-action-normalize-attachment-titles = Normalizza il titolo dell'allegato
+undo-action-trash =
+    { $count ->
+        [one] Sposta elemento nel cestino
+        [many] Sposta { $count } elementi nel cestino
+       *[other] Sposta { $count } elementi nel cestino
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Ripristina elemento
+        [many] Ripristina { $count } elementi
+       *[other] Ripristina { $count } elementi
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Sposta collezione nel cestino
+        [many] Sposta { $count } collezioni nel cestino
+       *[other] Sposta { $count } collezioni nel cestino
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Sposta ricerca salvata nel cestino
+        [many] Sposta { $count } ricerche salvate nel cestino
+       *[other] Sposta { $count } ricerche salvate nel cestino
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Ripristina collezione
+        [many] Ripristina { $count } collezioni
+       *[other] Ripristina { $count } collezioni
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Ripristina oggetto
+        [many] Ripristina { $count } oggetti
+       *[other] Ripristina { $count } oggetti
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Aggiungi a una collezione
+        [many] Aggiungi { $count } elementi a una collezione
+       *[other] Aggiungi { $count } elementi a una collezione
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Rimuovi dalla collezione
+        [many] Rimuovi { $count } elementi da una collezione
+       *[other] Rimuovi { $count } elementi da una collezione
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Sposta nella collezione
+        [many] Sposta { $count } elementi nella collezione
+       *[other] Sposta { $count } elementi nella collezione
+    }
+undo-action-rename-collection = Rinomina collezione
+undo-action-move-collection = Sposta collezione
+undo-action-add-tag =
+    { $count ->
+        [one] Aggiungi tag
+        [many] Aggiungi tag a { $count } elementi
+       *[other] Aggiungi tag a { $count } elementi
+    }
+undo-action-change-tag = Cambia tag
+undo-action-split-tag = Dividi tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Rimuovi tag
+        [many] Rimuovi tag da { $count } elementi
+       *[other] Rimuovi tag da { $count } elementi
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Rimuovi tag
+        [many] Rimuovi { $count } tag
+       *[other] Rimuovi { $count } tag
+    }
+undo-action-remove-all-tags = Rimuovi tutti i tag
+undo-action-edit-note = Modifica nota
+undo-action-add-creator = Aggiungi autore
+undo-action-remove-creator = Rimuovi autore
+undo-action-edit-creator = Modifica autore
+undo-action-reorder-creator = Ordina autori
+undo-action-change-type = Modifica tipo di elemento
+undo-action-change-parent-item =
+    { $count ->
+        [one] Modifica elemento genitore
+        [many] Modifica genitore per { $count } elementi
+       *[other] Modifica genitore per { $count } elementi
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Rendi indipendente
+        [many] Rendi indipendenti { $count } elementi
+       *[other] Rendi indipendenti { $count } elementi
+    }
+undo-action-add-related = Aggiungi elemento correlato
+undo-action-remove-related = Rimuovi elemento correlato
+undo-action-merge-items =
+    { $count ->
+        [one] Unisci elemento
+        [many] Unisci { $count } elementi
+       *[other] Unisci { $count } elementi
+    }
+menu-edit-undo-action = Annulla { $action }
+menu-edit-redo-action = Ripeti { $action }
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 7361e89714..baf6a093c1 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -250,19 +250,12 @@ date.relative.yearsAgo.one=1 anno fa
 date.relative.yearsAgo.multiple=%S anni fa
 
 pane.collections.title=Collezioni
-pane.collections.delete.title=Elimina la collezione
-pane.collections.delete=Desideri eliminare la collezione selezionata?
-pane.collections.delete.keepItems=Gli elementi contenuti in questa collezione non verranno eliminati.
-pane.collections.deleteWithItems.title=Elimina la collezione e gli elementi contenuti
-pane.collections.deleteWithItems=Desideri eliminare le collezioni che hai selezionato e spostare tutti gli elementi nel cestino?
 pane.feed.deleteWithItems.title=Disiscriviti
 pane.feed.deleteWithItems=Desideri cancellare l'iscrizione a questo feed?
 
-pane.collections.deleteSearch.title=Elimina ricerca
-pane.collections.deleteSearch=Vuoi eliminare la ricerca selezionata?
 pane.collections.emptyTrash=Vuoi eliminare definitivamente gli elementi dal Cestino?
 pane.collections.newSavedSeach=Nuova ricerca salvata
-pane.collections.savedSearchName=Immettere un nome per la ricerca salvata:
+pane.collections.savedSearchName=Inserisci un nome per la ricerca salvata:
 pane.collections.library=Biblioteca personale
 pane.collections.publications=Le mie pubblicazioni
 pane.collections.feeds=Feed
@@ -277,24 +270,9 @@ pane.collections.duplicate=Elementi duplicati
 pane.collections.removeLibrary=Elimina la biblioteca
 pane.collections.removeLibrary.text=Desideri eliminare “%S” da questo computer in maniera definitiva?
 
-pane.collections.menu.duplicate.savedSearch=Duplica la ricerca salvata
 pane.collections.menu.remove.library=Elimina la biblioteca…
-pane.collections.menu.delete.collection=Elimina la collezione…
-pane.collections.menu.delete.collectionAndItems=Elimina la collezione e gli elementi contenuti…
-pane.collections.menu.delete.savedSearch=Elimina la ricerca salvata...
-pane.collections.menu.delete.feedAndItems=Disiscriviti dal feed...
-pane.collections.menu.export.collection=Esporta la collezione…
-pane.collections.menu.export.savedSearch=Esporta la ricerca salvata...
-pane.collections.menu.export.feed=Esporta il feed...
-pane.collections.menu.createBib.collection=Crea una bibliografia a partire dalla collezione…
-pane.collections.menu.createBib.savedSearch=Crea una bibliografia dalla ricerca salvata...
-pane.collections.menu.createBib.feed=Crea una bibliografia basata sul feed...
 pane.collections.showCollectionInLibrary=Mostra la collezione nella biblioteca
 
-pane.collections.menu.generateReport.collection=Genera un report per la collezione…
-pane.collections.menu.generateReport.savedSearch=Genera un rapporto dalla ricerca salvata...
-pane.collections.menu.generateReport.feed=Genera un rapporto basato sul feed...
-
 pane.collections.menu.refresh.feed=Ricarica il feed...
 pane.collections.menu.refresh.allFeeds=Ricarica tutti i feed
 pane.collections.menu.markAsRead.feed=Segna feed come già letto
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox deve essere riavviato pe
 zotero.preferences.sync.reset.fileSyncHistory=Durante la prossima sincronizzazione, %1$S confronterà tutti i file allegati in "%2$S" con quanto archiviato online. Verranno scaricati tutti i file allegati online che mancano dalla biblioteca locale e, viceversa, verranno caricati i file allegati in locale che mancano alla biblioteca online.\n\nQuesta opzione non è necessaria durante il normale utilizzo.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=La cronologia di sincronizzazione dei file di "%S" è stata cancellata.
 
-zotero.preferences.search.rebuildIndex=Ricrea indicizzazione
-zotero.preferences.search.rebuildWarning=Ricreare l'intera indicizzazione? L'operazione potrebbe richiedere alcuni minuti.\n\nPer processare solo gli elementi non indicizzati, seleziona %S.
-zotero.preferences.search.clearIndex=Cancella indicizzazione
-zotero.preferences.search.clearWarning=Dopo aver cancellato l'indicizzazione non sarà più possibile ricercare nel contenuto degli allegati.\n\nInoltre, non sarà possibile indicizzare nuovamente i collegamenti senza visitare nuovamente la pagina web. Per mantenere indicizzati i collegamenti, seleziona '%S'.
-zotero.preferences.search.clearNonLinkedURLs=Cancella tutto tranne i collegamenti web
-zotero.preferences.search.indexUnindexed=Processa elementi non indicizzati
 zotero.preferences.export.quickCopy.citationStyles=Stili di citazione
 zotero.preferences.export.quickCopy.exportFormats=Formati di esportazione
 zotero.preferences.export.quickCopy.instructions=La copia veloce permette di esportare rapidamente gli elementi in un formato a scelta. Puoi copiare negli appunti gli elementi selezionati cliccando %S o trascinando gli elementi direttamente in una casella di testo in un altro programma.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=È necessario inserire una citazione prima
 integration.error.mustInsertBibliography=È necessario inserire una bibliografia prima di eseguire questa operazione.
 integration.error.cannotInsertHere=I campi di Zotero non possono essere inseriti in questa posizione.
 integration.error.notInCitation=Per modificare una citazione di Zotero il cursore deve trovarsi all'interno di essa.
+integration.error.inBibliography=Per inserire una citazione, posiziona il cursore nel corpo del documento. Per modificare la bibliografia direttamente, usa %S.
 integration.error.noBibliography=Lo stile bibliografico in uso non prevede una bibliografia. Se si desidera aggiungere una bibliografia selezionare un altro stile.
 integration.error.deletePipe=Impossibile avviare il processo utilizzato da Zotero per comunicare con il programma di scrittura. Si desidera che Zotero provi a correggere questo errore? Verrà richiesto di inserire la propria password.
 integration.error.invalidStyle=Lo stile selezionato non sembra essere uno stile valido. Se si tratta di uno stile creato dall'utente, assicurarsi che sia possibile validarlo come descritto in http://zotero.org/support/dev/citation_styles. In alternativa, si provi a selezionare un altro stile.
diff --git a/chrome/locale/ja-JP/zotero/about.dtd b/chrome/locale/ja-JP/zotero/about.dtd
index ee7d5b3545..135ac31e78 100644
--- a/chrome/locale/ja-JP/zotero/about.dtd
+++ b/chrome/locale/ja-JP/zotero/about.dtd
@@ -1,13 +1,13 @@
 <!ENTITY zotero.version "バージョン">
 <!ENTITY zotero.whatsNew "更新情報">
-<!ENTITY zotero.createdby "作成者:">
-<!ENTITY zotero.director "責任者">
-<!ENTITY zotero.directors "責任者">
-<!ENTITY zotero.developers "開発者:">
-<!ENTITY zotero.alumni "同窓会員:">
-<!ENTITY zotero.about.localizations "各国語版:">
-<!ENTITY zotero.about.additionalSoftware "Third-Party Software:">
-<!ENTITY zotero.thanks "次のコミュニティメンバーに謝辞を表します:">
+<!ENTITY zotero.createdby "作成者 :">
+<!ENTITY zotero.director "ディレクター :">
+<!ENTITY zotero.directors "ディレクター :">
+<!ENTITY zotero.developers "開発者 :">
+<!ENTITY zotero.alumni "卒業生 :">
+<!ENTITY zotero.about.localizations "各国語版 :">
+<!ENTITY zotero.about.additionalSoftware "サードパーティ製ソフトウェア">
+<!ENTITY zotero.thanks "謝辞 :">
 <!ENTITY zotero.about.close "閉じる">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "その他の貢献者と謝辞">
-<!ENTITY zotero.citationProcessing "出典表記と参考文献目録を処理中">
+<!ENTITY zotero.citationProcessing "引用文献と参考文献の処理">
diff --git a/chrome/locale/ja-JP/zotero/connector.json b/chrome/locale/ja-JP/zotero/connector.json
index f0fb0818e6..c49833d6b3 100644
--- a/chrome/locale/ja-JP/zotero/connector.json
+++ b/chrome/locale/ja-JP/zotero/connector.json
@@ -6,7 +6,7 @@
     "message": "詳細情報..."
   },
   "general_needHelp": {
-    "message": "助けが必要？"
+    "message": "お困りですか？"
   },
   "general_done": {
     "message": "完了"
@@ -18,7 +18,7 @@
     "message": "いいえ"
   },
   "general_tryAgain": {
-    "message": "もう一度試す"
+    "message": "再試行"
   },
   "general_warning": {
     "message": "警告"
@@ -30,13 +30,13 @@
     "message": "キャンセル"
   },
   "general_selectAll": {
-    "message": "すべてを選択"
+    "message": "すべて選択"
   },
   "general_deselectAll": {
-    "message": "選択をすべて解除"
+    "message": "すべて選択解除"
   },
   "general_pleaseWait": {
-    "message": "しばらくお待ちください..."
+    "message": "お待ちください..."
   },
   "general_copyToClipboard": {
     "message": "クリップボードにコピー"
@@ -51,7 +51,7 @@
     "message": "スナップショット"
   },
   "itemType_note": {
-    "message": "ノート"
+    "message": "メモ"
   },
   "itemType_link": {
     "message": "ウェブリンク"
@@ -63,7 +63,7 @@
     "message": "保存先は"
   },
   "progressWindow_detailsBtnView": {
-    "message": "詳細を見る"
+    "message": "詳細を表示"
   },
   "progressWindow_detailsBtnHide": {
     "message": "詳細を隠す"
@@ -72,19 +72,43 @@
     "message": "対象コレクションセレクター"
   },
   "progressWindow_savingItems": {
-    "message": "アイテム $1 件を保存中 $2"
+    "message": "項目$1 件を保存中 $2"
+  },
+  "progressWindow_savingItem": {
+    "message": "項目 $1 を保存中"
+  },
+  "progressWindow_saveItem": {
+    "message": "項目  $1: $2"
+  },
+  "progressWindow_downloadComplete": {
+    "message": "$1 を保存しました"
+  },
+  "progressWindow_downloadCompletePlural": {
+    "message": "$1 を保存しました / $2"
   },
   "progressWindow_downloadFailed": {
     "message": "$1のダウンロードに失敗しました。"
   },
+  "progressWindow_downloadFailedPlural": {
+    "message": "$1 のダウンロードに失敗しました / $2"
+  },
+  "progressWindow_allDone": {
+    "message": "保存が完了しました。ダイアログを閉じます。"
+  },
+  "progressWindow_alreadySaved": {
+    "message": "このWebページの項目は既に保存されています。"
+  },
   "progressWindow_tagPlaceholder": {
     "message": "タグ（コンマで区切り）"
   },
+  "progressWindow_filterPlaceholder": {
+    "message": "コレクションのフィルタリング"
+  },
   "progressWindow_error_translation": {
-    "message": "アイテムの保存中にエラーが発生しました。 さらに詳しくは $1 をご確認ください。"
+    "message": "項目の保存中にエラーが発生しました。 さらに詳しくは $1 をご確認ください。"
   },
   "progressWindow_error_siteAccessLimitsError": {
-    "message": "このアイテムの保存中にエラーが発生しました。 $1 は、一度に保存できるアイテムの数を制限する場合があります。 詳細については、$2 を参照してください。"
+    "message": "この項目の保存中にエラーが発生しました。 $1 は、一度に保存できる項目の数を制限する場合があります。 詳細については、$2 を参照してください。"
   },
   "progressWindow_error_troubleshootingTranslatorIssues": {
     "message": "トランスレータの不具合を解決"
@@ -101,29 +125,35 @@
   "progressWindow_error_upgradeClient_latestVersion": {
     "message": "最新版"
   },
+  "itemSelector_title": {
+    "message": "ライブラリに追加する項目の選択 :"
+  },
   "extensionIsDisabled": {
-    "message": "$1は無効にします"
+    "message": "このページでは $1 コネクタは使用できません"
+  },
+  "extensionIsDisabled_fileURL": {
+    "message": "$1 コネクタはファイル URL では使用できません"
   },
   "extensionIsDisabled_extensionPage": {
-    "message": "$1は拡張機能ページに無効にします"
+    "message": "$1 コネクタは拡張ページでは使用できません"
   },
   "appConnector": {
     "message": "$1 コネクタ"
   },
   "upgradeApp": {
-    "message": "バージョン $1 にアップグレード"
+    "message": "$1 へアップグレード"
   },
   "firstRun_title": {
     "message": "$1 コネクタをインストールしました。"
   },
   "firstRun_text1": {
-    "message": "$1 コネクタを使用すると、ブラウザからワンクリックで<a href=\"$2\">アイテムを $1に保存</a>できます。"
+    "message": "$1 コネクタを使用すると、ブラウザからワンクリックで<a href=\"$2\">項目を $1に保存</a>できます。"
   },
   "firstRun_text2": {
     "message": "まだの方は、スタンドアロンの $1 アプリケーションを<a href=\"$2\">ダウンロードして</a>、最高の体験をお楽しみください。"
   },
   "firstRun_acceptButton": {
-    "message": "了解しました"
+    "message": "了解"
   },
   "error_connection_isAppRunning": {
     "message": " $1 が実行中ですか？"
@@ -138,7 +168,7 @@
     "message": "オンライン・ライブラリへの保存を有効にする"
   },
   "reports_report_submitted": {
-    "message": "エラーレポートが送信されました。\n\nレポート ID: $1\n\nこのレポート ID、問題の説明、再現に必要な手順を Zotero フォーラムに投稿してください。\n\nフォーラムで参照されない限り、エラーレポートはレビューされません。"
+    "message": "エラーレポートが送信されました。\n\nレポート ID : $1\n\nこのレポート ID、問題の説明、再現に必要な手順を Zotero フォーラムに投稿してください。\n\nフォーラムで参照されない限り、エラーレポートはレビューされません。"
   },
   "reports_debug_output_submitted": {
     "message": "デバッグ出力が送信されました。\n\nデバッグ ID は $1 です、"
@@ -174,10 +204,10 @@
     "message": "$1 は、複数のユーザーが同時に引用を編集できないように、文書をロックします。文書内で引用編集を同時に行うと、引用や文書の破損につながる可能性があります。ネットワーク障害など、予期せぬ事態により、文書が永久にロックされる場合があります。このようなことが起こったと思われる場合は、ロックを無効にすることができます。<br/><br/>文書のロックを無効にしますか？"
   },
   "integration_googleDocs_authScopeError": {
-    "message": "$1は引用を挿入するために、あなたの Google Docs 文書を編集する権限が必要です。 $1にあなたの Google Docs 文書の閲覧と編集と作成、削除が許可されていることを確認し、再度お試しください。"
+    "message": "$1は引用を挿入するために、あなたの Google Docs 文書を編集する権限が必要です。 $1にあなたの Google Docs 文書の閲覧と編集と作成、削除が許可されていることを確認し、再度試してください。"
   },
   "integration_googleDocs_documentPermissionError": {
-    "message": "選択した Google アカウントには、この文書を編集する権限がありません。編集権限のあるアカウントを選択し、再度お試しください。"
+    "message": "選択した Google アカウントには、この文書を編集する権限がありません。編集権限のあるアカウントを選択し、再度試してください。"
   },
   "integration_googleDocs_orphanedCitations_buttonTooltip": {
     "message": "リンクされていない $1 の引用を表示する"
@@ -186,24 +216,24 @@
     "message": "編集しようとしている引用が $1 からリンク解除されました。"
   },
   "integration_googleDocs_orphanedCitations_alertButton": {
-    "message": "引用を再リンクする"
+    "message": "引用文献を再リンク"
   },
   "integration_googleDocs_orphanedCitations_disclaimer": {
-    "message": "これらの引用は <a target=\"_blank\" href=\"https://www.zotero.org/support/kb/google_docs_citations_unlinked\">$1 からリンク解除</a>されました。更新したり、参考文献目録に表示したりする前に、再リンクする必要があります。"
+    "message": "これらの引用は <a target=\"_blank\" href=\"https://www.zotero.org/support/kb/google_docs_citations_unlinked\">$1 からリンク解除</a>されました。更新したり、参考文献に表示したりする前に、再リンクする必要があります。"
   },
   "copyUnproxiedLink": {
-    "message": "プロキシを通じないリンクをコピーします"
+    "message": "プロキシ経由でないリンクをコピー"
   },
   "copyUnproxiedPageURL": {
-    "message": "プロキシを通じないページのURLをコピーします"
+    "message": "プロキシ経由でないページURLをコピー"
   },
   "reloadViaProxy": {
-    "message": "プロキシ経由でリロードします"
+    "message": "プロキシ経由で再読み込み"
   },
   "reloadVia": {
-    "message": "$1経由でリロードします"
+    "message": "$1 経由で再読み込み"
   },
   "general_saveTo": {
-    "message": "$1 に保存する"
+    "message": "$1 に保存"
   }
 }
diff --git a/chrome/locale/ja-JP/zotero/csledit.dtd b/chrome/locale/ja-JP/zotero/csledit.dtd
index 6bb1953478..774d448eff 100644
--- a/chrome/locale/ja-JP/zotero/csledit.dtd
+++ b/chrome/locale/ja-JP/zotero/csledit.dtd
@@ -1,3 +1,3 @@
 <!ENTITY styles.editor "Zotero スタイルエディタ">
 
-<!ENTITY styles.editor.citePosition "引用箇所:">
+<!ENTITY styles.editor.citePosition "引用箇所 :">
diff --git a/chrome/locale/ja-JP/zotero/cslpreview.dtd b/chrome/locale/ja-JP/zotero/cslpreview.dtd
index b077c5eb6c..047721a69d 100644
--- a/chrome/locale/ja-JP/zotero/cslpreview.dtd
+++ b/chrome/locale/ja-JP/zotero/cslpreview.dtd
@@ -1,6 +1,6 @@
 <!ENTITY styles.preview "Zotero スタイルプレビュー">
 
-<!ENTITY styles.preview.citationFormat "引用形式:">
+<!ENTITY styles.preview.citationFormat "引用形式 :">
 <!ENTITY styles.preview.citationFormat.all "すべて">
 <!ENTITY styles.preview.citationFormat.author "著者">
 <!ENTITY styles.preview.citationFormat.authorDate "著者-日付">
diff --git a/chrome/locale/ja-JP/zotero/fileRenaming.ftl b/chrome/locale/ja-JP/zotero/fileRenaming.ftl
index a44ce20921..6c59a22fd4 100644
--- a/chrome/locale/ja-JP/zotero/fileRenaming.ftl
+++ b/chrome/locale/ja-JP/zotero/fileRenaming.ftl
@@ -1,6 +1,6 @@
 file-renaming-settings-window =
     .title = Configure File Renaming
-file-renaming-settings-library-label = Library:
+file-renaming-settings-library-label = ライブラリ :
 file-renaming-auto-rename-files =
     .label = Automatically rename files
 file-renaming-file-types = Rename files of these types:
@@ -17,13 +17,13 @@ file-renaming-file-type-video =
 file-renaming-rename-now =
     .label = Rename Files…
 file-renaming-rename-linked =
-    .label = Rename linked files
+    .label = リンクされたファイル名の変更
 file-renaming-format-title = Filename Format
 file-renaming-format-instructions = You can customize the filename pattern { -app-name } uses to rename attachment files from parent metadata.
 file-renaming-format-instructions-example = For example, "{ $example }" in this template will be replaced with the title of the parent item, truncated at 50 characters.
 file-renaming-format-instructions-more = 詳細については、 <label data-l10n-name="file-renaming-format-help-link">ドキュメント</label> を参照してください。
 file-renaming-format-template = Filename Template:
-file-renaming-format-preview = Preview:
+file-renaming-format-preview = プレビュー :
 file-renaming-preview-changes = Preview Changes…
 file-renaming-rename-files =
     .label = Rename Files
diff --git a/chrome/locale/ja-JP/zotero/integration.ftl b/chrome/locale/ja-JP/zotero/integration.ftl
index 8de4fd2991..32d73a7304 100644
--- a/chrome/locale/ja-JP/zotero/integration.ftl
+++ b/chrome/locale/ja-JP/zotero/integration.ftl
@@ -23,7 +23,7 @@ integration-citationDialog = Citation Dialog
 integration-citationDialog-section-open = Open Documents ({ $count })
 integration-citationDialog-section-selected = Selected Items ({ $count }/{ $total })
 integration-citationDialog-section-selectedAnnotations = Selected Annotations
-integration-citationDialog-section-selectedItems = 選択されたアイテム
+integration-citationDialog-section-selectedItems = 選択された項目
 integration-citationDialog-section-cited =
     { $count ->
         [0] Cited Items
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = 著者名を省略
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,12 +55,16 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = プレビュー
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = ライブラリ
 integration-citationDialog-mode-list = List
 integration-citationDialog-btn-type-citation =
-    .title = Add/Edit Citation
+    .title = 引用文献の追加/編集
 integration-citationDialog-btn-type-add-note =
     .title = メモを追加
 integration-citationDialog-btn-type-annotations =
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -102,28 +112,28 @@ integration-citationDialog-add-to-citation = Add to Citation
 integration-citationDialog-annotations-filter =
     .placeholder = Filter annotations
 integration-citationDialog-annotations-empty = Select an item, attachment, or annotation to view annotation details
-integration-prefs-displayAs-label = Display Citations As:
+integration-prefs-displayAs-label = 引用文献の出力形式 :
 integration-prefs-footnotes =
     .label = 脚注
 integration-prefs-endnotes =
     .label = 文末注
 integration-prefs-bookmarks =
     .label = Store citation as bookmarks
-integration-prefs-bookmarks-description = ブックマークはWordとLibreOfficeの間で共有できますが、意図せずに変更された場合にエラーを生じる場合があり、また脚注に挿入することが出来ません。
+integration-prefs-bookmarks-description = ブックマークは Word と LibreOffice の間で共有できますが、意図せずに変更された場合にエラーが発生する場合があり、また脚注に挿入することが出来ません。
 integration-prefs-bookmarks-formatNotice =
     { $show ->
         [true] The document must be saved as .doc or .docx.
        *[other] { "" }
     }
 integration-prefs-automaticCitationUpdates =
-    .label = Automatically update citations
-    .tooltip = Citations with pending updates will be highlighted in the document
-integration-prefs-automaticCitationUpdates-description = Disabling updates can speed up citation insertion in large documents. Click Refresh to update citations manually.
+    .label = 引用文献を自動的に更新
+    .tooltip = 更新待ちの引用文献は文書内で強調表示されます。
+integration-prefs-automaticCitationUpdates-description = 更新を無効化すれば大きな文書への引用文献の挿入が高速化できます。引用文献を手動で更新するためには更新ボタンをクリックしてください。
 integration-prefs-automaticJournalAbbeviations =
     .label = MEDLINEの略誌名を使用する
-integration-prefs-automaticJournalAbbeviations-description = 「雑誌略誌名」のフィールドは無視されます。
+integration-prefs-automaticJournalAbbeviations-description = 「雑誌略語」のフィールドは無視されます。
 integration-prefs-exportDocument =
-    .label = Switch to a Different Word Processor…
+    .label = 別のワードプロセッサに切り替え...
 integration-error-unable-to-find-winword = { -app-name } could not find a running Word instance.
 integration-warning-citation-changes-will-be-lost = You have made changes to a citation that will be lost if you continue.
 integration-warning-bibliography-changes-will-be-lost = You have made changes to the bibliography that will be lost if you continue.
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ja-JP/zotero/note-editor.ftl b/chrome/locale/ja-JP/zotero/note-editor.ftl
index a1f30c0474..47f2f0a646 100644
--- a/chrome/locale/ja-JP/zotero/note-editor.ftl
+++ b/chrome/locale/ja-JP/zotero/note-editor.ftl
@@ -1,66 +1,66 @@
-note-editor-set = Set
+note-editor-set = 設定
 note-editor-more = その他
-note-editor-replace = Replace
-note-editor-replace-all = Replace All
-note-editor-unlink = Unlink
+note-editor-replace = 置き換え
+note-editor-replace-all = すべて置き換え
+note-editor-unlink = リンク解除
 note-editor-right-to-left = 右から左
 note-editor-left-to-right = 左から右
 note-editor-update-notice =
     This note was edited with a newer version of { -app-name }.
     Please update { -app-name } to make changes.
-note-editor-enter-link = Enter Link
+note-editor-enter-link = リンクの入力
 note-editor-heading-1 = 表題1
 note-editor-heading-2 = 表題2
 note-editor-heading-3 = 表題3
 note-editor-paragraph = 段落
 note-editor-monospaced = 等幅
-note-editor-bullet-list = Bulleted List
-note-editor-ordered-list = Numbered List
-note-editor-block-quote = Block Quote
+note-editor-bullet-list = 箇条書きリスト
+note-editor-ordered-list = 番号付きリスト
+note-editor-block-quote = ブロック引用
 note-editor-math-block = 数学ブロック
-note-editor-format-text = Format Text
+note-editor-format-text = テキストの書式設定
 note-editor-highlight-text = テキストを強調表示
 note-editor-text-color = 文字色
-note-editor-remove-color = Remove Color
+note-editor-remove-color = 色を削除
 note-editor-bold = 太字
 note-editor-italic = 斜体
 note-editor-underline = 下線
 note-editor-strikethrough = 打ち消し線
 note-editor-subscript = 下付き文字
 note-editor-superscript = 上付き文字
-note-editor-return-to-notes-list = Return to Notes List
-note-editor-insert-link = Insert Link
+note-editor-return-to-notes-list = メモ一覧に戻る
+note-editor-insert-link = リンクを挿入
 note-editor-clear-formatting = 書式設定を消去
-note-editor-align = Align
-note-editor-align-left = Align Left
-note-editor-align-center = Align Center
-note-editor-align-right = Align Right
-note-editor-insert-citation = Insert Citation
-note-editor-go-to-page = Go to Page
-note-editor-show-item = Show Item
-note-editor-edit-citation = Edit Citation
-note-editor-show-on-page = Show on Page
-note-editor-add-citation = Add Citation
-note-editor-remove-citation = Hide Citation
-note-editor-find-and-replace = Find and Replace
+note-editor-align = 整列
+note-editor-align-left = 左揃え
+note-editor-align-center = 中央揃え
+note-editor-align-right = 右揃え
+note-editor-insert-citation = 引用文献を挿入
+note-editor-go-to-page = ページへ移動
+note-editor-show-item = 項目を表示
+note-editor-edit-citation = 引用文献の編集
+note-editor-show-on-page = ページに表示
+note-editor-add-citation = 引用文献を追加
+note-editor-remove-citation = 引用文献を隠す
+note-editor-find-and-replace = 検索と置換
 note-editor-edit-in-window = 別ウィンドウで編集
 note-editor-apply-annotation-colors = 注釈の色を表示する
 note-editor-remove-annotation-colors = 注釈の色を隠す
-note-editor-add-citations = Show Annotation Citations
-note-editor-remove-citations = Hide Annotation Citations
+note-editor-add-citations = 注釈の引用文献を表示
+note-editor-remove-citations = 注釈の引用文献を隠す
 note-editor-image = 画像
 note-editor-math = 数学
 note-editor-table = 表
-note-editor-citation = Citation
-note-editor-copy-image = Copy Image
-note-editor-save-image-as = Save Image As…
-note-editor-insert-row-before = Insert Row Above
-note-editor-insert-row-after = Insert Row Below
-note-editor-insert-column-before = Insert Column Left
-note-editor-insert-column-after = Insert Column Right
-note-editor-delete-row = Delete Row
-note-editor-delete-column = Delete Column
-note-editor-delete-table = Delete Table
+note-editor-citation = 引用文献
+note-editor-copy-image = 画像をコピー
+note-editor-save-image-as = ファイル形式を指定して画像を保存…
+note-editor-insert-row-before = 上に行を挿入
+note-editor-insert-row-after = 下に行を挿入
+note-editor-insert-column-before = 左に列を挿入
+note-editor-insert-column-after = 右に列を挿入
+note-editor-delete-row = 行を削除
+note-editor-delete-column = 列を削除
+note-editor-delete-table = 表を削除
 note-editor-link-popup-appeared = Link popup appeared. Use Shift-Tab to navigate it.
 note-editor-citation-popup-appeared = Citation popup appeared. Use Shift-Tab to navigate it.
-note-editor-toggle-context-pane = Toggle Context Pane
+note-editor-toggle-context-pane = コンテキストパネルの切り替え
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index ffa14c9f6a..ee546449d1 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -2,37 +2,37 @@
 
 <!ENTITY zotero.preferences.helpButton.label "ヘルプ">
 
-<!ENTITY zotero.preferences.default "既定値:">
-<!ENTITY zotero.preferences.items "アイテム">
+<!ENTITY zotero.preferences.default "既定値 :">
+<!ENTITY zotero.preferences.items "項目">
 <!ENTITY zotero.preferences.period ".">
 <!ENTITY zotero.preferences.custom "カスタム...">
 
-<!ENTITY zotero.preferences.prefpane.general "一般">
+<!ENTITY zotero.preferences.prefpane.general "全般">
 
-<!ENTITY zotero.preferences.interface "Interface">
-<!ENTITY zotero.preferences.fileHandling "File Handling">
-<!ENTITY zotero.preferences.automaticSnapshots "ウェブページからアイテムを作成するときに自動的にスナップショットを作成する">
-<!ENTITY zotero.preferences.downloadAssociatedFiles "アイテムを作成するときに自動的に関連 PDF や他のファイルを添付する">
-<!ENTITY zotero.preferences.autoRenameFiles.renameLinked "Rename linked files">
-<!ENTITY zotero.preferences.fileHandler.openPDFsUsing "Open PDFs using">
+<!ENTITY zotero.preferences.interface "インターフェース">
+<!ENTITY zotero.preferences.fileHandling "ファイル処理">
+<!ENTITY zotero.preferences.automaticSnapshots "ウェブページから項目を作成するときに自動的にスナップショットを作成する">
+<!ENTITY zotero.preferences.downloadAssociatedFiles "項目を作成するときに自動的に関連 PDF や他のファイルを添付する">
+<!ENTITY zotero.preferences.autoRenameFiles.renameLinked "リンクされたファイル名の変更">
+<!ENTITY zotero.preferences.fileHandler.openPDFsUsing "PDF 文書を開く">
 <!ENTITY zotero.preferences.fileHandler.systemDefault "システムデフォルト">
 
 <!ENTITY zotero.preferences.miscellaneous "各種設定">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
+<!ENTITY zotero.preferences.autoUpdate "トランスレータとスタイルの更新を自動的に確認する">
 <!ENTITY zotero.preferences.updateNow "今すぐ更新">
-<!ENTITY zotero.preferences.reportTranslationFailure "壊れたサイト・トランスレータを報告する">
+<!ENTITY zotero.preferences.reportTranslationFailure "サイトの問題を報告">
 <!ENTITY zotero.preferences.parseRISRefer "ダウンロード済みの BibTeX/RIS/Refer ファイルに対して Zotero を使用する">
-<!ENTITY zotero.preferences.automaticTags "キーワードと件名標目を含むアイテムに自動的にタグを付ける">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "ゴミ箱の中のアイテムが">
+<!ENTITY zotero.preferences.automaticTags "キーワードと件名で項目に自動的にタグを付ける">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "ごみ箱内の項目を">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "日を経過したら自動的に削除する">
 
-<!ENTITY zotero.preferences.reader.tabsTitle.label "Show tabs as">
-<!ENTITY zotero.preferences.reader.tabsTitle.creatorYearTitle "Creator - Year - Title">
-<!ENTITY zotero.preferences.reader.tabsTitle.titleCreatorYear "Title - Creator - Year">
+<!ENTITY zotero.preferences.reader.tabsTitle.label "タブで表示">
+<!ENTITY zotero.preferences.reader.tabsTitle.creatorYearTitle "著者 - 年 - タイトル">
+<!ENTITY zotero.preferences.reader.tabsTitle.titleCreatorYear "タイトル - 著者 - 年">
 <!ENTITY zotero.preferences.reader.tabsTitle.filename "ファイル名">
 
 <!ENTITY zotero.preferences.groups "グループ">
-<!ENTITY zotero.preferences.groups.whenCopyingInclude "アイテムをライブラリ間でコピーするときは次を含む:">
+<!ENTITY zotero.preferences.groups.whenCopyingInclude "項目をライブラリ間でコピーするときに含める項目 :">
 <!ENTITY zotero.preferences.groups.childNotes "子メモ">
 <!ENTITY zotero.preferences.groups.childFiles "子スナップショットおよびインポートされたファイル">
 <!ENTITY zotero.preferences.groups.annotations "注釈">
@@ -40,104 +40,104 @@
 <!ENTITY zotero.preferences.groups.tags "タグ">
 
 <!ENTITY zotero.preferences.feeds "フィード">
-<!ENTITY zotero.preferences.feeds.sorting.label "Sorting:">
-<!ENTITY zotero.preferences.feeds.sorting.newest "最新のアイテムを最初に表示">
-<!ENTITY zotero.preferences.feeds.sorting.oldest "最古のアイテムを最初に表示">
-<!ENTITY zotero.preferences.feeds.feedDefaults "Feed Defaults">
+<!ENTITY zotero.preferences.feeds.sorting.label "並べ替え :">
+<!ENTITY zotero.preferences.feeds.sorting.newest "最新の項目を最初に表示">
+<!ENTITY zotero.preferences.feeds.sorting.oldest "最古の項目を最初に表示">
+<!ENTITY zotero.preferences.feeds.feedDefaults "既定のフィード">
 
 <!ENTITY zotero.preferences.prefpane.sync "同期">
-<!ENTITY zotero.preferences.sync.username "ユーザー名:">
-<!ENTITY zotero.preferences.sync.password "パスワード:">
+<!ENTITY zotero.preferences.sync.username "ユーザー名 :">
+<!ENTITY zotero.preferences.sync.password "パスワード :">
 <!ENTITY zotero.preferences.sync.createAccount "アカウントを作成">
 <!ENTITY zotero.preferences.sync.lostPassword "パスワードを忘れましたか？">
 <!ENTITY zotero.preferences.sync.syncAutomatically "自動的に同期">
 <!ENTITY zotero.preferences.sync.syncFullTextContent "全文を同期する">
 <!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero はあなたの Zotero ライブラリに含まれるファイルの全文をを zotero.org や他のリンクした機器と同期させることができます。これにより、どこでも簡単にあなたのファイルを探すことができるようになります。あなたのファイルの全文が公開されることはありません。">
-<!ENTITY zotero.preferences.sync.about "同期（シンク）について">
+<!ENTITY zotero.preferences.sync.about "同期について">
 <!ENTITY zotero.preferences.sync.fileSyncing "ファイルの同期">
-<!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "マイ・ライブラリ内の添付ファイルの同期に右のプログラムを使う:">
+<!ENTITY zotero.preferences.sync.fileSyncing.url "URL :">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "マイライブラリ内の添付ファイルの同期に使うプログラム :">
 
-<!ENTITY zotero.preferences.sync.fileSyncing.download "ファイルをダウンロードする">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "ファイルのダウンロード">
 <!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "同期する際に">
 <!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "必要に応じて">
-<!ENTITY zotero.preferences.sync.fileSyncing.verifyServer "Verify Server">
+<!ENTITY zotero.preferences.sync.fileSyncing.verifyServer "サーバーの検証">
 <!ENTITY zotero.preferences.sync.librariesToSync "同期するライブラリ">
-<!ENTITY zotero.preferences.sync.librariesToSync.button "Choose Libraries…">
+<!ENTITY zotero.preferences.sync.librariesToSync.button "ライブラリの選択...">
 <!ENTITY zotero.preferences.sync.librariesToSync.sync "同期">
 <!ENTITY zotero.preferences.sync.librariesToSync.library "ライブラリ">
 <!ENTITY zotero.preferences.sync.reset.warning1 "次の操作は、稀に起こる特別な状況のためだけのもので、一般的な問題解決に用いられるべきではありません。多くの場合、リセットすることで更なる問題を引き起こします。以下をご参照ください。">
 <!ENTITY zotero.preferences.sync.reset.warning2 "同期リセットの設定">
-<!ENTITY zotero.preferences.sync.reset.warning3 "により詳しい情報があります。">
-<!ENTITY zotero.preferences.sync.reset.resetDataSyncHistory "Reset Data Sync History">
+<!ENTITY zotero.preferences.sync.reset.warning3 "詳細情報。">
+<!ENTITY zotero.preferences.sync.reset.resetDataSyncHistory "データ同期の履歴をリセット">
 <!ENTITY zotero.preferences.sync.reset.resetDataSyncHistory.desc "ローカルのデータをリモートのデータと統合し、同期の履歴は無視する">
-<!ENTITY zotero.preferences.sync.reset.restoreFromOnlineLibrary "Restore from Online Library">
-<!ENTITY zotero.preferences.sync.reset.restoreFromOnlineLibrary.desc "Overwrite local Zotero data with data from the online library.">
-<!ENTITY zotero.preferences.sync.reset.restoreToOnlineLibrary "Replace Online Library">
-<!ENTITY zotero.preferences.sync.reset.restoreToOnlineLibrary.desc "Overwrite online library with local Zotero data">
-<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "ファイル同期の履歴を削除する">
-<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Compare all attachment files with the storage service">
+<!ENTITY zotero.preferences.sync.reset.restoreFromOnlineLibrary "オンラインライブラリから復元">
+<!ENTITY zotero.preferences.sync.reset.restoreFromOnlineLibrary.desc "オンラインライブラリを使ってローカルのZoteroデータを上書き">
+<!ENTITY zotero.preferences.sync.reset.restoreToOnlineLibrary "オンラインライブラリの置き換え">
+<!ENTITY zotero.preferences.sync.reset.restoreToOnlineLibrary.desc "オンラインライブラリをローカルの Zotero データで上書き">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "ファイル同期の履歴をリセット">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "すべての添付ファイルをストレージサービスと比較">
 <!ENTITY zotero.preferences.sync.reset "リセット">
-<!ENTITY zotero.preferences.sync.reset.showResetOptions "Show Reset Options…">
-<!ENTITY zotero.preferences.sync.reset.button "Reset…">
+<!ENTITY zotero.preferences.sync.reset.showResetOptions "リセット オプションを表示…">
+<!ENTITY zotero.preferences.sync.reset.button "リセット...">
 
 
 <!ENTITY zotero.preferences.prefpane.search "検索">
 <!ENTITY zotero.preferences.search.fulltextCache "フルテキストのキャッシュ">
 <!ENTITY zotero.preferences.search.indexStats "索引統計">
 
-<!ENTITY zotero.preferences.search.indexStats.indexed "索引作成済">
-<!ENTITY zotero.preferences.search.indexStats.partial "一部索引作成済">
-<!ENTITY zotero.preferences.search.indexStats.unindexed "索引未作成">
-<!ENTITY zotero.preferences.search.indexStats.words "単語:">
+<!ENTITY zotero.preferences.search.indexStats.indexed "索引作成済 :">
+<!ENTITY zotero.preferences.search.indexStats.partial "一部作成済 :">
+<!ENTITY zotero.preferences.search.indexStats.unindexed "未作成 :">
+<!ENTITY zotero.preferences.search.indexStats.words "単語 :">
 
-<!ENTITY zotero.preferences.fulltext.textMaxLength "各ファイルの索引の最大字数:">
-<!ENTITY zotero.preferences.fulltext.pdfMaxPages "各ファイル毎の索引化するページ数の上限:">
+<!ENTITY zotero.preferences.fulltext.textMaxLength "ファイルごとの索引作成の最大文字数 :">
+<!ENTITY zotero.preferences.fulltext.pdfMaxPages "ファイルごとの索引作成の最大ページ数 :">
 
 <!ENTITY zotero.preferences.prefpane.export "エクスポート">
 
-<!ENTITY zotero.preferences.citationOptions.caption "出典表記オプション">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "論文の URL アドレスを参考文献目録に含む">
+<!ENTITY zotero.preferences.citationOptions.caption "引用文献オプション">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "論文の URL アドレスを参考文献に含める">
 <!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "この機能が無効化されていると、Zotero はページ範囲が指定されていない文献に限り、学術雑誌、雑誌論文、新聞記事を引用する際に、URL アドレスを含みます。">
 
 <!ENTITY zotero.preferences.quickCopy.caption "クィックコピー">
-<!ENTITY zotero.preferences.quickCopy.itemFormat "アイテムのフォーマット">
+<!ENTITY zotero.preferences.quickCopy.itemFormat "項目のフォーマット">
 <!ENTITY zotero.preferences.quickCopy.noteFormat "メモのフォーマット">
 <!ENTITY zotero.preferences.quickCopy.copyAsHTML "HTMLとしてコピー">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.setings "サイト固有の設定:">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "ドメイン／パス">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "ドメイン / パス">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(例: wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.format "フォーマット">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.locale "言語">
-<!ENTITY zotero.preferences.quickCopy.dragLimit "アイテム数が右の値より大きい時はドラッグ時のクイックコピーを無効化する:">
+<!ENTITY zotero.preferences.quickCopy.dragLimit "項目数が右の値より大きい時はドラッグ時のクイックコピーを無効化する:">
 
 <!ENTITY zotero.preferences.prefpane.cite "引用">
-<!ENTITY zotero.preferences.cite.wordProcessors "ワード・プロセッサ">
-<!ENTITY zotero.preferences.styleEditor "Style Editor">
-<!ENTITY zotero.preferences.stylePreview "Style Preview">
+<!ENTITY zotero.preferences.cite.wordProcessors "ワードプロセッサ">
+<!ENTITY zotero.preferences.styleEditor "スタイルエディタ">
+<!ENTITY zotero.preferences.stylePreview "スタイルのプレビュー">
 
 <!ENTITY zotero.preferences.cite.styles.styleManager "スタイル管理">
 <!ENTITY zotero.preferences.cite.styles.styleManager.title "スタイル名">
 <!ENTITY zotero.preferences.cite.styles.styleManager.updated "更新日">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
 
-<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "ライブラリ画面へ">
-<!ENTITY zotero.preferences.keys.quicksearch "簡易検索">
-<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
-<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
-<!ENTITY zotero.preferences.keys.toggleAllRead "すべてのフィードのアイテムを既読/未読にする">
-<!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "選択されたアイテムの出典表記をクリップボードにコピー">
-<!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "選択されたアイテムの参考文献目録をクリップボードにコピー">
+<!ENTITY zotero.preferences.keys.saveToZotero "Zotero に保存 (アドレスバーのアイコン)">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "ライブラリパネルへ">
+<!ENTITY zotero.preferences.keys.quicksearch "クイック検索">
+<!ENTITY zotero.preferences.keys.newItem "新しい項目の作成">
+<!ENTITY zotero.preferences.keys.newNote "新しいメモの作成">
+<!ENTITY zotero.preferences.keys.toggleAllRead "すべてのフィードの項目を既読/未読にする">
+<!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "選択された項目の引用文献をクリップボードにコピー">
+<!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "選択された項目の参考文献をクリップボードにコピー">
 <!ENTITY zotero.preferences.keys.importFromClipboard "クリップボードからインポート">
-<!ENTITY zotero.preferences.keys.changesTakeEffect "Changes take effect after restart">
+<!ENTITY zotero.preferences.keys.changesTakeEffect "変更は再起動後に有効になります">
 
 <!ENTITY zotero.preferences.prefpane.proxies "プロキシ">
 
 <!ENTITY zotero.preferences.proxies.proxyOptions "プロキシ設定">
 <!ENTITY zotero.preferences.proxies.desc_before_link "Zotero は保存されたプロキシを通じて透過的に要求を転送します。さらに詳しくは">
-<!ENTITY zotero.preferences.proxies.desc_link "プロキシ・ヘルプ">
-<!ENTITY zotero.preferences.proxies.desc_after_link "をご覧ください。">
+<!ENTITY zotero.preferences.proxies.desc_link "プロキシヘルプ">
+<!ENTITY zotero.preferences.proxies.desc_after_link "詳細情報。">
 <!ENTITY zotero.preferences.proxies.transparent "プロキシ転送を有効化する">
 <!ENTITY zotero.preferences.proxies.autoRecognize "自動的にプロキシ・リソースを認識する">
 <!ENTITY zotero.preferences.proxies.showRedirectNotification "プロキシを通じて転送するときに通知を表示する">
@@ -153,42 +153,42 @@
 <!ENTITY zotero.preferences.proxies.p_variable "&#37;p - 先頭のスラッシュを除いたプロキシページのパス (例, about/index.html)">
 <!ENTITY zotero.preferences.proxies.d_variable "&#37;d - ディレクトリパス (例, about/)">
 <!ENTITY zotero.preferences.proxies.f_variable "&#37;f - ファイル名 (例, index.html)">
-<!ENTITY zotero.preferences.proxies.a_variable "&#37;a - あらゆる文字列">
+<!ENTITY zotero.preferences.proxies.a_variable "&#37;a - すべての文字列">
 
 <!ENTITY zotero.preferences.prefpane.advanced "詳細">
-<!ENTITY zotero.preferences.advanced.filesAndFolders "ファイルとフォルダ">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "ファイルとフォルダー">
 <!ENTITY zotero.preferences.advanced.keys "ショートカット">
 
 <!ENTITY zotero.preferences.advanced.advancedConfiguration "高度な設定">
 
-<!ENTITY zotero.preferences.prefpane.locate "所在確認">
-<!ENTITY zotero.preferences.locate.locateEngineManager "所在確認エンジンの管理">
-<!ENTITY zotero.preferences.locate.description "詳細">
-<!ENTITY zotero.preferences.locate.name "名称">
-<!ENTITY zotero.preferences.locate.addDescription "To add a Lookup Engine that is not on the list, visit the desired search engine in your browser and select “Add” from Zotero’s Locate menu.">
+<!ENTITY zotero.preferences.prefpane.locate "出典の確認">
+<!ENTITY zotero.preferences.locate.locateEngineManager "文献検索エンジンの管理">
+<!ENTITY zotero.preferences.locate.description "説明">
+<!ENTITY zotero.preferences.locate.name "名前">
+<!ENTITY zotero.preferences.locate.addDescription "リストにない検索エンジンを追加するには、ブラウザで目的の検索エンジンにアクセスし、Zotero の 検索メニューから &quot;追加&quot; を選択します。">
 <!ENTITY zotero.preferences.locate.restoreDefaults "初期設定に戻す">
 
-<!ENTITY zotero.preferences.charset "文字コード">
-<!ENTITY zotero.preferences.charset.importCharset "文字コードをインポート">
-<!ENTITY zotero.preferences.charset.displayExportOption "文字コードの選択肢をエクスポートの際に表示する">
+<!ENTITY zotero.preferences.charset "文字エンコーディング">
+<!ENTITY zotero.preferences.charset.importCharset "文字エンコーディングのインポート">
+<!ENTITY zotero.preferences.charset.displayExportOption "エクスポート時に文字エンコーディングオプションを表示する">
 
-<!ENTITY zotero.preferences.dataDir "データ・ディレクトリの場所">
+<!ENTITY zotero.preferences.dataDir "データディレクトリの場所">
 <!ENTITY zotero.preferences.dataDir.useProfile "Firefox プロファイルのディレクトリを使用する">
-<!ENTITY zotero.preferences.dataDir.custom "個人設定:">
-<!ENTITY zotero.preferences.dataDir.choose "Choose…">
-<!ENTITY zotero.preferences.dataDir.viaCommandLine "(specified via command line)">
-<!ENTITY zotero.preferences.dataDir.reveal "データ・ディレクトリを表示する">
-<!ENTITY zotero.preferences.dataDir.migrate "Migrate To New Default Location…">
+<!ENTITY zotero.preferences.dataDir.custom "カスタム :">
+<!ENTITY zotero.preferences.dataDir.choose "選択...">
+<!ENTITY zotero.preferences.dataDir.viaCommandLine "(コマンドライン経由で指定)">
+<!ENTITY zotero.preferences.dataDir.reveal "データディレクトリを表示">
+<!ENTITY zotero.preferences.dataDir.migrate "新しい既定の場所へ移動...">
 
 <!ENTITY zotero.preferences.attachmentBaseDir.caption "リンク付き添付ファイルの基本ディレクトリ">
 <!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero は、基本ディレクトリの中のリンク付き添付ファイルについて相対パスを使用します。これにより、基本ディレクトリのファイル構造が同じである限り、異なるコンピューター上のファイルへのアクセスが可能になります。">
-<!ENTITY zotero.preferences.attachmentBaseDir.basePath "基本ディレクトリ">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "ベースディレクトリ">
 <!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "選択...">
 <!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "絶対パスに戻す...">
 
 <!ENTITY zotero.preferences.dbMaintenance "データベースの管理">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "データベースの整合性をチェック">
-<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles…">
-<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators…">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "トランスレータと引用スタイルをリセット...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "トランスレータをリセット...">
 
-<!ENTITY zotero.preferences.configEditor "Config Editor">
+<!ENTITY zotero.preferences.configEditor "設定エディタ">
diff --git a/chrome/locale/ja-JP/zotero/preferences.ftl b/chrome/locale/ja-JP/zotero/preferences.ftl
index 0b8926a1c0..137597a56d 100644
--- a/chrome/locale/ja-JP/zotero/preferences.ftl
+++ b/chrome/locale/ja-JP/zotero/preferences.ftl
@@ -28,9 +28,9 @@ preferences-color-scheme = Color Scheme:
 preferences-color-scheme-auto =
     .label = 自動
 preferences-color-scheme-light =
-    .label = Light
+    .label = ライト
 preferences-color-scheme-dark =
-    .label = Dark
+    .label = ダーク
 preferences-item-pane-header = Item Pane Header:
 preferences-item-pane-header-style = Header Citation Style:
 preferences-item-pane-header-locale = Header Language:
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = データディレクトリ :
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -77,20 +79,20 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Default: { $directory })
     .aria-label = Default location
-preferences-pane-account = Account
+preferences-pane-account = アカウント
 -preferences-sync-data-syncing = データの同期
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = 同期
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
     .label = Sync attachment files in group libraries using { -app-name } Storage
 preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
 preferences-account-log-out =
-    .label = Log Out…
+    .label = ログアウト…
 preferences-sync-reset-restore-to-server-body = { -app-name } will replace “{ $libraryName }” on { $domain } with data from this computer.
 preferences-sync-reset-restore-to-server-deleted-items-text =
     { $remoteItemsDeletedCount } { $remoteItemsDeletedCount ->
@@ -111,7 +113,7 @@ preferences-sync-reset-restore-to-server-checkbox-label =
 preferences-sync-reset-restore-to-server-confirmation-text = delete online library
 preferences-sync-reset-restore-to-server-yes = Replace Data in Online Library
 preferences-account-log-in =
-    .label = Log In
+    .label = ログイン
 preferences-account-waiting-for-login =
     .value = Waiting for login…
 preferences-account-cancel-button =
@@ -119,9 +121,13 @@ preferences-account-cancel-button =
 preferences-account-logged-out-status =
     .value = (logged out)
 preferences-account-email-label =
-    .value = Email:
+    .value = Email :
 preferences-account-switch-accounts =
     .label = Switch Accounts…
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ja-JP/zotero/publications.dtd b/chrome/locale/ja-JP/zotero/publications.dtd
index bda15b2853..8dad358f58 100644
--- a/chrome/locale/ja-JP/zotero/publications.dtd
+++ b/chrome/locale/ja-JP/zotero/publications.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.publications.my_publications "私の出版物">
 
-<!ENTITY zotero.publications.intro "「私の出版物」に追加したアイテムは、zotero.org のプロフィールページに表示されます。添付ファイルを含めることを選択した場合、それらは指定したライセンスの下で公開されます。あなた自身が作成した著作物のみを加えてください。また、配布を希望し、かつ配布する権利を持つファイルのみを含めてください。">
+<!ENTITY zotero.publications.intro "「私の出版物」に追加した項目は、zotero.org のプロフィールページに表示されます。添付ファイルを含めることを選択した場合、それらは指定したライセンスの下で公開されます。あなた自身が作成した著作物のみを加えてください。また、配布を希望し、かつ配布する権利を持つファイルのみを含めてください。">
 <!ENTITY zotero.publications.include.checkbox.files "ファイルを含める">
 <!ENTITY zotero.publications.include.checkbox.notes "メモを含める">
 <!ENTITY zotero.publications.include.adjustAtAnyTime "「私の出版物」コレクションから、いつでも表示するものを調整できます。">
diff --git a/chrome/locale/ja-JP/zotero/reader.ftl b/chrome/locale/ja-JP/zotero/reader.ftl
index 154c53bd57..a263fb8260 100644
--- a/chrome/locale/ja-JP/zotero/reader.ftl
+++ b/chrome/locale/ja-JP/zotero/reader.ftl
@@ -1,22 +1,22 @@
 reader-annotations = 注釈
-reader-show-annotations = Show Annotations
-reader-search-annotations = Search Annotations
-reader-search-outline = Search Outline
+reader-show-annotations = 注釈を表示
+reader-search-annotations = 注釈の検索
+reader-search-outline = アウトラインの検索
 reader-no-annotations = 注釈はこのサイドバーに表示されます
 reader-no-extracted-text = 抽出された文字がありません
-reader-add-comment = Add comment
-reader-annotation-comment = Annotation comment
-reader-annotation-text = Annotation text
-reader-manage-tags = Manage tags for this annotation
-reader-open-menu = Open annotation menu
-reader-thumbnails = Thumbnails
-reader-tag-selector-message = Filter annotations by this tag
-reader-add-tags = Add tags…
+reader-add-comment = コメントの追加
+reader-annotation-comment = 注釈コメント
+reader-annotation-text = 注釈テキスト
+reader-manage-tags = この注釈のタグを管理
+reader-open-menu = 注釈メニューを開く
+reader-thumbnails = サムネイル
+reader-tag-selector-message = このタグで注釈をフィルタリング
+reader-add-tags = タグを追加
 reader-highlight-text = テキストを強調表示
-reader-underline-text = Underline Text
+reader-underline-text = 下線付きテキスト
 reader-add-note = メモを追加
-reader-add-text = Add Text
-reader-select-area = Select Area
+reader-add-text = テキストを追加
+reader-select-area = 領域を選択
 reader-highlight-annotation = Highlight annotation
 reader-highlight-annotation-short = Highlight
 reader-underline-annotation = Underline annotation
@@ -25,29 +25,29 @@ reader-note-annotation = Note Annotation
 reader-text-annotation = Text Annotation
 reader-image-annotation = Image Annotation
 reader-ink-annotation = Ink Annotation
-reader-search-result-index = Search result
-reader-search-result-total = Total search results
-reader-draw = Draw
-reader-eraser = Eraser
-reader-pick-color = Pick a Color
-reader-add-to-note = Add to Note
+reader-search-result-index = 検索結果
+reader-search-result-total = 合計検索結果
+reader-draw = 描画
+reader-eraser = 消しゴム
+reader-pick-color = 色の取得
+reader-add-to-note = メモに追加
 reader-zoom-in = 拡大表示
 reader-zoom-out = 縮小表示
-reader-zoom-reset = Reset Zoom
+reader-zoom-reset = 倍率をリセット
 reader-zoom-auto = 自動的にサイズ変更
 reader-zoom-page-width = ページ幅に合わせる
 reader-zoom-page-height = ページの高さに合わせる
-reader-split-vertically = Split Vertically
-reader-split-horizontally = Split Horizontally
+reader-split-vertically = 左右に分割
+reader-split-horizontally = 上下に分割
 reader-next-page = 次のページ
 reader-previous-page = 前のページ
 reader-page = ページ
-reader-location = Location
-reader-read-only = Read-only
-reader-prompt-transfer-from-pdf-title = Import Annotations
+reader-location = 場所
+reader-read-only = 読み取り専用
+reader-prompt-transfer-from-pdf-title = 注釈のインポート
 reader-prompt-transfer-from-pdf-text = Annotations stored in the PDF file will be moved to { $target }.
-reader-prompt-password-protected = The operation is not supported for password-protected PDF files.
-reader-prompt-delete-pages-title = Delete Pages
+reader-prompt-password-protected = この操作はパスワード保護されたPDFファイルではサポートされていません。
+reader-prompt-delete-pages-title = ページを削除
 reader-prompt-delete-pages-text =
     { $count ->
         [one] Are you sure you want to delete { $count } page from the PDF file?
@@ -59,76 +59,76 @@ reader-prompt-delete-annotations-text =
         [one] Are you sure you want to delete the selected annotation?
        *[other] Are you sure you want to delete the selected annotations?
     }
-reader-rotate-left = Rotate Left
-reader-rotate-right = Rotate Right
-reader-edit-page-number = Edit Page Number…
-reader-edit-annotation-text = Edit Annotation Text
-reader-copy-image = Copy Image
-reader-save-image-as = Save Image As…
-reader-page-number-popup-header = Change page number for:
+reader-rotate-left = 左に回転
+reader-rotate-right = 右に回転
+reader-edit-page-number = ページ番号の編集…
+reader-edit-annotation-text = 注釈テキストの編集
+reader-copy-image = 画像をコピー
+reader-save-image-as = ファイル形式を指定して画像を保存…
+reader-page-number-popup-header = ページ番号の変更 :
 reader-this-annotation = この注釈
 reader-selected-annotations = 選択された注釈
 reader-this-page = このページ
 reader-this-page-and-later-pages = このページとその後のページ
 reader-all-pages = すべてのページ
 reader-auto-detect = 自動検出
-reader-enter-password = Enter the password to open this PDF file
-reader-include-annotations = Include annotations
-reader-preparing-document-for-printing = Preparing document for printing…
-reader-phrase-not-found = Phrase not found
+reader-enter-password = この PDF ファイルを開くためのパスワードを入力してください
+reader-include-annotations = 注釈を含める
+reader-preparing-document-for-printing = 印刷のために文書を準備しています…
+reader-phrase-not-found = フレーズが見つかりません
 reader-find = 検索
 reader-close = 閉じる
-reader-show-thumbnails = Show Thumbnails
-reader-show-outline = Show Outline
-reader-find-previous = Find the previous occurrence of the phrase
-reader-find-next = Find the next occurrence of the phrase
-reader-toggle-sidebar = Toggle Sidebar
-reader-find-in-document = Find in Document
-reader-toggle-context-pane = Toggle Context Pane
-reader-highlight-all = Highlight all
-reader-match-case = Match case
-reader-whole-words = Whole words
-reader-appearance = Appearance
-reader-epub-appearance-line-height = Line height
-reader-epub-appearance-word-spacing = Word spacing
-reader-epub-appearance-letter-spacing = Letter spacing
-reader-epub-appearance-page-width = Page width
-reader-epub-appearance-use-original-font = Use original font
-reader-epub-appearance-line-height-revert = Use default line height
-reader-epub-appearance-word-spacing-revert = Use default word spacing
-reader-epub-appearance-letter-spacing-revert = Use default letter spacing
-reader-epub-appearance-page-width-revert = Use default page width
-reader-convert-to-highlight = Convert to Highlight
-reader-convert-to-underline = Convert to Underline
+reader-show-thumbnails = サムネイルを表示
+reader-show-outline = アウトラインを表示
+reader-find-previous = フレーズの前の出現箇所を検索
+reader-find-next = フレーズの次の出現箇所を検索
+reader-toggle-sidebar = サイドバーの表示を切り替え
+reader-find-in-document = ドキュメント内を検索
+reader-toggle-context-pane = コンテキストパネルの切り替え
+reader-highlight-all = すべて強調表示
+reader-match-case = 大文字と小文字を区別
+reader-whole-words = 単語全体
+reader-appearance = 外観
+reader-epub-appearance-line-height = 行の高さ
+reader-epub-appearance-word-spacing = 単語間隔
+reader-epub-appearance-letter-spacing = 文字間隔
+reader-epub-appearance-page-width = ページ幅
+reader-epub-appearance-use-original-font = オリジナルフォントを使用
+reader-epub-appearance-line-height-revert = デフォルトの行の高さを使用
+reader-epub-appearance-word-spacing-revert = デフォルトの単語間隔を使用
+reader-epub-appearance-letter-spacing-revert = デフォルトの文字間隔を使用
+reader-epub-appearance-page-width-revert = デフォルトのページ幅を使用
+reader-convert-to-highlight = 強調表示に変換
+reader-convert-to-underline = 下線に変換
 reader-size = サイズ
-reader-merge = Merge
-reader-copy-link = Copy Link
-reader-theme-original = Original
-reader-theme-snow = Snow
-reader-theme-sepia = Sepia
-reader-theme-dark = Dark
+reader-merge = 結合
+reader-copy-link = リンクをコピー
+reader-theme-original = オリジナル
+reader-theme-snow = 雪
+reader-theme-sepia = セピア
+reader-theme-dark = ダーク
 reader-theme-black = ブラック
-reader-add-theme = Add Theme
-reader-theme-invert-images = Invert Images
-reader-scroll-mode = Scrolling
-reader-spread-mode = Spreads
-reader-flow-mode = Page Layout
+reader-add-theme = テーマを追加
+reader-theme-invert-images = 画像を反転
+reader-scroll-mode = スクロール
+reader-spread-mode = 見開きページ
+reader-flow-mode = ページレイアウト
 reader-columns = コラム
-reader-split-view = Split View
-reader-themes = Themes
-reader-vertical = Vertical
-reader-horizontal = Horizontal
-reader-wrapped = Wrapped
+reader-split-view = 分割表示
+reader-themes = テーマ
+reader-vertical = 垂直方向
+reader-horizontal = 水平方向
+reader-wrapped = 折り返し
 reader-none = なし
-reader-odd = Odd
-reader-even = Even
-reader-paginated = Paginated
-reader-scrolled = Scrolled
-reader-single = Single
-reader-double = Double
-reader-theme-name = Theme Name:
-reader-background = Background:
-reader-foreground = Foreground:
+reader-odd = 奇数
+reader-even = 偶数
+reader-paginated = ページ送り
+reader-scrolled = スクロール
+reader-single = シングル
+reader-double = ダブル
+reader-theme-name = テーマ名 :
+reader-background = 背景 :
+reader-foreground = 前景 :
 reader-reading-mode = Reading Mode
 reader-reading-mode-not-supported = Reading Mode is not supported in this document.
 reader-clear-selection = 選択の解除
@@ -213,7 +213,7 @@ reader-read-aloud-more-voices = More Voices…
 reader-read-aloud-language = 言語
 reader-read-aloud-remaining-time = Remaining reading time
 reader-read-aloud-log-in-link = <log-in>Log in</log-in> to access { -app-name } Voices.
-reader-read-aloud-log-in-button = Log In
+reader-read-aloud-log-in-button = ログイン
 reader-read-aloud-done-button = { general-done }
 reader-read-aloud-add-more-time = Add more time
 reader-read-aloud-quota-exceeded-message =
@@ -253,7 +253,7 @@ reader-read-aloud-region = Region
 reader-read-aloud-region-auto = 自動
 reader-read-aloud-annotation-popup-move = Move annotation by sentence
 reader-read-aloud-annotation-popup-extend = Extend annotation by sentence
-reader-read-aloud-annotation-popup-delete = 削除する
+reader-read-aloud-annotation-popup-delete = 削除
 reader-read-aloud-annotation-popup-done = 完了
 reader-read-aloud-annotation-popup-change-color = Change color
 reader-read-aloud-annotation-popup-highlight = Highlight
diff --git a/chrome/locale/ja-JP/zotero/schema.ftl b/chrome/locale/ja-JP/zotero/schema.ftl
index b9f8c4d677..48fb21b04b 100644
--- a/chrome/locale/ja-JP/zotero/schema.ftl
+++ b/chrome/locale/ja-JP/zotero/schema.ftl
@@ -7,9 +7,9 @@ itemFields-partTitle = Part Title
 itemFields-priorityDate = Priority Date
 itemFields-sessionTitle = Session Title
 creatorTypes-chair = Chair
-creatorTypes-creator = Creator
+creatorTypes-creator = 著者
 creatorTypes-executiveProducer = Executive Producer
-creatorTypes-host = Host
+creatorTypes-host = ホスト
 creatorTypes-narrator = Narrator
 creatorTypes-originalCreator = Original Creator
 creatorTypes-organizer = Organizer
diff --git a/chrome/locale/ja-JP/zotero/searchbox.dtd b/chrome/locale/ja-JP/zotero/searchbox.dtd
index 27e579d91f..61103e0012 100644
--- a/chrome/locale/ja-JP/zotero/searchbox.dtd
+++ b/chrome/locale/ja-JP/zotero/searchbox.dtd
@@ -1,25 +1,19 @@
-<!ENTITY zotero.search.name "検索式名：">
+<!ENTITY zotero.search.name "名前 :">
 
-<!ENTITY zotero.search.searchInLibrary "ライブラリの中を検索">
-
-<!ENTITY zotero.search.joinMode.prefix "Match">
+<!ENTITY zotero.search.joinMode.prefix "検索条件">
 <!ENTITY zotero.search.joinMode.any "のいずれか">
-<!ENTITY zotero.search.joinMode.all "all">
-<!ENTITY zotero.search.joinMode.suffix "を満たす:">
+<!ENTITY zotero.search.joinMode.all "すべて">
+<!ENTITY zotero.search.joinMode.suffix "を満たす :">
 
-<!ENTITY zotero.search.recursive.label "サブコレクションを検索する">
-<!ENTITY zotero.search.noChildren "最上位階層のアイテムのみを表示">
-<!ENTITY zotero.search.includeParentsAndChildren "一致するアイテムの親アイテムと子アイテムを表示">
+<!ENTITY zotero.search.recursive.label "サブコレクションを検索">
+<!ENTITY zotero.search.noChildren "最上位階層の項目のみを表示">
+<!ENTITY zotero.search.includeParentsAndChildren "一致する項目の親項目と子項目を表示">
 
 <!ENTITY zotero.search.textModes.phrase "フレーズ">
-<!ENTITY zotero.search.textModes.phraseBinary "Phrase (incl. binary files)">
+<!ENTITY zotero.search.textModes.phraseBinary "フレーズ (バイナリファイルを含める)">
 <!ENTITY zotero.search.textModes.regexp "正規表現">
-<!ENTITY zotero.search.textModes.regexpCS "正規表現（大文字小文字の区別あり）">
+<!ENTITY zotero.search.textModes.regexpCS "正規表現（大文字と小文字を区別）">
 
 <!ENTITY zotero.search.date.units.days "日間">
 <!ENTITY zotero.search.date.units.months "ヶ月間">
 <!ENTITY zotero.search.date.units.years "年間">
-
-<!ENTITY zotero.search.search "検索実行">
-<!ENTITY zotero.search.clear "消去">
-<!ENTITY zotero.search.saveSearch "検索条件を保存">
diff --git a/chrome/locale/ja-JP/zotero/standalone.dtd b/chrome/locale/ja-JP/zotero/standalone.dtd
index 9bdcb9e271..8802ff0ead 100644
--- a/chrome/locale/ja-JP/zotero/standalone.dtd
+++ b/chrome/locale/ja-JP/zotero/standalone.dtd
@@ -3,9 +3,9 @@
 <!ENTITY servicesMenuMac.label "サービス">
 <!ENTITY hideThisAppCmdMac.label "&brandShortName; を隠す">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.label "ほかを隠す">
+<!ENTITY hideOtherAppsCmdMac.label "その他を隠す">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY showAllAppsCmdMac.label "すべてを表示">
+<!ENTITY showAllAppsCmdMac.label "すべて表示">
 <!ENTITY quitApplicationCmdMac.label "Zotero を終了">
 <!ENTITY quitApplicationCmdMac.key "Q">
 
@@ -22,7 +22,7 @@
 <!ENTITY closeCmd.label "閉じる">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "C">
-<!ENTITY manageAttachments.label "Manage Attachments">
+<!ENTITY manageAttachments.label "添付ファイルの管理">
 <!ENTITY convertToStored.label "リンクファイルを保存ファイルに変換...">
 <!ENTITY importCmd.label "インポート...">
 <!ENTITY importCmd.key "I">
@@ -32,13 +32,13 @@
 <!ENTITY quitApplicationCmd.label "終了">
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
-<!ENTITY copyCitationCmd.label "出典表記をコピー">
-<!ENTITY copyBibliographyCmd.label "参考文献目録をコピー">
-<!ENTITY copyNoteCmd.label "Copy Note">
+<!ENTITY copyCitationCmd.label "引用文献のコピー">
+<!ENTITY copyBibliographyCmd.label "参考文献のコピー">
+<!ENTITY copyNoteCmd.label "メモのコピー">
 
-<!ENTITY bidiSwitchPageDirectionItem.label "ページの方向を切り替える">
+<!ENTITY bidiSwitchPageDirectionItem.label "ページ方向の切り替え">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
-<!ENTITY bidiSwitchTextDirectionItem.label "文字列の方向を切り替える">
+<!ENTITY bidiSwitchTextDirectionItem.label "文字列方向の切り替え">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
@@ -49,19 +49,19 @@
 <!ENTITY viewMenu.accesskey "V">
 <!ENTITY layout.label "レイアウト">
 <!ENTITY standardView.label "標準ビュー">
-<!ENTITY stackedView.label "Stacked View">
+<!ENTITY stackedView.label "スタックビュー">
 <!ENTITY collectionsPane.label "コレクションパネル">
-<!ENTITY itemPane.label "Item Pane">
-<!ENTITY tagSelector.label "Tag Selector">
-<!ENTITY recursiveCollections.label "サブコレクションからアイテムを表示">
+<!ENTITY itemPane.label "項目パネル">
+<!ENTITY tagSelector.label "タグセレクター">
+<!ENTITY recursiveCollections.label "サブコレクションから項目を表示">
 <!ENTITY fontSize.label "フォントサイズ">
 <!ENTITY noteFontSize.label "メモのフォントサイズ">
-<!ENTITY columns.label "Columns">
-<!ENTITY sortBy.label "Sort By">
+<!ENTITY columns.label "列">
+<!ENTITY sortBy.label "並べ替え">
 
 <!ENTITY toolsMenu.label "ツール">
 <!ENTITY toolsMenu.accesskey "T">
-<!ENTITY installConnector.label "Install Browser Connector…">
+<!ENTITY installConnector.label "ブラウザコネクタをインストール…">
 <!ENTITY installConnector.accesskey "C">
 <!ENTITY addons.label "アドオン">
 <!ENTITY developer.label "開発者">
@@ -77,20 +77,20 @@
 <!ENTITY aboutProduct.accesskey "A">
 <!ENTITY productHelp.label "サポートとヘルプ">
 <!ENTITY productHelp.accesskey "H">
-<!ENTITY helpTroubleshootingInfo.label "トラブルシューティング情報...">
+<!ENTITY helpTroubleshootingInfo.label "トラブルシューティング...">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
-<!ENTITY helpFeedbackPage.label "ディスカッション・フォーラム">
+<!ENTITY helpFeedbackPage.label "フォーラム">
 <!ENTITY helpFeedbackPage.accesskey "F">
 
-<!ENTITY helpReportErrors.label "エラーを報告する...">
+<!ENTITY helpReportErrors.label "エラー報告...">
 <!ENTITY helpReportErrors.accesskey "R">
 
 <!ENTITY debugOutputLogging.label "デバッグ出力のログ">
 <!ENTITY debugOutputLogging.accesskey "L">
-<!ENTITY debugOutputLogging.submit "出力を提出する">
+<!ENTITY debugOutputLogging.submit "出力を提出">
 <!ENTITY debugOutputLogging.view "出力を表示">
-<!ENTITY debugOutputLogging.clear "出力を消去する">
-<!ENTITY debugOutputLogging.restartWithLoggingEnabled "ログを有効化して再起動する...">
+<!ENTITY debugOutputLogging.clear "出力を消去">
+<!ENTITY debugOutputLogging.restartWithLoggingEnabled "ログを有効化して再起動...">
 
-<!ENTITY helpCheckForUpdates.label "更新を確認...">
+<!ENTITY helpCheckForUpdates.label "更新の確認...">
 <!ENTITY helpCheckForUpdates.accesskey "U">
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index ab932de980..b5b4d92776 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -1,12 +1,12 @@
 <!ENTITY zotero.general.yes "はい">
 <!ENTITY zotero.general.no "いいえ">
 <!ENTITY zotero.general.optional "（任意）">
-<!ENTITY zotero.general.note "メモ:">
+<!ENTITY zotero.general.note "メモ :">
 <!ENTITY zotero.general.selectAll "すべて選択">
-<!ENTITY zotero.general.deselectAll "選択をすべて解除">
+<!ENTITY zotero.general.deselectAll "すべて選択解除">
 <!ENTITY zotero.general.edit "編集">
 <!ENTITY zotero.general.delete "削除">
-<!ENTITY zotero.general.moveToTrash "Move to Trash">
+<!ENTITY zotero.general.moveToTrash "ごみ箱へ移動">
 <!ENTITY zotero.general.ok "OK">
 <!ENTITY zotero.general.cancel "キャンセル">
 <!ENTITY zotero.general.refresh "再読み込み">
@@ -15,10 +15,10 @@
 <!ENTITY zotero.general.advancedOptions.label "高度なオプション">
 <!ENTITY zotero.general.tools "ツール">
 <!ENTITY zotero.general.more "その他">
-<!ENTITY zotero.general.moreInformation "More Information">
+<!ENTITY zotero.general.moreInformation "詳細">
 <!ENTITY zotero.general.loading "読み込み中...">
 <!ENTITY zotero.general.close "閉じる">
-<!ENTITY zotero.general.minimize "Minimize">
+<!ENTITY zotero.general.minimize "最小化">
 <!ENTITY zotero.general.other "その他...">
 <!ENTITY zotero.general.bigger "拡大">
 <!ENTITY zotero.general.smaller "縮小">
@@ -28,7 +28,7 @@
 <!ENTITY zotero.errorReport.title "Zotero エラーレポート">
 <!ENTITY zotero.errorReport.submissionInProgress "エラーレポートが送信されるまでお待ちください。">
 <!ENTITY zotero.errorReport.submitted "エラーレポートが送信されました。">
-<!ENTITY zotero.errorReport.reportID "レポート ID:">
+<!ENTITY zotero.errorReport.reportID "レポート ID :">
 <!ENTITY zotero.errorReport.postToForums "このレポート ID、問題の説明、および問題を再現するために必要なあらゆる手順について、Zotero フォーラム (forums.zotero.org)に投稿して下さい。">
 <!ENTITY zotero.errorReport.notReviewed "エラーレポートはフォーラムで言及されない限り、調査されることはありません。">
 
@@ -49,153 +49,151 @@
 <!ENTITY zotero.tabs.notes.label "メモ">
 <!ENTITY zotero.tabs.attachments.label "添付ファイル">
 
-<!ENTITY zotero.toolbar.duplicate.label "重複アイテムを表示">
-<!ENTITY zotero.collections.showUnfiledItems "未整理のアイテムを表示">
-<!ENTITY zotero.collections.showRetractedItems "取り消し済みのアイテムを表示">
+<!ENTITY zotero.toolbar.duplicate.label "重複項目を表示">
+<!ENTITY zotero.collections.showUnfiledItems "未整理の項目を表示">
+<!ENTITY zotero.collections.showRetractedItems "取り消し済みの項目を表示">
 
-<!ENTITY zotero.items.itemType "アイテムの種類">
-<!ENTITY zotero.items.creator_column "編著者名">
+<!ENTITY zotero.items.itemType "項目の種類">
+<!ENTITY zotero.items.creator_column "著者">
 <!ENTITY zotero.items.year_column "年">
 <!ENTITY zotero.items.dateModified_column "更新日時">
-<!ENTITY zotero.items.moreColumns.label "列を追加する">
-<!ENTITY zotero.items.restoreColumnOrder.label "列の順序を復元する">
+<!ENTITY zotero.items.moreColumns.label "列を追加">
+<!ENTITY zotero.items.restoreColumnOrder.label "列の順序を復元">
 
-<!ENTITY zotero.items.menu.showInLibrary "ライブラリの中に表示">
-<!ENTITY zotero.items.menu.attach.note "メモを追加">
-<!ENTITY zotero.items.menu.attach "添付ファイルを追加する">
-<!ENTITY zotero.items.menu.attach.link.uri "URIへのリンクを添付する...">
-<!ENTITY zotero.items.menu.attach.file "保存されたファイルのコピーを添付する...">
-<!ENTITY zotero.items.menu.attach.fileLink "リンクをファイルに添付する...">
+<!ENTITY zotero.items.menu.showInLibrary "ライブラリに表示">
+<!ENTITY zotero.items.menu.attach.note "メモの追加">
+<!ENTITY zotero.items.menu.attach "添付ファイルの追加">
+<!ENTITY zotero.items.menu.attach.link.uri "URI へのリンクを添付...">
+<!ENTITY zotero.items.menu.attach.file "保存されたファイルのコピーを添付...">
+<!ENTITY zotero.items.menu.attach.fileLink "リンクをファイルに添付...">
 
-<!ENTITY zotero.items.menu.restoreToLibrary "ライブラリへ復帰させる">
-<!ENTITY zotero.items.menu.duplicateItem "選択されたアイテムを複製">
-<!ENTITY zotero.items.menu.mergeItems "アイテムを統合する...">
-<!ENTITY zotero.items.menu.unrecognize "Undo Retrieve Metadata">
+<!ENTITY zotero.items.menu.restoreToLibrary "ライブラリへ復元">
+<!ENTITY zotero.items.menu.duplicateItem "選択された項目を複製">
+<!ENTITY zotero.items.menu.mergeItems "項目の統合...">
+<!ENTITY zotero.items.menu.unrecognize "メタデータの取得を元に戻す">
 
-<!ENTITY zotero.duplicatesMerge.versionSelect "土台として用いるアイテムのヴァージョンを選んでください:">
-<!ENTITY zotero.duplicatesMerge.fieldSelect "このアイテムの重複するヴァージョンから維持したいフィールドを選択してください:">
+<!ENTITY zotero.duplicatesMerge.versionSelect "マスターとして使用する項目のバージョンを選択 :">
+<!ENTITY zotero.duplicatesMerge.fieldSelect "項目の他のバージョンから保持するフィールドを選択 :">
 
-<!ENTITY zotero.toolbar.newItem.label "新規アイテム">
+<!ENTITY zotero.toolbar.newItem.label "新規項目">
 <!ENTITY zotero.toolbar.moreItemTypes.label "その他">
-<!ENTITY zotero.toolbar.lookup.label "識別子によってアイテムを追加する">
-<!ENTITY zotero.toolbar.removeItem.label "アイテムを削除...">
+<!ENTITY zotero.toolbar.lookup.label "識別子によって項目を追加">
+<!ENTITY zotero.toolbar.removeItem.label "項目を削除...">
 <!ENTITY zotero.toolbar.newGroup "新規グループ...">
 <!ENTITY zotero.toolbar.newSubcollection.label "新規サブコレクション...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "新規検索条件の保存...">
-<!ENTITY zotero.toolbar.emptyTrash.label "ゴミ箱を空にする">
-<!ENTITY zotero.toolbar.tagSelector.label "タグ選択ボックスを表示する／隠す">
+<!ENTITY zotero.toolbar.emptyTrash.label "ごみ箱を空にする">
+<!ENTITY zotero.toolbar.tagSelector.label "タグ選択ボックスの表示/非表示">
 <!ENTITY zotero.toolbar.actions.label "アクション">
 <!ENTITY zotero.toolbar.import.label "インポート...">
-<!ENTITY zotero.toolbar.importFromClipboard "クリップボードからインポートする">
+<!ENTITY zotero.toolbar.importFromClipboard "クリップボードからインポート">
 <!ENTITY zotero.toolbar.export.label "ライブラリをエクスポート...">
 <!ENTITY zotero.toolbar.rtfScan.label "RTF スキャン">
 <!ENTITY zotero.toolbar.preferences.label "環境設定...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "サポートとヘルプ">
 <!ENTITY zotero.toolbar.about.label "Zotero について">
-<!ENTITY zotero.toolbar.advancedSearch "高度な検索">
-<!ENTITY zotero.toolbar.openURL.label "所在確認">
-<!ENTITY zotero.toolbar.openURL.tooltip "あなたの所属機関の図書館を通じて所在確認">
+<!ENTITY zotero.toolbar.openURL.label "出典の確認">
+<!ENTITY zotero.toolbar.openURL.tooltip "地元の図書館で検索">
 
 <!ENTITY zotero.toolbar.feeds.new "新しいフィード">
-<!ENTITY zotero.toolbar.feeds.new.fromURL "URLから...">
-<!ENTITY zotero.toolbar.feeds.new.fromOPML "OPMLから...">
-<!ENTITY zotero.toolbar.feeds.edit "フィードを編集する...">
+<!ENTITY zotero.toolbar.feeds.new.fromURL "URL から...">
+<!ENTITY zotero.toolbar.feeds.new.fromOPML "OPML から...">
+<!ENTITY zotero.toolbar.feeds.edit "フィードの編集...">
 
 <!ENTITY zotero.item.add "追加">
-<!ENTITY zotero.item.attachment.file.show "ファイルを表示">
-<!ENTITY zotero.item.textTransform "テキストの大文字・小文字を指定する">
+<!ENTITY zotero.item.attachment.file.show "ファイルの場所を開く">
+<!ENTITY zotero.item.textTransform "テキストの変換">
 <!ENTITY zotero.item.textTransform.titlecase "各単語の先頭を大文字に">
-<!ENTITY zotero.item.textTransform.sentencecase "各文の先頭を大文字に">
-<!ENTITY zotero.item.creatorTransform.nameSwap "姓と名を入れ替える">
-<!ENTITY zotero.item.creatorTransform.fixCase "Fix Case">
-<!ENTITY zotero.item.copyAsURL "URLとしてコピーする">
-<!ENTITY zotero.item.deletePermanently "永久に削除する...">
+<!ENTITY zotero.item.textTransform.sentencecase "文頭のみ大文字に">
+<!ENTITY zotero.item.creatorTransform.nameSwap "姓と名を入れ替え">
+<!ENTITY zotero.item.creatorTransform.fixCase "大文字/小文字の修正">
+<!ENTITY zotero.item.copyAsURL "URL としてコピー">
+<!ENTITY zotero.item.deletePermanently "完全削除...">
 
-<!ENTITY zotero.item.tags.removeAll "すべてのタグを削除する...">
+<!ENTITY zotero.item.tags.removeAll "すべてのタグを削除...">
 
 <!ENTITY zotero.toolbar.newNote "新しいメモ">
-<!ENTITY zotero.toolbar.note.standalone "新しく独立メモを作成">
-<!ENTITY zotero.toolbar.note.child "子メモを追加する">
-<!ENTITY zotero.toolbar.lookup "識別子によって所在確認...">
+<!ENTITY zotero.toolbar.note.standalone "新しい独立メモの作成">
+<!ENTITY zotero.toolbar.note.child "子メモを追加">
+<!ENTITY zotero.toolbar.lookup "識別子によって出典の確認...">
 <!ENTITY zotero.toolbar.attachment.linked "ファイルへのリンク作成...">
 <!ENTITY zotero.toolbar.attachment.add "ファイルのコピーを保存...">
 <!ENTITY zotero.toolbar.attachment.weblink "現在のページへのリンクを保存">
 <!ENTITY zotero.toolbar.attachment.snapshot "現在のページのスナップショットを撮る">
-<!ENTITY zotero.toolbar.context.item "アイテム">
+<!ENTITY zotero.toolbar.context.item "項目">
 <!ENTITY zotero.toolbar.context.notes "メモ">
 
 <!ENTITY zotero.tagSelector.noTagsToDisplay "表示するタグがありません">
 <!ENTITY zotero.tagSelector.loadingTags "タグを読込中...">
 <!ENTITY zotero.tagSelector.showAutomatic "自動生成タグも表示">
 <!ENTITY zotero.tagSelector.displayAllInLibrary "このライブラリの全タグを表示">
-<!ENTITY zotero.tagSelector.deleteAutomaticInLibrary "このライブラリから自動生成されたタグを削除する...">
-<!ENTITY zotero.tagSelector.clearAll "選択をすべて解除">
-<!ENTITY zotero.tagSelector.assignColor "色を指定...">
+<!ENTITY zotero.tagSelector.deleteAutomaticInLibrary "このライブラリから自動生成されたタグを削除...">
+<!ENTITY zotero.tagSelector.clearAll "すべて選択解除">
+<!ENTITY zotero.tagSelector.assignColor "色の指定...">
 <!ENTITY zotero.tagSelector.renameTag "タグ名の変更...">
 <!ENTITY zotero.tagSelector.deleteTag "タグを削除...">
-<!ENTITY zotero.tagSelector.splitTag "Split…">
+<!ENTITY zotero.tagSelector.splitTag "分割...">
 
-<!ENTITY zotero.tagColorChooser.title "タグの色と位置を選ぶ">
-<!ENTITY zotero.tagColorChooser.color "色:">
-<!ENTITY zotero.tagColorChooser.position "位置:">
-<!ENTITY zotero.tagColorChooser.setColor "色を指定">
-<!ENTITY zotero.tagColorChooser.removeColor "色を取り除く">
+<!ENTITY zotero.tagColorChooser.title "タグの色と位置の選択">
+<!ENTITY zotero.tagColorChooser.color "色 :">
+<!ENTITY zotero.tagColorChooser.position "位置 :">
+<!ENTITY zotero.tagColorChooser.setColor "色の指定">
+<!ENTITY zotero.tagColorChooser.removeColor "色を削除">
 
-<!ENTITY zotero.lookup.description "ISBN、DOI、PMID、arXiv ID、ADS Bibcodes を入力して、ライブラリに追加します。">
+<!ENTITY zotero.lookup.description "ISBN、DOI、PMID、arXiv ID、ADS Bibcodes を入力して、ライブラリに追加 :">
 <!ENTITY zotero.lookup.button.search "検索">
 
-<!ENTITY zotero.createParent.title "親アイテムを作成">
+<!ENTITY zotero.createParent.title "親項目の作成">
 <!ENTITY zotero.createParent.button.manual "手動入力">
 
-<!ENTITY zotero.selectitems.title "アイテムを選択">
-<!ENTITY zotero.selectitems.intro.label "ライブラリに追加したいアイテムを選択してください">
+<!ENTITY zotero.selectitems.title "項目の選択">
+<!ENTITY zotero.selectitems.intro.label "ライブラリに追加したい項目を選択してください">
 <!ENTITY zotero.selectitems.cancel.label "キャンセル">
 <!ENTITY zotero.selectitems.select.label "OK">
 
-<!ENTITY zotero.bibliography.title "出典表記／参考文献目録を作成">
-<!ENTITY zotero.bibliography.style.label "引用スタイル:">
-<!ENTITY zotero.bibliography.manageStyles "スタイルを管理する...">
-<!ENTITY zotero.bibliography.locale.label "言語:">
-<!ENTITY zotero.bibliography.outputMode "出力モード:">
-<!ENTITY zotero.bibliography.bibliography "参考文献目録">
-<!ENTITY zotero.bibliography.outputMethod "出力方法:">
+<!ENTITY zotero.bibliography.title "引用文献/参考文献の作成">
+<!ENTITY zotero.bibliography.style.label "引用スタイル :">
+<!ENTITY zotero.bibliography.manageStyles "スタイルの管理...">
+<!ENTITY zotero.bibliography.locale.label "言語 :">
+<!ENTITY zotero.bibliography.outputMode "出力モード :">
+<!ENTITY zotero.bibliography.bibliography "参考文献">
+<!ENTITY zotero.bibliography.outputMethod "出力方法 :">
 <!ENTITY zotero.bibliography.saveAsRTF.label "RTF として保存">
 <!ENTITY zotero.bibliography.saveAsHTML.label "HTML として保存">
 <!ENTITY zotero.bibliography.copyToClipboard.label "クリップボードにコピー">
 <!ENTITY zotero.bibliography.print.label "印刷">
 
-<!ENTITY zotero.integration.docPrefs.title "ドキュメントの設定">
-<!ENTITY zotero.integration.addEditCitation.title "出典表記を追加・編集">
-<!ENTITY zotero.integration.editBibliography.title "参考文献目録を編集">
+<!ENTITY zotero.integration.docPrefs.title "文書の設定">
+<!ENTITY zotero.integration.addEditCitation.title "引用文献の追加/編集">
+<!ENTITY zotero.integration.editBibliography.title "参考文献の編集">
 
 <!ENTITY zotero.progress.title "進捗">
 
 <!ENTITY zotero.import "インポート">
 <!ENTITY zotero.import.whereToImportFrom "どこからインポートしますか？">
 <!ENTITY zotero.import.source.file "単一ファイル (BibTeX, RIS, Zotero RDF, など.)">
-<!ENTITY zotero.import.source.folder "A folder of PDFs or other files">
-<!ENTITY zotero.import.onlineImport "online import">
+<!ENTITY zotero.import.source.folder "PDF やその他のファイルのフォルダー">
+<!ENTITY zotero.import.onlineImport "オンラインインポート">
 <!ENTITY zotero.import.importing "インポート中...">
 <!ENTITY zotero.import.database "データベース">
-<!ENTITY zotero.import.lastModified "Last Modified">
+<!ENTITY zotero.import.lastModified "最終更新日">
 <!ENTITY zotero.import.size "サイズ">
-<!ENTITY zotero.import.createCollection "Place imported collections and items into new collection">
-<!ENTITY zotero.import.fileHandling "File Handling">
-<!ENTITY zotero.import.online.newItemsOnly "Download new items only; don’t update previously imported items">
+<!ENTITY zotero.import.createCollection "インポートしたコレクションと項目を新しいコレクションに配置">
+<!ENTITY zotero.import.fileHandling "ファイル処理">
+<!ENTITY zotero.import.online.newItemsOnly "新しい項目のみをダウンロードします。以前にインポートした項目は更新しません。">
 
 <!ENTITY zotero.exportOptions.title "エクスポート...">
 <!ENTITY zotero.exportOptions.format.label "フォーマット:">
 <!ENTITY zotero.exportOptions.translatorOptions.label "トランスレータのオプション">
 
-<!ENTITY zotero.charset.label "文字コード">
-<!ENTITY zotero.moreEncodings.label "その他の文字コード">
+<!ENTITY zotero.charset.label "文字エンコーディング">
+<!ENTITY zotero.moreEncodings.label "その他のエンコーディング">
 
-<!ENTITY zotero.citation.keepSorted.label "参考文献の順序を維持">
+<!ENTITY zotero.citation.keepSorted.label "ソースの並べ順を維持">
 
 <!ENTITY zotero.citation.suppressAuthor.label "著者名を省略">
-<!ENTITY zotero.citation.prefix.label "接頭辞:">
-<!ENTITY zotero.citation.suffix.label "接尾辞:">
-<!ENTITY zotero.citation.editorWarning.label "警告: エディタの中で出典表記を編集すると、データベース側、または引用スタイルの変更を反映した自動更新が行われなくなります。">
+<!ENTITY zotero.citation.prefix.label "接頭辞 :">
+<!ENTITY zotero.citation.suffix.label "接尾辞 :">
+<!ENTITY zotero.citation.editorWarning.label "警告: エディタの中で引用文献を編集すると、データベース側、または引用スタイルの変更を反映した自動更新が行われなくなります。">
 
 <!ENTITY zotero.richText.italic.label "斜体">
 <!ENTITY zotero.richText.bold.label "太字">
@@ -205,101 +203,100 @@
 
 <!ENTITY zotero.annotate.toolbar.add.label "注釈を追加">
 <!ENTITY zotero.annotate.toolbar.collapse.label "すべての注釈を折りたたむ">
-<!ENTITY zotero.annotate.toolbar.expand.label "すべての注釈を展開する">
+<!ENTITY zotero.annotate.toolbar.expand.label "すべての注釈を展開">
 <!ENTITY zotero.annotate.toolbar.highlight.label "テキストを強調表示">
 <!ENTITY zotero.annotate.toolbar.unhighlight.label "テキストの強調表示を解除">
 
-<!ENTITY zotero.integration.prefs.displayAs.label "出典表記の出力形式:">
+<!ENTITY zotero.integration.prefs.displayAs.label "引用文献の出力形式 :">
 <!ENTITY zotero.integration.prefs.footnotes.label "脚注">
 <!ENTITY zotero.integration.prefs.endnotes.label "文末注">
 
-<!ENTITY zotero.integration.prefs.formatUsing.label "出典表記の保存形式:">
+<!ENTITY zotero.integration.prefs.formatUsing.label "引用文献の保存形式 :">
 <!ENTITY zotero.integration.prefs.bookmarks.label "ブックマーク">
-<!ENTITY zotero.integration.prefs.bookmarks.caption "ブックマークはWordとLibreOfficeの間で共有できますが、意図せずに変更された場合にエラーを生じる場合があり、また脚注に挿入することが出来ません。">
+<!ENTITY zotero.integration.prefs.bookmarks.caption "ブックマークは Word  と LibreOffice の間で共有できますが、意図せずに変更された場合にエラーが発生する場合があり、また脚注に挿入することが出来ません。">
 
-<!ENTITY zotero.integration.prefs.automaticCitationUpdates.label "Automatically update citations">
-<!ENTITY zotero.integration.prefs.automaticCitationUpdates.tooltip "Citations with pending updates will be highlighted in the document">
-<!ENTITY zotero.integration.prefs.automaticCitationUpdates.description "Disabling updates can speed up citation insertion in large documents. Click Refresh to update citations manually.">
+<!ENTITY zotero.integration.prefs.automaticCitationUpdates.label "引用文献を自動的に更新">
+<!ENTITY zotero.integration.prefs.automaticCitationUpdates.tooltip "更新待ちの引用文献は文書内で強調表示されます。">
+<!ENTITY zotero.integration.prefs.automaticCitationUpdates.description "更新を無効化すれば大きな文書への引用文献の挿入が高速化できます。引用文献を手動で更新するためには更新ボタンをクリックしてください。">
 
-<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "MEDLINEの略誌名を使用する">
-<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "「雑誌略誌名」のフィールドは無視されます。">
+<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.label "MEDLINE の略誌名を使用する">
+<!ENTITY zotero.integration.prefs.automaticJournalAbbeviations.caption "「雑誌略語」のフィールドは無視されます。">
 
-<!ENTITY zotero.integration.prefs.exportDocument "Switch to a Different Word Processor…">
+<!ENTITY zotero.integration.prefs.exportDocument "別のワードプロセッサに切り替え...">
 
 <!ENTITY zotero.integration.showEditor.label "エディタを表示">
 <!ENTITY zotero.integration.classicView.label "クラシック表示">
 
-<!ENTITY zotero.integration.references.label "参考文献目録に含まれる文献">
+<!ENTITY zotero.integration.references.label "参考文献一覧">
 
 <!ENTITY zotero.sync.stop "同期を停止">
 <!ENTITY zotero.sync.error "同期エラー">
-<!ENTITY zotero.sync.storage.progress "進捗:">
-<!ENTITY zotero.sync.storage.downloads "ダウンロード:">
-<!ENTITY zotero.sync.storage.uploads "アップロード:">
+<!ENTITY zotero.sync.storage.progress "進捗 :">
+<!ENTITY zotero.sync.storage.downloads "ダウンロード :">
+<!ENTITY zotero.sync.storage.uploads "アップロード :">
 
 <!ENTITY zotero.sync.longTagFixer.followingTagTooLong "あなたの Zotero ライブラリにある以下のタグは、サーバと同期させるには長過ぎます。">
 <!ENTITY zotero.sync.longTagFixer.syncedTagSizeLimit "タグを同期させるには 256 文字以下である必要があります。">
 <!ENTITY zotero.sync.longTagFixer.splitEditDelete "問題のタグを複数のタグに分割するか、手動でタグを編集して短くするか、あるいは削除してください。">
-<!ENTITY zotero.sync.longTagFixer.split "分割する">
-<!ENTITY zotero.sync.longTagFixer.splitAtThe "次の場所で分割:">
+<!ENTITY zotero.sync.longTagFixer.split "分割">
+<!ENTITY zotero.sync.longTagFixer.splitAtThe "次の場所で分割 :">
 <!ENTITY zotero.sync.longTagFixer.character "文字目">
 <!ENTITY zotero.sync.longTagFixer.characters "文字目">
 <!ENTITY zotero.sync.longTagFixer.uncheckedTagsNotSaved "チェックされていないタグは保存されません。">
-<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "このタグは全てのアイテムから削除されます。">
+<!ENTITY zotero.sync.longTagFixer.tagWillBeDeleted "このタグはすべての項目から削除されます。">
 
-<!ENTITY zotero.merge.title "衝突の解決">
-<!ENTITY zotero.merge.of "of">
+<!ENTITY zotero.merge.title "競合の解決">
+<!ENTITY zotero.merge.of " / ">
 <!ENTITY zotero.merge.deleted "削除済み">
 
 <!ENTITY zotero.proxy.recognized.title "プロキシが認識されました。">
 <!ENTITY zotero.proxy.recognized.warning "あなたの図書館、学校または企業のウェブサイトからリンクされたプロキシのみを追加するようにしてください。">
 <!ENTITY zotero.proxy.recognized.warning.secondary "その他のプロキシを追加すると、悪意あるサイトがあなたの信頼するサイトに成り済ます恐れがあります。">
 <!ENTITY zotero.proxy.recognized.disable.label "以前に認識されたプロキシを通じて、要求を自動転送しないでください。">
-<!ENTITY zotero.proxy.recognized.ignore.label "無視する">
+<!ENTITY zotero.proxy.recognized.ignore.label "無視">
 
 <!ENTITY zotero.feedSettings.title "フィードの設定">
 <!ENTITY zotero.feedSettings.saveButton.label "保存">
-<!ENTITY zotero.feedSettings.url.label "URL:">
-<!ENTITY zotero.feedSettings.title.label "題名:">
+<!ENTITY zotero.feedSettings.url.label "URL :">
+<!ENTITY zotero.feedSettings.title.label "タイトル :">
 <!ENTITY zotero.feedSettings.refresh.label1 "フィードを">
 <!ENTITY zotero.feedSettings.refresh.label2 "時間おきに更新する">
-<!ENTITY zotero.feedSettings.cleanupUnreadAfter.label1 "未読フィードアイテムを">
-<!ENTITY zotero.feedSettings.cleanupUnreadAfter.label2 "日後に除去する">
-<!ENTITY zotero.feedSettings.cleanupReadAfter.label1 "既読フィードアイテムを">
-<!ENTITY zotero.feedSettings.cleanupReadAfter.label2 "日後に除去する">
+<!ENTITY zotero.feedSettings.cleanupUnreadAfter.label1 "未読フィード項目を">
+<!ENTITY zotero.feedSettings.cleanupUnreadAfter.label2 "日後に消去する">
+<!ENTITY zotero.feedSettings.cleanupReadAfter.label1 "既読フィード項目を">
+<!ENTITY zotero.feedSettings.cleanupReadAfter.label2 "日後に消去する">
 
 <!ENTITY zotero.rtfScan.title "RTF スキャン">
-<!ENTITY zotero.rtfScan.cancel.label "取り消す">
-<!ENTITY zotero.rtfScan.citation.label "出典表記">
-<!ENTITY zotero.rtfScan.itemName.label "アイテム名">
-<!ENTITY zotero.rtfScan.unmappedCitations.label "文献不明の出典表記">
-<!ENTITY zotero.rtfScan.ambiguousCitations.label "曖昧な出典表記
-">
-<!ENTITY zotero.rtfScan.mappedCitations.label "文献同定済みの出典表記">
+<!ENTITY zotero.rtfScan.cancel.label "キャンセル">
+<!ENTITY zotero.rtfScan.citation.label "引用文献">
+<!ENTITY zotero.rtfScan.itemName.label "項目名">
+<!ENTITY zotero.rtfScan.unmappedCitations.label "マッピングされていない引用文献">
+<!ENTITY zotero.rtfScan.ambiguousCitations.label "曖昧な引用文献">
+<!ENTITY zotero.rtfScan.mappedCitations.label "マップ済みの引用文献">
 <!ENTITY zotero.rtfScan.introPage.label "案内">
-<!ENTITY zotero.rtfScan.introPage.description "Zotero は RTF ファイルから自動的に出典表記を抽出し、出典表記を再整形して、参考文献目録を挿入することができます。この RTF スキャン機能は現在、以下に挙げる形式の出典表記をサポートしています:">
+<!ENTITY zotero.rtfScan.introPage.description "Zotero は RTF ファイルから自動的に引用文献を抽出し、引用文献を再整形して、参考文献を挿入することができます。この RTF スキャン機能は現在、以下に挙げる形式の引用文献をサポートしています:">
 <!ENTITY zotero.rtfScan.introPage.description2 "まず最初に、RTF 入力元ファイルと出力先ファイルを下記から選んでください。">
-<!ENTITY zotero.rtfScan.scanPage.label "出典表記をスキャンしています">
-<!ENTITY zotero.rtfScan.scanPage.description "Zotero はあなたの文書の出典表記をスキャンしています。しばらくお待ちください。">
-<!ENTITY zotero.rtfScan.citationsPage.label "引用されたアイテムを検証する">
-<!ENTITY zotero.rtfScan.citationsPage.description "以下に表示される、 Zotero が認識した出典表記の一覧をご覧頂き、対応する文献を正しく見つけたかどうかご確認ください。次の手順に進む前に、文献不明の出典表記やあいまいな出典表記はすべて解消される必要があります。">
+<!ENTITY zotero.rtfScan.scanPage.label "引用文献をスキャンしています">
+<!ENTITY zotero.rtfScan.scanPage.description "Zotero はあなたの文書の引用文献をスキャンしています。しばらくお待ちください。">
+<!ENTITY zotero.rtfScan.citationsPage.label "引用された項目を検証する">
+<!ENTITY zotero.rtfScan.citationsPage.description "以下に表示される、 Zotero が認識した引用文献の一覧をご覧頂き、対応する文献を正しく見つけたかどうかご確認ください。次の手順に進む前に、文献不明の引用文献やあいまいな引用文献はすべて解消される必要があります。">
 <!ENTITY zotero.rtfScan.stylePage.label "文書の書式設定">
-<!ENTITY zotero.rtfScan.formatPage.label "出典表記の書式設定">
+<!ENTITY zotero.rtfScan.formatPage.label "引用文献の書式設定">
 <!ENTITY zotero.rtfScan.formatPage.description "Zotero はあなたの RTF ファイルを処理中、整形中です。しばらくお待ちください。">
 <!ENTITY zotero.rtfScan.completePage.label "RTF スキャンが完了しました">
 <!ENTITY zotero.rtfScan.completePage.description "あなたの文書はスキャンされ処理が完了しました。正しく整形されていることを確認してください。">
 <!ENTITY zotero.rtfScan.inputFile.label "入力元ファイル">
 <!ENTITY zotero.rtfScan.outputFile.label "出力先ファイル">
 
-<!ENTITY zotero.file.choose.label "ファイルを選択...">
+<!ENTITY zotero.file.choose.label "ファイルの選択...">
 <!ENTITY zotero.file.noneSelected.label "ファイルが選択されていません">
 
-<!ENTITY zotero.attachLink.title "URIへのリンクを添付する">
-<!ENTITY zotero.attachLink.label.link "リンク:">
-<!ENTITY zotero.attachLink.label.title "題:">
+<!ENTITY zotero.attachLink.title "URI へのリンクを添付">
+<!ENTITY zotero.attachLink.label.link "リンク :">
+<!ENTITY zotero.attachLink.label.title "タイトル :">
 
-<!ENTITY zotero.context.addChildNote "Add Item Note">
-<!ENTITY zotero.context.addChildNoteFromAnnotations "Add Item Note from Annotations">
+<!ENTITY zotero.context.addChildNote "メモを追加">
+<!ENTITY zotero.context.addChildNoteFromAnnotations "注釈からメモを追加">
 <!ENTITY zotero.context.addStandaloneNote "独立メモを追加">
 <!ENTITY zotero.context.addStandaloneNoteFromAnnotations "注釈から独立メモを追加">
 <!ENTITY zotero.context.editInWindow "別ウィンドウで編集">
@@ -312,19 +309,19 @@
 <!ENTITY zotero.pdfReader.verticalScrolling "垂直スクロール">
 <!ENTITY zotero.pdfReader.horizontalScrolling "水平スクロール">
 <!ENTITY zotero.pdfReader.wrappedScrolling "折り返しスクロール">
-<!ENTITY zotero.pdfReader.noSpreads "スプレッドなし ">
-<!ENTITY zotero.pdfReader.oddSpreads "奇数スプレッド">
-<!ENTITY zotero.pdfReader.evenSpreads "偶数スプレッド">
-<!ENTITY zotero.pdfReader.scrolled "Scrolled">
-<!ENTITY zotero.pdfReader.paginated "Paginated">
+<!ENTITY zotero.pdfReader.noSpreads "見開きなし">
+<!ENTITY zotero.pdfReader.oddSpreads "奇数ページ見開き">
+<!ENTITY zotero.pdfReader.evenSpreads "偶数ページ見開き">
+<!ENTITY zotero.pdfReader.scrolled "スクロール">
+<!ENTITY zotero.pdfReader.paginated "ページ送り">
 <!ENTITY zotero.pdfReader.zoomIn "拡大表示">
 <!ENTITY zotero.pdfReader.zoomOut "縮小表示">
-<!ENTITY zotero.pdfReader.zoomReset "Reset Zoom">
+<!ENTITY zotero.pdfReader.zoomReset "倍率をリセット">
 <!ENTITY zotero.pdfReader.zoomAuto "自動的にサイズ変更">
 <!ENTITY zotero.pdfReader.zoomPageWidth "ページ幅に合わせる">
 <!ENTITY zotero.pdfReader.zoomPageHeight "ページの高さに合わせる">
-<!ENTITY zotero.pdfReader.splitVertically "Split Vertically">
-<!ENTITY zotero.pdfReader.splitHorizontally "Split Horizontally">
+<!ENTITY zotero.pdfReader.splitVertically "左右に分割">
+<!ENTITY zotero.pdfReader.splitHorizontally "上下に分割">
 <!ENTITY zotero.pdfReader.transferFromPDF "注釈のインポート…">
-<!ENTITY zotero.pdfReader.rotatePageLeft "Rotate Page Left">
-<!ENTITY zotero.pdfReader.rotatePageRight "Rotate Page Right">
+<!ENTITY zotero.pdfReader.rotatePageLeft "ページを左に回転">
+<!ENTITY zotero.pdfReader.rotatePageRight "ページを右に回転">
diff --git a/chrome/locale/ja-JP/zotero/zotero.ftl b/chrome/locale/ja-JP/zotero/zotero.ftl
index fd6ecaa904..4572db7c5a 100644
--- a/chrome/locale/ja-JP/zotero/zotero.ftl
+++ b/chrome/locale/ja-JP/zotero/zotero.ftl
@@ -2,8 +2,8 @@ general-sentence-separator = { "" }
 general-key-control = Control
 general-key-shift = Shift
 general-key-alt = Alt
-general-key-option = Option
-general-key-command = Command
+general-key-option = オプション
+general-key-command = コマンド
 option-or-alt =
     { PLATFORM() ->
         [macos] { general-key-option }
@@ -24,47 +24,57 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = 印刷
-general-remove = Remove
+general-remove = 削除
 general-add = 追加
 general-remind-me-later = 後で通知する
 general-dont-ask-again = 今後このメッセージを表示しない
 general-choose-file = ファイルを選択...
 general-open-settings = 設定を開く
-general-settings = Settings…
+general-settings = 設定…
 general-help = ヘルプ
 general-tag = タグ
-general-got-it = Got It
+general-got-it = 了解
 general-done = 完了
-general-view-troubleshooting-instructions = View Troubleshooting Instructions
-general-go-back = Go Back
-general-accept = Accept
+general-view-troubleshooting-instructions = トラブルシューティングを表示
+general-go-back = 戻る
+general-accept = 承諾
 general-cancel = キャンセル
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = ライブラリの中に表示
-general-restartApp = Restart { -app-name }
+general-restartApp = 再起動 { -app-name }
 general-restartInTroubleshootingMode = トラブルシューティングモードで再起動する
 general-save = 保存
-general-clear = Clear
+general-clear = 消去
+clear-button =
+    .label = { general-clear }
 general-update = 更新
 general-back = 戻る
 general-edit = 編集
-general-cut = Cut
+general-cut = 切り取り
 general-copy = コピー
-general-paste = Paste
+general-paste = 貼り付け
 general-find = 検索
-general-delete = Delete
-general-insert = Insert
+general-delete = 削除
+general-insert = 挿入
 general-and = and
 general-et-al = et al.
-general-previous = Previous
-general-next = Next
+general-previous = 前へ
+general-next = 次へ
 general-learn-more = 詳細情報の表示
 general-more-information = さらに詳しく
 general-warning = 警告
-general-type-to-continue = Type “{ $text }” to continue.
-general-continue = Continue
+general-type-to-continue = 続行するには、 “{ $text }” と入力してください。
+general-continue = 続行
 general-red = 赤
-general-orange = Orange
+general-orange = 橙
 general-yellow = 黄
 general-green = 緑
 general-teal = ティール
@@ -74,67 +84,68 @@ general-magenta = マゼンタ
 general-violet = バイオレット
 general-maroon = マルーン
 general-gray = 灰色
-general-black = Black
+general-black = 黒
 general-loading = 読み込み中…
-citation-style-label = Citation Style:
-language-label = 言語:
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
+citation-style-label = 引用スタイル :
+language-label = 言語 :
 menu-custom-group-submenu =
-    .label = More Options…
+    .label = その他...
 menu-file-show-in-finder =
-    .label = Show in Finder
+    .label = ファインダーで表示
 menu-file-show-file =
-    .label = Show File
+    .label = ファイルの場所を開く
 menu-file-show-files =
-    .label = Show Files
+    .label = ファイルの場所を開く
 menu-print =
     .label = { general-print }
 menu-density =
-    .label = Density
-add-attachment = Add Attachment
+    .label = 項目間の間隔
+add-attachment = 添付ファイルの追加
 new-note = 新しいメモ
 menu-add-by-identifier =
-    .label = Add by Identifier…
+    .label = 識別子によって追加…
 menu-add-attachment =
     .label = { add-attachment }
 menu-add-standalone-file-attachment =
     .label = ファイルを追加…
 menu-add-standalone-linked-file-attachment =
-    .label = Add Link to File…
+    .label = ファイルへのリンクを追加…
 menu-add-child-file-attachment =
-    .label = Attach File…
+    .label = ファイルを添付…
 menu-add-child-linked-file-attachment =
-    .label = Attach Link to File…
+    .label = リンクをファイルに添付...
 menu-add-child-linked-url-attachment =
-    .label = Attach Web Link…
+    .label = Web リンクを添付…
 menu-new-note =
     .label = { new-note }
 menu-new-standalone-note =
-    .label = 新しく独立メモを作成
+    .label = 新しい独立メモの作成
 menu-new-item-note =
-    .label = New Item Note
+    .label = 新しい項目のメモ
 menu-restoreToLibrary =
-    .label = Restore to Library
+    .label = ライブラリへ復元
 menu-deletePermanently =
-    .label = Delete Permanently…
+    .label = 完全削除...
 menu-tools-plugins =
     .label = プラグイン
 menu-view-columns-move-left =
-    .label = Move Column Left
+    .label = 列を左に移動
 menu-view-columns-move-right =
-    .label = Move Column Right
+    .label = 列を右に移動
 menu-view-hide-context-annotation-rows =
-    .label = Hide Non-Matching Annotations
+    .label = 一致しない注釈を隠す
 menu-view-note-font-size =
     .label = メモのフォントサイズ
 menu-view-note-tab-font-size =
-    .label = Note Tab Font Size
+    .label = メモのタブのフォントサイズ
 menu-show-tabs-menu =
-    .label = Show Tabs Menu
+    .label = タブメニューを表示
 menu-edit-copy-annotation =
     .label =
         { $count ->
-            [one] Copy Annotation
-           *[other] Copy { $count } Annotations
+           *[other] { $count } 個の注釈をコピー
         }
 main-window-command =
     .label = ライブラリ
@@ -142,13 +153,13 @@ main-window-key =
     .key = L
 zotero-toolbar-tabs-menu =
     .tooltiptext = List all tabs
-filter-collections = Filter Collections
+filter-collections = コレクションのフィルタリング
 zotero-collections-search =
     .placeholder = { filter-collections }
 zotero-collections-search-btn =
     .tooltiptext = { filter-collections }
 zotero-tabs-menu-filter =
-    .placeholder = タブを検索
+    .placeholder = タブの検索
 zotero-tabs-menu-close-button =
     .title = タブを閉じる
 zotero-toolbar-tabs-scroll-forwards =
@@ -162,14 +173,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = 検索式保存を編集する
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = エクスポート...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = 下へ移動
 item-creator-moveToTop =
@@ -210,7 +317,7 @@ item-menu-change-parent-item =
     .label = Change Parent Item…
 item-menu-relate-items =
     .label = Relate Items
-view-online = View Online
+view-online = オンラインで表示
 item-menu-option-view-online =
     .label = { view-online }
 item-button-view-online =
@@ -232,28 +339,28 @@ import-online-intro-title = 案内
 import-source-file =
     .label = 単一ファイル (BibTeX, RIS, Zotero RDF, など.)
 import-source-folder =
-    .label = A folder of PDFs or other files
+    .label = PDF やその他のファイルのフォルダー
 import-source-online =
     .label = { $targetApp } online import
 import-options = オプション
 import-importing = インポート中...
 import-create-collection =
-    .label = インポートされたコレクションやアイテムを新しいコレクションに格納する
+    .label = インポートされたコレクションや項目を新しいコレクションに格納する
 import-recreate-structure =
     .label = Recreate folder structure as collections
 import-fileTypes-header = File Types to Import:
 import-fileTypes-pdf =
-    .label = PDFs
+    .label = PDF
 import-fileTypes-other =
     .placeholder = Other files by pattern, comma-separated (e.g., *.jpg,*.png)
-import-file-handling = File Handling
+import-file-handling = ファイル処理
 import-file-handling-store =
     .label = Copy files to the { -app-name } storage folder
 import-file-handling-link =
     .label = Link to files in original location
 import-fileHandling-description = Linked files cannot be synced by { -app-name }.
 import-online-new =
-    .label = Download new items only; don’t update previously imported items
+    .label = 新しい項目のみをダウンロードします。以前にインポートした項目は更新しません。
 import-mendeley-username = ユーザー名
 import-mendeley-password = パスワード
 general-error = エラー
@@ -282,6 +389,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -292,7 +400,7 @@ items-column-added-by = Added By
 items-column-modified-by = Modified By
 items-column-last-read = Last Read
 report-error =
-    .label = Report Error…
+    .label = エラーを報告...
 rtfScan-wizard =
     .title = RTF スキャン
 rtfScan-introPage-description = { -app-name } can automatically extract and reformat citations and insert a bibliography into RTF files. It currently supports citations in variations of the following formats:
@@ -307,12 +415,12 @@ rtfScan-choose-output-file =
     .label = { general-choose-file }
     .aria-label = Choose Output File
 rtfScan-intro-page = 案内
-rtfScan-scan-page = Scanning for Citations
+rtfScan-scan-page = 引用文献をスキャンしています
 rtfScan-scanPage-description = { -app-name } is scanning your document for citations. Please be patient.
-rtfScan-citations-page = 引用されたアイテムを検証する
+rtfScan-citations-page = 引用された項目を検証する
 rtfScan-citations-page-description = Please review the list of recognized citations below to ensure that { -app-name } has selected the corresponding items correctly. Any unmapped or ambiguous citations must be resolved before proceeding to the next step.
 rtfScan-style-page = 文書の書式設定
-rtfScan-format-page = Formatting Citations
+rtfScan-format-page = 引用文献の書式設定
 rtfScan-format-page-description = { -app-name } is processing and formatting your RTF file. Please be patient.
 rtfScan-complete-page = RTF スキャンが完了しました
 rtfScan-complete-page-description = あなたの文書はスキャンされ処理が完了しました。正しく整形されていることを確認してください。
@@ -321,8 +429,8 @@ rtfScan-action-find-match =
 rtfScan-action-accept-match =
     .title = Accept this match
 runJS-title = Run JavaScript
-runJS-editor-label = Code:
-runJS-run = Run
+runJS-editor-label = コード :
+runJS-run = 実行
 runJS-help = { general-help }
 runJS-completed = completed successfully
 runJS-result =
@@ -337,7 +445,7 @@ bibliography-style-label = { citation-style-label }
 bibliography-locale-label = { language-label }
 bibliography-displayAs-label = Display citations as:
 bibliography-advancedOptions-label = 高度なオプション
-bibliography-outputMode-label = Output Mode:
+bibliography-outputMode-label = 出力モード :
 bibliography-outputMode-citations =
     .label =
         { $type ->
@@ -346,8 +454,8 @@ bibliography-outputMode-citations =
            *[other] Citations
         }
 bibliography-outputMode-bibliography =
-    .label = Bibliography
-bibliography-outputMethod-label = Output Method:
+    .label = 参考文献
+bibliography-outputMethod-label = 出力方法 :
 bibliography-outputMethod-saveAsRTF =
     .label = RTF として保存
 bibliography-outputMethod-saveAsHTML =
@@ -356,7 +464,7 @@ bibliography-outputMethod-copyToClipboard =
     .label = クリップボードにコピー
 bibliography-outputMethod-print =
     .label = 印刷
-bibliography-manageStyles-label = Manage Styles…
+bibliography-manageStyles-label = スタイルの管理...
 styleEditor-locatorType =
     .aria-label = Locator type
 styleEditor-locatorInput = Locator input
@@ -365,9 +473,9 @@ styleEditor-locale = { language-label }
 styleEditor-editor =
     .aria-label = Style editor
 styleEditor-preview =
-    .aria-label = Preview
+    .aria-label = プレビュー
 publications-intro-page = 私の出版物
-publications-intro = 「私の出版物」に追加したアイテムは、zotero.org のプロフィールページに表示されます。添付ファイルを含めることを選択した場合、それらは指定したライセンスの下で公開されます。あなた自身が作成した著作物のみを加えてください。また、配布を希望し、かつ配布する権利を持つファイルのみを含めてください。
+publications-intro = 「私の出版物」に追加した項目は、zotero.org のプロフィールページに表示されます。添付ファイルを含めることを選択した場合、それらは指定したライセンスの下で公開されます。あなた自身が作成した著作物のみを加えてください。また、配布を希望し、かつ配布する権利を持つファイルのみを含めてください。
 publications-include-checkbox-files =
     .label = ファイルを含める
 publications-include-checkbox-notes =
@@ -404,11 +512,11 @@ publications-choose-license-sharealike =
     .accesskey = S
 publications-choose-license-commercial-prompt = あなたの著作物の商用利用を許可しますか？
 publications-buttons-add-to-my-publications =
-    .label = Add to My Publications
+    .label = 「私の出版物」へ追加
 publications-buttons-next-sharing =
     .label = Next: Sharing
 publications-buttons-next-choose-license =
-    .label = Choose a License
+    .label = ライセンスの選択
 licenses-cc-0 = CC0 1.0 Universal Public Domain Dedication
 licenses-cc-by = Creative Commons Attribution 4.0 International License
 licenses-cc-by-nd = Creative Commons Attribution-NoDerivatives 4.0 International License
@@ -425,7 +533,7 @@ restart-in-troubleshooting-mode-menuitem =
 restart-in-troubleshooting-mode-dialog-title = { general-restartInTroubleshootingMode }
 restart-in-troubleshooting-mode-dialog-description = { -app-name } will restart with all plugins disabled. Some features may not function correctly while Troubleshooting Mode is enabled.
 menu-ui-density =
-    .label = Density
+    .label = 項目間の間隔
 menu-ui-density-comfortable =
     .label = Comfortable
 menu-ui-density-compact =
@@ -438,12 +546,12 @@ pane-notes = メモ
 pane-note-info = Note Info
 pane-libraries-collections = Libraries and Collections
 pane-tags = タグ
-pane-related = 関連アイテム
+pane-related = 関連項目
 pane-attachment-info = Attachment Info
-pane-attachment-preview = Preview
+pane-attachment-preview = プレビュー
 pane-attachment-annotations = 注釈
 pane-header-attachment-associated =
-    .label = Rename associated file
+    .label = 関連ファイル名を変更
 item-details-pane =
     .aria-label = { pane-item-details }
 section-info =
@@ -536,7 +644,7 @@ sidenav-reorder-reset =
 toggle-item-pane =
     .tooltiptext = Toggle Item Pane
 toggle-context-pane =
-    .tooltiptext = Toggle Context Pane
+    .tooltiptext = コンテキストパネルの切り替え
 pin-section =
     .label = Pin Section
 unpin-section =
@@ -563,16 +671,16 @@ toolbar-new-collection =
 new-collection-dialog =
     .title = 新規コレクション
     .buttonlabelaccept = Create Collection
-new-collection-name = Name:
+new-collection-name = 名前 :
 new-collection-create-in = Create in:
 show-publications-menuitem =
     .label = Show My Publications
-attachment-info-title = Title
+attachment-info-title = タイトル
 attachment-info-filename = ファイル名
 attachment-info-accessed = アクセス日時
 attachment-info-pages = ページ
 attachment-info-modified = 更新日時
-attachment-info-index = 索引済のアイテム
+attachment-info-index = 索引済の項目
 attachment-info-convert-note =
     .label =
         Migrate to { $type ->
@@ -583,7 +691,7 @@ attachment-info-convert-note =
     .tooltiptext = Adding notes to attachments is no longer supported, but you can edit this note by migrating it to a separate note.
 section-note-info =
     .label = { pane-note-info }
-note-info-title = Title
+note-info-title = タイトル
 note-info-parent-item = Parent Item
 note-info-parent-item-button =
     { $hasParentItem ->
@@ -604,7 +712,7 @@ item-title-empty-note = 無題のメモ
 attachment-preview-placeholder = No attachment to preview
 attachment-rename-from-parent =
     .tooltiptext = Rename File to Match Parent Item
-account-log-in = Log In
+account-log-in = ログイン
 account-not-logged-in-text = Log in to your Zotero account to sync your data.
 account-error-login-session-expired = Your login session has expired. Please try again.
 toggle-preview =
@@ -618,21 +726,33 @@ annotation-image-not-available = [Image not available]
 quicksearch-mode =
     .aria-label = Quick Search mode
 quicksearch-input =
-    .aria-label = Quick Search
+    .aria-label = クイック検索
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = 高度な検索
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
     .label = なし
 item-pane-header-title =
-    .label = Title
+    .label = タイトル
 item-pane-header-titleCreatorYear =
-    .label = Title, Creator, Year
+    .label = タイトル、著者、年
 item-pane-header-bibEntry =
     .label = Bibliography Entry
 item-pane-header-more-options =
-    .label = More Options
+    .label = その他
 item-pane-message-items-selected =
     { $count ->
         [0] No items selected
@@ -680,9 +800,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = 検索
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = 注釈
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -690,16 +865,22 @@ advanced-search-operators-menu =
     .aria-label = Operator
     .label = { $label }
 advanced-search-condition-input =
-    .aria-label = Value
+    .aria-label = 値
     .label = { $label }
-search-conditions-tooltip-fields = フィールド:
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
+search-conditions-tooltip-fields = フィールド :
 search-conditions-collection = コレクション
 search-conditions-savedSearch = 保存済み検索条件
-search-conditions-itemTypeID = アイテムの種類
+search-conditions-itemTypeID = 項目の種類
 search-conditions-tag = タグ
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = メモ
-search-conditions-childNote = 子ノート
-search-conditions-creator = 編著者名
+search-conditions-childNote = 子メモ
+search-conditions-creator = 著者
 search-conditions-thesisType = 学位論文の種類
 search-conditions-reportType = レポートの種類
 search-conditions-videoRecordingFormat = ビデオフォーマット
@@ -715,19 +896,35 @@ search-conditions-dateModified = 変更日
 search-conditions-fulltextContent = 添付ファイルの内容
 search-conditions-programmingLanguage = プログラミング言語
 search-conditions-fileTypeID = 添付ファイルの種類
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = 注釈の文字
 search-conditions-annotationComment = 注釈のコメント
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = タイトル、著者、年
+search-conditions-submenu-attachment = 添付ファイル
+search-conditions-submenu-annotation = 注釈
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = ファイルの種類
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = 種類
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = 著者
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
        *[other] { $count } files added
     }
 select-items-window =
-    .title = アイテムを選択
+    .title = 項目を選択
 select-items-dialog =
-    .buttonlabelaccept = Select
+    .buttonlabelaccept = 選択
 select-items-convertToStandalone =
     .label = Convert to Standalone
 select-items-convertToStandaloneAttachment =
@@ -742,7 +939,7 @@ select-items-convertToStandaloneNote =
             [one] Convert to Standalone Note
            *[other] Convert to Standalone Notes
         }
-file-type-webpage = Webpage
+file-type-webpage = ウェブページ
 file-type-image = 画像
 file-type-pdf = PDF
 file-type-audio = オーディオ
@@ -750,6 +947,9 @@ file-type-video = ビデオ
 file-type-presentation = プレゼンテーション
 file-type-document = 文書
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +958,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = インストール
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +993,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = 検索実行
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = 保存
+save-search-name-title = 検索条件を保存
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = メモを編集
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = 項目の種類を変更
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 14c973384c..0ef04a80f8 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -4,26 +4,26 @@ general.warning=警告
 general.dontShowWarningAgain=次回からこの警告を表示しない。
 general.dontShowAgainFor=この警告を今日と %1$S 日間は表示しない。
 general.browserIsOffline=%S は現在オフラインモードに入っています。
-general.locate=所在確認...
+general.locate=出典の確認...
 general.restartRequired=再起動してください。
 general.restartRequiredForChange=変更を適用するために %S を再起動してください。
 general.restartRequiredForChanges=変更を適用するために %S を再起動してください。
-general.restartNow=今すぐ再起動する
-general.restartLater=後で再起動する
-general.restartApp=%S を再起動する
-general.quitApp=%S を終了する
+general.restartNow=今すぐ再起動
+general.restartLater=後で再起動
+general.restartApp=%S を再起動
+general.quitApp=%S を終了
 general.errorHasOccurred=エラーが発生しました。
-general.unknownErrorOccurred=不明のエラーが発生しました。
+general.unknownErrorOccurred=不明なエラーが発生しました。
 general.invalidResponseServer=サーバーからの応答が無効です。
-general.tryAgainLater=Please try again in a few minutes.
-general.serverError=The server returned an error. Please try again.
+general.tryAgainLater=数分後にもう一度試してください。
+general.serverError=サーバーがエラーを返しました。もう一度試してください。
 general.pleaseRestart=%S を再起動してください。
 general.pleaseRestartAndTryAgain=%S を再起動してから、もう一度試してください。
-general.checkForUpdate=更新を確認する
-general.checkForUpdates=Check for Updates
+general.checkForUpdate=更新の確認
+general.checkForUpdates=更新の確認
 general.actionCannotBeUndone=この操作を実行すると、元に戻すことができません。
-general.install=インストールする
-general.updateAvailable=更新が公開されています
+general.install=インストール
+general.updateAvailable=更新が利用可能です
 general.downloading=%S をダウンロードしています…
 general.downloading.quoted=”%S” をダウンロードしています…
 general.noUpdatesFound=更新は見つかりませんでした。
@@ -42,56 +42,56 @@ general.permissionDenied=権限が拒否されました。
 general.character.singular=文字
 general.character.plural=文字
 general.create=作成
-general.delete=削除する
-general.remove=取り除く
+general.delete=削除
+general.remove=削除
 general.import=インポート
 general.export=エクスポート
 general.update=更新
-general.moreInformation=さらに詳しく
-general.learnMore=詳細情報の表示
-general.seeForMoreInformation=さらに詳しくは、%S を調べてみてください。
+general.moreInformation=詳細
+general.learnMore=詳細情報
+general.seeForMoreInformation=詳細は、%S を調べてみてください。
 general.open=%S を開く
 general.close=閉じる
 general.enable=有効化
 general.disable=無効化
 general.reset=リセット
 general.hide=隠す
-general.quit=終了する
+general.quit=終了
 general.useDefault=既定値を使用
 general.openDocumentation=ヘルプを開く
 general.numMore=さらに %S 個...
-general.openPreferences=環境設定を開く
+general.openPreferences=環境設定
 general.keys.ctrlShift=Ctrl+Shift+
 general.keys.cmdShift=Cmd+Shift+
-general.dontShowAgain=Don’t Show Again
+general.dontShowAgain=今後このメッセージを表示しない
 general.dontAskAgain=今後このメッセージを表示しない
 general.remindMeLater=後で通知する
-general.fix=Fix…
-general.tryAgain=もう一度試す
+general.fix=修復...
+general.tryAgain=再試行
 general.tryLater=後で試す
-general.showDirectory=フォルダを表示する
-general.showInLibrary=Show in Library
-general.continue=続ける
-general.skip=Skip
+general.showDirectory=ディレクトリを表示
+general.showInLibrary=ライブラリに表示
+general.continue=続行
+general.skip=スキップ
 general.copy=コピー
 general.copyToClipboard=クリップボードにコピー
 general.cancel=キャンセル
-general.clear=Clear
+general.clear=消去
 general.processing=処理中
 general.finished=完了
 general.submitted=送信済み
 general.thanksForHelpingImprove=%S の改善にご協力いただき、ありがとうございます。
-general.describeProblem=問題を簡単に説明してください:
+general.describeProblem=問題点を簡潔に説明してください :
 general.nMegabytes=%S MB
-general.item=アイテム
+general.item=項目
 general.back=戻る
 general.languages=言語
 general.default=既定値
 general.custom=カスタム
 general.loading=読み込み中…
 general.richText=リッチ テキスト
-general.clearSelection=Clear Selection
-general.insert=Insert
+general.clearSelection=選択解除
+general.insert=挿入
 general.username=ユーザー名
 general.password=パスワード
 general.print=印刷
@@ -99,7 +99,7 @@ general.save=保存
 general.edit=編集
 
 general.red=赤
-general.orange=Orange
+general.orange=橙
 general.yellow=黄
 general.green=緑
 general.teal=ティール
@@ -109,31 +109,31 @@ general.magenta=マゼンタ
 general.violet=バイオレット
 general.maroon=マルーン
 general.gray=灰色
-general.black=Black
+general.black=黒
 
 general.operationInProgress=既に Zotero 処理が進行中です。
 general.operationInProgress.waitUntilFinished=完了するまでお待ちください。
 general.operationInProgress.waitUntilFinishedAndTryAgain=完了してから、もう一度試してください。
 
 networkError.connectionNotSecure=安全ではない接続
-networkError.insecureConnectionTo=%1$S could not make a secure connection to %2$S.
+networkError.insecureConnectionTo=%1$S は %2$S への安全な接続を確立できませんでした。
 networkError.errorViaProxy=プロキシサーバー経由での接続中にエラーが発生しました
 networkError.connectionMonitored=接続が監視されている可能性があり、%S は中間サーバーを信頼するように構成されていません。
 
 about.createdBy=%1$S は %2$S のプロジェクトであり、[グローバル・コミュニティ] によって開発されています。
 about.openSource=%S は [オープンソースソフトウェア] であり、多くの [優れたオープンソースプロジェクト] に依存しています。
-about.getInvolved=協力したいですか？ 今日から[参加しましょう]！
+about.getInvolved=参加してみませんか？ 今すぐ [参加]！
 
 punctuation.openingQMark="
 punctuation.closingQMark="
 punctuation.colon=:
-punctuation.colon.withString=%S:
+punctuation.colon.withString=%S :
 punctuation.ellipsis=…
 punctuation.comma=,
 
-install.quickStartGuide=Zotero かんたん操作案内
+install.quickStartGuide=Zotero クイックスタートガイド
 install.quickStartGuide.message.welcome=Zotero にようこそ！
-install.quickStartGuide.message.view=研究資料を収集、管理、引用そして共有する方法を学ぶために「かんたん操作案内」をご覧ください。
+install.quickStartGuide.message.view=研究資料を収集、管理、引用そして共有する方法を学ぶために「Zotero クイックスタートガイド」をご覧ください。
 install.quickStartGuide.message.thanks=Zotero をインストールして頂きありがとうございました。
 
 upgrade.status=データベースの更新中...
@@ -146,82 +146,82 @@ upgrade.loadDBRepairTool=データベース修復ツールを読み込む。
 upgrade.couldNotMigrate=Zotero は必要なファイルの完全な移行ができませんでした。\nもう一度更新を試みるためには、すべての添付ファイルを閉じて %S を再起動してください。
 upgrade.couldNotMigrate.restart=もし、この案内が繰り返し表示される場合は、コンピュータを再起動してください。
 upgrade.nonupgradeableDB1=Zotero はこのバージョンの Zotero で動作するように更新できない、古いデータベースを見つけました。
-upgrade.nonupgradeableDB2=To continue, upgrade your database using Zotero %S first or delete your Zotero data directory to start with a new database.
+upgrade.nonupgradeableDB2=続行するには、まず Zotero %S を使用してデータベースを更新するか、Zotero データディレクトリを削除して新しいデータベースで開始してください。
 
-errorReport.reportError=エラーを報告する...
-errorReport.reportErrors=エラーを報告する...
+errorReport.reportError=エラー報告...
+errorReport.reportErrors=エラー報告...
 errorReport.reportInstructions=ヘルプメニューから ”％S” を選択すると、このエラーを報告できます。
 errorReport.followingReportWillBeSubmitted=下記の報告が送信されます。
 errorReport.noErrorsLogged=%S が起動してからエラーは記録されていません。
 errorReport.advanceMessage=Zotero 開発者へ報告するためには %S を押してください。
-errorReport.stepsToReproduce=再現手順:
-errorReport.expectedResult=期待される結果:
-errorReport.actualResult=実際の結果:
+errorReport.stepsToReproduce=再現手順 :
+errorReport.expectedResult=期待される結果 :
+errorReport.actualResult=実際の結果 :
 errorReport.noNetworkConnection=ネットワークへ接続していません
 errorReport.invalidResponseRepository=レポジトリからの応答が不正です
 errorReport.repoCannotBeContacted=レポジトリに接続することができません。
 
 
-attachmentBasePath.selectDir=基本ディレクトリを選択して下さい。
-attachmentBasePath.chooseNewPath.title=新しい基本ディレクトリを確認して下さい。
+attachmentBasePath.selectDir=ベースディレクトリを選択して下さい。
+attachmentBasePath.chooseNewPath.title=新しいベースディレクトリを確認して下さい。
 attachmentBasePath.chooseNewPath.message=このディレクトリ以下のリンク付き添付ファイルは、相対パスを用いて保存されます。
-attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
-attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
-attachmentBasePath.chooseNewPath.button=基本ディレクトリの設定を変更
+attachmentBasePath.chooseNewPath.existingAttachments.singular=１個の添付ファイルが新しいベースディレクトリ内に見つかりました。
+attachmentBasePath.chooseNewPath.existingAttachments.plural=%S 個の添付ファイルが新しいベースディレクトリ内に見つかりました。
+attachmentBasePath.chooseNewPath.button=ベースディレクトの設定を変更
 attachmentBasePath.clearBasePath.title=絶対パスに戻す
 attachmentBasePath.clearBasePath.message=新しいリンク付き添付ファイルは絶対パスを用いて保存されます。
-attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
-attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
+attachmentBasePath.clearBasePath.existingAttachments.singular=古いベースディレクトリ内の１個の添付ファイルは、絶対パスを使用するように変換されます。
+attachmentBasePath.clearBasePath.existingAttachments.plural=古いベースディレクトリ内の %S 個の添付ファイルは、絶対パスを使用するように変換されます。
 attachmentBasePath.clearBasePath.button=基本ディレクトリの設定を消去
 
-dataDir.dirCannotBeCreated=The %S data directory (%S) cannot be created.
-dataDir.checkDirWriteAccess=Make sure you have write access to this directory and that security software isn’t preventing %S from writing to the disk.
+dataDir.dirCannotBeCreated=%S データディレクトリ (%S) を作ることができません。
+dataDir.checkDirWriteAccess=このディレクトリに書き込み権限があること、セキュリティ ソフトウェアが %S によるディスクへの書き込みを妨げていないことを確認してください。
 dataDir.databaseCannotBeOpened=%S データベースを開くことができません。
-dataDir.checkPermissions=Make sure you have read and write permissions for all files in the %1$S data directory and that security software isn’t preventing %1$S from accessing that directory.
-dataDir.moveToDefaultLocation=You may be able to fix this problem by moving the data directory to the new default location in your home directory. %S will automatically detect the new location.
-dataDir.location=Data Directory: %S
-dataDir.notFound=%S データ保存フォルダが見つかりません。
-dataDir.notFound.defaultFound=The %S data directory could not be found at %S, but a data directory was found at %S. Use this directory instead?
+dataDir.checkPermissions=%1$S データディレクトリ内のすべてのファイルに読み取り権限と書き込み権限があり、セキュリティ ソフトウェアによって %1$S がそのディレクトリへのアクセスを妨げていないことを確認してください。
+dataDir.moveToDefaultLocation=この問題はデータディレクトリをホームディレクトリの中の新しい既定の場所へ移動することで解決できるかもしれません。%S は新しい場所を自動的に検出します。
+dataDir.location=データディレクトリ : %S
+dataDir.notFound=%S データディレクトリが見つかりません。
+dataDir.notFound.defaultFound=%S データディレクトリが %S に見つかりませんが、%S に別のデータディレクトリが見つかりました。こちらのディレクトリを代わりに使用しますか？
 dataDir.useNewLocation=新しい場所を使用
-dataDir.previousDir=前のフォルダ:
-dataDir.default=Default (%S)
-dataDir.useDefaultLocation=Use Default Location
-dataDir.selectDir=Zotero のデータ保存フォルダを選択してください
-dataDir.selectNewDir=Select a new %S data directory
-dataDir.changeDataDirectory=Change Data Directory…
-dataDir.chooseNewDataDirectory=Choose New Data Directory…
-dataDir.cannotBeSetWithAlternative=The data directory cannot be set to a “%S” directory. Did you mean %S?
-dataDir.cannotBeLinkedAttachmentBaseDirectory=The data directory cannot be set to the same location as the Linked Attachment Base Directory.
-dataDir.unsafeLocation.selected.cloud=Storing the data directory in a cloud storage folder is very likely to corrupt your database.
+dataDir.previousDir=前のディレクトリ :
+dataDir.default=既定 (%S)
+dataDir.useDefaultLocation=既定の場所を使用する
+dataDir.selectDir=Zotero のデータディレクトリを選択
+dataDir.selectNewDir=新しい %S データディレクトリの選択
+dataDir.changeDataDirectory=データディレクトリの変更…
+dataDir.chooseNewDataDirectory=新しいデータディレクトリの選択…
+dataDir.cannotBeSetWithAlternative=データディレクトリを "%S " ディレクトリに設定することはできません。%S であっていますか？
+dataDir.cannotBeLinkedAttachmentBaseDirectory=データディレクトリを「リンク付き添付ファイルのベースディレクトリ」と同じ場所に設定することはできません。
+dataDir.unsafeLocation.selected.cloud=データディレクトリをクラウドストレージのフォルダに保存すると、データベースが破損する可能性が非常に高くなります。
 dataDir.unsafeLocation.selected.areYouSure=この保存先で本当に良いですか？
-dataDir.unsafeLocation.existing.cloud=Your %S data directory appears to be within a cloud storage folder, which is very likely to corrupt your database.
+dataDir.unsafeLocation.existing.cloud=あなたのデータディレクトリ %S はクラウドストレージのフォルダ内にあるようです。これにより、データベースが破損する可能性が非常に高くなります。
 dataDir.unsafeLocation.existing.chooseDifferent=他の場所を選びますか？
-dataDir.selectedDirNonEmpty.title=選択されたフォルダは空ではありません
-dataDir.selectedDirNonEmpty.text=The directory you selected is not empty and does not appear to be a Zotero data directory.\n\nCreate Zotero files in this directory anyway?
-dataDir.mustSelectEmpty.title=Directory Not Empty
-dataDir.mustSelectEmpty.text=The directory you selected is not empty. You must select an empty directory to continue.
-dataDir.selectedDirEmpty.title=Directory Empty
-dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually move files from the existing data directory to the new location after %1$S has closed.
+dataDir.selectedDirNonEmpty.title=選択されたディレクトリは空ではありません
+dataDir.selectedDirNonEmpty.text=選択されたディレクトリは空ではなく、Zotero のデータディレクトリではないようです。\n\nこのディレクトリに Zotero のファイルを作成してよろしいですか？
+dataDir.mustSelectEmpty.title=選択されたディレクトリは空ではありません
+dataDir.mustSelectEmpty.text=選択されたディレクトリは空ではありません。空のディレクトリを選択してから続けて下さい。
+dataDir.selectedDirEmpty.title=空のディレクトリ
+dataDir.selectedDirEmpty.text=選択したディレクトリは空です。既存の Zotero データディレクトリを移動するには、%1$S を終了した後、既存のデータディレクトリから新しい場所にファイルを手動で移動する必要があります。
 dataDir.selectedDirEmpty.useNewDir=新しいディレクトリを使用しますか？
-dataDir.moveFilesToNewLocation=%1$S を再起動する前に、必ず既存の Zotero データ保存フォルダから新しい場所へファイルを移動しておいてください。
+dataDir.moveFilesToNewLocation=%1$S を再起動する前に、必ず既存の Zotero データディレクトリから新しい場所へファイルを移動しておいてください。
 dataDir.incompatibleDbVersion.title=互換性のないデータベースのバージョン
-dataDir.incompatibleDbVersion.text=The selected data directory is too old to be used with this version of %S. Please first upgrade the data directory using Zotero 4.0 or select a different directory.
-dataDir.migration.inProgress=Data directory migration in progress…
-dataDir.migration.failure.title=Data Directory Migration Error
-dataDir.migration.failure.partial.automatic.text=%1$S attempted to move your data directory to a new default location, but some files could not be transferred. Close any open attachment files and try again. You can also quit %2$S and attempt to move the remaining files manually.
-dataDir.migration.failure.partial.manual.text=Some files in your %1$S data directory could not be transferred to the new location. Close any open attachment files and try again. You can also quit %2$S and attempt to move the remaining files manually.
-dataDir.migration.failure.partial.old=Old directory: %S
-dataDir.migration.failure.partial.new=New directory: %S
-dataDir.migration.failure.partial.showDirectoriesAndQuit=Show Directories and Quit
-dataDir.migration.failure.full.automatic.text1=%S attempted to move your data directory to a new default location, but the migration could not be completed.
-dataDir.migration.failure.full.automatic.text2=It is recommended that you close %S and move your data directory manually.
-dataDir.migration.failure.full.automatic.newDirOnDifferentDrive=%S attempted to move your data directory to a new default location, but the old directory is on a different drive and cannot be migrated automatically.
-dataDir.migration.failure.full.manual.text1=Your %S data directory could not be migrated.
-dataDir.migration.failure.full.manual.text2=It is recommended that you close %S and manually move your data directory to the new default location.
-dataDir.migration.failure.full.firefoxOpen=Your data directory cannot be migrated while Zotero for Firefox is open. Please close Firefox and try again.
-dataDir.migration.failure.full.current=Current location: %S
-dataDir.migration.failure.full.recommended=Recommended location: %S
-dataDir.migration.failure.full.showCurrentDirectoryAndQuit=Show Current Directory and Quit
+dataDir.incompatibleDbVersion.text=選択したデータディレクトリは古すぎるため、このバージョンの %S では使用できません。まず Zotero 4.0 を使用してデータディレクトリをアップグレードするか、別のディレクトリを選択してください。
+dataDir.migration.inProgress=データ ディレクトリの移行が進行中…
+dataDir.migration.failure.title=データディレクトリの移行エラー
+dataDir.migration.failure.partial.automatic.text=%1$S はデータディレクトリを新しいデフォルトの場所に移動しようとしましたが、一部のファイルを転送できませんでした。開いている添付ファイルをすべて閉じて、もう一度試してください。%2$S を終了して、残りのファイルを手動で移動することもできます。
+dataDir.migration.failure.partial.manual.text=%1$S データディレクトリ内の一部のファイルを新しい場所に転送できませんでした。開いている添付ファイルをすべて閉じて、もう一度試してください。%2$S を終了して、残りのファイルを手動で移動することもできます。
+dataDir.migration.failure.partial.old=古いディレクトリ : %S
+dataDir.migration.failure.partial.new=新しいディレクトリ : %S
+dataDir.migration.failure.partial.showDirectoriesAndQuit=ディレクトリの表示と終了
+dataDir.migration.failure.full.automatic.text1=%S はデータ ディレクトリを新しいデフォルトの場所に移動しようとしましたが、移行を完了できませんでした。
+dataDir.migration.failure.full.automatic.text2=%S を閉じて、データ ディレクトリを手動で移動することをお勧めします。
+dataDir.migration.failure.full.automatic.newDirOnDifferentDrive=%S はデータ ディレクトリを新しいデフォルトの場所に移動しようとしましたが、古いディレクトリは別のドライブ上にあるため、自動的に移行できません。
+dataDir.migration.failure.full.manual.text1=%S データ ディレクトリを移行できませんでした。
+dataDir.migration.failure.full.manual.text2=%S を閉じて、データ ディレクトリを手動で新しいデフォルトの場所に移動することをお勧めします。
+dataDir.migration.failure.full.firefoxOpen=Firefox版 Zotero が開いている間はデータディレクトリを移行できません。Firefoxを閉じてもう一度試してください。
+dataDir.migration.failure.full.current=現在の場所 : %S
+dataDir.migration.failure.full.recommended=推奨される場所 : %S
+dataDir.migration.failure.full.showCurrentDirectoryAndQuit=現在のディレクトリの表示と終了
 
 app.standalone=スタンドアローン版 Zotero
 app.firefox=Firefox 版 Zotero
@@ -230,13 +230,13 @@ startupError=%S の開始中にエラーが発生しました。
 startupError.databaseInUse=あなたの Zotero データベースは現在使用中です。同一のデータベースを利用する Zotero のインスタンスは、一度に一つしか開くことができません。
 startupError.zoteroVersionIsOlder=このバージョンの Zotero は、最後にあなたのデータベースを使用した Zotero よりも古いバージョンです。
 startupError.incompatibleDBVersion=この %1$S データベースは %1$S %2$S 以降 を必要とします。
-startupError.zoteroVersionIsOlder.current=現在のバージョン: %S
-startupError.zoteroVersionIsOlder.upgrade=%S から最新ヴァージョンに更新してください。.
+startupError.zoteroVersionIsOlder.current=現在のバージョン : %S
+startupError.zoteroVersionIsOlder.upgrade=%S から最新バージョンに更新してください。.
 startupError.databaseUpgradeError=データベース更新のエラー
 startupError.internetFunctionalityMayNotWork=インターネット接続に依存する機能が動作しない場合があります。
-startupError.bundledFileUpdateError=%S was unable to load translators and styles.
-startupError.startedFromDiskImage1=%S was started from a disk image, which can break some functionality.
-startupError.startedFromDiskImage2=To install %1$S properly, quit the program, open the disk image you downloaded, and drag “%1$S” to the alias of the Applications folder shown in the window. Then eject the disk image and launch Zotero by opening it from your Applications folder.
+startupError.bundledFileUpdateError=%S はトランスレータとスタイルを読み込めませんでした。
+startupError.startedFromDiskImage1=%S はディスク イメージから起動されましたが、一部の機能が動作しなくなる可能性があります。
+startupError.startedFromDiskImage2=%1$S を正しくインストールするには、プログラムを終了し、ダウンロードしたディスクイメージを開き、"%1$S" をウィンドウに表示されているアプリケーションフォルダのエイリアスにドラッグしてください。その後、ディスクイメージを取り出し、アプリケーションフォルダーから Zotero を開いて起動してください。
 
 date.relative.secondsAgo.one=1 秒前
 date.relative.secondsAgo.multiple=%S 秒前
@@ -250,129 +250,107 @@ date.relative.yearsAgo.one=1 年前
 date.relative.yearsAgo.multiple=%S 年前
 
 pane.collections.title=コレクション
-pane.collections.delete.title=コレクションを削除する
-pane.collections.delete=本当に選択されたコレクションを削除してもよろしいですか？
-pane.collections.delete.keepItems=このコレクション内の各アイテムは削除されません。
-pane.collections.deleteWithItems.title=コレクションとアイテムを削除する
-pane.collections.deleteWithItems=本当に選択されたコレクションとその中に含まれる全アイテムをゴミ箱に入れてもよろしいですか。
-pane.feed.deleteWithItems.title=Unsubscribe
-pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
+pane.feed.deleteWithItems.title=登録解除
+pane.feed.deleteWithItems=このフィードの登録を解除しますか？
 
-pane.collections.deleteSearch.title=検索条件を削除する
-pane.collections.deleteSearch=選択された検索条件を削除してもよろしいですか？
-pane.collections.emptyTrash=ゴミ箱の中にあるアイテムをを永久に削除してもよいですか？
+pane.collections.emptyTrash=ごみ箱の中にある項目をを永久に削除しますか？
 pane.collections.newSavedSeach=新規検索条件の保存
-pane.collections.savedSearchName=この検索条件に名をつけて保存してください:
-pane.collections.library=マイ・ライブラリ
+pane.collections.savedSearchName=この検索条件に名をつけて保存 :
+pane.collections.library=マイライブラリ
 pane.collections.publications=私の出版物
 pane.collections.feeds=フィード
-pane.collections.libraryAndFeeds=My Library & Feeds
+pane.collections.libraryAndFeeds=マイライブラリとフィード
 pane.collections.groupLibraries=グループのライブラリ
 pane.collections.feedLibraries=フィード
-pane.collections.trash=ゴミ箱
+pane.collections.trash=ごみ箱
 pane.collections.untitled=無題
-pane.collections.unfiled=未整理のアイテム
-pane.collections.retracted=取り消し済みのアイテム
-pane.collections.duplicate=重複アイテム
-pane.collections.removeLibrary=Remove Library
-pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
+pane.collections.unfiled=未整理の項目
+pane.collections.retracted=取り消し済みの項目
+pane.collections.duplicate=重複項目
+pane.collections.removeLibrary=ライブラリを削除
+pane.collections.removeLibrary.text="%S" をこのコンピューターから完全に削除しますか？
 
-pane.collections.menu.duplicate.savedSearch=保存済み検索条件を複製
-pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=コレクションを削除する...
-pane.collections.menu.delete.collectionAndItems=コレクションとアイテムを削除する...
-pane.collections.menu.delete.savedSearch=保存済み検索条件を削除する...
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=コレクションをエクスポート...
-pane.collections.menu.export.savedSearch=保存済み検索条件をエクスポート...
-pane.collections.menu.export.feed=フィードのエクスポート...
-pane.collections.menu.createBib.collection=コレクションから参考文献目録を作成する...
-pane.collections.menu.createBib.savedSearch=保存済み検索条件から参考文献目録を作成する...
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
-pane.collections.showCollectionInLibrary=Show Collection in Library
+pane.collections.menu.remove.library=ライブラリを削除...
+pane.collections.showCollectionInLibrary=ライブラリのコレクションを表示
 
-pane.collections.menu.generateReport.collection=コレクションからレポートを作成...
-pane.collections.menu.generateReport.savedSearch=保存済み検索条件からレポートを作成...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
-pane.collections.menu.refresh.feed=Refresh Feed
-pane.collections.menu.refresh.allFeeds=Refresh All Feeds
+pane.collections.menu.refresh.feed=フィードを更新
+pane.collections.menu.refresh.allFeeds=すべてのフィードを更新
 pane.collections.menu.markAsRead.feed=フィードを既読にする
 pane.collections.menu.markAsRead.allFeeds=すべてのフィードを既読にする
 
-pane.tagSelector.rename.title=タグの名称変更
-pane.tagSelector.rename.message=タグの名称を変更してください。\n\nタグの変更がすべての関連アイテムに適用されます。
+pane.tagSelector.rename.title=タグ名の変更
+pane.tagSelector.rename.message=タグの名称を変更してください。\n\nタグの変更がすべての関連項目に適用されます。
 pane.tagSelector.delete.title=タグの削除
-pane.tagSelector.delete.message=このタグを削除してよろしいですか？\n\nタグがすべてのアイテムから削除されます。
-pane.tagSelector.deleteAutomatic.title=Delete Automatic Tags
-pane.tagSelector.deleteAutomatic.message=このライブラリの中の %1$S 自動生成タグを削除してもよろしいですか？;このライブラリの中の %1$S 自動生成タグを削除してもよろしいですか？
+pane.tagSelector.delete.message=このタグを削除しますか？\n\nタグがすべての項目から削除されます。
+pane.tagSelector.deleteAutomatic.title=自動生成タグを削除
+pane.tagSelector.deleteAutomatic.message=このライブラリの中の %1$S 自動生成タグを削除しますか？;このライブラリの中の %1$S 自動生成タグを削除しますか？
 pane.tagSelector.numSelected.none=タグが選択されていません
 pane.tagSelector.numSelected.singular=%S 個のタグが選択されています
 pane.tagSelector.numSelected.plural=%S 個のタグが選択されています
 pane.tagSelector.maxColoredTags=各ライブラリ内につき、 最大 %S 個のタグまでしか色を指定できません。
 
-tagColorChooser.numberKeyInstructions=キーボードの $NUMBER キーを押すことで、このタグを選択済みのアイテムに追加することができます。
+tagColorChooser.numberKeyInstructions=キーボードの $NUMBER キーを押すことで、このタグを選択済みの項目に追加することができます。
 tagColorChooser.maxTags=各ライブラリ内につき、 最大 %S 個のタグまでしか色を指定できません。
 
 pane.items.intro.text1=%S へようこそ！
-pane.items.intro.text2=ライブラリの構築を開始する方法については、[クイックスタートガイド] を参照してください。また、ウェブを閲覧するときに %S にアイテムを追加できるように、必ず [%Sをインストール] してください。
+pane.items.intro.text2=ライブラリの構築を開始する方法については、[クイックスタートガイド] を参照してください。また、ウェブを閲覧するときに %S に項目を追加できるように、必ず [%Sをインストール] してください。
 pane.items.intro.text3=他のコンピューターですでに %S を使用したことがありますか？ 作業を中断したところから続けるためには、[同期を設定] してください。
 
-pane.items.title=アイテム
-pane.items.loading=アイテムを読込中...
-pane.items.loadError=アイテムリストの読み込みエラー
-pane.items.columnChooser.moreColumns=列を増やす
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
-pane.items.attach.link.uri.unrecognized=Zotero did not recognize the URI you entered. Please check the address and try again.
-pane.items.attach.link.uri.file=To attach a link to a file, please use “%S”.
-pane.items.trash.title=ゴミ箱に移動する
-pane.items.trash=選択されたアイテムをゴミ箱に移動してよろしいですか？
-pane.items.trash.multiple=選択されたアイテムをゴミ箱に移動してよろしいですか？
+pane.items.title=項目
+pane.items.loading=項目を読込中...
+pane.items.loadError=項目リストの読み込みエラー
+pane.items.columnChooser.moreColumns=表示列の追加
+pane.items.columnChooser.secondarySort=2列目の並び順 (%S)
+pane.items.attach.link.uri.unrecognized=Zotero はあなたが入力した URI を認識できませんでした。アドレスを確認してもう一度試してください。
+pane.items.attach.link.uri.file=ファイルへのリンクを添付するには “%S” を使用してください。
+pane.items.trash.title=ごみ箱へ移動
+pane.items.trash=選択された項目をごみ箱に移動しますか？
+pane.items.trash.multiple=選択された項目をごみ箱に移動しますか？
 pane.items.delete.title=削除
-pane.items.delete=選択されたアイテムを削除してよろしいですか？
-pane.items.delete.multiple=選択されたアイテムを削除してよろしいですか？
-pane.items.remove.title=コレクションから除外する
-pane.items.remove=選択されたアイテムをこのコレクションから除外してもよろしいですか？
-pane.items.remove.multiple=選択された複数のアイテムをこのコレクションから除外してもよろしいですか？
-pane.items.removeFromOther=Are you sure you want to remove the selected item from “%S”?
-pane.items.removeFromPublications.title=Remove from My Publications
-pane.items.removeFromPublications=Are you sure you want to remove the selected item from My Publications?
-pane.items.removeFromPublications.multiple=Are you sure you want to remove the selected items from My Publications?
-pane.items.removeRecursive.title=Remove from Collection and Subcollections
-pane.items.removeRecursive=Are you sure you want to remove the selected item from this collection and all subcollections?
-pane.items.removeRecursive.multiple=Are you sure you want to remove the selected items from this collection and all subcollections?
+pane.items.delete=選択された項目を削除しますか？
+pane.items.delete.multiple=選択された項目を削除しますか？
+pane.items.remove.title=コレクションから削除
+pane.items.remove=選択された項目をこのコレクションから削除しますか？
+pane.items.remove.multiple=選択された複数の項目をこのコレクションから削除しますか？
+pane.items.removeFromOther=選択された項目を “%S” から削除しますか？
+pane.items.removeFromPublications.title=私の出版物から削除
+pane.items.removeFromPublications=選択された項目を私の出版物から削除しますか？
+pane.items.removeFromPublications.multiple=選択された項目を私の出版物から削除しますか？
+pane.items.removeRecursive.title=コレクションとサブコレクションから削減
+pane.items.removeRecursive=選択された項目をこのコレクションとすべてのサブコレクションから削除しますか？
+pane.items.removeRecursive.multiple=選択された項目をこのコレクションとすべてのサブコレクションから削除しますか？
 pane.items.menu.addNoteFromAnnotations=注釈からメモを追加
-pane.items.menu.createNoteFromAnnotations=Create Note from Annotations
-pane.items.menu.findAvailableFile=Find Full Text
+pane.items.menu.createNoteFromAnnotations=注釈からメモを作成
+pane.items.menu.findAvailableFile=全文検索
 pane.items.menu.addToCollection=コレクションに追加
-pane.items.menu.remove=コレクションからアイテムを取り除く...
-pane.items.menu.remove.multiple=コレクションから複数のアイテムを取り除く...
-pane.items.menu.removeFromPublications=Remove Item from My Publications…
-pane.items.menu.removeFromPublications.multiple=Remove Items from My Publications…
-pane.items.menu.moveToTrash=アイテムをゴミ箱に入れる...
-pane.items.menu.moveToTrash.multiple=アイテムをゴミ箱に入れる...
-pane.items.menu.delete=Delete Permanently…
-pane.items.menu.export=選択されたアイテムをエクスポート...
-pane.items.menu.export.multiple=選択されたアイテムをエクスポート...
+pane.items.menu.remove=コレクションから項目を削除...
+pane.items.menu.remove.multiple=コレクションから複数の項目を削除...
+pane.items.menu.removeFromPublications=「私の出版物」から項目を削除...
+pane.items.menu.removeFromPublications.multiple=「私の出版物」から項目を削除...
+pane.items.menu.moveToTrash=項目をごみ箱に移動...
+pane.items.menu.moveToTrash.multiple=項目をごみ箱に移動...
+pane.items.menu.delete=完全削除...
+pane.items.menu.export=選択された項目をエクスポート...
+pane.items.menu.export.multiple=選択された項目をエクスポート...
 pane.items.menu.exportNote=選択されたメモをエクスポート…
 pane.items.menu.exportNote.multiple=選択されたメモをエクスポート…
-pane.items.menu.exportPDF=Export PDF…
-pane.items.menu.exportPDF.multiple=Export PDFs…
-pane.items.menu.createBib=選択されたアイテムから参考文献目録を作成...
-pane.items.menu.createBib.multiple=選択されたアイテムから参考文献目録を作成...
-pane.items.menu.generateReport=選択されたアイテムからレポートを作成...
-pane.items.menu.generateReport.multiple=選択されたアイテムからレポートを作成...
-pane.items.menu.reindexItem=アイテムを再索引化する
-pane.items.menu.reindexItem.multiple=アイテムを再索引化する
-pane.items.menu.recognizeDocument=Retrieve Metadata
-pane.items.menu.createParent=親アイテムを作成
-pane.items.menu.createParent.multiple=親アイテムを作成
-pane.items.menu.renameAttachments=親メータデータからファイル名を変更する
-pane.items.menu.renameAttachments.multiple=親メータデータからファイル名を変更する
-pane.items.menu.duplicateAndConvert.toBookSection=Create Book Section
-pane.items.menu.duplicateAndConvert.toBook=Create Book from Book Section
+pane.items.menu.exportPDF=PDF のエクスポート…
+pane.items.menu.exportPDF.multiple=PDF のエクスポート
+pane.items.menu.createBib=選択された項目から参考文献を作成...
+pane.items.menu.createBib.multiple=選択された項目から参考文献を作成...
+pane.items.menu.generateReport=選択された項目からレポートを作成...
+pane.items.menu.generateReport.multiple=選択された項目からレポートを作成...
+pane.items.menu.reindexItem=項目を再索引化
+pane.items.menu.reindexItem.multiple=項目を再索引化
+pane.items.menu.recognizeDocument=メタデータの取得
+pane.items.menu.createParent=親項目を作成
+pane.items.menu.createParent.multiple=親項目を作成
+pane.items.menu.renameAttachments=親メータデータからファイル名を変更
+pane.items.menu.renameAttachments.multiple=親メータデータからファイル名を変更
+pane.items.menu.duplicateAndConvert.toBookSection=書籍の章を作成
+pane.items.menu.duplicateAndConvert.toBook=書籍の章から書籍を作成
 pane.items.menu.showInFeed=フィードに表示
-pane.items.showItemInLibrary=Show Item in Library
+pane.items.showItemInLibrary=ライブラリに項目を表示
 
 pane.items.letter.oneParticipant=%S への手紙
 pane.items.letter.twoParticipants=%S and %S への手紙
@@ -383,51 +361,51 @@ pane.items.interview.twoParticipants=%S and %S によるインタビュー
 pane.items.interview.threeParticipants=%S, %S, and %S によるインタビュー
 pane.items.interview.manyParticipants=%S et al. によるインタビュー
 
-pane.item.duplicates.selectToMerge=統合すべきアイテムを選んで下さい。
-pane.item.duplicates.writeAccessRequired=アイテムの統合にはライブラリの書き込みアクセス権が必要です。
-pane.item.duplicates.onlyTopLevel=最上位階層のアイテムのみ統合することができます。
-pane.item.duplicates.onlySameItemType=統合されるアイテムはすべて同じアイテムの種類に属していなければなりません。
+pane.item.duplicates.selectToMerge=統合する項目の選択
+pane.item.duplicates.writeAccessRequired=項目の統合にはライブラリの書き込みアクセス権が必要です。
+pane.item.duplicates.onlyTopLevel=最上位階層の項目のみ統合することができます。
+pane.item.duplicates.onlySameItemType=統合される項目はすべて同じ項目の種類に属していなければなりません。
 
 pane.item.markAsRead=既読にする
 pane.item.markAsUnread=未読にする
-pane.item.addTo="%S" に追加する
-pane.item.showInMyPublications=Show in My Publications
-pane.item.hideFromMyPublications=Hide from My Publications
-pane.item.changeType.title=アイテムの種類を変更
-pane.item.changeType.text=アイテムの種類を変更してよろしいですか？\n\n以下のフィールドが失われます:
+pane.item.addTo="%S" に追加
+pane.item.showInMyPublications=「私の出版物」に表示
+pane.item.hideFromMyPublications=「私の出版物」から隠す
+pane.item.changeType.title=項目の種類を変更
+pane.item.changeType.text=項目の種類を変更しますか？\n\n以下のフィールドが失われます :
 pane.item.defaultFirstName=名
 pane.item.defaultLastName=姓
 pane.item.defaultFullName=氏名
-pane.item.switchFieldMode.one=Switch to Single Field
-pane.item.switchFieldMode.two=Switch to Two Fields
+pane.item.switchFieldMode.one=単一フィールドに切り替え
+pane.item.switchFieldMode.two=2つのフィールドに切り替え
 pane.item.notes.allNotes=すべてのメモ 
 pane.item.notes.untitled=無題のメモ
-pane.item.notes.delete.confirm=このメモを削除してもよろしいですか？
+pane.item.notes.delete.confirm=このメモを削除しますか？
 pane.item.notes.ignoreMissingImage=一部のメモ画像が欠落しており、コピーできません。
-pane.item.attachments.rename.title=新しい題名:
-pane.item.attachments.rename.renameAssociatedFile=関連ファイル名を変更する
+pane.item.attachments.rename.title=新しいタイトル :
+pane.item.attachments.rename.renameAssociatedFile=関連ファイル名を変更
 pane.item.attachments.rename.error=ファイル名を変更中にエラーが発生しました。
-pane.item.attachments.rename.confirmExtChange.text1=Are you sure you want to change the file extension from “%1$S” to “%2$S”?
-pane.item.attachments.rename.confirmExtChange.text2=If you change the extension, the file may open with a different application outside of %S.
-pane.item.attachments.rename.confirmExtChange.keep=Keep %S
-pane.item.attachments.rename.confirmExtChange.change=Use %S
+pane.item.attachments.rename.confirmExtChange.text1=ファイルの拡張子を “%1$S” から “%2$S” に変更しますか？
+pane.item.attachments.rename.confirmExtChange.text2=拡張子を変更すると、ファイルは %S 以外の別のアプリケーションで開かれる可能性があります。
+pane.item.attachments.rename.confirmExtChange.keep=%S を保持
+pane.item.attachments.rename.confirmExtChange.change=%S を使用
 pane.item.attachments.fileNotFound.title=ファイルが見つかりませんでした
 pane.item.attachments.fileNotFound.text1=添付ファイルが見つかりませんでした。
 pane.item.attachments.fileNotFound.text1.path=添付ファイルが次のパスで見つかりませんでした：
 pane.item.attachments.fileNotFound.text2.stored=%1$S の外部に移動または削除されたか、ファイルが別のコンピューターで追加された場合に、%2$S との間でまだ同期されていない可能性があります。
 pane.item.attachments.fileNotFound.text2.stored.notOnServer=%1$S の外部に移動または削除されたか、ファイルが別のコンピューターで追加された場合に、%2$S に対してまだ同期されていない可能性があります。
-pane.item.attachments.fileNotFound.text2.linked=It may have been moved or deleted outside of %1$S, or a Linked Attachment Base Directory may be set incorrectly on one of your computers.
-pane.item.attachments.delete.confirm=この添付ファイルを削除してもよろしいですか？
-pane.item.attachments.autoRelink.title=File Located Automatically
-pane.item.attachments.autoRelink.text1=The file could not be found at the specified location, but a file with the same name was found within your Linked Attachment Base Directory:
-pane.item.attachments.autoRelink.text2=Old Location: %S
-pane.item.attachments.autoRelink.text3=New Location: %S
-pane.item.attachments.autoRelink.text4=%1$S can automatically relink this attachment.
-pane.item.attachments.autoRelink.relink=Relink
-pane.item.attachments.autoRelinkOthers.title=Additional Files Located
-pane.item.attachments.autoRelinkOthers.text=One other unlinked attachment in this library was found within the same directory. Relink this attachment as well?;%S other unlinked attachments in this library were found within the same directory. Relink all located attachments?
-pane.item.attachments.autoRelink.locateManually=Locate Manually…
-pane.item.attachments.autoRelink.relinkAll=Relink All
+pane.item.attachments.fileNotFound.text2.linked=%1$S の外部に移動または削除されたか、コンピューターのいずれかでリンク添付ファイルのベースディレクトリが正しく設定されていない可能性があります。
+pane.item.attachments.delete.confirm=この添付ファイルを削除しますか？
+pane.item.attachments.autoRelink.title=ファイルは自動的に配置されました
+pane.item.attachments.autoRelink.text1=指定された場所にファイルが見つかりませんでしたが、リンクされた添付ファイルのベースディレクトリ内に同じ名前のファイルが見つかりました :
+pane.item.attachments.autoRelink.text2=古い場所 : %S
+pane.item.attachments.autoRelink.text3=新しい場所 : %S
+pane.item.attachments.autoRelink.text4=%1$S はこの添付ファイルを自動的に再リンクできます。
+pane.item.attachments.autoRelink.relink=再リンク
+pane.item.attachments.autoRelinkOthers.title=追加ファイルが配置されました
+pane.item.attachments.autoRelinkOthers.text=このライブラリ内で同じディレクトリにリンクされていない添付ファイルがもう1つ見つかりました。この添付ファイルも再リンクしますか？；このライブラリ内で同じディレクトリにリンクされていない %S 件の添付ファイルが見つかりました。見つかったすべての添付ファイルを再リンクしますか？
+pane.item.attachments.autoRelink.locateManually=手動で配置…
+pane.item.attachments.autoRelink.relinkAll=すべて再リンク
 pane.item.attachments.has=添付ファイルあり
 pane.item.attachments.hasPDF=PDF 添付ファイルあり
 pane.item.attachments.hasSnapshot=スナップショットあり
@@ -436,17 +414,17 @@ pane.item.attachments.hasImage=画像添付ファイルあり
 pane.item.attachments.hasVideo=動画添付ファイルあり
 pane.item.attachments.hasLink=リンクあり
 pane.item.attachments.select=ファイルを選択
-pane.item.attachments.PDF.installTools.title=PDFツールがインストールされていません
+pane.item.attachments.PDF.installTools.title=PDF ツールがインストールされていません
 pane.item.attachments.PDF.installTools.text=この機能を利用するには、Zotero 環境設定において、PDF ツールをまずインストールする必要があります。
 pane.item.attachments.filename=ファイル名
 pane.item.noteEditor.clickHere=ここをクリック
-pane.item.tags.icon.user=ユーザの追加したタグ
+pane.item.tags.icon.user=ユーザーの追加したタグ
 pane.item.tags.icon.automatic=自動的に追加されたタグ
-pane.item.tags.removeAll=Remove all tags from this item?
-pane.item.parentItem=親アイテム:
+pane.item.tags.removeAll=この項目からすべてのタグ削除しますか？
+pane.item.parentItem=親項目 :
 
-pane.context.noParent=親アイテムなし
-pane.context.itemNotes=アイテムのメモ
+pane.context.noParent=親項目なし
+pane.context.itemNotes=項目のメモ
 pane.context.allNotes=すべてのメモ 
 
 itemTypes.note=メモ
@@ -490,17 +468,17 @@ itemTypes.preprint=プレプリント
 itemTypes.dataset=データセット
 itemTypes.standard=標準
 
-itemFields.itemType=アイテムの種類
-itemFields.title=題名
+itemFields.itemType=項目の種類
+itemFields.title=タイトル
 itemFields.dateAdded=追加日時
 itemFields.dateModified=更新日時
 itemFields.source=情報源
 itemFields.notes=メモ
 itemFields.tags=タグ
 itemFields.attachments=添付ファイル
-itemFields.related=関連アイテム
+itemFields.related=関連項目
 itemFields.url=URL
-itemFields.rights=License
+itemFields.rights=ライセンス
 itemFields.series=叢書
 itemFields.volume=巻
 itemFields.issue=号
@@ -515,9 +493,9 @@ itemFields.date=出版年月日
 itemFields.section=章
 itemFields.callNumber=図書整理番号
 itemFields.archiveLocation=アーカイブ番号
-itemFields.distributor=配布／販売している会社
+itemFields.distributor=販売代理店
 itemFields.extra=その他
-itemFields.journalAbbreviation=雑誌略誌名
+itemFields.journalAbbreviation=雑誌略語
 itemFields.DOI=DOI
 itemFields.accessDate=アクセス日時
 itemFields.seriesTitle=叢書名
@@ -531,7 +509,7 @@ itemFields.legislativeBody=立法機関
 itemFields.history=歴史
 itemFields.reporter=レポーター
 itemFields.court=裁判所
-itemFields.numberOfVolumes=巻数
+itemFields.numberOfVolumes=# 巻数
 itemFields.committee=委員会
 itemFields.assignee=譲受人
 itemFields.patentNumber=特許番号
@@ -575,7 +553,7 @@ itemFields.websiteTitle=ウェブサイト名
 itemFields.reportNumber=レポート番号
 itemFields.billNumber=法規番号
 itemFields.codeVolume=法典の巻
-itemFields.codePages=Code Pages
+itemFields.codePages=コードページ
 itemFields.dateDecided=決定期日
 itemFields.reporterVolume=リポーター巻
 itemFields.firstPage=最初のページ
@@ -593,9 +571,9 @@ itemFields.nameOfAct=法令名
 itemFields.subject=件名
 itemFields.proceedingsTitle=紀要名
 itemFields.bookTitle=書籍名
-itemFields.shortTitle=題名 (略)
+itemFields.shortTitle=簡略タイトル
 itemFields.docketNumber=事件整理番号
-itemFields.numPages=#ページ
+itemFields.numPages=# ページ数
 itemFields.programTitle=プログラム名
 itemFields.issuingAuthority=発行機関
 itemFields.filingDate=出願日
@@ -610,16 +588,16 @@ itemFields.identifier=識別子
 itemFields.type=種類
 itemFields.format=フォーマット
 itemFields.status=ステータス
-itemFields.authority=Authority
-itemFields.organization=Organization
-itemFields.feed=Feed
+itemFields.authority=権限
+itemFields.organization=組織
+itemFields.feed=フィード
 
-creatorTypes.author=著者名
+creatorTypes.author=著者
 creatorTypes.contributor=寄稿者名
 creatorTypes.editor=編集者名
 creatorTypes.translator=翻訳者名
 creatorTypes.seriesEditor=叢書編集者名
-creatorTypes.interviewee=インタビュー対象:
+creatorTypes.interviewee=インタビュー対象
 creatorTypes.interviewer=インタビュアー
 creatorTypes.director=監督
 creatorTypes.scriptwriter=脚本家
@@ -642,34 +620,34 @@ creatorTypes.guest=ゲスト
 creatorTypes.podcaster=ポッドキャスト送信者
 creatorTypes.reviewedAuthor=レビューされた著者
 creatorTypes.cosponsor=共同スポンサー
-creatorTypes.bookAuthor=書籍著者名
+creatorTypes.bookAuthor=書籍著者
 
 save.error.cannotMakeChangesToCollection=現在選択中のコレクションに変更を加えることはできません。
 save.error.cannotAddFilesToCollection=現在選択中のコレクションへはファイルを追加することができません。
-save.error.cannotAddToMyPublications=アイテムを「私の出版物」へ直接保存することはできません。 アイテムを追加するには、ライブラリの他の場所からアイテムをドラッグしてください。
-save.error.cannotAddToFeed=アイテムをフィードに保存することはできません。
+save.error.cannotAddToMyPublications=項目を「私の出版物」へ直接保存することはできません。 項目を追加するには、ライブラリの他の場所から項目をドラッグしてください。
+save.error.cannotAddToFeed=項目をフィードに保存することはできません。
 
-ingester.scraping=アイテムを保存しています...
+ingester.scraping=項目を保存しています...
 ingester.scrapingTo=保存先
-ingester.scrapeComplete=アイテムを保存しました
-ingester.scrapeError=アイテムを保存できませんでした
-ingester.scrapeErrorDescription=アイテムの保存中にエラーが発生しました。 さらに詳しくは %S をご確認ください。
+ingester.scrapeComplete=項目を保存しました
+ingester.scrapeError=項目を保存できませんでした
+ingester.scrapeErrorDescription=項目の保存中にエラーが発生しました。 さらに詳しくは %S をご確認ください。
 ingester.scrapeErrorDescription.linkText=トランスレータの不具合を解決
 ingester.scrapeErrorDescription.previousError=以前の Zotero エラーによって保存中にエラーが発生しました。
 
-ingester.importFile.title=ファイルをインポート
-ingester.importFile.text=ファイル"%S"をインポートしますか？
-ingester.importFile.intoNewCollection=新しいコレクションへインポートする
+ingester.importFile.title=ファイルのインポート
+ingester.importFile.text=ファイル "%S" をインポートしますか？
+ingester.importFile.intoNewCollection=新しいコレクションへインポート
 
-ingester.lookup.performing=所在確認を実行中...
-ingester.lookup.error=このアイテムの所在確認を実行中にエラーが発生しました。
+ingester.lookup.performing=出典の確認を実行中...
+ingester.lookup.error=この項目の出典の確認中にエラーが発生しました。
 
-findPDF.searchingForAvailableFiles=Searching for available files…
-findPDF.checkingItems=%1$S 個のアイテムを確認中;%1$S 個のアイテムを確認中
+findPDF.searchingForAvailableFiles=利用可能なファイルを検索しています…
+findPDF.checkingItems=%1$S 個の項目を確認中;%1$S 個の項目を確認中
 findPDF.openAccessPDF=オープンアクセス PDF
 findPDF.pdfWithMethod=PDF (%S)
-findPDF.noFilesFound=No files found
-findPDF.noFileFound=No file found
+findPDF.noFilesFound=ファイルが見つかりません
+findPDF.noFileFound=ファイルが見つかりません
 
 attachment.fullText=フルテキスト
 attachment.acceptedVersion=受け入れたバージョン
@@ -679,18 +657,18 @@ attachment.convertToStored.text=%1$S 個の添付ファイルがリンクファ
 attachment.convertToStored.deleteOriginal=保存後に元のファイルを削除します;保存後に元のファイルを削除します
 
 db.dbCorrupted=%1$S データベースの “%2$S” が破損したようです。
-db.dbCorrupted.cloudStorage=This generally occurs when the %S data directory is stored in a cloud storage folder or on a network drive. If you’ve moved your data directory to one of those places, you should move it back to the default location.
-db.dbCorrupted.repairOrRestore=You will need to repair the database or restore it from a backup or from your online library.
-db.dbCorrupted.restoreFromLastAutomaticBackup=%S can attempt to restore from the last automatic backup from %S at %S.
-db.dbCorrupted.viewMoreInformation=For more information on repairing or restoring the database and preventing further corruption, see %S
-db.dbCorruptedNoBackup=The %1$S database “%2$S” appears to have become corrupted, and no automatic backup is available.\n\nA new database has been created. The damaged file was saved to your %1$S data directory as “%3$S”.
-db.dbRestored=The %1$S database “%2$S” appears to have become corrupted.\n\nYour data was restored from the last automatic backup from %3$S at %4$S. The damaged file was saved to your %1$S data directory as “%5$S”.
-db.dbRestored.cloudStorage=If your data directory is stored in a cloud storage folder or on a network drive, you should move it back to the default location immediately.
-db.dbRestoreFailed=The %1$S database “%2$S” appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database has been created. The damaged file was saved to your %1$S data directory as “%3$S”.
-db.dbCorrupted.automaticBackup=Restore from Automatic Backup
+db.dbCorrupted.cloudStorage=これは通常、%S データディレクトリがクラウドストレージフォルダまたはネットワークドライブに保存されている場合に発生します。データディレクトリをこれらの場所に移動した場合は、デフォルトの場所に戻す必要があります。
+db.dbCorrupted.repairOrRestore=データベースを修復するか、バックアップまたはオンラインライブラリから復元する必要があります。
+db.dbCorrupted.restoreFromLastAutomaticBackup=%S は %S の %S に作成された最後の自動バックアップから復元を試みることができます。
+db.dbCorrupted.viewMoreInformation=データベースの修復や復元、さらなる破損の防止に関する詳細は、%S をご参照ください。
+db.dbCorruptedNoBackup=%1$S データベース “%2$S” が破損した可能性があり、自動バックアップは利用できません。\n\n新しいデータベースが作成されました。破損したファイルは %1$S のデータディレクトリに “%3$S” として保存されました。
+db.dbRestored=%1$S データベース “%2$S” が破損した可能性があります。\n\nデータは %3$S の %4$S に作成された最後の自動バックアップから復元されました。破損したファイルは %1$S のデータディレクトリに “%5$S” として保存されました。
+db.dbRestored.cloudStorage=データ ディレクトリがクラウド ストレージ フォルダーまたはネットワーク ドライブに保存されている場合は、すぐにデフォルトの場所に戻す必要があります。
+db.dbRestoreFailed=%1$S データベース “%2$S” が破損した可能性があり、最後の自動バックアップからの復元試行は失敗しました。\n\n新しいデータベースが作成されました。破損したファイルは %1$S のデータディレクトリに “%3$S” として保存されました。
+db.dbCorrupted.automaticBackup=自動生成バックアップから復元
 
 db.integrityCheck.passed=データベースにエラーは見つかりませんでした。
-db.integrityCheck.failed=データベースにエラーが見つかりました!
+db.integrityCheck.failed=データベースにエラーが見つかりました。
 db.integrityCheck.dbRepairTool=http://zotero.org/utils/dbfix で利用可能なデータベース修復ツールを用いてこれらのエラーの修正を試みることができます。
 db.integrityCheck.repairAttempt=Zotero はこれらのエラーの修復を試みることができます。
 db.integrityCheck.appRestartNeeded=%S を再起動する必要があります。
@@ -699,18 +677,18 @@ db.integrityCheck.errorsFixed=Zoteroデータベースのエラーは修復さ
 db.integrityCheck.errorsNotFixed=Zotero データベースのエラーを修復することができません。
 db.integrityCheck.reportInForums=この問題を Zotero フォーラムに報告することができます。
 
-zotero.preferences.chooseApplication=Choose Application
+zotero.preferences.chooseApplication=アプリケーションの選択
 
 zotero.preferences.update.updated=更新されました
 zotero.preferences.update.upToDate=最新版
 zotero.preferences.update.error=エラー
-zotero.preferences.launchNonNativeFiles=可能な場合はPDFや他のファイルを %S 内で開く
+zotero.preferences.launchNonNativeFiles=可能な場合は PDF や他のファイルを %S 内で開く
 zotero.preferences.locale.automaticWithLocale=自動 (%S)
 zotero.preferences.locale.automatic=自動
 
 zotero.preferences.sync.purgeStorage.title=Zotero サーバー上の添付ファイルを消去しますか？
-zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
-zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
+zotero.preferences.sync.purgeStorage.desc=ファイル同期に WebDAV を使用する予定で、以前にマイライブラリの添付ファイルを Zotero サーバーに同期していた場合、グループのためのストレージスペースを増やすために、それらのファイルを Zotero サーバーから削除することができます。\n\nファイルの削除は、zotero.org のアカウント設定からいつでも行うことができます。
+zotero.preferences.sync.purgeStorage.confirmButton=ファイルを消去
 zotero.preferences.sync.purgeStorage.cancelButton=消去しない
 zotero.preferences.sync.librariesToSync.loadingLibraries=ライブラリを読み込んでいます...
 zotero.preferences.sync.reset.userInfoMissing=リセットの機能を使う前に、ユーザー名とパスワードを  %S タブに入力する必要があります。
@@ -718,18 +696,12 @@ zotero.preferences.sync.reset.restoreFromServer=このコピーの Zotero の全
 zotero.preferences.sync.reset.replaceLocalData=ローカルのデータを置き換える
 zotero.preferences.sync.reset.restartToComplete=復元処理を完了させるためには Firefox を再起動させる必要があります。
 zotero.preferences.sync.reset.fileSyncHistory=次回の同期時、%1$S は “%2$S” 内のすべての添付ファイルをストレージサービスに対して問い合わせます。ローカルで見つからなかった添付ファイルがあればすべてダウンロードされ、リモートで見つからなかった添付ファイルはすべてアップロードされます。\n\nこのオプションは、通常は使用する必要はありません。
-zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
+zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S” のファイル同期履歴が消去されました。
 
-zotero.preferences.search.rebuildIndex=索引を再作成
-zotero.preferences.search.rebuildWarning=すべての索引を再作成しますか？しばらく時間がかかる可能性があります。\n\nまだ索引されていないアイテムについてだけ索引を作成するには、%S を選択してください。
-zotero.preferences.search.clearIndex=索引の削除
-zotero.preferences.search.clearWarning=索引を削除した後、添付ファイルの内容は検索できなくなります。\n\nウェブページを再訪問しない限り添付のウェブリンクは再索引されません。ウェブリンクの索引を維持するには、%S を選択してください。
-zotero.preferences.search.clearNonLinkedURLs=ウェブリンク以外すべて削除
-zotero.preferences.search.indexUnindexed=まだ索引が作成されていないアイテムの索引を作成
-zotero.preferences.export.quickCopy.citationStyles=Citation Styles
+zotero.preferences.export.quickCopy.citationStyles=引用スタイル
 zotero.preferences.export.quickCopy.exportFormats=エクスポート形式
-zotero.preferences.export.quickCopy.instructions=クイック コピーを使用すると、指定されたフォーマットでアイテムをすばやくエクスポートできます。選択したアイテムをコピーするには、%S を押すしてクリップボードにコピーするか、別のプログラムのテキストボックスに直接ドラッグします。
-zotero.preferences.export.quickCopy.citationInstructions=For citation styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.instructions=クイック コピーを使用すると、指定されたフォーマットで項目をすばやくエクスポートできます。選択した項目をコピーするには、%S を押すしてクリップボードにコピーするか、別のプログラムのテキストボックスに直接ドラッグします。
+zotero.preferences.export.quickCopy.citationInstructions=引用スタイルについては、項目をドラッグする前に %S を押して、あるいはシフトキーを押したままで、引用文献や脚注をコピーすることができます。
 zotero.preferences.export.quickCopy.note.htmlOptions.label=リッチ テキスト/HTML
 
 zotero.preferences.wordProcessors.installationSuccess=インストールは成功しました。
@@ -740,24 +712,24 @@ zotero.preferences.wordProcessors.notInstalled=アドイン %S は現在イン
 zotero.preferences.wordProcessors.install=アドイン %S をインストールする
 zotero.preferences.wordProcessors.reinstall=アドイン %S を再インストールする
 zotero.preferences.wordProcessors.installing=%S をインストール中です...
-zotero.preferences.wordProcessors.incompatibleVersions1=%1$S %2$S は %4$S 以前の %3$S のバージョンと互換性がありません。%3$S を取り除くか、最新版を %5$S. からダウンロードしてください。
+zotero.preferences.wordProcessors.incompatibleVersions1=%1$S %2$S は %4$S 以前の %3$S のバージョンと互換性がありません。%3$S を削除するか、最新版を %5$S. からダウンロードしてください。
 zotero.preferences.wordProcessors.incompatibleVersions2=%1$S %2$S を動かすには  %4$S 以上の %3$S が必要です。最新版の %3$S.を %5$S からダウンロードしてください。
 
-zotero.preferences.styles.addStyle=スタイルを追加する
+zotero.preferences.styles.addStyle=スタイルを追加
 
-zotero.preferences.advanced.baseDirectory.withinDataDir=You cannot select a Linked Attachment Base Directory within the %S data directory.
-zotero.preferences.advanced.resetTranslatorsAndStyles=トランスレータとスタイルをリセットする
+zotero.preferences.advanced.baseDirectory.withinDataDir=%S データディレクトリ内でリンクされた添付ファイルのベース ディレクトリを選択することはできません。
+zotero.preferences.advanced.resetTranslatorsAndStyles=トランスレータとスタイルをリセット
 zotero.preferences.advanced.resetTranslatorsAndStyles.changesLost=新しく追加あるいは変更されたトランスレータとスタイルはすべて失われます。
-zotero.preferences.advanced.resetTranslators=トランスレータをリセットする
+zotero.preferences.advanced.resetTranslators=トランスレータをリセット
 zotero.preferences.advanced.resetTranslators.changesLost=新しく追加あるいは変更されたトランスレータはすべて失われます。
-zotero.preferences.advanced.resetStyles=スタイルをリセットする
+zotero.preferences.advanced.resetStyles=スタイルをリセット
 zotero.preferences.advanced.resetStyles.changesLost=新しく追加あるいは変更されたスタイルは失われます。
-zotero.preferences.advanced.migrateDataDir.title=Migrate Data Directory
-zotero.preferences.advanced.migrateDataDir.directoryExists1=%S にフォルダが既に存在します。
-zotero.preferences.advanced.migrateDataDir.directoryExists2=Please move or rename it and try again.
-zotero.preferences.advanced.migrateDataDir.directoryWillBeMoved=Your %1$S data directory will be moved to %2$S.
+zotero.preferences.advanced.migrateDataDir.title=データディレクトリの移行
+zotero.preferences.advanced.migrateDataDir.directoryExists1=%S にディレクトリが既に存在します。
+zotero.preferences.advanced.migrateDataDir.directoryExists2=移動するか名前を変更してもう一度試してください。
+zotero.preferences.advanced.migrateDataDir.directoryWillBeMoved=%1$S データ ディレクトリは %2$S に移動されます。
 zotero.preferences.advanced.migrateDataDir.appMustBeRestarted=移行を完了するためには %S を再起動する必要があります。
-zotero.preferences.advanced.migrateDataDir.manualMigration=You can also quit %1$S and move your existing data directory to %2$S manually, which may be faster for larger data directories. %3$S will automatically detect the new location.
+zotero.preferences.advanced.migrateDataDir.manualMigration=%1$S を終了して、既存のデータディレクトリを手動で %2$S に移動することもできます。大きなデータディレクトリの場合、こちらの方が速いかもしれません。%3$S は新しい場所を自動的に検出します。
 
 zotero.debugOutputLogging=デバッグ出力のログ
 zotero.debugOutputLogging.linesLogged=%1$S 行がログに記録されました;%1$S 行がログに記録されました
@@ -766,65 +738,65 @@ zotero.debugOutputLogging.dialog.sent=デバッグ出力は %S に送信され
 zotero.debugOutputLogging.dialog.error=デバッグ出力の送信中にエラーが発生しました。
 zotero.debugOutputLogging.enabledAfterRestart=デバッグ出力のログは、%S が再起動した後で有効になります。
 
-dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
-dragAndDrop.filesNotFound=The following files were not found and could not be copied:
+dragAndDrop.existingFiles=次のファイルは宛先ディレクトリに既に存在していたため、コピーされませんでした :
+dragAndDrop.filesNotFound=次のファイルは見つからなかったため、コピーできませんでした :
 
 fileInterface.importing=インポート中...
 fileInterface.importComplete=インポート完了
-fileInterface.itemsWereImported=%1$S item was imported;%1$S items were imported
-fileInterface.itemsWereRelinked=%1$S item was relinked;%1$S items were relinked
-fileInterface.itemsExported=アイテムをエクスポート中...
+fileInterface.itemsWereImported=%1$S 個の項目をインポートしました;%1$S 個の項目をインポートしました
+fileInterface.itemsWereRelinked=%1$S 個の項目が再リンクされました;%1$S 個の項目が再リンクされました
+fileInterface.itemsExported=項目をエクスポート中...
 fileInterface.import=インポート
-fileInterface.chooseAppDatabaseToImport=Choose the %S database to import
+fileInterface.chooseAppDatabaseToImport=インポートする %S データベースの選択
 fileInterface.export=エクスポート
-fileInterface.exportedItems=エクスポートされたアイテム
+fileInterface.exportedItems=エクスポートされた項目
 fileInterface.imported=インポート済
 fileInterface.unsupportedFormat=選択されたファイルは対応していないフォーマットです。
 fileInterface.appDatabase=%S データベース
 fileInterface.appImportCollection=%S インポート
-fileInterface.viewSupportedFormats=対応しているフォーマットを見る...
-fileInterface.untitledBibliography=Untitled Bibliography
-fileInterface.bibliographyHTMLTitle=参考文献目録
+fileInterface.viewSupportedFormats=対応しているフォーマットを表示...
+fileInterface.untitledBibliography=無題の参考文献
+fileInterface.bibliographyHTMLTitle=参考文献
 fileInterface.importError=選択されたファイルのインポート中にエラーが発生しました。ファイルの有効性を確認して、もう一度試してください。
-fileInterface.importError.translator=An error occurred importing the selected file with “%S”. Please ensure that the file is valid and try again.
+fileInterface.importError.translator="%S" の選択されたファイルのインポート中にエラーが発生しました。有効なファイルを確認して、もう一度試してください。
 fileInterface.importClipboardNoDataError=インポート可能なデータはクリップボードに見つかりませんでした。
-fileInterface.noReferencesError=選択されたアイテムは文献を含みません。文献を１つ以上選択してから、もう一度お試しください。
-fileInterface.bibliographyGenerationError=参考文献目録を作成中にエラーが発生しました。再度試してください。
+fileInterface.noReferencesError=選択された項目は文献を含みません。文献を１つ以上選択してから、もう一度試してください。
+fileInterface.bibliographyGenerationError=参考文献を作成中にエラーが発生しました。再度試してください。
 fileInterface.exportError=選択されたファイルをエクスポート中にエラーが発生しました。
-fileInterface.importOPML=Import Feeds from OPML
+fileInterface.importOPML=OPMLからフィードをインポート
 fileInterface.OPMLFeedFilter=OPML フィードのリスト
 
 quickCopy.copyAs=%S としてコピー
 
-quickSearch.mode.titleCreatorYear=題名、編著者名、年
-quickSearch.mode.fieldsAndTags=全フィールドとタグ
+quickSearch.mode.titleCreatorYear=タイトル、著者、年
+quickSearch.mode.fieldsAndTags=すべてのフィールドとタグ
 quickSearch.mode.everything=すべて
 
 advancedSearchMode=詳細検索モード — Enterキーを押すと検索できます。
 searchInProgress=検索しています。しばらくお待ちください。
 
-searchOperator.is=が次と一致:
-searchOperator.isNot=が次と一致しない:
-searchOperator.beginsWith=が次で始まる:
-searchOperator.contains=が次を含む:
-searchOperator.doesNotContain=が次を含まない:
-searchOperator.isLessThan=が次より小さい:
-searchOperator.isGreaterThan=が次より大きい:
-searchOperator.isBefore=が次より前:
-searchOperator.isAfter=が次より後:
-searchOperator.isInTheLast=が次の期間の間にある:
+searchOperator.is=が次と一致 :
+searchOperator.isNot=が次と一致しない :
+searchOperator.beginsWith=が次で始まる :
+searchOperator.contains=が次を含む :
+searchOperator.doesNotContain=が次を含まない :
+searchOperator.isLessThan=が次より小さい :
+searchOperator.isGreaterThan=が次より大きい :
+searchOperator.isBefore=が次より前 :
+searchOperator.isAfter=が次より後 :
+searchOperator.isInTheLast=が次の期間の間にある :
 
-fulltext.indexState.indexed=索引済のアイテム
+fulltext.indexState.indexed=索引済の項目
 fulltext.indexState.unavailable=不明
 fulltext.indexState.partial=一部索引済
 fulltext.indexState.queued=待機中
 
 exportOptions.exportNotes=メモをエクスポート
 exportOptions.exportFileData=ファイルをエクスポート
-exportOptions.includeAnnotations=Include Annotations
-exportOptions.includeAppLinks=Include %S Links
-exportOptions.useJournalAbbreviation=雑誌略誌名を使用
-charset.UTF8withoutBOM=Unicode (UTF-8 without BOM)
+exportOptions.includeAnnotations=注釈を含める
+exportOptions.includeAppLinks=%S のリンクを含める
+exportOptions.useJournalAbbreviation=雑誌略語を使用
+charset.UTF8withoutBOM=Unicode (UTF-8 BOMなし)
 charset.autoDetect=(自動検出)
 
 date.daySuffixes=日, 日, 日, 日
@@ -839,21 +811,21 @@ citation.multipleSources=複数の参照データ...
 citation.singleSource=単一の参照データ...
 citation.showEditor=エディタを表示する...
 citation.hideEditor=エディタを表示しない...
-citation.citations=出典表記
+citation.citations=引用文献
 citation.notes=メモ
 citation.locator.timestamp=タイムスタンプ
 
 report.title.default=Zotero レポート
-report.parentItem=親アイテム:
-report.notes=メモ:
-report.tags=タグ:
+report.parentItem=親項目 :
+report.notes=メモ :
+report.tags=タグ :
 
-annotations.confirmClose.title=この注釈を閉じてもよろしいですか?
+annotations.confirmClose.title=この注釈を閉じますか?
 annotations.confirmClose.body=全文が失われます。
 annotations.close.tooltip=注釈の削除
 annotations.move.tooltip=注釈を移動
-annotations.collapse.tooltip=Collapse Annotation
-annotations.expand.tooltip=Expand Annotation
+annotations.collapse.tooltip=注釈を折りたたむ
+annotations.expand.tooltip=注釈を展開
 annotations.oneWindowWarning=スナップショットの注釈は同時に複数のブラウザ画面に開けることができません。このスナップショットは注釈なしで開かれます。
 
 integration.fields.label=フィールド (推奨)
@@ -863,116 +835,117 @@ integration.fields.fileFormatNotice=文書は .doc または .docx として保
 integration.referenceMarks.caption=リファレンスマークは Word と共有することができません。
 integration.referenceMarks.fileFormatNotice=文書は .odt として保存する必要があります。
 
-integration.regenerate.title=出典表記をもう一度作成しますか？
-integration.regenerate.body=出典表記エディタ内で行った編集内容はすべて失われます。
+integration.regenerate.title=引用文献をもう一度作成しますか？
+integration.regenerate.body=引用文献エディタ内で行った編集内容はすべて失われます。
 integration.regenerate.saveBehavior=常にこの設定を使用する。
 
-integration.revertAll.title=Are you sure you want to revert all edits to your bibliography?
-integration.revertAll.body=If you choose to continue, all references cited in the text will appear in the bibliography with their original text, and any references manually added will be removed from the bibliography.
+integration.revertAll.title=この参考文献について行ったすべての編集内容を元に戻しますか？
+integration.revertAll.body=このまま続けると、文章中に引用されたすべての文献が未編集の形で参考文献に表示され、手動で追加された文献は、参考文献から削除されます。
 integration.revertAll.button=すべてを元に戻す
-integration.revert.title=この編集を元に戻してもよろしいですか？
-integration.revert.body=If you choose to continue, the text of the bibliography entries corresponded to the selected item(s) will be replaced with the unmodified text specified by the selected style.
+integration.revert.title=この編集を元に戻しますか？
+integration.revert.body=このまま続けると、選択された項目に対応する、参考文献の項目の文字列は、選択された引用スタイルによって指定された、未編集の文字列に置き換えられます。
 integration.revert.button=元に戻す
 integration.removeBibEntry.title=選択された文献はあなたの文書中に引用されています。
-integration.removeBibEntry.body=本当にこれを参考文献目録から取り除いてよろしいですか？
+integration.removeBibEntry.body=本当にこれを参考文献から削除しますか？
 
 integration.cited=引用済み
-integration.cited.loading=引用されたアイテムを読み込んでいます...
+integration.cited.loading=引用された項目を読み込んでいます...
 integration.openTabs=文書を開く
-integration.selectedItems=選択されたアイテム
+integration.selectedItems=選択された項目
 integration.ibid=ibid
-integration.emptyCitationWarning.title=空白の出典表記
-integration.emptyCitationWarning.body=現在選択中の引用スタイルでは、指定した出典表記は空白になってしまいます。本当にこれを追加してよろしいですか？
+integration.emptyCitationWarning.title=空白の引用文献
+integration.emptyCitationWarning.body=現在選択中の引用スタイルでは、指定した引用文献は空白になってしまいます。本当にこれを追加してよろしいですか？
 integration.openInLibrary=%S で開く
 
 integration.error.incompatibleVersion=このバージョンの Zotero ワードプロセッサ・プラグイン ($INTEGRATION_VERSION) は、現在インストールされているバージョンの Zotero (%1$S) と互換性がありません。両方について最新版を使用することをご確認ください。
 integration.error.incompatibleVersion2=Zotero %1$S は %2$S %3$S 以降を必要とします。最新版の %2$S を zotero.org からダウンロードしてください。
-integration.error.title=Zotero インテグレーションのエラー（Zotero Integration Error）
+integration.error.title=Zotero 統合エラー
 integration.error.generic=Zotero が文書を更新中にエラーが発生しました。
-integration.error.mustInsertCitation=この操作に先立って、まず出典表記を挿入しておく必要があります。
-integration.error.mustInsertBibliography=この操作に先立って、まず参考文献目録を挿入しておく必要があります。
+integration.error.mustInsertCitation=この操作に先立って、まず引用文献を挿入しておく必要があります。
+integration.error.mustInsertBibliography=この操作に先立って、まず参考文献を挿入しておく必要があります。
 integration.error.cannotInsertHere=Zotero フィールドをこの場所に挿入することはできません。
-integration.error.notInCitation=出典表記を編集するためには、カーソルを Zotero 出典表記の位置に合わせてください。
-integration.error.noBibliography=現在選択中の引用スタイルは参考文献目録を定義していません。もしも参考文献目録の追加を希望の場合は、他の引用スタイルを選択してください。
+integration.error.notInCitation=引用文献を編集するためには、カーソルを Zotero 引用文献の位置に合わせてください。
+integration.error.inBibliography=引用を挿入するには、本文中にカーソルを置きます。参考文献リストを直接編集するには、%S を使用します。
+integration.error.noBibliography=現在選択中の引用スタイルは参考文献を定義していません。もしも参考文献の追加を希望の場合は、他の引用スタイルを選択してください。
 integration.error.deletePipe=Zotero がワードプロセッサと交信するための通路が初期化できませんでした。Zotero にこのエラーを修復させてみますか？パスワードが要求されます。
 integration.error.invalidStyle=選択された引用スタイルは、有効ではないようです。もしご自身で引用スタイルを作られた場合、http://zotero.org/support/dev/citation_styles に書かれた通り、文法の正当性チェックに合格しているかご確認ください。または、他のスタイルを選んで下さい。
-integration.error.fieldTypeMismatch=Zotero cannot update this document because it was created by a different word processing application with an incompatible field encoding. In order to make a document compatible with both Word and LibreOffice, open the document in the word processor with which it was originally created and switch the field type to Bookmarks in the Zotero Document Preferences.
+integration.error.fieldTypeMismatch=この文書は異なるワードプロセッサで作成され、フィールドのエンコーディングが互換性がないため、Zotero はこの文書を更新できません。Word と LibreOffice の両方で互換性のある文書にするには、文書を元々作成したワードプロセッサで開き、Zotero の文書設定でフィールドタイプをブックマークに切り替えてください。
 integration.error.styleMissing=この文書に使用されている引用スタイルが見つかりません。%S から引用スタイルをインストールしますか？
 integration.error.styleNotFound=引用スタイル %S を見つけることができませんでした。
-integration.error.misconfiguredWordStartupFolder.some=%S could not install the Word plugin for some versions of Word installed on your computer because the Word Startup folder location is misconfigured.
-integration.error.misconfiguredWordStartupFolder.all=%S could not install the Word plugin because the Word Startup folder location is misconfigured.
-integration.error.misconfiguredWordStartupFolder.fix=The plugin may not appear in Word until you reset your Startup folder to the default location.
+integration.error.misconfiguredWordStartupFolder.some=Word スタートアップ フォルダーの場所が正しく構成されていないため、%S はコンピューターにインストールされている一部のバージョンの Word の Word プラグインをインストールできませんでした。
+integration.error.misconfiguredWordStartupFolder.all=%S は、Word のスタートアップフォルダーの場所が誤って設定されているため、Word プラグインをインストールできませんでした。
+integration.error.misconfiguredWordStartupFolder.fix=スタートアップフォルダーをデフォルトの場所にリセットするまで、プラグインが Word に表示されない場合があります。
 integration.error.macWordSBPermissionsMissing.title=欠けている権限
-integration.error.macWordSBPermissionsMissing=Zotero does not have permission to control Word. To grant this permission:\n\n1) Open System Settings\n2) Select “Privacy & Security” in the left column\n3) Select “Automation”\n4) Find “Zotero” and click the arrow to expand it\n5) Make sure “Microsoft Word” is enabled under “Zotero”\n6) Restart Word
-integration.error.macWordSBPermissionsMissing.pre2016=If “Microsoft Word” does not appear under “Automation”, make sure you are running Word 2011 version 14.7.7 or later.
-integration.error.m1UpgradeOS.title=macOSをアップグレードすることが必要です
-integration.error.m1UpgradeOS=Citing in Word on an Apple Silicon Mac with macOS 11.3 or earlier is not supported and may cause %S to freeze. Please upgrade to macOS 11.4 or later.
-integration.error.viewTroubleshootingInfo=Would you like to view troubleshooting instructions?
-integration.error.tabUnavailable=The operation cannot be completed because the %S tab is no longer available.
+integration.error.macWordSBPermissionsMissing=Zotero は Word を操作する権限を持っていません。この権限を付与するには：\n\n1) システム設定を開きます\n2) 左の列で「プライバシーとセキュリティ」を選択します\n3)「オートメーション」を選択します\n4)「Zotero」を見つけて矢印をクリックし展開します\n5)「Zotero」の下で「Microsoft Word」が有効になっていることを確認します\n6) Word を再起動します
+integration.error.macWordSBPermissionsMissing.pre2016=“オートメーション”の下に “Microsoft Word” が表示されない場合は、Word 2011 バージョン 14.7.7 以降を実行していることを確認してください。
+integration.error.m1UpgradeOS.title=macOS をアップグレードすることが必要です
+integration.error.m1UpgradeOS=Apple Silicon搭載 MacでmacOS 11.3以前の環境で Word に引用を挿入することはサポートされておらず、%S がフリーズする可能性があります。macOS 11.4以降にアップグレードしてください。
+integration.error.viewTroubleshootingInfo=トラブルシューティングの手順を表示しますか？
+integration.error.tabUnavailable=%S タブが利用できなくなったため、操作を完了できません。
 
 integration.replace=この Zotero フィールドを置き換えますか？
-integration.missingItem.single=このアイテムはあなたの Zotero データベースにはもう存在しません。代わりのアイテムを選択しますか？
-integration.missingItem.multiple=Item %1$S in the highlighted citation no longer exists in your Zotero database. Do you want to select a substitute item?
-integration.missingItem.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but deleting it from your bibliography.
-integration.removeCodesWarning=フィールドコードを取り除くと、Zotero はこの文書中の出典表記と参考文献目録を更新することができなくなります。本当に続けてよろしいですか？
+integration.missingItem.single=この項目はあなたの Zotero データベースにはもう存在しません。代わりの項目を選択しますか？
+integration.missingItem.multiple=この引用文献の中の項目 %1$S は、あなたの Zotero データベースの中にはもう存在しません。代わりの項目を選択しますか？
+integration.missingItem.description="いいえ" をクリックすると、この項目を含む引用文献のフィールドコードを消去し、引用文献の文字は残しつつ参考文献からはこの文献が削除されます。
+integration.removeCodesWarning=フィールドコードを削除すると、Zotero はこの文書中の引用文献と参考文献を更新することができなくなります。本当に続けてよろしいですか？
 integration.upgradeWarning=あなたの文書は $S $S 以降を使用するために、恒久的に更新される必要があります。これより先に進む前に文書のバックアップを作成することを推奨します。本当に続けてもよろしいですか？
-integration.error.newerDocumentVersion=Your document was created with a newer version of Zotero (%1$S) than the currently installed version (%2$S). Please upgrade Zotero before editing this document.
-integration.corruptField=The Zotero field code corresponding to this citation, which tells Zotero which item in your library this citation represents, has been corrupted. Would you like to reselect the item?
-integration.corruptField.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but potentially deleting it from your bibliography.
-integration.corruptBibliography=参考文献目録のための Zotero フィールドコードが損傷しています。Zotero にこのフィールドコードを除去させ、新しい参考文献目録を作らせますか？
-integration.corruptBibliography.description=All items cited in the text will appear in the new bibliography, but modifications you made in the "Edit Bibliography" dialog will be lost.
-integration.citationChanged=Zotero がこの出典表記を生成してから、あなたはこれに変更を加えました。この変更を維持し、今後の更新を防ぎますか？
-integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
-integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
-integration.citationChanged.original=Original: %S
-integration.citationChanged.modified=Modified: %S
-integration.delayCitationUpdates.alert.text1=Updating citations in this document is taking a long time. Would you like to disable automatic citation updates?
-integration.delayCitationUpdates.alert.text2.toolbar=You will need to click Refresh in the Zotero toolbar when you are done inserting citations.
-integration.delayCitationUpdates.alert.text2.tab=You will need to click Refresh in the Zotero tab when you are done inserting citations.
-integration.delayCitationUpdates.alert.text3=You can change this setting later in the document preferences.
-integration.delayCitationUpdates.bibliography.toolbar=Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero toolbar.
-integration.delayCitationUpdates.bibliography.tab=Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero tab.
-integration.importDocument.title=Transferred Document
-integration.importDocument.description=Would you like to restore the %S citations in this document for use in %S?
-integration.importDocument.button=Restore Citations
-integration.importDocument.notAvailable=Your version of %S does not support document transfer. Please update to a newer version.
-integration.exportDocument.title=Prepare Citations for Transfer
-integration.exportDocument.description1=Zotero will convert citations in the document to a format that can be safely transferred to another supported word processor.
-integration.exportDocument.description2=You should make a backup of the document before proceeding.
-integration.importInstructions=The Zotero citations in this document have been converted to a format that can be safely transferred between word processors. Open this document in a supported word processor and press Refresh in the Zotero plugin to continue working with the citations.
-integration.upgradeTemplate=The %S plugin for %S is outdated. Reinstall the plugin from Preferences → Cite → Word Processors.
-integration.mendeleyImport.title=Missing Mendeley Data
-integration.mendeleyImport.description=%1$S detected that the document you are citing with contains Mendeley citations. %1$S will be able to manage these citations if you import your Mendeley database.
-integration.mendeleyImport.openImporter=Open Mendeley Importer...
+integration.error.newerDocumentVersion=あなたの文書は、現在インストールされているバージョン  (%2$S) より新しいバージョンの Zotero (%1$S) によって作られました。この文書を編集する前にZotero を更新してください。
+integration.corruptField=この引用文献のに対応するフィールドコードが損傷しました。このフィールドコードとは、あなたのライブラリのどの項目がこの引用文献に該当するかを Zotero に指定するためのものです。この項目をもう一度選択しますか？
+integration.corruptField.description="いいえ" をクリックすると、この項目を含む引用文献のフィールドコードを消去しつつ、引用文献の文字は残されます。参考文献からはこの文献が削除される恐れがあります。
+integration.corruptBibliography=参考文献のための Zotero フィールドコードが損傷しています。Zotero にこのフィールドコードを消去させ、新しい参考文献を作らせますか？
+integration.corruptBibliography.description=文書中に引用された項目は、すべて新しい参考文献に含まれますが、「参考文献の編集」ダイアログで行った編集内容は失われることになります。
+integration.citationChanged=Zotero がこの引用文献を生成してから、あなたはこれに変更を加えました。この変更を維持し、今後の更新を防ぎますか？
+integration.citationChanged.description="はい"をクリックすると、他の引用文献を追加したり、スタイルを変更したり、該当する文献の書誌情報を修正したりした場合でも、Zotero はこの引用文献を更新しません。"いいえ"をクリックすると変更内容が失われます。
+integration.citationChanged.edit=Zotero がこの引用文献を生成してから、あなたはこれに変更を加えました。編集をするとこの変更内容を消去することになります。続けてもよろしいですか？
+integration.citationChanged.original=オリジナル : %S
+integration.citationChanged.modified=修正済み : %S
+integration.delayCitationUpdates.alert.text1=この文書の引用の更新に時間がかかっています。自動引用更新を無効にしますか？
+integration.delayCitationUpdates.alert.text2.toolbar=引用の挿入が終わったら、Zoteroツールバーの「更新」をクリックする必要があります。
+integration.delayCitationUpdates.alert.text2.tab=引用の挿入が終わったら、Zoteroタブの更新をクリックする必要があります。
+integration.delayCitationUpdates.alert.text3=この設定は後で文書の環境設定で変更できます。
+integration.delayCitationUpdates.bibliography.toolbar=自動引用更新は無効になっています。参考文献を表示するには、Zotero ツールバーの更新をクリックしてください。
+integration.delayCitationUpdates.bibliography.tab=自動引用更新は無効になっています。参考文献を表示するには、Zotero タブの更新をクリックしてください。
+integration.importDocument.title=転送された文書
+integration.importDocument.description=この文書の %S の引用を %S で使用するために復元しますか？
+integration.importDocument.button=引用文献を復元
+integration.importDocument.notAvailable=お使いの %S のバージョンは文書転送をサポートしていません。新しいバージョンにアップデートしてください。
+integration.exportDocument.title=転送のための引用文献の準備
+integration.exportDocument.description1=Zoteroは、文書内の引用文献を別の対応するワードプロセッサに安全に転送できる形式に変換します。
+integration.exportDocument.description2=続行する前に、文書のバックアップを作成してください。
+integration.importInstructions=この文書の Zotero の引用文献は、ワードプロセッサ間で安全に転送できる形式に変換されています。対応するワードプロセッサでこの文書を開き、Zoteroプラグインの更新を押して引用文献の作業を続けてください。
+integration.upgradeTemplate=%S プラグイン (%S用の) は古くなっています。設定 → 引用 → ワードプロセッサからプラグインを再インストールしてください。
+integration.mendeleyImport.title=Mendeleyデータが見つかりません
+integration.mendeleyImport.description=%1$S は、あなたが引用している文書にMendeleyの引用が含まれていることを検出しました。Mendeleyデータベースをインポートすれば、%1$S はこれらの引用を管理できるようになります。
+integration.mendeleyImport.openImporter=Mendeley インポーターを開く...
 
-styles.install.title=引用スタイルをインストールする
-styles.install.unexpectedError="%1$S"をインストール中に予期せぬエラーが生じました
-styles.installStyle=スタイル"%1$S"を%2$Sからインストールしますか？
-styles.updateStyle=既存のスタイル"%1$S"を、%3$S からの"%2$S"で更新しますか？
-styles.installed=スタイル"%S"が正常にインストールされました。
+styles.install.title=引用スタイルをインストール
+styles.install.unexpectedError="%1$S" をインストール中に予期しないエラーが発生しました
+styles.installStyle=スタイル "%1$S" を %2$S からインストールしますか？
+styles.updateStyle=既存のスタイル "%1$S" を、%3$S からの "%2$S" で更新しますか？
+styles.installed=スタイル "%S" が正常にインストールされました。
 styles.installError=%S は有効なスタイル定義ファイルではありません。
 styles.validationWarning="%S" は有効な CSL 1.0.2 引用スタイルファイルではないため、Zotero では正しく動作しない恐れがあります。\n\n本当に続けてもよろしいですか？
 styles.installSourceError=%1$S は、 %2$S にある不正 CSLファイル、または存在しない CSL ファイルをソースとして参照しています。
-styles.deleteStyle=本当にスタイル "%1$S"を削除してもよろしいですか？
-styles.deleteStyles=本当に選択されたスタイルを削除してもよろしいですか？
+styles.deleteStyle=本当にスタイル "%1$S" を削除しますか？
+styles.deleteStyles=本当に選択されたスタイルを削除しますか？
 
-styles.abbreviations.title=雑誌略誌名を読み込む
-styles.abbreviations.parseError=雑誌略誌名ファイル "%1$S" は有効な JSON ではありません。
-styles.abbreviations.missingInfo=雑誌略誌名ファイル "%1$S" は完全な情報ブロックを特定していません。
+styles.abbreviations.title=雑誌略語を読み込む
+styles.abbreviations.parseError=雑誌略語ファイル "%1$S" は有効な JSON ではありません。
+styles.abbreviations.missingInfo=雑誌略語ファイル "%1$S" は完全な情報ブロックを特定していません。
 
 sync.sync=同期
-sync.syncWith=Sync with %S
+sync.syncWith=%S と同期
 sync.stopping=停止中...
 sync.cancel=同期をキャンセル
 sync.openSyncPreferences=同期の環境設定を開く
 sync.resetGroupAndSync=グループと同期をリセットする
-sync.resetGroupFilesAndSync=Reset Group Files and Sync
-sync.skipGroup=Skip Group
-sync.removeGroupsAndSync=グループと同期を取り除く
+sync.resetGroupFilesAndSync=グループのファイルと同期をリセット
+sync.skipGroup=グループをスキップ
+sync.removeGroupsAndSync=グループと同期を削除
 
-sync.reminder.setUp.message=Back up your library with %S syncing.
+sync.reminder.setUp.message=%S 同期でライブラリをバックアップしてください。
 sync.reminder.setUp.action=同期の設定
-sync.reminder.autoSync.message=%S hasn’t synced in a while. Do you want to enable automatic syncing?
+sync.reminder.autoSync.message=%S はしばらく同期されていません。自動同期を有効にしますか？
 
 sync.error.usernameNotSet=ユーザーネームが指定されていません
 sync.error.usernameNotSet.text=Zotero サーバーと同期するためには、Zotero 環境設定において、zotero.org のユーザー名とパスワードを入力する必要があります。
@@ -981,73 +954,73 @@ sync.error.invalidLogin=ユーザーネームまたはパスワードが不正
 sync.error.invalidLogin.text=Zotero 同期サーバーはあなたのユーザー名とパスワードを受け付けませんでした。\n \n  Zotero 環境設定の同期設定において zotero.org へのログイン情報を正確に入力したかご確認下さい。
 sync.error.enterPassword=パスワードを入力してください
 sync.error.loginManagerCorrupted1=Zotero はあなたのログイン情報にアクセスすることができません。%S ログインデータベースが壊れているのかもしれません。
-sync.error.loginManagerCorrupted2=Close %1$S, remove cert9.db, key4.db, and logins.json from your %1$S profile directory, and re-enter your Zotero login information in the Sync pane of the %1$S preferences.
+sync.error.loginManagerCorrupted2=%1$S を閉じて、%1$S のプロファイルディレクトリから cert9.db、key4.db、logins.json を削除し、%1$S の設定の同期パネルで Zotero のログイン情報を再入力してください。
 sync.error.syncInProgress=同期処理がすでに実行中です。
 sync.error.syncInProgress.wait=この前の同期が完了するのをお待ち頂くか、あるいは %S を再起動してください。
-sync.error.groupWriteAccessLost=You no longer have write access to the group ‘%1$S’, and changes you’ve made locally cannot be uploaded. If you continue, your copy of the group will be reset to its state on %2$S, and local changes to items and files will be lost.
-sync.error.groupFileWriteAccessLost=You no longer have file editing access for the group ‘%1$S’, and files you’ve changed locally cannot be uploaded. If you continue, all group files will be reset to their state on %2$S.
-sync.error.groupCopyChangedItems=If you would like a chance to copy your changes elsewhere or to request write access from a group administrator, you can skip syncing of the group now.
-sync.error.groupCopyChangedFiles=If you would like a chance to copy modified files elsewhere or to request file editing access from a group administrator, you can skip syncing of the group now.
+sync.error.groupWriteAccessLost=あなたはグループ ‘%1$S’ への書き込み権限を失っており、ローカルで行った変更はアップロードできません。続行すると、グループのコピーは %2$S の状態にリセットされ、項目やファイルへのローカルの変更は失われます。
+sync.error.groupFileWriteAccessLost=あなたはグループ ‘%1$S’ のファイル編集権限を失っており、ローカルで変更したファイルはアップロードできません。続行すると、すべてのグループファイルは %2$S の状態にリセットされます。
+sync.error.groupCopyChangedItems=変更を他の場所にコピーする機会を持ちたい場合や、グループ管理者に書き込み権限をリクエストしたい場合は、今はグループの同期をスキップできます。
+sync.error.groupCopyChangedFiles=変更したファイルを他の場所にコピーする機会を持ちたい場合や、グループ管理者にファイル編集権限をリクエストしたい場合は、今はグループの同期をスキップできます。
 sync.error.manualInterventionRequired=自動の同期処理は、手動処理が必要な矛盾に陥りました。
 sync.error.clickSyncIcon=手動で同期させるため同期アイコンをクリックしてください。
 sync.error.invalidClock=システムの時計が不正な時間になっています。Zotero サーバーと同期するためにはこれを直す必要があります。
 sync.error.sslConnectionError=SSL 接続のエラー
 sync.error.checkConnection=サーバーへの接続エラー。インターネット接続をご確認下さい。
 sync.error.emptyResponseServer=サーバーからの応答を空にする。
-sync.error.invalidCharsFilename=ファイル名 '%S' は不正な文字を含んでいます。\n\nファイル名を変更してもう一度お試しください。OS を通じてファイル名を変更する場合、もう一度 Zotero 内でリンクを作り直す必要があります。
+sync.error.invalidCharsFilename=ファイル名 '%S' は不正な文字を含んでいます。\n\nファイル名を変更してもう一度試してください。OS を通じてファイル名を変更する場合、もう一度 Zotero 内でリンクを作り直す必要があります。
 sync.error.apiKeyInvalid=%S はあなたのアカウントの認証ができませんでした。アカウント情報を再度入力して下さい。
 sync.error.collectionTooLong=“%S” というコレクション名は長すぎて同期できません。名前を短くしてからもう一度同期してください。
-sync.error.fieldTooLong=%1$S フィールドの値 “%2$S” の文字数が多すぎて同期できません。アイテム内のフィールドを編集して文字数を減らしてからもう一度同期してください。
-sync.error.creatorTooLong=The creator name “%S” in one of your items is too long to sync. Shorten the field and sync again.
-sync.error.noteEmbeddedImage=Notes with embedded images cannot currently be synced. Syncing of embedded images may be supported in a future version.
-sync.error.noteTooLong=The note “%S” is too long to sync. Shorten the note and sync again.
-sync.error.reportSiteIssuesToForums=If you receive this message repeatedly for items saved from a particular site, you can report this issue in the %S Forums.
-sync.error.invalidDataError=Some data in %S could not be downloaded. It may have been saved with a newer version of %S.
-sync.error.invalidDataError.otherData=Other data will continue to sync.
+sync.error.fieldTooLong=%1$S フィールドの値 “%2$S” の文字数が多すぎて同期できません。項目内のフィールドを編集して文字数を減らしてからもう一度同期してください。
+sync.error.creatorTooLong=“%S” という著者名は長すぎて同期できません。項目内の編著者名フィールドを編集して短い名前にしてからもう一度同期してください。。
+sync.error.noteEmbeddedImage=埋め込み画像を含むメモは現在同期できません。埋め込み画像の同期は将来のバージョンでサポートされる可能性があります。
+sync.error.noteTooLong=メモ "%S" は同期するには長すぎます。メモを短くしてから再度同期してください。
+sync.error.reportSiteIssuesToForums=特定のサイトから保存した項目でこのメッセージが繰り返し表示される場合は、%S フォーラムでこの問題を報告できます。
+sync.error.invalidDataError=%S の一部のデータをダウンロードできませんでした。より新しいバージョンの %S で保存された可能性があります。
+sync.error.invalidDataError.otherData=その他のデータは引き続き同期されます。
 
-account.unlinkWarning=Logging out will prevent %S from syncing your data.
-account.unlinkWarning.removeData=Remove my %S data from this computer
-account.unlinkWarning.button=Log Out
-account.warning.emptyLibrary=You are about to sync to an empty %1$S database. This could happen if you accidentally deleted the %2$S file in your %1$S data directory or the location of your data directory changed.
-account.warning.emptyLibrary.dataWillBeDownloaded=If you continue, data in the ‘%1$S’ account will be downloaded to this computer. Your online library won’t be affected.
-account.warning.existingDataElsewhere=If your %S data exists elsewhere on this computer, you should move it to the current data directory or change the data directory location to point to your existing data.
-account.lastSyncWithDifferentAccount=This %1$S database was last synced with a different account (“%2$S”) from the one you are attempting to sync with (“%3$S”). If you continue, all %1$S libraries associated with the “%2$S” account will be removed from this computer.
-account.lastSyncWithDifferentAccount.beforeContinuing=Before continuing, make sure all data and files you wish to keep have been synced with the “%S” account or you have a backup of your %S data directory.
-account.confirmDelete=Remove all data for “%S” from this computer
+account.unlinkWarning=アカウントのリンクを解除すると、%S はデータを同期できなくなります。
+account.unlinkWarning.removeData=このコンピュータから %S データを削除する
+account.unlinkWarning.button=ログアウト
+account.warning.emptyLibrary=これから空の %1$S データベースに同期しようとしています。これは、%1$S のデータディレクトリ内の %2$S ファイルを誤って削除した場合や、データディレクトリの場所が変更された場合に起こる可能性があります。
+account.warning.emptyLibrary.dataWillBeDownloaded=続行すると、‘%1$S’ アカウントのデータがこのコンピュータにダウンロードされます。オンラインライブラリには影響ありません。
+account.warning.existingDataElsewhere=もし %S のデータがこのコンピュータの他の場所に存在する場合は、それを現在のデータディレクトリに移動するか、データディレクトリの場所を既存のデータを指すように変更してください。
+account.lastSyncWithDifferentAccount=この %1$S データベースは、最後に同期されたアカウント（“%2$S”）と、現在同期しようとしているアカウント（“%3$S”）が異なります。続行すると、“%2$S” アカウントに関連付けられたすべての %1$S ライブラリがこのコンピュータから削除されます。
+account.lastSyncWithDifferentAccount.beforeContinuing=続行する前に、保持したいすべてのデータとファイルが “%S” アカウントと同期されているか、または %S のデータディレクトリのバックアップを持っていることを確認してください。
+account.confirmDelete=このコンピュータから “%S” のすべてのデータを削除する
 account.confirmDelete.button=アカウントを切り替える
 
-sync.conflict.autoChange.alert=One or more locally deleted Zotero %S have been modified remotely since the last sync.
-sync.conflict.autoChange.log=A Zotero %S has changed both locally and remotely since the last sync:
-sync.conflict.remoteVersionsKept=The remote versions have been kept.
-sync.conflict.remoteVersionKept=The remote version has been kept.
-sync.conflict.localVersionsKept=The local versions have been kept.
-sync.conflict.localVersionKept=The local version has been kept.
-sync.conflict.recentVersionsKept=最新のヴァージョンが維持されました。
-sync.conflict.recentVersionKept=最新のヴァージョン '%S' が維持されました。
-sync.conflict.viewErrorConsole=すべての変更についての一覧を見るには %S エラー・コンソールをご覧ください。
-sync.conflict.localVersion=ローカルのヴァージョン: %S
-sync.conflict.remoteVersion=リモートのヴァージョン: %S
+sync.conflict.autoChange.alert=1つ以上のローカルで削除された Zotero の %S が、最後の同期以降リモートで変更されています。
+sync.conflict.autoChange.log=Zotero の %S が最後の同期以降、ローカルとリモートの両方で変更されました：
+sync.conflict.remoteVersionsKept=リモートバージョンは保持されています。
+sync.conflict.remoteVersionKept=リモートバージョンは保持されています。
+sync.conflict.localVersionsKept=ローカルバージョンは保持されています。
+sync.conflict.localVersionKept=ローカルバージョンは保持されています。
+sync.conflict.recentVersionsKept=最新バージョンが保持されています。
+sync.conflict.recentVersionKept=最新バージョン '%S' が保持されています。
+sync.conflict.viewErrorConsole=すべての変更についての一覧を表示するには %S エラーコンソールをご覧ください。
+sync.conflict.localVersion=ローカルのバージョン : %S
+sync.conflict.remoteVersion=リモートのバージョン : %S
 sync.conflict.deleted=[削除済み]
-sync.conflict.collectionItemMerge.alert=最後の同期のあと、ひとつあるいは複数の Zotero アイテムが、複数のコンピューター上で、追加または削除されています。
-sync.conflict.collectionItemMerge.log=コレクション '%S' の中の Zotero アイテムは、最後の同期の後で複数のコンピュータ上において追加または削除されました。次のアイテムがコレクションに追加されています。:
-sync.conflict.tagItemMerge.alert=最後の同期の後で、ひとつあるいは複数の Zotero タグが、複数のコンピューター上でアイテムから追加または削除されました。異なる組のタグが統合されました。
+sync.conflict.collectionItemMerge.alert=最後の同期のあと、ひとつあるいは複数の Zotero 項目が、複数のコンピューター上で、追加または削除されています。
+sync.conflict.collectionItemMerge.log=コレクション '%S' の中の Zotero 項目は、最後の同期の後で複数のコンピュータ上において追加または削除されました。次の項目がコレクションに追加されています :
+sync.conflict.tagItemMerge.alert=最後の同期の後で、ひとつあるいは複数の Zotero タグが、複数のコンピューター上で項目から追加または削除されました。異なる組のタグが統合されました。
 sync.conflict.tagItemMerge.log=最後の同期のあと、Zotero タグ '%S' が複数のコンピューター上で追加または削除されています。
-sync.conflict.tag.addedToRemote=以下のリモート・アイテムに追加されました:
-sync.conflict.tag.addedToLocal=以下のローカル・アイテムに追加されました:
+sync.conflict.tag.addedToRemote=以下のリモート項目に追加されました :
+sync.conflict.tag.addedToLocal=以下のローカル項目に追加されました :
 
-sync.conflict.localItem=ローカルのアイテム
-sync.conflict.remoteItem=リモートのアイテム
-sync.conflict.mergedItem=統合されたアイテム
-sync.conflict.localFile=ローカルのファイル
-sync.conflict.remoteFile=Remote File
-sync.conflict.resolveAllLocal=残りの矛盾についてはすべてローカルのバージョンを採用する
-sync.conflict.resolveAllRemote=残りの矛盾についてはすべてリモートのバージョンを採用する
-sync.conflict.itemChanged=The following item has been changed in multiple locations. Click the version to use for resolving conflicting fields, and then click %S.
-sync.conflict.fileChanged=The following file has been changed in multiple locations. Choose the version you would like to keep, and then click %S.
-sync.conflict.chooseThisVersion=このヴァージョンを選ぶ
+sync.conflict.localItem=ローカルの項目
+sync.conflict.remoteItem=リモートの項目
+sync.conflict.mergedItem=統合された項目
+sync.conflict.localFile=ローカルファイル
+sync.conflict.remoteFile=リモートファイル
+sync.conflict.resolveAllLocal=残りの競合はすべてローカルバージョンを使用する
+sync.conflict.resolveAllRemote=残りのすべての競合に対してリモートバージョンを使用する
+sync.conflict.itemChanged=次の項目は複数の場所で変更されています。競合するフィールドを解決するために使用するバージョンをクリックし、%S をクリックしてください。
+sync.conflict.fileChanged=以下のファイルは複数の場所で変更されています。保存するバージョンを選択し、%S をクリックしてください。
+sync.conflict.chooseThisVersion=このバージョンを選択
 
 sync.status.notYetSynced=未同期
-sync.status.lastSync=最後の同期:
+sync.status.lastSync=最後の同期 :
 sync.status.waiting=他の処理が終了するのを待っています
 sync.status.preparing=同期の準備中
 sync.status.loggingIn=同期サーバへログイン中
@@ -1064,33 +1037,33 @@ sync.storage.mbRemaining=%SMB が残っています
 sync.storage.kbRemaining=残り %SKB
 sync.storage.filesRemaining=%1$S/%2$S 個のファイル
 sync.storage.none=なし
-sync.storage.downloads=ダウンロード:
-sync.storage.uploads=アップロード:
-sync.storage.localFile=ローカル（手元）のファイル
-sync.storage.remoteFile=リモート（サーバ側）のファイル
+sync.storage.downloads=ダウンロード :
+sync.storage.uploads=アップロード :
+sync.storage.localFile=ローカルファイル
+sync.storage.remoteFile=リモートファイル
 sync.storage.savedFile=保存されたファイル
-sync.storage.serverConfigurationVerified=サーバの設定が検証されました。
+sync.storage.serverConfigurationVerified=サーバーの設定が検証されました。
 sync.storage.fileSyncSetUp=ファイルの同期の設定に成功しました。
 sync.storage.openAccountSettings=アカウント設定を開く
 
-sync.storage.error.default=同期エラーが生じました。同期をもう一度お試しください。\n\nもしこの案内が繰り返し表示される場合、 %S またはコンピューターを再起動して、もう一度お試しください。それでもまだこの案内が表示される場合は、エラー・レポートを送信して、Report ID を Zotero フォーラムの新しいスレッドに投稿してください。
-sync.storage.error.defaultRestart=同期エラーが生じました。 %S またはコンピューターを再起動してもう一度同期をお試しください。\n\nもしこの案内が繰り返し表示される場合は、エラー・レポートを送信して、Report ID を Zotero フォーラムの新しいスレッドに投稿してください。
-sync.storage.error.serverCouldNotBeReached=サーバ %S に接続できませんでした。
+sync.storage.error.default=同期エラーが発生しました。同期をもう一度試してください。\n\nもしこの案内が繰り返し表示される場合、 %S またはコンピューターを再起動して、もう一度試してください。それでもまだこの案内が表示される場合は、エラーレポートを送信して、Report ID を Zotero フォーラムの新しいスレッドに投稿してください。
+sync.storage.error.defaultRestart=同期エラーが発生しました。 %S またはコンピューターを再起動してもう一度同期を試してください。\n\nもしこの案内が繰り返し表示される場合は、エラーレポートを送信して、Report ID を Zotero フォーラムの新しいスレッドに投稿してください。
+sync.storage.error.serverCouldNotBeReached=サーバー %S に接続できませんでした。
 sync.storage.error.permissionDeniedAtAddress=以下のアドレスに Zotero データ保存ディレクトリを作る権限がありません:
-sync.storage.error.checkFileSyncSettings=ファイル同期の設定を確認するか、サーバ管理者に連絡してください。
+sync.storage.error.checkFileSyncSettings=ファイル同期の設定を確認するか、サーバー管理者に連絡してください。
 sync.storage.error.verificationFailed=%S の検証に失敗しました。Zotero 環境設定の同期パネルからファイル同期の設定をご確認ください。
-sync.storage.error.fileNotCreated=ファイル '%S' を Zotero 'ストレジ' ディレクトリ内に作成することができませんでした。
+sync.storage.error.fileNotCreated=ファイル '%S' を Zotero 'ストレージ' ディレクトリ内に作成することができませんでした。
 sync.storage.error.encryptedFilenames=ファイル '%S' の作成でエラーが発生しました。.\n\nさらに詳しくは http://www.zotero.org/support/kb/encrypted_filenames をご覧ください。
-sync.storage.error.fileEditingAccessLost=あなたはもはや Zotero グループ '%S'に編集アクセス権限を持っていません。あなたが追加したり編集したファイルはサーバ側と同期させることができません。
-sync.storage.error.copyChangedItems=編集されたアイテムやファイルを別の場所へコピーしたい場合は、直ちに同期をキャンセルしてください。
+sync.storage.error.fileEditingAccessLost=あなたはもはや Zotero グループ '%S'に編集アクセス権限を持っていません。あなたが追加したり編集したファイルはサーバー側と同期させることができません。
+sync.storage.error.copyChangedItems=編集された項目やファイルを別の場所へコピーしたい場合は、直ちに同期をキャンセルしてください。
 sync.storage.error.fileUploadFailed=ファイルのアップロードに失敗しました。
 sync.storage.error.directoryNotFound=ディレクトリが見つかりませんでした。
 sync.storage.error.doesNotExist=%S が見つかりません。
 sync.storage.error.createNow=これを今作成してよろしいですか？
 
-sync.storage.error.webdav.default=A WebDAV file sync error occurred. Please try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
-sync.storage.error.webdav.defaultRestart=A WebDAV file sync error occurred. Please restart %S and try syncing again.\n\nIf you receive this message repeatedly, check your WebDAV server settings in the Sync pane of the Zotero preferences.
-sync.storage.error.webdav.enterURL=WebDAV URL を入力して下さい。
+sync.storage.error.webdav.default=WebDAV ファイル同期エラーが発生しました。同期をもう一度試してください。\n\nこの案内が繰り返し表示される場合は、Zotero 環境設定の「同期」にある WebDAV のサーバー設定を確認してください。
+sync.storage.error.webdav.defaultRestart=WebDAV ファイル同期エラーが発生しました。%S を再起動してもう一度同期を試してください。\n\nもしこの案内が繰り返し表示される場合は、Zotero 環境設定の「同期」にある WebDAV サーバー設定を確認してください。
+sync.storage.error.webdav.enterURL=WebDAV URL を入力してください。
 sync.storage.error.webdav.invalidURL=%S は正しい WebDAV URL ではありません。
 sync.storage.error.webdav.invalidLogin=WebDAV サーバはユーザーネームとパスワードを拒否しました。
 sync.storage.error.webdav.permissionDenied=WebDAV サーバの %S にアクセスする権限がありません。
@@ -1100,58 +1073,58 @@ sync.storage.error.webdav.sslConnectionError=%S への接続に際しSSL 接続
 sync.storage.error.webdav.loadURLForMoreInfo=さらに詳しい情報を得るには WebDAV URL をブラウザに読み込んでください。
 sync.storage.error.webdav.seeCertOverrideDocumentation=さらに詳しくは証明書上書きのヘルプをご覧下さい。
 sync.storage.error.webdav.loadURL=WebDAV URL を読み込む。
-sync.storage.error.webdav.fileMissingAfterUpload=あなたの WebDAV サーバーに潜在的な問題が見つかりました。\n\nアップロードしたファイルはすぐにダウンロード可能になるわけではありません。とくにクラウドの保存サービスをご利用の場合、アップロードしてから利用可能になるまでに少々の時間がかかることがあります。\n\nもし Zotero ファイル同期が正常に機能しているようなら、この案内を無視して下さい。もし問題がある場合は、  Zotero フォーラムに投稿してください。
+sync.storage.error.webdav.fileMissingAfterUpload=あなたの WebDAV サーバーに潜在的な問題が見つかりました。\n\nアップロードしたファイルはすぐにダウンロード可能になるわけではありません。とくにクラウドの保存サービスをご利用の場合、アップロードしてから利用可能になるまでに少々の時間がかかることがあります。\n\nもし Zotero ファイル同期が正常に機能しているようなら、この案内を無視して下さい。もし問題がある場合は、Zotero フォーラムに投稿してください。
 sync.storage.error.webdav.nonexistentFileNotMissing=あなたの WebDAV サーバーは、実在しないファイルの存在を主張しています。WebDAV サーバーの管理者に問い合わせてください。
 sync.storage.error.webdav.serverConfig.title=WebDAV サーバー設定のエラー
 sync.storage.error.webdav.serverConfig=あなたの WebDAV サーバーが内部エラーを返しました。
 sync.storage.error.webdav.requestError=あなたの WebDAV サーバーは %2$S リクエストに対して HTTP %1$S エラーを返しました。
 sync.storage.error.webdav.checkSettingsOrContactAdmin=このメッセージを繰り返し受け取る場合は、あなたの WevDAV サーバーの設定を確認するか、WebDAV サーバーの管理者に連絡してください。
-sync.storage.error.webdav.url=URL: %S
+sync.storage.error.webdav.url=URL : %S
 
-sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
-sync.storage.error.zfs.tooManyQueuedUploads=You have too many queued uploads. Please try again in %S minutes.
-sync.storage.error.zfs.personalQuotaReached1=あなたの Zotero ファイル・ストレージの容量が一杯になりました。いくつかのファイルはアップロードされませんでした。他の Zotero データはサーバと同期し続けます。
+sync.storage.error.zfs.restart=ファイル同期エラーが発生しました。%S またはコンピューターを再起動してからもう一度同期を試してください。\n\nもしエラーが引き続き発生するようなら、セキュリティソフトウェア、プロキシサーバー、VPN、など、あなたのコンピューターまたはあなたのネットワークに問題がある可能性があります。ご使用のセキュリティソフトウェアやファイアウォールを無効化して試すか、もしノートパソコンならば、別のネットワークから試してください。
+sync.storage.error.zfs.tooManyQueuedUploads=アップロード待ちのデータが多すぎます。%S 分後にもう一度試してください。
+sync.storage.error.zfs.personalQuotaReached1=あなたの Zotero ファイルストレージの容量が一杯になりました。いくつかのファイルはアップロードされませんでした。他の Zotero データはサーバと同期し続けます。
 sync.storage.error.zfs.personalQuotaReached2=保管に関する他の選択肢についてはあなたの zotero.org アカウントの設定をご覧ください。
 sync.storage.error.zfs.groupQuotaReached1=グループ '%S' の Zotero ファイル・ストレージの容量が一杯になりました。いくつかのファイルはアップロードされませんでした。他の Zotero データはサーバ側と同期し続けます。
 sync.storage.error.zfs.groupQuotaReached2=グループのオーナーは zotero.org のストレジ設定からグループの保存容量割り当てを増やすことができます。
 sync.storage.error.zfs.fileWouldExceedQuota=ファイル '%S' はあなたの Zotero ファイルストレージの容量を超過します。
 
-sync.longTagFixer.saveTag=タグを保存する
-sync.longTagFixer.saveTags=タグを保存する
-sync.longTagFixer.deleteTag=タグを削除する
+sync.longTagFixer.saveTag=タグを保存
+sync.longTagFixer.saveTags=タグを保存
+sync.longTagFixer.deleteTag=タグを削除
 
 proxies.multiSite=複数サイト
 proxies.error=無効なプロキシ設定
 proxies.error.scheme.noHTTP=有効なスキームは "http://" または "https://" で始まらねばなりません。
 proxies.error.host.invalid=このプロキシによって サーブされるサイトの完全なホスト名（例, jstor.org）を入力する必要があります。
-proxies.error.scheme.noHost=複数サイト用プロキシ・スキームはホスト変数 (%h) を含んでいなければなりません。
-proxies.error.scheme.noPath=有効なプロキシ・スキームはパス変数（%p）またはディレクトリとファイル名変数（%d と %f）を含んでいなければいけません。
+proxies.error.scheme.noHost=複数サイト用プロキシスキームはホスト変数 (%h) を含んでいなければなりません。
+proxies.error.scheme.noPath=有効なプロキシスキームはパス変数（%p）またはディレクトリとファイル名変数（%d と %f）を含んでいなければいけません。
 proxies.error.host.proxyExists=あなたはホスト %1$S のために他のプロキシをすでに指定しています。
-proxies.error.scheme.invalid=入力されたプロキシ・スキームは不正です。あらゆるホストに適用できてしまいます。
+proxies.error.scheme.invalid=入力されたプロキシスキームは不正です。あらゆるホストに適用できてしまいます。
 proxies.notification.recognized.label=Zotero はあなたがこのウェブサイトにプロキシ経由でアクセスしていることを検出しました。今後、自動的に %1$S へのリクエストを %2$S 経由で転送しますか？
 proxies.notification.associated.label=Zotero はこのサイトを自動的にに以前定義されたプロキシと関連付けました。今後の %1$S へのリクエストは %2$S へと転送されます。
 proxies.notification.redirected.label=Zotero は自動的に %1$S へのあなたのリクエストを %2$S のプロキシ経由で転送しました。
 proxies.notification.enable.button=有効化...
 proxies.notification.settings.button=プロキシ設定...
-proxies.recognized.message=このプロキシを追加すると Zotero はこのページからのアイテム作成が可能になり、今後自動的に %1$S へのリクエストを %2$S 経由で転送します。
+proxies.recognized.message=このプロキシを追加すると Zotero はこのページからの項目作成が可能になり、今後自動的に %1$S へのリクエストを %2$S 経由で転送します。
 proxies.recognized.add=プロキシを追加
 
-recognizePDF.title=Metadata Retrieval
+recognizePDF.title=メタデータの取得
 recognizePDF.noOCR=PDF は OCRed テキストを含んでいません
-recognizePDF.couldNotRead=Could not read text from document
-recognizePDF.noMatches=一致する文献が見つかりません。
+recognizePDF.couldNotRead=文書からテキストを読み取れませんでした
+recognizePDF.noMatches=一致する文献が見つかりません
 recognizePDF.fileNotFound=ファイルが見つかりません
-recognizePDF.error=予期しないエラーが生じました
-recognizePDF.recognizing.label=Retrieving Metadata…
+recognizePDF.error=予期しないエラーが発生しました
+recognizePDF.recognizing.label=メタデータの取得...
 recognizePDF.complete.label=メタデータの取り込みが完了しました
-recognizePDF.attachmentName.label=Attachment Name
-recognizePDF.itemName.label=アイテム名
+recognizePDF.attachmentName.label=添付ファイル名
+recognizePDF.itemName.label=項目名
 
-rtfScan.openTitle=スキャンするファイルを選んでください
+rtfScan.openTitle=スキャンするファイルの選択
 rtfScan.scanning.label=RTF 文書をスキャン中…
 rtfScan.saving.label=RTF 文書を整形中...
 rtfScan.rtf=リッチテキスト形式 (RTF) (.rtf)
-rtfScan.saveTitle=整形されたファイルの保存先を選んでください。
+rtfScan.saveTitle=整形されたファイルの保存先を選択
 rtfScan.scannedFileSuffix=(スキャン済み)
 
 extractedAnnotations=抽出された注釈
@@ -1168,30 +1141,30 @@ file.accessError.restart=コンピューターを再起動するか、セキュ
 file.accessError.showParentDir=親ディレクトリを表示
 file.error.cannotAddShortcut=ショートカットファイルを直接追加することができません。オリジナルのファイルを選択してください。
 
-lookup.failure.title=所在確認が失敗しました。
-lookup.failure.description=Zotero は指定された認識子に該当するレコードを見つけることができませんでした。認識子をもう一度確認してから再度お試しください。
-lookup.failureToID.description=Zotero はあなたの入力に識別子を見つけることができませんでした。もう一度入力情報を確認してお試し下さい。
-lookup.failureTooMany.description=Too many identifiers. Please enter one identifier and try again.
+lookup.failure.title=出典の確認が失敗しました。
+lookup.failure.description=Zotero は指定された認識子に該当するレコードを見つけることができませんでした。認識子をもう一度確認してから再度試してください。
+lookup.failureToID.description=Zotero はあなたの入力に識別子を見つけることができませんでした。もう一度入力情報を確認して試してください。
+lookup.failureTooMany.description=識別子が多すぎます。識別子を1つだけ入力して、もう一度試してください。
 
-locate.online.label=オンラインで閲覧する
+locate.online.label=オンラインで表示
 locate.pdf.label=PDF ファイルを開く
 locate.pdfNewWindow.label=PDF ファイルを新しいウィンドウで開く
 locate.pdfNewTab.label=PDF ファイルを新しいタブで開く
-locate.snapshot.label=スナップショットを閲覧する
-locate.file.label=ファイルを閲覧する
-locate.externalViewer.label=外部ソフトウェアで開く
-locate.internalViewer.label=内蔵の閲覧機能で開く
-locate.libraryLookup.label=所在確認
-locate.libraryLookup.noResolver.title=OpenURLのリゾルバがありません
-locate.manageLocateEngines=所在確認エンジンの管理...
-locate.locateEngineDescription=Lookup engines help you find resources in your %S library on the web. Engines enabled in this list appear in the Locate drop-down in the toolbar.
+locate.snapshot.label=スナップショットを表示
+locate.file.label=ファイルの場所を開く
+locate.externalViewer.label=外部ビューアで開く
+locate.internalViewer.label=内蔵ビューアで開く
+locate.libraryLookup.label=出典の確認
+locate.libraryLookup.noResolver.title=OpenURL のリゾルバがありません
+locate.manageLocateEngines=文献検索エンジンの管理...
+locate.locateEngineDescription=検索エンジンは、ウェブ上の %S ライブラリ内のリソースを見つけるのに役立ちます。このリストで有効になっているエンジンは、ツールバーの 所在 ドロップダウンに表示されます。
 
-standalone.corruptInstallation=Your Zotero installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero from https://www.zotero.org/download as soon as possible.
+standalone.corruptInstallation=自動更新の失敗により、あなたの Zotero のインストールが破損しているようです。Zotero は引き続き動作する可能性がありますが、潜在的なバグを避けるために、できるだけ早く https://www.zotero.org/download から最新バージョンの Zotero をダウンロードしてください。
 standalone.addonInstallationFailed.title=アドオンのインストールに失敗しました
-standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero.
-standalone.rootWarning=You appear to be running Zotero as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writable by your user account.
+standalone.addonInstallationFailed.body=アドオン "%S" をインストールできませんでした。このバージョンの Zotero と互換性がない可能性があります。
+standalone.rootWarning=Zotero を root ユーザーとして実行しているようです。これは安全ではなく、ユーザーアカウントから起動した際に Zotero が正常に動作しない可能性があります。\n\n自動更新をインストールしたい場合は、Zotero のプログラムディレクトリをユーザーアカウントで書き込み可能に変更してください。
 standalone.rootWarning.exit=終了
-standalone.rootWarning.continue=続ける
+standalone.rootWarning.continue=続行
 standalone.updateMessage=推奨の更新が利用可能ですが、インストールするための権限がありません。自動的に更新するためには、Zotero ディレクトリをあなたのユーザーアカウントから書き込み可能に修正してください。
 
 connector.name=%S コネクタ
@@ -1199,19 +1172,19 @@ connector.error.title=Zotero コネクタのエラー
 
 firstRunGuidance.toolbarButton.new=‘Z’ ボタンをクリックするか、キーボードショートカット%Sを利用して Zotero を開いてください。
 firstRunGuidance.toolbarButton.upgrade=Zotero アイコンは Firefox ツールバーに表示されます。アイコンをクリックして Zotero を起動するか、%S のキーボードショートカットを使用してください
-firstRunGuidance.saveButton=このボタンをクリックしてどんなウェブページでもZoteroライブラリに保存することができます。一部のページでは、Zotero は著者名や発行日などの書誌情報も保存することができます。
+firstRunGuidance.saveButton=このボタンをクリックしてどんなウェブページでも Zotero ライブラリに保存することができます。一部のページでは、Zotero は著者や発行日などの書誌情報も保存することができます。
 
-styles.bibliography=Bibliography
-styles.editor.save=Save Citation Style
-styles.editor.warning.noItems=Zoteroのアイテムが選択されていません。
-styles.editor.warning.parseError=引用スタイルの文法エラー:
-styles.editor.warning.renderError=Error generating citations and bibliography:
-styles.editor.output.individualCitations=個別の出典表記
-styles.editor.output.singleCitation=Single Citation (with position "first")
-styles.preview.instructions=一つ以上のアイテムを Zotero 内で選択し、「再読み込み」ボタンをクリックすると、インストール済みの CSL 引用スタイルでどのようにフォーマットされるかが確認できます。
+styles.bibliography=参考文献
+styles.editor.save=引用スタイルを保存
+styles.editor.warning.noItems=Zotero の項目が選択されていません。
+styles.editor.warning.parseError=引用スタイルの文法エラー :
+styles.editor.warning.renderError=引用文献と参考文献の生成時にエラー :
+styles.editor.output.individualCitations=個別の引用文献
+styles.editor.output.singleCitation=単一の引用文献 (位置 : "先頭")
+styles.preview.instructions=一つ以上の項目を Zotero 内で選択し、「再読み込み」ボタンをクリックすると、インストール済みの CSL 引用スタイルでどのようにフォーマットされるかが確認できます。
 
-publications.intro.text1=「私の出版物」を使えば、あなたはご自分の著作のリストを作成し、それを %S におけるご自身のプロファイルページ上で共有することができます。個々のアイテムについてのメモを追加することができ、あなたの指定したライセンスの元で PDF や他のファイルを共有することも可能です。
-publications.intro.text2=アイテムを追加するには、ライブラリの他の場所からドラッグして下さい。添付しているメモやファイルを含むかどうかは選択することができます。
+publications.intro.text1=「私の出版物」を使えば、あなたはご自分の著作のリストを作成し、それを %S におけるご自身のプロファイルページ上で共有することができます。個々の項目についてのメモを追加することができ、あなたの指定したライセンスの元で PDF や他のファイルを共有することも可能です。
+publications.intro.text2=項目を追加するには、ライブラリの他の場所からドラッグして下さい。添付しているメモやファイルを含むかどうかは選択することができます。
 publications.intro.text3=<b>あなたご自身が作成した著作物のみを加えて下さい。</b>また、あなたが配布する意志をもつ場合のみ、あなたが配布する権利を有するファイルのみを加えるようにして下さい。
 publications.intro.authorship=私がこの作品を作りました。
 publications.intro.authorship.files=私がこの著作を作成し、これに含まれるファイルを配布する権利を有します。
@@ -1219,14 +1192,14 @@ publications.sharing.keepRightsField=既存の権利フィールドを維持す
 publications.sharing.keepRightsFieldWhereAvailable=可能なときは既存の権利フィールドを維持する
 publications.cc.moreInfo.text=あなたの著作を CC ライセンスの元に置く前に必ず Creative Commons %S を読んでください。あなたが適用するライセンスは、たとえあなたが後に別の条件を選んだり、著作の公開を中止するとしても、無効化できない点にご注意ください。
 publications.cc.moreInfo.linkText=使用許諾者のための検討事項
-publications.cc0.moreInfo.text=Be sure you have read the Creative Commons %S before applying CC0 to your work. Please note that dedicating your work to the public domain is irreversible, even if you later choose different terms or cease publishing the work.
+publications.cc0.moreInfo.text=ご自身の作品に CC0 を適用する前に、必ず Creative Commons %S をお読みください。作品をパブリックドメインに献呈することは取り消しできないことにご注意ください。たとえ後で異なる条件を選択したり、作品の公開をやめたりしても、この変更は元に戻せません。
 publications.cc0.moreInfo.linkText=CC0 FAQ
 publications.error.linkedFilesCannotBeAdded=リンクされたファイルは「私の出版物」に加えることができません
 
-publications.buttons.next=Next: %S
+publications.buttons.next=次 : %S
 publications.buttons.choose-sharing=共有
-publications.buttons.choose-license=Choose a License
-publications.buttons.addToMyPublications=Add to My Publications
+publications.buttons.choose-license=ライセンスの選択
+publications.buttons.addToMyPublications=「私の出版物」へ追加
 
 licenses.cc-by=Creative Commons Attribution 4.0 International License
 licenses.cc-by-nd=Creative Commons Attribution-NoDerivatives 4.0 International License
@@ -1235,224 +1208,224 @@ licenses.cc-by-nc=Creative Commons Attribution-NonCommercial 4.0 International L
 licenses.cc-by-nc-nd=Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License
 licenses.cc-by-nc-sa=Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
 
-retraction.alert.single=あなたのデータベース中の取り消し済みのアイテムがひとつあります
-retraction.alert.multiple=あなたのデータベース中の取り消し済みのアイテムがあります
-retraction.alert.view.single=View Item
-retraction.alert.view.multiple=View Items
-retraction.banner=この著作物は取り消されました。
-retraction.date=%Sに取り消し済みの物があります
-retraction.notice=取り消し済みの掲示
-retraction.details=More details:
-retraction.credit=Data from %S
-retraction.replacedItem.hide=Hide warning for replaced work…
-retraction.replacedItem.title=Retracted and Replaced Work
-retraction.replacedItem.text1=This work has been retracted and replaced by its publisher, and this item may not represent the final version.
-retraction.replacedItem.text2=Unfortunately, some publishers incorrectly reuse the original DOI and/or PMID when replacing a work. If you’ve checked that this is the latest version, you can permanently hide the retraction warning for this item.
-retraction.replacedItem.button=Hide Retraction Warning
-retraction.citeWarning.text1=The item you are citing has been retracted. Do you still want to add it to your document?
-retraction.citeWarning.text2=You can view the item in your library for further details on the retraction.
-retraction.citationWarning=A citation in your document has been retracted:
-retraction.citationWarning.dontWarn=Don’t warn me about this item again
+retraction.alert.single=あなたのデータベース中の取り消し済みの項目がひとつあります
+retraction.alert.multiple=あなたのデータベース中の取り消し済みの項目があります
+retraction.alert.view.single=項目を表示
+retraction.alert.view.multiple=項目を表示
+retraction.banner=この著作物は撤回されました。
+retraction.date=%S の撤回された著作物
+retraction.notice=撤回通知
+retraction.details=詳細資料 :
+retraction.credit=%S からのデータ
+retraction.replacedItem.hide=置き換えられた作品の警告を非表示にする…
+retraction.replacedItem.title=撤回および置き換えられた著作物
+retraction.replacedItem.text1=この作品は出版社によって撤回され、差し替えられています。この項目は最終版を示していない可能性があります。
+retraction.replacedItem.text2=残念ながら、一部の出版社は著作物を差し替える際に元の DOI や PMID を誤って再利用することがあります。これが最新のバージョンであることを確認した場合、この項目の撤回警告を永久に非表示にすることができます。
+retraction.replacedItem.button=撤回警告を非表示にする
+retraction.citeWarning.text1=あなたが引用している項目は撤回されています。それでも文書に追加しますか？
+retraction.citeWarning.text2=撤回の詳細については、ライブラリ内の項目を参照できます。
+retraction.citationWarning=あなたの文書内の引用が撤回されました：
+retraction.citationWarning.dontWarn=この項目については今後警告しない
 
 noteEditor.annotationsDateLine=(%S)
-noteEditor.cut=Cut
+noteEditor.cut=切り取り
 noteEditor.copy=コピー
-noteEditor.paste=Paste
+noteEditor.paste=貼り付け
 noteEditor.rightToLeft=右から左
 noteEditor.leftToRight=左から右
-noteEditor.updateNotice=This note was edited with a newer version of %1$S.\nPlease update %1$S to make changes.
-noteEditor.enterLink=Enter Link
+noteEditor.updateNotice=このメモは %1$S の新しいバージョンで編集されました。\n変更を加えるには %1$S を更新してください。
+noteEditor.enterLink=リンクの入力
 noteEditor.heading1=表題1
 noteEditor.heading2=表題2
 noteEditor.heading3=表題3
 noteEditor.paragraph=段落
 noteEditor.monospaced=等幅
-noteEditor.bulletList=Bulleted List
-noteEditor.orderedList=Numbered List
-noteEditor.blockquote=Block Quote
+noteEditor.bulletList=箇条書きリスト
+noteEditor.orderedList=番号付きリスト
+noteEditor.blockquote=ブロック引用
 noteEditor.mathBlock=数学ブロック
-noteEditor.formatText=Format Text
+noteEditor.formatText=テキストの書式設定
 noteEditor.highlightText=テキストを強調表示
 noteEditor.textColor=文字色
-noteEditor.removeColor=Remove Color
+noteEditor.removeColor=色を削除
 noteEditor.bold=太字
 noteEditor.italic=斜体
 noteEditor.underline=下線
 noteEditor.strikethrough=打ち消し線
 noteEditor.subscript=下付き文字
 noteEditor.superscript=上付き文字
-noteEditor.returnToNotesList=Return to Notes List
-noteEditor.insertLink=Insert Link
+noteEditor.returnToNotesList=メモ一覧に戻る
+noteEditor.insertLink=リンクを挿入
 noteEditor.clearFormatting=書式設定を消去
-noteEditor.align=Align
-noteEditor.alignLeft=Align Left
-noteEditor.alignCenter=Align Center
-noteEditor.alignRight=Align Right
-noteEditor.insertCitation=Insert Citation
+noteEditor.align=整列
+noteEditor.alignLeft=左揃え
+noteEditor.alignCenter=中央揃え
+noteEditor.alignRight=右揃え
+noteEditor.insertCitation=引用文献を挿入
 noteEditor.more=その他
 noteEditor.find=検索
-noteEditor.replace=Replace
-noteEditor.previous=Previous
-noteEditor.next=Next
-noteEditor.replaceNext=Replace
-noteEditor.replaceAll=Replace All
-noteEditor.goToPage=Go to Page
-noteEditor.showItem=Show Item
-noteEditor.editCitation=Edit Citation
-noteEditor.showOnPage=Show on Page
-noteEditor.unlink=Unlink
-noteEditor.set=Set
+noteEditor.replace=置き換え
+noteEditor.previous=前へ
+noteEditor.next=次へ
+noteEditor.replaceNext=置き換え
+noteEditor.replaceAll=すべて置き換え
+noteEditor.goToPage=ページへ移動
+noteEditor.showItem=項目を表示
+noteEditor.editCitation=引用文献の編集
+noteEditor.showOnPage=ページに表示
+noteEditor.unlink=リンク解除
+noteEditor.set=設定
 noteEditor.edit=編集
-noteEditor.addCitation=Add Citation
-noteEditor.removeCitation=Hide Citation
-noteEditor.findAndReplace=Find and Replace
+noteEditor.addCitation=引用文献を追加
+noteEditor.removeCitation=引用文献を隠す
+noteEditor.findAndReplace=検索と置換
 noteEditor.editInWindow=別ウィンドウで編集
-noteEditor.applyAnnotationColors=注釈の色を表示する
+noteEditor.applyAnnotationColors=注釈の色を表示
 noteEditor.removeAnnotationColors=注釈の色を隠す
-noteEditor.addCitations=Show Annotation Citations
-noteEditor.removeCitations=Hide Annotation Citations
+noteEditor.addCitations=注釈の引用文献を表示
+noteEditor.removeCitations=注釈の引用文献を隠す
 noteEditor.image=画像
 noteEditor.math=数学
 noteEditor.table=表
-noteEditor.citation=Citation
-noteEditor.copyImage=Copy Image
-noteEditor.saveImageAs=Save Image As…
-noteEditor.insertRowBefore=Insert Row Above
-noteEditor.insertRowAfter=Insert Row Below
-noteEditor.insertColumnBefore=Insert Column Left
-noteEditor.insertColumnAfter=Insert Column Right
-noteEditor.deleteRow=Delete Row
-noteEditor.deleteColumn=Delete Column
-noteEditor.deleteTable=Delete Table
+noteEditor.citation=引用文献
+noteEditor.copyImage=画像をコピー
+noteEditor.saveImageAs=ファイル形式を指定して画像を保存…
+noteEditor.insertRowBefore=上に行を挿入
+noteEditor.insertRowAfter=下に行を挿入
+noteEditor.insertColumnBefore=左に列を挿入
+noteEditor.insertColumnAfter=右に列を挿入
+noteEditor.deleteRow=行を削除
+noteEditor.deleteColumn=列を削除
+noteEditor.deleteTable=表を削除
 
 pdfReader.annotations=注釈
-pdfReader.showAnnotations=Show Annotations
-pdfReader.searchAnnotations=Search Annotations
-pdfReader.searchOutline=Search Outline
+pdfReader.showAnnotations=注釈を表示
+pdfReader.searchAnnotations=注釈の検索
+pdfReader.searchOutline=アウトラインの検索
 pdfReader.noAnnotations=注釈はこのサイドバーに表示されます
 pdfReader.noExtractedText=抽出された文字がありません
-pdfReader.addComment=Add comment
-pdfReader.annotationComment=Annotation comment
-pdfReader.annotationText=Annotation text
-pdfReader.manageTags=Manage tags for this annotation
-pdfReader.openMenu=Open annotation menu
-pdfReader.thumbnails=Thumbnails
-pdfReader.tagSelectorMessage=Filter annotations by this tag
-pdfReader.addTags=Add tags…
+pdfReader.addComment=コメントの追加
+pdfReader.annotationComment=注釈コメント
+pdfReader.annotationText=注釈テキスト
+pdfReader.manageTags=この注釈のタグを管理
+pdfReader.openMenu=注釈メニューを開く
+pdfReader.thumbnails=サムネイル
+pdfReader.tagSelectorMessage=このタグで注釈をフィルタリング
+pdfReader.addTags=タグを追加
 pdfReader.highlightText=テキストを強調表示
-pdfReader.underlineText=Underline Text
+pdfReader.underlineText=下線付きテキスト
 pdfReader.addNote=メモを追加
-pdfReader.addText=Add Text
-pdfReader.selectArea=Select Area
-pdfReader.searchResultIndex=Search result
-pdfReader.searchResultTotal=Total search results
-pdfReader.draw=Draw
-pdfReader.eraser=Eraser
-pdfReader.pickColor=Pick a Color
-pdfReader.addToNote=Add to Note
+pdfReader.addText=テキストを追加
+pdfReader.selectArea=領域を選択
+pdfReader.searchResultIndex=検索結果
+pdfReader.searchResultTotal=合計検索結果
+pdfReader.draw=描画
+pdfReader.eraser=消しゴム
+pdfReader.pickColor=色の取得
+pdfReader.addToNote=メモに追加
 pdfReader.zoomIn=拡大表示
 pdfReader.zoomOut=縮小表示
-pdfReader.zoomReset=Reset Zoom
+pdfReader.zoomReset=倍率をリセット
 pdfReader.zoomAuto=自動的にサイズ変更
 pdfReader.zoomPageWidth=ページ幅に合わせる
 pdfReader.zoomPageHeight=ページの高さに合わせる
-pdfReader.splitVertically=Split Vertically
-pdfReader.splitHorizontally=Split Horizontally
+pdfReader.splitVertically=左右に分割
+pdfReader.splitHorizontally=上下に分割
 pdfReader.nextPage=次のページ
 pdfReader.previousPage=前のページ
 pdfReader.page=ページ
-pdfReader.location=Location
-pdfReader.readOnly=Read-only
-pdfReader.promptTransferFromPDF.title=Import Annotations
-pdfReader.promptTransferFromPDF.text=Annotations stored in the PDF file will be moved to %1$S.
-pdfReader.promptPasswordProtected=The operation is not supported for password-protected PDF files.
-pdfReader.promptDeletePages.title=Delete Pages
-pdfReader.promptDeletePages.text=Are you sure you want to delete %1$S page from the PDF file?;Are you sure you want to delete %1$S pages from the PDF file?
-pdfReader.rotateLeft=Rotate Left
-pdfReader.rotateRight=Rotate Right
-pdfReader.editPageNumber=Edit Page Number…
-pdfReader.editAnnotationText=Edit Annotation Text
-pdfReader.copyImage=Copy Image
-pdfReader.saveImageAs=Save Image As…
-pdfReader.pageNumberPopupHeader=Change page number for:
+pdfReader.location=場所
+pdfReader.readOnly=読み取り専用
+pdfReader.promptTransferFromPDF.title=注釈のインポート
+pdfReader.promptTransferFromPDF.text=PDFファイルに保存されている注釈は %1$S に移動されます。
+pdfReader.promptPasswordProtected=この操作はパスワード保護されたPDFファイルではサポートされていません。
+pdfReader.promptDeletePages.title=ページを削除
+pdfReader.promptDeletePages.text=PDFファイルから %1$S ページを削除しますか？;PDFファイルから %1$S ページを削除しますか？
+pdfReader.rotateLeft=左に回転
+pdfReader.rotateRight=右に回転
+pdfReader.editPageNumber=ページ番号の編集…
+pdfReader.editAnnotationText=注釈テキストの編集
+pdfReader.copyImage=画像をコピー
+pdfReader.saveImageAs=ファイル形式を指定して画像を保存…
+pdfReader.pageNumberPopupHeader=ページ番号の変更 :
 pdfReader.thisAnnotation=この注釈
 pdfReader.selectedAnnotations=選択された注釈
 pdfReader.thisPage=このページ
 pdfReader.thisPageAndLaterPages=このページとその後のページ
 pdfReader.allPages=すべてのページ
 pdfReader.autoDetect=自動検出
-pdfReader.deleteAnnotation.singular=選択された注釈を削除してもよろしいですか？
-pdfReader.deleteAnnotation.plural=選択された注釈を削除してもよろしいですか？
-pdfReader.enterPassword=Enter the password to open this PDF file
-pdfReader.includeAnnotations=Include annotations
-pdfReader.preparingDocumentForPrinting=Preparing document for printing…
-pdfReader.phraseNotFound=Phrase not found
+pdfReader.deleteAnnotation.singular=選択された注釈を削除しますか？
+pdfReader.deleteAnnotation.plural=選択された注釈を削除しますか？
+pdfReader.enterPassword=この PDF ファイルを開くためのパスワードを入力してください
+pdfReader.includeAnnotations=注釈を含める
+pdfReader.preparingDocumentForPrinting=印刷のために文書を準備しています…
+pdfReader.phraseNotFound=フレーズが見つかりません
 pdfReader.find=検索
 pdfReader.close=閉じる
-pdfReader.showThumbnails=Show Thumbnails
-pdfReader.showOutline=Show Outline
-pdfReader.findPrevious=Find the previous occurrence of the phrase
-pdfReader.findNext=Find the next occurrence of the phrase
-pdfReader.toggleSidebar=Toggle Sidebar
-pdfReader.findInDocument=Find in Document
-pdfReader.toggleContextPane=Toggle Context Pane
-pdfReader.highlightAll=Highlight all
-pdfReader.matchCase=Match case
-pdfReader.wholeWords=Whole words
-pdfReader.appearance=Appearance
-pdfReader.epubAppearance.lineHeight=Line height
-pdfReader.epubAppearance.wordSpacing=Word spacing
-pdfReader.epubAppearance.letterSpacing=Letter spacing
-pdfReader.epubAppearance.pageWidth=Page width
-pdfReader.epubAppearance.useOriginalFont=Use original font
-pdfReader.epubAppearance.lineHeight.revert=Use default line height
-pdfReader.epubAppearance.wordSpacing.revert=Use default word spacing
-pdfReader.epubAppearance.letterSpacing.revert=Use default letter spacing
-pdfReader.epubAppearance.pageWidth.revert=Use default page width
-pdfReader.convertToHighlight=Convert to Highlight
-pdfReader.convertToUnderline=Convert to Underline
+pdfReader.showThumbnails=サムネイルを表示
+pdfReader.showOutline=アウトラインを表示
+pdfReader.findPrevious=フレーズの前の出現箇所を検索
+pdfReader.findNext=フレーズの次の出現箇所を検索
+pdfReader.toggleSidebar=サイドバーの表示を切り替え
+pdfReader.findInDocument=ドキュメント内を検索
+pdfReader.toggleContextPane=コンテキストパネルの切り替え
+pdfReader.highlightAll=すべて強調表示
+pdfReader.matchCase=大文字と小文字を区別
+pdfReader.wholeWords=単語全体
+pdfReader.appearance=外観
+pdfReader.epubAppearance.lineHeight=行の高さ
+pdfReader.epubAppearance.wordSpacing=単語間隔
+pdfReader.epubAppearance.letterSpacing=文字間隔
+pdfReader.epubAppearance.pageWidth=ページ幅
+pdfReader.epubAppearance.useOriginalFont=オリジナルフォントを使用
+pdfReader.epubAppearance.lineHeight.revert=デフォルトの行の高さを使用
+pdfReader.epubAppearance.wordSpacing.revert=デフォルトの単語間隔を使用
+pdfReader.epubAppearance.letterSpacing.revert=デフォルトの文字間隔を使用
+pdfReader.epubAppearance.pageWidth.revert=デフォルトのページ幅を使用
+pdfReader.convertToHighlight=強調表示に変換
+pdfReader.convertToUnderline=下線に変換
 pdfReader.size=サイズ
-pdfReader.merge=Merge
-pdfReader.copyLink=Copy Link
-pdfReader.theme.original=Original
-pdfReader.theme.snow=Snow
-pdfReader.theme.sepia=Sepia
-pdfReader.theme.dark=Dark
-pdfReader.addTheme=Add Theme
-pdfReader.scrollMode=Scrolling
-pdfReader.spreadMode=Spreads
-pdfReader.flowMode=Page Layout
-pdfReader.columns=コラム
-pdfReader.splitView=Split View
-pdfReader.themes=Themes
-pdfReader.vertical=Vertical
-pdfReader.horizontal=Horizontal
-pdfReader.wrapped=Wrapped
+pdfReader.merge=結合
+pdfReader.copyLink=リンクをコピー
+pdfReader.theme.original=オリジナル
+pdfReader.theme.snow=雪
+pdfReader.theme.sepia=セピア
+pdfReader.theme.dark=ダーク
+pdfReader.addTheme=テーマを追加
+pdfReader.scrollMode=スクロール
+pdfReader.spreadMode=見開きページ
+pdfReader.flowMode=ページレイアウト
+pdfReader.columns=列
+pdfReader.splitView=分割表示
+pdfReader.themes=テーマ
+pdfReader.vertical=垂直方向
+pdfReader.horizontal=水平方向
+pdfReader.wrapped=折り返し
 pdfReader.none=なし
-pdfReader.odd=Odd
-pdfReader.even=Even
-pdfReader.paginated=Paginated
-pdfReader.scrolled=Scrolled
-pdfReader.single=Single
-pdfReader.double=Double
-pdfReader.themeName=Theme Name:
-pdfReader.background=Background:
-pdfReader.foreground=Foreground:
+pdfReader.odd=奇数
+pdfReader.even=偶数
+pdfReader.paginated=ページ送り
+pdfReader.scrolled=スクロール
+pdfReader.single=シングル
+pdfReader.double=ダブル
+pdfReader.themeName=テーマ名 :
+pdfReader.background=背景 :
+pdfReader.foreground=前景 :
 
-spellCheck.checkSpelling=Check Spelling
-spellCheck.addRemoveDictionaries=Add/Remove Dictionaries…
-spellCheck.dictionaryManager.title=Add/Remove Dictionaries
-spellCheck.dictionaryManager.updateAvailable=%S (update available)
-spellCheck.dictionaryManager.error.unableToInstall=Unable to install “%S”:
+spellCheck.checkSpelling=スペルチェック
+spellCheck.addRemoveDictionaries=辞書の追加/削除…
+spellCheck.dictionaryManager.title=辞書の追加/削除
+spellCheck.dictionaryManager.updateAvailable=%S (更新が利用可能)
+spellCheck.dictionaryManager.error.unableToInstall=“%S” はインストールできません :
 
 tabs.move=タブを移動
 tabs.moveToStart=先頭へ移動
 tabs.moveToEnd=末尾へ移動
 tabs.moveToWindow=新しいウィンドウへ移動
-tabs.duplicate=Duplicate Tab
+tabs.duplicate=タブの複製
 tabs.undoClose=閉じたタブを開きなおす;閉じたタブを開きなおす
 tabs.closeOther=他のタブを閉じる
 
-addons.emptyListMessage=Download plugins from the [Zotero plugins directory].
-addons.remove.title=Remove %S?
-addons.remove.text=Are you sure you want to remove %1$S from %2$S?
+addons.emptyListMessage=[Zoteroプラグインディレクトリ] からプラグインをダウンロードしてください。
+addons.remove.title=%S を削除しますか？
+addons.remove.text=本当に %2$S から %1$S を削除しますか？
diff --git a/chrome/locale/km/zotero/integration.ftl b/chrome/locale/km/zotero/integration.ftl
index ebacfd4083..a623f44ec3 100644
--- a/chrome/locale/km/zotero/integration.ftl
+++ b/chrome/locale/km/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = បណ្ណាល័យ
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/km/zotero/preferences.ftl b/chrome/locale/km/zotero/preferences.ftl
index bef468b174..a058204df6 100644
--- a/chrome/locale/km/zotero/preferences.ftl
+++ b/chrome/locale/km/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = សមកាលកម្ម
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/km/zotero/searchbox.dtd b/chrome/locale/km/zotero/searchbox.dtd
index 47b9257c7e..91144bd9e3 100644
--- a/chrome/locale/km/zotero/searchbox.dtd
+++ b/chrome/locale/km/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "ឈ្មោះ:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "ផ្គូរផ្គង">
 <!ENTITY zotero.search.joinMode.any "មួយផ្នែក">
 <!ENTITY zotero.search.joinMode.all "ទាំងអស់">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "ថ្ងៃ">
 <!ENTITY zotero.search.date.units.months "ខែ">
 <!ENTITY zotero.search.date.units.years "ឆ្នាំ">
-
-<!ENTITY zotero.search.search "ស្វែងរក">
-<!ENTITY zotero.search.clear "សម្អាត">
-<!ENTITY zotero.search.saveSearch "ទាញរក្សាទុកការស្រាវជ្រាវ">
diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd
index b4eb7bdd66..074cb5e68b 100644
--- a/chrome/locale/km/zotero/zotero.dtd
+++ b/chrome/locale/km/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "លុបឯកសារ...">
 <!ENTITY zotero.toolbar.newGroup "ក្រុមថ្មី...">
 <!ENTITY zotero.toolbar.newSubcollection.label "បង្កើតអនុកម្រងឯកសារថ្មី...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "ការស្រាវជ្រាវរក្សាទុកថ្មី...">
 <!ENTITY zotero.toolbar.emptyTrash.label "សម្អាតធុងសំរាម">
 <!ENTITY zotero.toolbar.tagSelector.label "បង្ហាញ/លាក់ជម្រើសស្លាក">
 <!ENTITY zotero.toolbar.actions.label "បញ្ជីសកម្មភាព">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "ជម្រើសអាទិភាពផ្សេងៗ...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "គាំទ្រ និង ឯកសារ">
 <!ENTITY zotero.toolbar.about.label "អំពីហ្ស៊ូតេរ៉ូ">
-<!ENTITY zotero.toolbar.advancedSearch "ស្វែងរកលឿន">
 <!ENTITY zotero.toolbar.openURL.label "ទីតាំងឯកសារ">
 <!ENTITY zotero.toolbar.openURL.tooltip "រកនៅតាមបណ្ណាល័យរបស់អ្នក">
 
diff --git a/chrome/locale/km/zotero/zotero.ftl b/chrome/locale/km/zotero/zotero.ftl
index 1ad360a491..5cce606b84 100644
--- a/chrome/locale/km/zotero/zotero.ftl
+++ b/chrome/locale/km/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = បោះពុម្ពចេញ
 general-remove = លុបចោល
 general-add = បន្ថែម
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = បដិសេធ
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = បង្ហាញនៅក្នុងបណ្ណាល័យ
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = សម្អាត
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = កែតម្រូវ
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Loading…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = រចនាបថអាគតដ្ឋាន:
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = នាំចេញ...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = ស្វែងរកលឿន
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Advanced Search
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = ស្វែងរក
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = វិស័យ:
 search-conditions-collection = កម្រងឯកសារ
 search-conditions-savedSearch = ការស្រាវជ្រាវទាញរក្សាទុក
 search-conditions-itemTypeID = ប្រភេទឯកសារ
 search-conditions-tag = ស្លាក
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = កំណត់ចំណាំ
 search-conditions-childNote = កំណត់ត្រារណប
 search-conditions-creator = អ្នកនិពន្ធ
@@ -715,10 +897,26 @@ search-conditions-dateModified = កាលបរិច្ឆេទកែតម
 search-conditions-fulltextContent = ខ្លឹមសារឯកសារភ្ជាប់
 search-conditions-programmingLanguage = កម្មវិធីភាសា
 search-conditions-fileTypeID = ឯកសារភ្ជាប់
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = ឯកសារកម្ជាប់
+search-conditions-submenu-annotation = ចំណារពន្យល់
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = ប្រភេទឯកសារ
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = ប្រភេទ
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = អ្នកនិពន្ធ
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = វីដេអូ
 file-type-presentation = ឧទ្ទេសបទ
 file-type-document = ឯកសារ
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = ដំឡើង
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = ស្វែងរក
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = ទាញរក្សាទុកការស្រាវជ្រាវ
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = កែតម្រូវកំណត់ចំណាំ
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = ផ្លាស់ប្តូរប្រភទឯកសារ
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties
index 7ff383331e..6ffd9903c0 100644
--- a/chrome/locale/km/zotero/zotero.properties
+++ b/chrome/locale/km/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=១ ឆ្នាំកន្លងមកហើយ
 date.relative.yearsAgo.multiple=%S ឆ្នាំកន្លងមកហើយ
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=តើអ្នកចង់លុបកម្រងឯកសារដែលបានជ្រើសរើស?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=តើអ្នកចង់លុបការស្រាវជ្រាវដែលបានជ្រើសរើស?
 pane.collections.emptyTrash=តើអ្នកចង់លុបចោលរាល់ឯកសារដែលមាននៅក្នុងធុងសំរាម?
 pane.collections.newSavedSeach=ការស្រាវជ្រាវថ្មីដែលបានរក្សាទុក
 pane.collections.savedSearchName=ដាក់ឈ្មោះការស្រាវជ្រាវថ្មីដែលបានរក្សាទុក
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=នាំកម្រងឯកសារចេញ...
-pane.collections.menu.export.savedSearch=នាំការស្រាវជ្រាវដែលបានរក្សាទុកចេញ...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=បង្កើតរបាយការណ៍ពីកម្រងឯកសារ...
-pane.collections.menu.generateReport.savedSearch=បង្កើតរបាយការណ៍ពីការស្រាវជ្រាវដែលបានរក្សាទុក...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=បង្កើតលិបិក្រមជាថ្មី
-zotero.preferences.search.rebuildWarning=តើអ្នកចង់ស្តារលិបិក្រមឡើងវិញទាំងមូល? ដំណើរការនេះអាចចំណាយ​ពេលមួយរយៈ។ \n\n ដាក់លិបិក្រមទៅលើឯកសារណាដែលមិនទាន់​ដាក់លិបិក្រមប៉ុណ្ណោះដោយប្រើ %S។
-zotero.preferences.search.clearIndex=សម្អាតលិបិក្រម
-zotero.preferences.search.clearWarning=បន្ទាប់ពីសម្អាតលិបិក្រម ឯកសារដែលភ្ជាប់មកជាមួយនឹងលែងអាច​ស្រាវជ្រាវបាន។​ ឯកសារដែលភ្ជាប់គេហទំព័រ \n\nWeb មិនអាចដាក់​លិបិក្រម​បានដោយ​គ្មាន​ចូលទៅមើលទំព័រនេះជាថ្មី។ ដើម្បីឲការភ្ជាប់​គេហទំព័រត្រូវបានដាក់លិបិក្រម សូមជ្រើសរើស %S។
-zotero.preferences.search.clearNonLinkedURLs=សម្អាតទាំងអស់ លើកលែងកម្ជាប់គេហទំព័រ
-zotero.preferences.search.indexUnindexed=ដាក់លិបិក្រមឯកសារដែលមិនទាន់មានលិបិក្រម
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=នាំយកទម្រង់ចេញ
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=អ្នកត្រូវដាក់អ
 integration.error.mustInsertBibliography=អ្នកត្រូវដាក់គន្ថនិទេ្ទស មុនពេលចាប់ផ្តើមប្រតិបត្តិការនេះ។
 integration.error.cannotInsertHere=វិស័យហ្ស៊ូតេរ៉ូមិនអាចដាក់បាននៅទីនេះ។
 integration.error.notInCitation=អ្នកត្រូវតែដាក់ទស្សន៍ទ្រនិចនៅក្នុងអាគតដ្ឋាន ដើម្បីឲហ្ស៊ូតេរ៉ូអាចកែ​អត្ថបទបាន។
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=រចនាបថដែលអ្នកបានជ្រើសរើសមិនមានគន្ថនិទេ្ទស។ ប្រសិនបើ អ្នកចង់ដាក់គន្ថនិទេ្ទស សូមជ្រើសរើសរចនាបថមួយផ្សេងទៀត។
 integration.error.deletePipe=ហ្ស៊ូតេរ៉ូមិនអាចភ្ជាប់ទៅនឹងកម្មវិធីជំនួយវាយអត្ថបទរបស់អ្នកបានទេ។ តើអ្នកចង់ឲហ្ស៊ូតេរ៉ូព្យាយាមកែកំហុសនេះដែរឬទេ? អ្នកនឹងត្រូវក្រើនរំឭក​ដល់លេខសម្ងាត់។
 integration.error.invalidStyle=រចនាបថដែលអ្នកបានជ្រើសរើសមិនមានសុពលភាពទេ។ ប្រសិនបើ អ្នកបង្កើតរចនាបថដោយខ្លួនឯង សូមធ្វើឲប្រាកដថា រចនាបថនេះ ឆ្លងកាត់សុពលកម្មដូចដែលបានរៀបរាប់នៅក្នុងគេហទំព័រ http://zotero.org/support/dev/citation_styles. Alternatively, try selecting another style.
diff --git a/chrome/locale/ko-KR/zotero/integration.ftl b/chrome/locale/ko-KR/zotero/integration.ftl
index 67ca53c58a..589c05b816 100644
--- a/chrome/locale/ko-KR/zotero/integration.ftl
+++ b/chrome/locale/ko-KR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = 저자 숨김
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = 라이브러리
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ko-KR/zotero/preferences.ftl b/chrome/locale/ko-KR/zotero/preferences.ftl
index c00e2daffc..b4782ceda5 100644
--- a/chrome/locale/ko-KR/zotero/preferences.ftl
+++ b/chrome/locale/ko-KR/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = 동기화
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ko-KR/zotero/searchbox.dtd b/chrome/locale/ko-KR/zotero/searchbox.dtd
index 6d68e2febb..29f0fa3b8d 100644
--- a/chrome/locale/ko-KR/zotero/searchbox.dtd
+++ b/chrome/locale/ko-KR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "이름:">
 
-<!ENTITY zotero.search.searchInLibrary "라이브러리 검색:">
-
 <!ENTITY zotero.search.joinMode.prefix "다음 조건 중">
 <!ENTITY zotero.search.joinMode.any "아무거나">
 <!ENTITY zotero.search.joinMode.all "모두">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "일">
 <!ENTITY zotero.search.date.units.months "월">
 <!ENTITY zotero.search.date.units.years "년">
-
-<!ENTITY zotero.search.search "검색">
-<!ENTITY zotero.search.clear "결과 삭제">
-<!ENTITY zotero.search.saveSearch "검색결과 저장">
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index c9f6373367..aae26abeff 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "항목 삭제...">
 <!ENTITY zotero.toolbar.newGroup "새 그룹...">
 <!ENTITY zotero.toolbar.newSubcollection.label "새 하위 컬렉션...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "새 저장된 검색...">
 <!ENTITY zotero.toolbar.emptyTrash.label "휴지통 비우기">
 <!ENTITY zotero.toolbar.tagSelector.label "태그 선택기 보이기/감추기">
 <!ENTITY zotero.toolbar.actions.label "동작">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "환경설정...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "지원 및 도움말">
 <!ENTITY zotero.toolbar.about.label "Zotero 정보">
-<!ENTITY zotero.toolbar.advancedSearch "고급 검색">
 <!ENTITY zotero.toolbar.openURL.label "위치">
 <!ENTITY zotero.toolbar.openURL.tooltip "로컬 라이브러리에서 검색">
 
diff --git a/chrome/locale/ko-KR/zotero/zotero.ftl b/chrome/locale/ko-KR/zotero/zotero.ftl
index 9d488a05e1..8be52daebd 100644
--- a/chrome/locale/ko-KR/zotero/zotero.ftl
+++ b/chrome/locale/ko-KR/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = 인쇄
 general-remove = 제거
 general-add = 추가
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = 취소
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = 라이브러리로 표시
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = 저장
 general-clear = 결과 삭제
+clear-button =
+    .label = { general-clear }
 general-update = 업데이트
 general-back = 뒤로
 general-edit = 편집
@@ -76,6 +86,8 @@ general-maroon = 적갈색
 general-gray = 회색
 general-black = 검정
 general-loading = 불러오는 중...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = 인용 스타일:
 language-label = 언어:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = 저장된 검색 목록 편집
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = 저장된 검색 목록 편집
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = 내보내기...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = 아래로 이동
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = 빠른 검색
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = 고급 검색
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = 검색
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = 주석
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = 필드:
 search-conditions-collection = 컬렉션
 search-conditions-savedSearch = 저장된 검색
 search-conditions-itemTypeID = 항목 종류
 search-conditions-tag = 태그
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = 노트
 search-conditions-childNote = 하위 노트
 search-conditions-creator = 창작가
@@ -715,10 +897,26 @@ search-conditions-dateModified = 변경일
 search-conditions-fulltextContent = 목차 첨부
 search-conditions-programmingLanguage = 프로그래밍 언어
 search-conditions-fileTypeID = 첨부 파일 형식
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = 주석 텍스트
 search-conditions-annotationComment = 주석 댓글
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = 임의 필드
+search-conditions-titleCreatorYear = 제목, 저자, 연도
+search-conditions-submenu-attachment = 첨부
+search-conditions-submenu-annotation = 주석
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = 파일 형식
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = 형식
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = 저자
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = 동영상
 file-type-presentation = 발표이러한 오류를 수정하려고 시도합니다.
 file-type-document = 문서
 file-type-ebook = 전자책
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = 설치
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = 검색
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = 저장
+save-search-name-title = 검색결과 저장
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = 노트 편집
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = 항목 종류 변경
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index 8d80c7e4fa..896ac5641e 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1년 전
 date.relative.yearsAgo.multiple=%S년 전
 
 pane.collections.title=컬렉션
-pane.collections.delete.title=컬렉션 삭제
-pane.collections.delete=선택된 컬렉션을 정말 삭제하겠습니까?
-pane.collections.delete.keepItems=이 컬렉션에 속한 항목은 삭제되지 않습니다.
-pane.collections.deleteWithItems.title=컬렉션 및 항목 삭제
-pane.collections.deleteWithItems=정말 선택한 컬렉션을 삭제하고 컬렉션의 모든 항목을 휴지통으로 이동하시겠습니까?
 pane.feed.deleteWithItems.title=구독 중지
 pane.feed.deleteWithItems=정말 이 피드를 구독 중지할까요?
 
-pane.collections.deleteSearch.title=검색 내용 삭제
-pane.collections.deleteSearch=선택된 검색을 정말 삭제하겠습니까?
 pane.collections.emptyTrash=휴지통에 있는 항목을 영구적으로 삭제하시겠습니까?
 pane.collections.newSavedSeach=새 저장된 검색내용
 pane.collections.savedSearchName=저장된 검색내용의 이름 입력:
@@ -277,24 +270,9 @@ pane.collections.duplicate=중복 항목
 pane.collections.removeLibrary=라이브러리 삭제
 pane.collections.removeLibrary.text=정말로 이 컴퓨터에서 "%S" 항목을 영구적으로 삭제하기를 원하십니까?
 
-pane.collections.menu.duplicate.savedSearch=저장된 검색 목록 복제
 pane.collections.menu.remove.library=라이브러리 삭제...
-pane.collections.menu.delete.collection=컬렉션 삭제...
-pane.collections.menu.delete.collectionAndItems=컬렉션 및 항목 삭제...
-pane.collections.menu.delete.savedSearch=저장된 검색 삭제...
-pane.collections.menu.delete.feedAndItems=피드 구독 중지...
-pane.collections.menu.export.collection=컬렉션 내보내기...
-pane.collections.menu.export.savedSearch=저장된 검색 목록 내보내기...
-pane.collections.menu.export.feed=피드 내보내기...
-pane.collections.menu.createBib.collection=컬렉션에서 참고 문헌 목록 작성...
-pane.collections.menu.createBib.savedSearch=저장된 검색 목록에서 참고 문헌 목록 생성...
-pane.collections.menu.createBib.feed=피드로부터 참고 문헌 목록 생성...
 pane.collections.showCollectionInLibrary=라이브러리에서 컬렉션 보기
 
-pane.collections.menu.generateReport.collection=컬렉션에서 보고서 생성...
-pane.collections.menu.generateReport.savedSearch=저장된 검색 목록에서 보고서 생성...
-pane.collections.menu.generateReport.feed=피드로부터 보고서 생성...
-
 pane.collections.menu.refresh.feed=피드 새로고침
 pane.collections.menu.refresh.allFeeds=모든 피드 새로고침
 pane.collections.menu.markAsRead.feed=피드를 읽은 것으로 표시
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=복원 작업을 완료하려면
 zotero.preferences.sync.reset.fileSyncHistory=다음 동기화 시점에, %1$S 애플리케이션이 "%2$S"의 모든 첨부파일을 저장소 서비스의 파일과 비교하여 검사합니다. 로컬 저장소에 없지만 원격 저장소에 있는 첨부 파일이 다운로드되고, 반대로 원격 저장소에 없는 로컬 첨부파일은 업로드됩니다.\n\n이 기능은 일반적인 사용 환경에서는 필요치 않습니다.
 zotero.preferences.sync.reset.fileSyncHistory.cleared="%S" 파일 동기화 기록이 삭제되었습니다.
 
-zotero.preferences.search.rebuildIndex=색인 재구축
-zotero.preferences.search.rebuildWarning=전체 색인을 재구축하고 싶습니까? 이것은 시간이 걸릴지 모릅니다\n\n색인이 붙지 않은 항목에만 색인을 붙이기 위해, %S 사용.
-zotero.preferences.search.clearIndex=색인 제거
-zotero.preferences.search.clearWarning=색인 정리후, 첨부 내용은 더이상 검색할 수 없을겁니다.\n\n웹 링크 첨부는 페이지 재방문 없이 재색인 할 수 없습니다.웹 링크에 색인을 남기려면 %S(을)를 선택하세요.
-zotero.preferences.search.clearNonLinkedURLs=제외된 모든 웹 링크 지우기
-zotero.preferences.search.indexUnindexed=색인화 되지 않은 항목 색인
 zotero.preferences.export.quickCopy.citationStyles=인용 스타일
 zotero.preferences.export.quickCopy.exportFormats=내보내기 서식
 zotero.preferences.export.quickCopy.instructions=빠른 복사는 지정한 서식으로 항목을 빠르게 내보낼 수 있도록 합니다. 선택한 항목을 %S 단축키를 눌러 클립보드로 복사하거나 다른 프로그램의 텍스트 상자에 마우스로 바로 끌어 넣을 수 있습니다.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=이 작업을 수행하기 전에 인용을
 integration.error.mustInsertBibliography=이 작업을 수행하기 전에 참고문헌 목옥을 먼저 삽입해야 합니다.
 integration.error.cannotInsertHere=Zotero 필드는 여기에 삽입할 수 없습니다.
 integration.error.notInCitation=Zotero에서 인용문을 편집하려면 커서를 인용문 안에 놓아야 합니다.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=현재 참고문헌 스타일은 참고문헌 목록을 정의하지 않습니다. 참고문헌 목록을 추가하려면 다른 스타일을 선택하십시오.
 integration.error.deletePipe=Zotero와 워드 프로세서의 연결이 활성화되지 않은 것 같습니다. Zotero가 이 오류를 수정하도록 할까요? 이 경우 비밀번호 입력이 필요합니다.
 integration.error.invalidStyle=선택하신 스타일이 유효하지 않은 것 같습니다. 이 스타일을 직접 만드셨다면, https://github.com/citation-style-language/styles/wiki/Validation에 설명된 대로 유효성 검사를 통과하는지 확인해 주세요.
diff --git a/chrome/locale/lt-LT/zotero/integration.ftl b/chrome/locale/lt-LT/zotero/integration.ftl
index e7311e4825..30b47a22a6 100644
--- a/chrome/locale/lt-LT/zotero/integration.ftl
+++ b/chrome/locale/lt-LT/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Praleisti autorių
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Peržiūra
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteka
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/lt-LT/zotero/preferences.ftl b/chrome/locale/lt-LT/zotero/preferences.ftl
index 55dacba780..213d18ccd6 100644
--- a/chrome/locale/lt-LT/zotero/preferences.ftl
+++ b/chrome/locale/lt-LT/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Kalba ir regonas
 preferences-advanced-enable-bidi-ui =
     .label = Įgalinti abikrypčius teksto redagavimo įrankius
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Atstatyti numatytąją vietą…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sinchronizuoti
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/lt-LT/zotero/searchbox.dtd b/chrome/locale/lt-LT/zotero/searchbox.dtd
index 38d8c26b50..f14836fcea 100644
--- a/chrome/locale/lt-LT/zotero/searchbox.dtd
+++ b/chrome/locale/lt-LT/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Pavadinimas:">
 
-<!ENTITY zotero.search.searchInLibrary "Ieškoti bibliotekoje">
-
 <!ENTITY zotero.search.joinMode.prefix "Taikyti">
 <!ENTITY zotero.search.joinMode.any "bet kuriuos">
 <!ENTITY zotero.search.joinMode.all "visus">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "d.">
 <!ENTITY zotero.search.date.units.months "mėn.">
 <!ENTITY zotero.search.date.units.years "m.">
-
-<!ENTITY zotero.search.search "Ieškoti">
-<!ENTITY zotero.search.clear "Išvalyti">
-<!ENTITY zotero.search.saveSearch "Įsiminti paiešką">
diff --git a/chrome/locale/lt-LT/zotero/zotero.dtd b/chrome/locale/lt-LT/zotero/zotero.dtd
index b593440c43..724d068277 100644
--- a/chrome/locale/lt-LT/zotero/zotero.dtd
+++ b/chrome/locale/lt-LT/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Pašalinti įrašą...">
 <!ENTITY zotero.toolbar.newGroup "Nauja grupė...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Naujas poaplankis...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nauja įsiminta paieška...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Išvalyti šiukšlinę">
 <!ENTITY zotero.toolbar.tagSelector.label "Rodyti/slėpti gairių parinkiklį">
 <!ENTITY zotero.toolbar.actions.label "Veiksmai">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Nuostatos...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Palaikymas ir dokumentacija">
 <!ENTITY zotero.toolbar.about.label "Apie Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Išplėstinė paieška">
 <!ENTITY zotero.toolbar.openURL.label "Rasti vietą">
 <!ENTITY zotero.toolbar.openURL.tooltip "Ieškoti vietinėje bibliotekoje">
 
diff --git a/chrome/locale/lt-LT/zotero/zotero.ftl b/chrome/locale/lt-LT/zotero/zotero.ftl
index d646b89687..f5588d89cb 100644
--- a/chrome/locale/lt-LT/zotero/zotero.ftl
+++ b/chrome/locale/lt-LT/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Įvesti
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Spausdinti
 general-remove = Pašalinti
 general-add = Pridėti
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Peržiūrėti nesklandumų sprendimo
 general-go-back = Atgal
 general-accept = Accept
 general-cancel = Atsisakyti
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Rodyti bibliotekoje
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Paleisti gedimų nustatymo veiksenoje
 general-save = Įrašyti
 general-clear = Išvalyti
+clear-button =
+    .label = { general-clear }
 general-update = Atnaujinti
 general-back = Atgal
 general-edit = Taisa
@@ -76,6 +86,8 @@ general-maroon = kaštoninė
 general-gray = pilka
 general-black = juoda
 general-loading = Įkeliama...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citavimo stilius:
 language-label = Kalba:
 menu-custom-group-submenu =
@@ -162,14 +174,112 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Pervadinti rinkinį
-collections-menu-edit-saved-search =
-    .label = Taisyti įsimintąją paiešką
+items-section-collections-selected =
+    { $count ->
+        [one] Pasirinktas { $count } rinkinys
+        [few] Pasirinkti { $count } rinkiniai
+        [many] Pasirinkta { $count } rinkinių
+       *[other] Pasirinktas { $count } rinkinys
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Taisyti įsimintąją paiešką
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Perkelti į
 collections-menu-copy-collection =
     .label = Kopijuoti į
+collections-menu-export =
+    .label = Eksportuoti...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Nuleisti žemyn
 item-creator-moveToTop =
@@ -282,6 +392,7 @@ import-online-relink-only =
     .label = Iš naujo susieti Mendeley Desktop citatas
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } negali prisijungti { $targetApp }. Prašome patikrinti  interneto ryšį ir bandykite vėl.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -633,6 +744,18 @@ quicksearch-input =
     .aria-label = Greitoji paieška
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Išplėstinė paieška
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Rodyti kaip
 item-pane-header-none =
@@ -706,9 +829,64 @@ architecture-x64-on-arm64-action = Parsisiųsti { -app-name } programos ARM64 ve
 first-run-guidance-authorMenu = { -app-name } leidžia jums dar nurodyti sudarytojus (redaktorius) ir vertėjus. Per šį meniu galite pasirinkto vaidmenį žmogaus, kuris šiuo metu nurodytas esąs autorius, pakeisti į sudarytojo arba vertėjo vaidmenį.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Ieškoti
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotacijas
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Paieškos sąlyga
     .label = { $label }
@@ -718,11 +896,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Reikšmė
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Laikai:
 search-conditions-collection = Rinkinys
 search-conditions-savedSearch = Įrašyta paieška
 search-conditions-itemTypeID = Įrašo tipas
 search-conditions-tag = Gairė
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Pastaba
 search-conditions-childNote = Įrašo pastaba
 search-conditions-creator = Autorius
@@ -741,10 +925,26 @@ search-conditions-dateModified = Keitimo laikas
 search-conditions-fulltextContent = Prisegtos rinkmenos turinys
 search-conditions-programmingLanguage = Programavimo kalba
 search-conditions-fileTypeID = Prisegtos rinkmenos tipas
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Anotacijos tekstas
 search-conditions-annotationComment = Anotacijos komentaras
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Bet kuris laukas
+search-conditions-titleCreatorYear = Pavadinimas, autoriai, metai
+search-conditions-submenu-attachment = Priedas
+search-conditions-submenu-annotation = Anotacija
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Rinkmenos tipas
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tipas
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autorius
 find-pdf-files-added =
     { $count ->
         [one] Pridėta { $count } rinkmena
@@ -778,6 +978,9 @@ file-type-video = Vaizdas
 file-type-presentation = Pateiktis
 file-type-document = Dokumentas
 file-type-ebook = El. knyga
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -786,18 +989,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Įdėti ir ieškoti
 mac-word-plugin-install-message = Zotero turi galėti prieiti prie „Word“ duomenų tam, kad galėtų įdiegti papildinį „Word“ programai.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Įdiegti papildinį „Word“ programai
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Diegti
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -816,3 +1024,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Paieška
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Įrašyti
+save-search-name-title = Įsiminti paiešką
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Pervadinti rinkinį
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Taisyti pastabą:
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Pakeisti įrašo tipą
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/lt-LT/zotero/zotero.properties b/chrome/locale/lt-LT/zotero/zotero.properties
index 4f795c686f..c9e47a21d7 100644
--- a/chrome/locale/lt-LT/zotero/zotero.properties
+++ b/chrome/locale/lt-LT/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=prieš 1 metus
 date.relative.yearsAgo.multiple=prieš %S m.
 
 pane.collections.title=Rinkiniai
-pane.collections.delete.title=Šalinti rinkinį
-pane.collections.delete=Pašalinti pasirinktą rinkinį?
-pane.collections.delete.keepItems=Šiame rinkinyje esantys įrašai nebus pašalinti.
-pane.collections.deleteWithItems.title=Pašalinti kolekciją ir įrašus
-pane.collections.deleteWithItems=Tikrai norite pašalinti pasirinktą rinkinį ir visus jos įrašus perkelti į šiukšlinę?
 pane.feed.deleteWithItems.title=Nebeprenumeruoti
 pane.feed.deleteWithItems=Tikrai norite atsisakyti šio naujienų kanalo prenumeratos?
 
-pane.collections.deleteSearch.title=Šalinti paiešką
-pane.collections.deleteSearch=Pašalinti pasirinktą paiešką?
 pane.collections.emptyTrash=Visam laikui pašalinti šiukšlinėje esančius įrašus?
 pane.collections.newSavedSeach=Nauja įsiminta paieška
 pane.collections.savedSearchName=Pavadinkite įsimintiną paiešką:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Besidubliuojantys įrašai
 pane.collections.removeLibrary=Pašalinti biblioteką
 pane.collections.removeLibrary.text=Tikrai norite iš savo kompiuterio negrįžtamai pašalinti „%S“?
 
-pane.collections.menu.duplicate.savedSearch=Sukurti paieškos kopiją
 pane.collections.menu.remove.library=Pašalinti biblioteką...
-pane.collections.menu.delete.collection=Šalinti rinkinį...
-pane.collections.menu.delete.collectionAndItems=Šalinti rinkinį ir įrašus...
-pane.collections.menu.delete.savedSearch=Šalinti įsimintą paiešką...
-pane.collections.menu.delete.feedAndItems=Nebeprenumeruoti naujienų kanalo...
-pane.collections.menu.export.collection=Eksportuoti rinkinį...
-pane.collections.menu.export.savedSearch=Eksportuoti įsimintą paiešką...
-pane.collections.menu.export.feed=Eksportuoti naujienų kanalą...
-pane.collections.menu.createBib.collection=Sukurti bibliografiją iš rinkinio...
-pane.collections.menu.createBib.savedSearch=Sukurti bibliografiją iš įsimintos paieškos...
-pane.collections.menu.createBib.feed=Sukurti bibliografiją iš naujienų kanalo...
 pane.collections.showCollectionInLibrary=Rodyti rinkinį bibliotekoje
 
-pane.collections.menu.generateReport.collection=Sukurti ataskaitą iš rinkinio...
-pane.collections.menu.generateReport.savedSearch=Sukurti ataskaitą iš įsimintų paieškų...
-pane.collections.menu.generateReport.feed=Sukurti ataskaitą iš naujienų kanalo...
-
 pane.collections.menu.refresh.feed=Atnaujinti naujienų kanalą
 pane.collections.menu.refresh.allFeeds=Atnaujinti visus kanalus
 pane.collections.menu.markAsRead.feed=Žymėti naujienų kanalą skaitytu
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Prieš užbaigiant atkūrimą, r
 zotero.preferences.sync.reset.fileSyncHistory=Kito sinchronizavimo metu, %1$S patikrins visas „%2$S“ įrašų rinkmenas, esančias saugykloje. Rinkmenos, kurių nėra vietiniame kompiuteryje, bus parsiųstos; o vietinės rinkmenos, kurių nėra nuotolinėje saugykloje, bus nusiųstos į tą saugyklą.\n\nPaprastai ši parinktis nėra reikalinga.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=„%S“ rinkmenų sinchronizavimo žurnalas išvalytas.
 
-zotero.preferences.search.rebuildIndex=Iš naujo perindeksuoti
-zotero.preferences.search.rebuildWarning=Ar norėtumėte visą indeksą sukurti iš naujo? Tai gali užtrukti.\n\nNorėdami suindeksuoti tik dar nesuindeksuotus įrašus, spauskite „%S“.
-zotero.preferences.search.clearIndex=Išvalyti indeksą
-zotero.preferences.search.clearWarning=Išvalę indeksą, nebegalėsite ieškoti priedų turinyje.\n\nInternetinių nuorodų tipo priedus perindeksuojant iš naujo aplankomas tas tinklalapis. Norėdami išlaikyti suindeksuotas nuorodas į tinklalapius, rinkitės %S.
-zotero.preferences.search.clearNonLinkedURLs=Valyti viską, išskyrus tinklalapių nuorodas
-zotero.preferences.search.indexUnindexed=Indeksuoti dar nesuindeksuotus įrašus
 zotero.preferences.export.quickCopy.citationStyles=Citavimo stiliai
 zotero.preferences.export.quickCopy.exportFormats=Eksportavimo formatai
 zotero.preferences.export.quickCopy.instructions=Greitasis kopijavimas leidžia greitai eksportuoti įrašus norimu formatu. Galite nukopijuoti pasirinktus įrašus į iškarpinę nuspaudę %S klavišus arba nutempdami įrašus į teksto lauką kitoje programoje.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Prieš šį veiksmą, turite įterpti citav
 integration.error.mustInsertBibliography=Prieš šį veiksmą turite įterpti bibliografiją.
 integration.error.cannotInsertHere=Čia negalima įterpti Zotero laukų.
 integration.error.notInCitation=Norėdami keisti Zotero citavimą, ties juo nuveskite žymeklį.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Dabartinis bibliografijos stilius neapibrėžia biliografijos. Jei norite sukurti bibliografiją, pasirinkite kitą stilių.
 integration.error.deletePipe=Nepavyksta užmegzti ryšio su tekstų rengykle. Ar norėtumėte, kad Zotero pamėgintų ištaisyti šią klaidą? Jums reikės įvesti slaptažodį.
 integration.error.invalidStyle=Pasirinktas stilius nėra tinkamas. Jei pats sukūrėte šį stilių, siūlome https://github.com/citation-style-language/styles/wiki/Validation svetainėje patikrinti, ar jis atitinka reikalavimus. Arba galite tiesiog pasirinkti kitą stilių.
diff --git a/chrome/locale/mn-MN/zotero/integration.ftl b/chrome/locale/mn-MN/zotero/integration.ftl
index bd11f34c77..af962f6a05 100644
--- a/chrome/locale/mn-MN/zotero/integration.ftl
+++ b/chrome/locale/mn-MN/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Library
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/mn-MN/zotero/preferences.ftl b/chrome/locale/mn-MN/zotero/preferences.ftl
index cd0824ac10..7b8fa1b222 100644
--- a/chrome/locale/mn-MN/zotero/preferences.ftl
+++ b/chrome/locale/mn-MN/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/mn-MN/zotero/searchbox.dtd b/chrome/locale/mn-MN/zotero/searchbox.dtd
index 359a16d930..a25e0959ac 100644
--- a/chrome/locale/mn-MN/zotero/searchbox.dtd
+++ b/chrome/locale/mn-MN/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Name:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "Match">
 <!ENTITY zotero.search.joinMode.any "any">
 <!ENTITY zotero.search.joinMode.all "all">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "days">
 <!ENTITY zotero.search.date.units.months "months">
 <!ENTITY zotero.search.date.units.years "years">
-
-<!ENTITY zotero.search.search "Search">
-<!ENTITY zotero.search.clear "Clear">
-<!ENTITY zotero.search.saveSearch "Save Search">
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index 52651952fc..2c1ae05fcb 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Remove Item…">
 <!ENTITY zotero.toolbar.newGroup "New Group…">
 <!ENTITY zotero.toolbar.newSubcollection.label "New Subcollection…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "New Saved Search…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Empty Trash">
 <!ENTITY zotero.toolbar.tagSelector.label "Show/Hide Tag Selector">
 <!ENTITY zotero.toolbar.actions.label "Actions">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferences…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Support and Documentation">
 <!ENTITY zotero.toolbar.about.label "About Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Advanced Search">
 <!ENTITY zotero.toolbar.openURL.label "Locate">
 <!ENTITY zotero.toolbar.openURL.tooltip "Find through your local library">
 
diff --git a/chrome/locale/mn-MN/zotero/zotero.ftl b/chrome/locale/mn-MN/zotero/zotero.ftl
index 0f03ae2f2e..5d83ec4d5f 100644
--- a/chrome/locale/mn-MN/zotero/zotero.ftl
+++ b/chrome/locale/mn-MN/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Хэвлэх
 general-remove = Устгах
 general-add = Нэмэх
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Цуцлах
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Номын санг харуул
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = Цэвэрлэх
+clear-button =
+    .label = { general-clear }
 general-update = Шинэчлэх
 general-back = Буцах
 general-edit = Edit
@@ -76,6 +86,8 @@ general-maroon = Элгэн хүрэн
 general-gray = Саарал
 general-black = Хар
 general-loading = Ачаалж байна...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citation Style:
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Quick Search
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Advanced Search
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Fields:
 search-conditions-collection = Collection
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Item Type
 search-conditions-tag = Tag
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Note
 search-conditions-childNote = Child Note
 search-conditions-creator = Creator
@@ -715,10 +897,26 @@ search-conditions-dateModified = Date Modified
 search-conditions-fulltextContent = Attachment Content
 search-conditions-programmingLanguage = Programming Language
 search-conditions-fileTypeID = Attachment File Type
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Attachment
+search-conditions-submenu-annotation = Annotation
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = File Type
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Author
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentation
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Суулгах
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Search
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = Save Search
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Тэмдэглэл засварлах
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Change Item Type
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index e35780455e..71bd53e910 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 year ago
 date.relative.yearsAgo.multiple=%S years ago
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Are you sure you want to delete the selected collection?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Are you sure you want to delete the selected search?
 pane.collections.emptyTrash=Are you sure you want to permanently remove items in the Trash?
 pane.collections.newSavedSeach=New Saved Search
 pane.collections.savedSearchName=Enter a name for this saved search:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Export Collection…
-pane.collections.menu.export.savedSearch=Export Saved Search…
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Generate Report from Collection…
-pane.collections.menu.generateReport.savedSearch=Generate Report from Saved Search…
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Rebuild Index
-zotero.preferences.search.rebuildWarning=Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.
-zotero.preferences.search.clearIndex=Clear Index
-zotero.preferences.search.clearWarning=After clearing the index, attachment content will no longer be searchable.\n\nWeb link attachments cannot be reindexed without revisiting the page. To leave web links indexed, choose %S.
-zotero.preferences.search.clearNonLinkedURLs=Clear All Except Web Links
-zotero.preferences.search.indexUnindexed=Index Unindexed Items
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/nb-NO/zotero/integration.ftl b/chrome/locale/nb-NO/zotero/integration.ftl
index de7971eabc..03dd78083d 100644
--- a/chrome/locale/nb-NO/zotero/integration.ftl
+++ b/chrome/locale/nb-NO/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffiks
 integration-citationDialog-details-prefix = Prefiks
 integration-citationDialog-details-suppressAuthor = Utelat forfatter
+integration-citationDialog-details-locator-info = Tips: Du kan også skrive inn sidetall og andre referanser direkte i hovedfeltet. <a data-l10n-name="docs-link">Lær mer</a>
 integration-citationDialog-details-includeComments = Inkluderer merknader
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] Ingen valgte eller åpne elementer med merknader
     }
 integration-citationDialog-settings-keepSorted = Behold sortering av kildene
+integration-citationDialog-preview-empty = Forhåndsvisning
+integration-citationDialog-preview-error = Forhåndsvisning ikke tilgjengelig
+integration-citationDialog-btn-displayPreview =
+    .title = Vis forhåndsvisning av henvisning
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Trykk på Tab for å velge elementer som skal legges til i denne henvisningen. Trykk på Escape for å forkaste endringene og lukke dialogboksen.
+integration-citationDialog-just-added-input-placeholder = Skriv «10-15» for å henvise til sider, eller søk etter elementer
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Du har gjort endr
 integration-warning-discard-changes = Forkast endringer
 integration-warning-command-is-running = En kommando for tekstbehandlingsintegrasjon kjører allerede.
 first-run-guidance-citationDialog =
-    Skriv inn en tittel, forfatter og/eller år for å søke etter en referanse.
+    Klikk på boblen eller bruk tastene ← og ↓ for å se henvisningsdetaljene og tilpasse innstillinger som sidetall, prefiks og suffiks.
     
-    Når du har gjort ditt valg, klikker du på boblen eller velger den via tastaturet og trykker ↓/Mellomromstasten for å vise siteringsalternativer som sidetall, prefiks og suffiks.
-    
-    Du kan også legge til et sidetall eller en annen stedsreferanse ved å inkludere det i søkeordene dine (f.eks. «historikk { $locator }») eller ved å skrive det inn etter boblen og trykke på { return-or-enter }.
+    Du kan også legge til et sidetall eller en annen referanse ved å inkludere det i søkeordene dine (f.eks. «historie { $locator }») eller ved å skrive det etter boblen og trykke på { return-or-enter }.
diff --git a/chrome/locale/nb-NO/zotero/preferences.ftl b/chrome/locale/nb-NO/zotero/preferences.ftl
index 003406dea7..6918fb2e11 100644
--- a/chrome/locale/nb-NO/zotero/preferences.ftl
+++ b/chrome/locale/nb-NO/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Språk og region
 preferences-advanced-enable-bidi-ui =
     .label = Aktiver verktøy for toveis tekstredigering
+preferences-advanced-data-dir =
+    .value = Datamappe:
 preferences-advanced-reset-data-dir =
     .label = Gå tilbake til standard plassering…
 preferences-advanced-custom-data-dir =
@@ -77,21 +79,21 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Standard: { $directory })
     .aria-label = Standard plassering
-preferences-pane-account = Account
+preferences-pane-account = Konto
 -preferences-sync-data-syncing = Datasynkronisering
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Logg inn med { -app-name }-kontoen din for å synkronisere dataene dine mellom enheter, samarbeide med andre og mer.
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = Synkronisering
+preferences-sync-settings-intro = { -app-name } kan synkronisere biblioteksdataene og filene dine på tvers av enheter. <label data-l10n-name="sync-link">Lær mer</label>
+preferences-sync-reset-heading = Tilbakestill synkronisering
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Synkroniser vedleggsfiler i gruppebiblioteker ved hjelp av { -app-name }-lagring
+preferences-sync-fileSyncing-tos = Ved å bruke { -app-name }-lagring samtykker du i å være bundet av <label data-l10n-name="terms-link">vilkårene og betingelsene</label>.
 preferences-account-log-out =
     .label = Logg ut…
-preferences-sync-reset-restore-to-server-body = { -app-name } vil erstatte “{ $libraryName }” på { $domain } med data fra denne datamaskinen.
+preferences-sync-reset-restore-to-server-body = { -app-name } vil erstatte «{ $libraryName }» på { $domain } med data fra denne datamaskinen.
 preferences-sync-reset-restore-to-server-deleted-items-text =
     { $remoteItemsDeletedCount } { $remoteItemsDeletedCount ->
         [one] element
@@ -122,6 +124,10 @@ preferences-account-email-label =
     .value = E-post:
 preferences-account-switch-accounts =
     .label = Bytt kontoer…
-preferences-account-switch-text = Hvis du bytter til en annen konto, vil alle { -app-name }-data på denne datamaskinen bli slettet. Før du fortsetter, må du forsikre deg om at alle data og filer du ønsker å beholde, er synkronisert med kontoen «{ $username }», eller at du har en sikkerhetskopi av { -app-name }-datakatalogen.
+preferences-account-switch-text = Hvis du bytter til en annen konto, vil alle { -app-name }-data på denne datamaskinen bli slettet. Før du fortsetter, må du forsikre deg om at alle data og filer du ønsker å beholde, er synkronisert med kontoen «{ $username }», eller at du har en sikkerhetskopi av { -app-name }-datamappen.
 preferences-account-switch-confirmation-text = slett lokale data
 preferences-account-switch-accept = Slett data og start på nytt
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/nb-NO/zotero/reader.ftl b/chrome/locale/nb-NO/zotero/reader.ftl
index f34949f998..5c77fdbb20 100644
--- a/chrome/locale/nb-NO/zotero/reader.ftl
+++ b/chrome/locale/nb-NO/zotero/reader.ftl
@@ -86,7 +86,7 @@ reader-toggle-sidebar = Slå av/på sidepanel
 reader-find-in-document = Finn i dokument
 reader-toggle-context-pane = Slå av/på kontekstruten
 reader-highlight-all = Uthev alle
-reader-match-case = Sorter etter
+reader-match-case = Bruk store og små bokstaver
 reader-whole-words = Hele ord
 reader-appearance = Utseende
 reader-epub-appearance-line-height = Linjeavstand
@@ -144,7 +144,7 @@ reader-a11y-resize-annotation = Hvis du vil endre størrelsen på kommentaren, h
 reader-a11y-annotation-popup-appeared = Bruk Tab for å navigere i popup-vinduet for kommentarer.
 reader-a11y-annotation-created = { $type } opprettet.
 reader-a11y-annotation-selected = { $type } valgt.
--reader-a11y-textual-annotation-instruction = For å kommentere tekst via tastaturet, bruk først “{ reader-find-in-document }” for å finne frasen, og trykk deretter { general-key-control }-{ option-or-alt }-{ $number } for å gjøre søkeresultatet om til en kommentar.
+-reader-a11y-textual-annotation-instruction = For å kommentere tekst via tastaturet, bruk først «{ reader-find-in-document }» for å finne frasen, og trykk deretter { general-key-control }-{ option-or-alt }-{ $number } for å gjøre søkeresultatet om til en kommentar.
 -reader-a11y-annotation-instruction = For å legge til denne kommentaren i dokumentet, fokuserer du på dokumentet og trykker { general-key-control }-{ option-or-alt }-{ $number }.
 reader-toolbar-highlight =
     .aria-description = { -reader-a11y-textual-annotation-instruction(number: 1) }
@@ -183,7 +183,7 @@ reader-import-from-epub-no-annotations-current-file =
     
     { -app-name } kan importere e-bok kommentarer som er opprettet i Calibre og KOReader.
 reader-import-from-epub-no-annotations-other-file =
-    “{ $filename }” ser ikke ut til å inneholde noen Calibre- eller KOReader-kommentarer.
+    «{ $filename }» ser ikke ut til å inneholde noen Calibre- eller KOReader-kommentarer.
     
     Hvis denne e-boken har kommentarer opprettet i KOReader, kan du prøve å velge en "metadata.epub.lua"-fil direkte.
 reader-import-from-epub-select-other = Velg annen fil…
@@ -223,7 +223,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = En ukjent feil har oppstått.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Kan ikke koble til høytlesingstjenesten. Sjekk internettforbindelsen din.
 reader-read-aloud-error-daily-limit-exceeded = Du har overskredet den daglige grensen din for stemmer i { -app-name }.
 reader-read-aloud-retry = Prøv på nytt
 reader-read-aloud-first-run-title = Velg den foretrukne høytlesningsstemmen din:
diff --git a/chrome/locale/nb-NO/zotero/searchbox.dtd b/chrome/locale/nb-NO/zotero/searchbox.dtd
index 611d470bc9..3d5adadc8a 100644
--- a/chrome/locale/nb-NO/zotero/searchbox.dtd
+++ b/chrome/locale/nb-NO/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Navn:">
 
-<!ENTITY zotero.search.searchInLibrary "Søk i bibliotek:">
-
 <!ENTITY zotero.search.joinMode.prefix "Finn">
 <!ENTITY zotero.search.joinMode.any "hvilken som helst">
 <!ENTITY zotero.search.joinMode.all "alle">
@@ -9,7 +7,7 @@
 
 <!ENTITY zotero.search.recursive.label "Søk i under-samlinger">
 <!ENTITY zotero.search.noChildren "Vis kun overordnede elementer">
-<!ENTITY zotero.search.includeParentsAndChildren "Inkluder under- og overordnede elementer">
+<!ENTITY zotero.search.includeParentsAndChildren "Inkluder overordnede og underordnede elementer av samsvarende elementer">
 
 <!ENTITY zotero.search.textModes.phrase "Frase">
 <!ENTITY zotero.search.textModes.phraseBinary "Frase (inkl. binærfiler)">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dager">
 <!ENTITY zotero.search.date.units.months "måneder">
 <!ENTITY zotero.search.date.units.years "år">
-
-<!ENTITY zotero.search.search "Søk">
-<!ENTITY zotero.search.clear "Fjern">
-<!ENTITY zotero.search.saveSearch "Lagre søk">
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index 6acdb75ae7..723dabdb2f 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -70,7 +70,7 @@
 <!ENTITY zotero.items.menu.restoreToLibrary "Gjenopprett til bibliotek">
 <!ENTITY zotero.items.menu.duplicateItem "Dupliser det valgte elementet">
 <!ENTITY zotero.items.menu.mergeItems "Slå sammen elementer…">
-<!ENTITY zotero.items.menu.unrecognize "Gjør om hent metadat">
+<!ENTITY zotero.items.menu.unrecognize "Angre hent metadata">
 
 <!ENTITY zotero.duplicatesMerge.versionSelect "Velg versjon av element til bruk som hovedelement:">
 <!ENTITY zotero.duplicatesMerge.fieldSelect "Velg felt å bevare fra andre versjoner av elementet:">
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Fjern element...">
 <!ENTITY zotero.toolbar.newGroup "Ny gruppe...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Ny under-samling...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nytt lagret søk...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Tøm søppelkorg">
 <!ENTITY zotero.toolbar.tagSelector.label "Vis/skjul emneordvelger">
 <!ENTITY zotero.toolbar.actions.label "Handlinger">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Innstillinger...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Støtte og dokumentasjon">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Avansert søk">
 <!ENTITY zotero.toolbar.openURL.label "Lokaliser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom ditt lokale bibliotek">
 
diff --git a/chrome/locale/nb-NO/zotero/zotero.ftl b/chrome/locale/nb-NO/zotero/zotero.ftl
index 7bbd80f272..cf40753a28 100644
--- a/chrome/locale/nb-NO/zotero/zotero.ftl
+++ b/chrome/locale/nb-NO/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Skriv ut
 general-remove = Fjern
 general-add = Legg til
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Se instruksjoner for feilsøking
 general-go-back = Gå tilbake
 general-accept = Aksepter
 general-cancel = Avbryt
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Vis i bibliotek
 general-restartApp = Start { -app-name } på nytt
 general-restartInTroubleshootingMode = Start på nytt i feilsøkingsmodus
 general-save = Lagre
 general-clear = Fjern
+clear-button =
+    .label = { general-clear }
 general-update = Oppdater
 general-back = Tilbake
 general-edit = Rediger
@@ -61,7 +71,7 @@ general-next = Neste
 general-learn-more = Lær mer
 general-more-information = Mer informasjon
 general-warning = Advarsel
-general-type-to-continue = Skriv “{ $text }” for å fortsette.
+general-type-to-continue = Skriv «{ $text }» for å fortsette.
 general-continue = Fortsett
 general-red = Rød
 general-orange = Oransje
@@ -76,6 +86,8 @@ general-maroon = Rødbrun
 general-gray = Grå
 general-black = Svart
 general-loading = Laster inn...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Henvisningsstil:
 language-label = Språk:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Vis { recently-read }
 item-menu-remove-from-recently-read =
     .label = Fjern fra { recently-read }…
-collections-menu-rename-collection =
-    .label = Endre navn på samlingen
-collections-menu-edit-saved-search =
-    .label = Rediger lagret søk
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } samling valgt
+       *[other] { $count } samlinger valgt
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } valgt lagret søk
+       *[other] { $count } valgte lagrede søk
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } kilde valgt
+       *[other] { $count } kilder valgt
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } valgt samling)
+       *[other] { $library } ({ $count } valgte samlinger)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } valgt lagret søk
+       *[other] { $library } ({ $count } valgte lagrede søk)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } kilde valgt)
+       *[other] { $library } ({ $count } kilder valgt)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Endre navn
+edit-saved-search = Rediger lagret søk
+collections-menu-edit-search =
+    .label = Rediger søk
+collections-menu-duplicate-search =
+    .label = Dupliser søk
 collections-menu-move-collection =
     .label = Flytt til
 collections-menu-copy-collection =
     .label = Kopier til
+collections-menu-export =
+    .label = Eksporter...
+collections-menu-generate-report =
+    .label = Opprett rapport…
+collections-menu-create-bibliography =
+    .label = Opprett bibliografi…
+collections-menu-unsubscribe =
+    .label = Avslutt abonnement…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Slett samling…
+           *[other] Slett samlinger…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Slett samling og elementer…
+           *[other] Slett samlinger og elementer…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Slett søk…
+           *[other] Slett søk…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Slett samling
+       *[other] Slett samlinger
+    }
+collections-delete-message =
+    { $count ->
+        [one] Er du sikker på at du vil slette denne samlingen?
+       *[other] Er du sikker på at du vil slette { $count } samlinger?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Elementer i denne samlingen vil ikke bli slettet.
+       *[other] Elementer i disse samlingene vil ikke bli slettet.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Slett samling og elementer
+       *[other] Slett samlinger og elementer
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Er du sikker på at du vli slette denne samlingen og flytte alle elementene i den til søppelkorgen?
+       *[other] Er du sikker på at du vil slette { $count } samlinger og flytte alle elementer i de til søppelkorgen?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Slett søk
+       *[other] Slett søk
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Er du sikker på at du vil slette dette søket?
+       *[other] Er du sikker på at du vil slette { $count } søk?
+    }
 item-creator-moveDown =
     .label = Flytt ned
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Koble sammen igjen Mendeley Desktop henvisninger
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } kunne ikke koble til { $targetApp }. Kontroller Internett-tilkoblingen din og prøv igjen.
+tab-title-multiple-collections = Flere
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -464,7 +573,7 @@ section-attachments-annotations =
             [one] { $count } kommentar
            *[other] { $count } kommentarer
         }
-section-attachments-move-to-trash-message = Er du sikker på at du vil flytte “{ $title }” til søppelkorgen?
+section-attachments-move-to-trash-message = Er du sikker på at du vil flytte «{ $title }» til søppelkorgen?
 section-notes =
     .label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Hurtigsøk
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Avansert søk
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Lukk avansert søk
+advanced-search-expand =
+    .tooltiptext = Utvid avansert søk
+advanced-search-collapse =
+    .tooltiptext = Skjul avansert søk
 item-pane-header-view-as =
     .label = Vis som
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Last ned { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } kan du også angi redaktører og oversettere. Du kan gjøre en forfatter om til en redaktør eller oversetter ved å velge fra denne menyen.
 first-run-guidance-readAloud = { -app-name } kan nå lese dokumentene dine for deg ved hjelp av naturlige stemmer.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Fjern betingelse
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Legg til betingelse
+advanced-search-group-btn =
+    .tooltiptext = Legg til gruppebetingelse
+advanced-search-remove-group-btn =
+    .tooltiptext = Fjern gruppe
+advanced-search-ungroup-btn =
+    .tooltiptext = Opphev gruppering av betingelser
+advanced-search-result-level-menu =
+    .aria-label = Resultattype
+advanced-search-result-level-prefix-root =
+    .value = Finn
+advanced-search-join-prefix-root =
+    .value = finner
+advanced-search-result-level-any =
+    .label = et hvilket som helst element
+advanced-search-result-level-item =
+    .label = Overordnede elementer
+advanced-search-result-level-attachment =
+    .label = vedlegg
+advanced-search-result-level-note =
+    .label = notater
+advanced-search-result-level-annotation =
+    .label = kommentarer
+advanced-search-binding-menu =
+    .aria-label = Finn mot samme element
+advanced-search-binding-separate =
+    .label = separat
+advanced-search-binding-same-attachment =
+    .label = i samme vedlegg
+advanced-search-binding-same-note =
+    .label = i samme notat
+advanced-search-binding-same-annotation =
+    .label = i samme kommentar
+advanced-search-of-the-following =
+    .value = av følgende
+advanced-search-binding-hint-attachment =
+    .value = Disse betingelsene kan samsvare med separate vedlegg.
+advanced-search-binding-hint-note =
+    .value = Disse betingelsene kan samsvare med separate notater.
+advanced-search-binding-hint-annotation =
+    .value = Disse betingelsene kan samsvare med separate kommentarer.
+advanced-search-level-warning-mixed = Disse betingelsene kan ikke alle samsvare med samme element, så dette søket vil aldri gi noen resultater. Prøv å søke på «{ $matchAny }» blant dem, eller sett resultattypen til «{ $topLevelItems }».
+advanced-search-level-warning-unreachable = Dette søket inneholder et søkevilkår som ikke kan brukes på den valgte resultattypen. Angi resultattypen til «{ $topLevelItems }», eller fjern det uforenlige søkevilkåret.
+advanced-search-group-warning-unreachable =
+    En betingelse her kan ikke forekomme i samme { $entity ->
+        [attachment] vedlegg
+        [note] notat
+       *[annotation] kommentar
+    }. Sammenlign disse separat, eller fjern den uforenlige betingelsen.
+advanced-search-group-warning-mixed = Disse betingelsene kan ikke alle samsvare med samme element, så denne gruppen vil aldri gi treff. Prøv å søke etter «{ $matchAny }» blant dem, eller sett resultattypen til «{ $topLevelItems }».
+advanced-search-bind-same-attachment =
+    .label = Finn det samme vedlegget
+advanced-search-bind-same-note =
+    .label = Finn det samme notatet
+advanced-search-bind-same-annotation =
+    .label = Finn den samme kommentaren
 advanced-search-conditions-menu =
     .aria-label = Søketilstand
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Verdi
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Felter:
 search-conditions-collection = Samling
 search-conditions-savedSearch = Lagret søk
 search-conditions-itemTypeID = Elementtype
 search-conditions-tag = Emneord
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notat
 search-conditions-childNote = Underordnet notat
 search-conditions-creator = Opphaver
@@ -715,10 +897,26 @@ search-conditions-dateModified = Dato endret
 search-conditions-fulltextContent = Vedleggsinnhold
 search-conditions-programmingLanguage = Programmeringsspråk
 search-conditions-fileTypeID = Vedleggets filtype
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Vedlegg sist lest
 search-conditions-annotationText = Kommentartekst
 search-conditions-annotationComment = Merknad til kommentar
+search-conditions-annotationType = Type kommentar
+search-conditions-annotationColor = Farge kommentar
+search-conditions-annotationAuthor = Forfatter kommentar
 search-conditions-anyField = Hvilket som helst felt
+search-conditions-titleCreatorYear = Tittel, opphaver, år
+search-conditions-submenu-attachment = Vedlegg
+search-conditions-submenu-annotation = Kommentar
+search-conditions-short-fulltextContent = Innhold
+search-conditions-short-fileTypeID = Filtype
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Sist lest
+search-conditions-short-annotationText = Tekst
+search-conditions-short-annotationComment = Merknad
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Farge
+search-conditions-short-annotationAuthor = Forfatter
 find-pdf-files-added =
     { $count ->
         [one] { $count } fil lagt til
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentasjon
 file-type-document = Dokument
 file-type-ebook = E-bok
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Du har blitt oppgradert til <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Lær om <a data-l10n-name="new-features-link">hva som er nytt </a>
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Lim inn og søk
 mac-word-plugin-install-message = Zotero trenger tilgang til Word-data for å installere Word-programtillegget.
+mac-word-plugin-install-folder-message = { -app-name }  trenger tilgang til oppstartmappen til Word for å installere Word-programtillegget.
 mac-word-plugin-install-action-button =
     .label = Installer Word-programtillegget
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Installer programtillegget i oppstartmappen til Word
+mac-word-plugin-install-folder-dialog-button = Installer
+mac-word-plugin-install-wrong-folder-selected = Den foreslåtte mappen må velges. Prøv på nytt uten å velge en annen mappe.
 file-renaming-banner-message = { -app-name } synkroniserer nå automatisk filnavnene på vedlegg når du gjør endringer i elementene.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = { -app-name } Tilknytter må oppdateres for å fungere med denne versjonen av { -app-name }.
 userjs-pref-warning = Noen { -app-name }-innstillinger er blitt overskrevet ved hjelp av en metode som ikke støttes. { -app-name } vil tilbakestille dem og starte på nytt.
 migrate-extra-fields-progress-message = Migrerer nye felt fra Ekstra-feltet
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Del opp emneord
 long-tag-fixer-button-dont-split =
@@ -787,4 +993,141 @@ banner-close-button =
     .aria-label = Avvis varsel
 plugins-blocked-plugin =
     .message = Dette programtillegget har blitt deaktivert av { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Dette kan skje hvis datamappen til { -app-name } ligger i en mappe i skylagring (OneDrive, Dropbox osv.) eller på en nettverksressurs.
+login-manager-reset = { -app-name } klarte ikke å lese de lagrede påloggingsopplysningene dine, så de er blitt tilbakestilt. Vennligst logg inn på nytt i { preferences-pane-account }-panelet i innstillingene for { -app-name }.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } fikk ikke tilgang til { -os-name }-nøkkelringen for å lagre påloggingsopplysningene dine på en sikker måte. Sørg for at nøkkelringen er tilgjengelig, og prøv på nytt.
+        [windows] { -app-name } klarte ikke å lagre påloggingsopplysningene dine på en sikker måte. Prøv på nytt eller start { -app-name } på nytt.
+       *[other] { -app-name } fikk ikke tilgang til { -os-name }-nøkkelringen din for å lagre påloggingsopplysningene dine på en sikker måte. Sørg for at en nøkkelringstjeneste kjører, og prøv på nytt.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } fikk ikke tilgang til { -os-name }-nøkkelringen for å kryptere dine lagrede påloggingsopplysninger. Påloggingsopplysningene dine forblir lagret ukryptert på disken. Sørg for at nøkkelringen din er tilgjengelig, og start { -app-name } på nytt.
+        [windows] { -app-name } klarte ikke å kryptere dine lagrede påloggingsopplysninger. Påloggingsopplysningene dine forblir lagret ukryptert på disken. Start { -app-name } på nytt og prøv igjen.
+       *[other] { -app-name } fikk ikke tilgang til { -os-name }-nøkkelringen for å kryptere de lagrede påloggingsopplysningene dine. Påloggingsopplysningene dine forblir lagret ukryptert på disken. Sørg for at en nøkkelringstjeneste kjører, og start { -app-name } på nytt.
+    }
+search-button =
+    .label = Søk
+save-search-new-button =
+    .label = Lagre søk…
+save-search-edit-button =
+    .label = Lagre
+save-search-name-title = Lagre søk
+save-search-name-message = Angi et navn for lagret søk:
+saved-search-close-confirmation-title = Rediger lagret søk
+saved-search-close-confirmation-body = Ønsker du å lagre endringer gjort for dette lagrede søket?
+item-pane-batch-editing-prompt =
+    .aria-label = Gruppevis redigering
+item-pane-batch-editing-enable =
+    .label = Rediger flere elementer…
+item-pane-batch-editing-multiple-values-placeholder = Flere
+item-pane-batch-editing-clear-values = Fjern alle verdier
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Redigerer { $count } element
+       *[other] Redigerer { $count } elementer
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Rediger metadata
+       *[other] Rediger metadata for { $count } elementer
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Redigering av «{ $field }»
+       *[other] Redigering av «{ $field }» for { $count } elementer
+    }
+undo-action-normalize-attachment-titles = Normaliser vedleggstittel
+undo-action-trash =
+    { $count ->
+        [one] Legg element i søppelkorg
+       *[other] Legg { $count } elementer i søppelkorg
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Gjenopprett element
+       *[other] Gjenopprett { $count } elementer
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Legg samling i søppelkorgen
+       *[other] Legg{ $count } samlinger i søppelkorgen
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Legg lagret søk i søppelkorgen
+       *[other] Legg { $count } lagrede søk i søppelkorgen
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Gjenopprett samling
+       *[other] Gjenopprett { $count } samlinger
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Gjenopprett objekt
+       *[other] Gjenopprett { $count } objekter
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Legg til samling
+       *[other] Legg til { $count } elementer til samling
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Fjern fra samling
+       *[other] Fjern { $count } elementer fra samling
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Flytt til samling
+       *[other] Flytt { $count } elementer til samling
+    }
+undo-action-rename-collection = Endre navn på samlingen
+undo-action-move-collection = Flytt samling
+undo-action-add-tag =
+    { $count ->
+        [one] Legg til emneord
+       *[other] Legg til emneord til { $count } elementer
+    }
+undo-action-change-tag = Endre emneord
+undo-action-split-tag = Del opp emneord
+undo-action-remove-tag =
+    { $count ->
+        [one] Fjern emneord
+       *[other] Fjern emneord fra { $count } elementer
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Fjern emneord
+       *[other] Fjern { $count } emneord
+    }
+undo-action-remove-all-tags = Fjern alle emneord
+undo-action-edit-note = Rediger notat
+undo-action-add-creator = Legg til opphaver
+undo-action-remove-creator = Fjern opphaver
+undo-action-edit-creator = Rediger opphaver
+undo-action-reorder-creator = Bytt rekkefølge på opphaver
+undo-action-change-type = Endre elementtype
+undo-action-change-parent-item =
+    { $count ->
+        [one] Endre overordnet element
+       *[other] Endre overordnet element for { $count } elementer
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Konverter til enkeltstående element
+       *[other] Konverter { $count } elementer til enkeltstående elementer
+    }
+undo-action-add-related = Legg til relatert
+undo-action-remove-related = Fjern relatert
+undo-action-merge-items =
+    { $count ->
+        [one] Slå sammen element
+       *[other] Slå sammen { $count } elementer
+    }
+menu-edit-undo-action = Angre { $action }
+menu-edit-redo-action = Gjør om { $action }
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 398e7926fa..3f829ce0e7 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -25,7 +25,7 @@ general.actionCannotBeUndone=Denne handlingen kan ikke angres.
 general.install=Installer
 general.updateAvailable=Oppdatering tilgjengelig
 general.downloading=Laster ned %S…
-general.downloading.quoted=Laster ned “%S”…
+general.downloading.quoted=Laster ned «%S»…
 general.noUpdatesFound=Ingen oppdateringer funnet
 general.isUpToDate=%S er oppdatert.
 general.upgrade=Oppgrader
@@ -190,7 +190,7 @@ dataDir.selectDir=Velg en Zotero datamappe
 dataDir.selectNewDir=Velg en ny %S datamappe
 dataDir.changeDataDirectory=Endre datamappe…
 dataDir.chooseNewDataDirectory=Velg ny datamappe…
-dataDir.cannotBeSetWithAlternative=Datamappen kan ikke settes til en “%S” mappe. Mente du %S?
+dataDir.cannotBeSetWithAlternative=Datamappen kan ikke settes til en «%S» mappe. Mente du %S?
 dataDir.cannotBeLinkedAttachmentBaseDirectory=Datamappe kan ikke settes til den samme som basismappe for lenkede vedlegg.
 dataDir.unsafeLocation.selected.cloud=Plassering av datamappen i en skytjeneste vil høyst sannsynlig skade databasen din.
 dataDir.unsafeLocation.selected.areYouSure=Er du sikker på at du vil bruke denne plasseringen?
@@ -236,7 +236,7 @@ startupError.databaseUpgradeError=Databaseoppgraderingsfeil
 startupError.internetFunctionalityMayNotWork=Funksjonalitet som krever en internettforbindelse fungerer kanskje ikke.
 startupError.bundledFileUpdateError=%S var ikke i stand til å laste oversettere og stiler.
 startupError.startedFromDiskImage1=%S ble startet fra en diskfil, noe som kan bryte noe funksjonalitet.
-startupError.startedFromDiskImage2=For å installere %1$S skikkelig, avslutt programmet, åpne diskfilen du lastet ned, og dra  “%1$S” til alias for Programmer mappen vist i vinduet. Deretter løs ut diskfilen og last Zotero ved å åpne den fra Programmer mappen din.
+startupError.startedFromDiskImage2=For å installere %1$S skikkelig, avslutt programmet, åpne diskfilen du lastet ned, og dra  «%1$S» til alias for Programmer mappen vist i vinduet. Deretter løs ut diskfilen og last Zotero ved å åpne den fra Programmer mappen din.
 
 date.relative.secondsAgo.one=1 sekund siden
 date.relative.secondsAgo.multiple=%S sekunder siden
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 år siden
 date.relative.yearsAgo.multiple=%S år siden
 
 pane.collections.title=Samlinger
-pane.collections.delete.title=Slett samling
-pane.collections.delete=Er du sikker på at du vil slette den valgte samlingen?
-pane.collections.delete.keepItems=Elementer i denne samlingen vil ikke bli slettet.
-pane.collections.deleteWithItems.title=Slett samling og elementer
-pane.collections.deleteWithItems=Er du sikker på at du vil slette den valgte samlingen og flytte alle elementer i den til søppelkorgen?
 pane.feed.deleteWithItems.title=Avslutt abonnement
 pane.feed.deleteWithItems=Er du sikker på at du vil avslutte abonnementet fra denne nyhetsstrømmen?
 
-pane.collections.deleteSearch.title=Slett søk
-pane.collections.deleteSearch=Er du sikker på at du vil slette det valgte søket?
 pane.collections.emptyTrash=Er du sikker på at du vil slette elementene permanent fra søppelkorgen?
 pane.collections.newSavedSeach=Nytt lagret søk
 pane.collections.savedSearchName=Angi et navn på dette lagrede søket:
@@ -275,26 +268,11 @@ pane.collections.unfiled=Ikke arkiverte elementer
 pane.collections.retracted=Tilbaketrukne elementer
 pane.collections.duplicate=Dupliserte elementer
 pane.collections.removeLibrary=Fjern bibliotek
-pane.collections.removeLibrary.text=Er du sikker på at du vil fjerne “%S” for alltid fra denne datamaskinen?
+pane.collections.removeLibrary.text=Er du sikker på at du vil fjerne «%S» for alltid fra denne datamaskinen?
 
-pane.collections.menu.duplicate.savedSearch=Dupliser lagret søk
 pane.collections.menu.remove.library=Fjern bibliotek…
-pane.collections.menu.delete.collection=Slett samling…
-pane.collections.menu.delete.collectionAndItems=Slett samling og elementer…
-pane.collections.menu.delete.savedSearch=Slett lagret søk…
-pane.collections.menu.delete.feedAndItems=Avslutt abonnement fra nyhetsstrøm…
-pane.collections.menu.export.collection=Eksporter samling...
-pane.collections.menu.export.savedSearch=Eksporter lagret søk...
-pane.collections.menu.export.feed=Eksporter nyhetsstrøm...
-pane.collections.menu.createBib.collection=Opprett bibliografi fra samling...
-pane.collections.menu.createBib.savedSearch=Opprett bibliografi fra lagret søk…
-pane.collections.menu.createBib.feed=Opprett bibliografi fra nyhetsstrøm…
 pane.collections.showCollectionInLibrary=Vis samling i bibliotek
 
-pane.collections.menu.generateReport.collection=Opprett rapport fra samling...
-pane.collections.menu.generateReport.savedSearch=Opprett rapport fra lagret søk...
-pane.collections.menu.generateReport.feed=Lag rapport fra nyhetsstrøm…
-
 pane.collections.menu.refresh.feed=Oppdater nyhetsstrøm
 pane.collections.menu.refresh.allFeeds=Oppdater alle nyhetsstrømmer
 pane.collections.menu.markAsRead.feed=Merk nyhetsstrøm som lest
@@ -324,7 +302,7 @@ pane.items.loadError=Feil ved lasting av elementliste
 pane.items.columnChooser.moreColumns=Flere kolonner
 pane.items.columnChooser.secondarySort=Sekundær sortering (%S)
 pane.items.attach.link.uri.unrecognized=Zotero gjenkjente ikke URI som du la inn. Sjekk adressen og prøv igjen.
-pane.items.attach.link.uri.file=For å legge ved en lenke til en fil, bruk “%S”.
+pane.items.attach.link.uri.file=For å legge ved en lenke til en fil, bruk «%S».
 pane.items.trash.title=Flytt til søppelkorg
 pane.items.trash=Er du sikker på at du vil flytte det valgte elementet til søppelkorgen?
 pane.items.trash.multiple=Er du sikker på at du vil flytte valgte elementer til søppelkorgen?
@@ -390,7 +368,7 @@ pane.item.duplicates.onlySameItemType=Sammenslåtte elementer må alle være sam
 
 pane.item.markAsRead=Merk som lest
 pane.item.markAsUnread=Merk som ulest
-pane.item.addTo=Legg til “%S”
+pane.item.addTo=Legg til «%S»
 pane.item.showInMyPublications=Vis i Mine publikasjoner
 pane.item.hideFromMyPublications=Skjul fra Mine publikasjoner
 pane.item.changeType.title=Endre elementtype
@@ -425,7 +403,7 @@ pane.item.attachments.autoRelink.text3=Ny plassering: %S
 pane.item.attachments.autoRelink.text4=%1$S kan automatisk gjenopprette kobling til dette vedlegget.
 pane.item.attachments.autoRelink.relink=Gjenopprett kobling
 pane.item.attachments.autoRelinkOthers.title=Ytterliggere filer er funnet
-pane.item.attachments.autoRelinkOthers.text=Et annet frakoblet vedlegg i dette biblioteket ble funnet i samme katalog. Gjenopprett også kobling til dette vedlegget på nytt?;%S andre frakoblede vedlegg i dette biblioteket ble funnet i samme katalog. Gjenopprett kobling til alle vedlegg som ble funnet på nytt?
+pane.item.attachments.autoRelinkOthers.text=Et annet frakoblet vedlegg i dette biblioteket ble funnet i samme mappe. Gjenopprett også kobling til dette vedlegget på nytt?;%S andre frakoblede vedlegg i dette biblioteket ble funnet i samme mappe. Gjenopprett kobling til alle vedlegg som ble funnet på nytt?
 pane.item.attachments.autoRelink.locateManually=Lokaliser manuelt…
 pane.item.attachments.autoRelink.relinkAll=Gjenopprett kobling til alle
 pane.item.attachments.has=Har vedlegg
@@ -678,15 +656,15 @@ attachment.convertToStored.title=Konverter til lagret fil;Konverter til lagrede
 attachment.convertToStored.text=%1$S vedlegget vil bli konvertert fra en lenket fil til en lagret fil;%1$S vedleggene vil bli konvertert fra lenkede filer til lagrede filer
 attachment.convertToStored.deleteOriginal=Slett opprinnelig fil etter lagring;Slett opprinnelige filer etter lagring
 
-db.dbCorrupted=%1$S databasen “%2$S” ser ut til å ha blitt skadet.
+db.dbCorrupted=%1$S databasen «%2$S» ser ut til å ha blitt skadet.
 db.dbCorrupted.cloudStorage=Dette skjer normalt når %S datamappen er lagret i en lagringsmappe i skyen eller på en nettverksdisk. Hvis du har flyttet din datamappe til et av de stedene, bør du flytte den tilbake til standard plassering.
 db.dbCorrupted.repairOrRestore=Du må reparere databasen eller gjenopprette den fra en sikkerhetskopi eller fra ditt bibliotek på nett.
 db.dbCorrupted.restoreFromLastAutomaticBackup=%S kan forsøke å gjenopprette fra siste automatiske sikkerhetskopi fra %S på %S.
 db.dbCorrupted.viewMoreInformation=For mer informasjon om å reparere eller gjenopprette databasen og forhindre ytterligere skade, se %S
-db.dbCorruptedNoBackup=%1$S databasen “%2$S” ser ut til å ha blitt skadd, og ingen automatisk sikkerhetskopi er tilgjengelig.\n\nEn ny database har blitt opprettet. Den skadde filen ble lagret i din %1$S datamappe som “%3$S”.
-db.dbRestored=%1$S databasen “%2$S” ser ut til å ha blitt skadd.\n\nDine data ble gjenopprettet fra siste automatiske sikkerhetskopi fra  %3$S på %4$S. Den skadde filen ble lagret til din %1$S datamappe som “%5$S”.
+db.dbCorruptedNoBackup=%1$S databasen «%2$S» ser ut til å ha blitt skadd, og ingen automatisk sikkerhetskopi er tilgjengelig.\n\nEn ny database har blitt opprettet. Den skadde filen ble lagret i din %1$S datamappe som «%3$S».
+db.dbRestored=%1$S databasen «%2$S» ser ut til å ha blitt skadd.\n\nDine data ble gjenopprettet fra siste automatiske sikkerhetskopi fra  %3$S på %4$S. Den skadde filen ble lagret til din %1$S datamappe som «%5$S».
 db.dbRestored.cloudStorage=Hvis din datamappe er plassert i en lagringsmappe i skyen eller på en nettverksdisk bør du umiddelbart flytte den tilbake til standard plassering.
-db.dbRestoreFailed=%1$S databasen “%2$S” ser ut til å ha blitt skadd og et forsøk på å gjenopprette fra siste automatiske sikkerhetskopi mislyktes.\n\nEn ny database har blitt opprettet. Den skadde filen ble lagret i din %1$S datamappe som “%3$S”.
+db.dbRestoreFailed=%1$S databasen «%2$S» ser ut til å ha blitt skadd og et forsøk på å gjenopprette fra siste automatiske sikkerhetskopi mislyktes.\n\nEn ny database har blitt opprettet. Den skadde filen ble lagret i din %1$S datamappe som «%3$S».
 db.dbCorrupted.automaticBackup=Gjenopprett fra automatisk sikkerhetskopi
 
 db.integrityCheck.passed=Ingen feil ble funnet i databasen.
@@ -717,15 +695,9 @@ zotero.preferences.sync.reset.userInfoMissing=Du må skrive inn et brukernavn og
 zotero.preferences.sync.reset.restoreFromServer=Alle data i denne kopien av Zotero vil bli slettet og erstattet med data som tilhører brukeren '%S' på Zotero server.
 zotero.preferences.sync.reset.replaceLocalData=Erstatt lokale data
 zotero.preferences.sync.reset.restartToComplete=Firefox må startes på nytt for å fullføre gjenopprettingsprosessen.
-zotero.preferences.sync.reset.fileSyncHistory=Ved neste synkronisering vil %1$S sjekke alle vedlegg i “%2$S” mot lagringstjenesten. Eventuelle eksterne vedlegg som mangler lokalt vil bli lastet ned og lokale vedlegg som mangler eksternt vil bli lastet opp.\n\nDette valget er ikke nødvendig under normal bruk.
-zotero.preferences.sync.reset.fileSyncHistory.cleared=Filsynkroniseringshistorie for “%S” har blitt fjernet.
+zotero.preferences.sync.reset.fileSyncHistory=Ved neste synkronisering vil %1$S sjekke alle vedlegg i «%2$S» mot lagringstjenesten. Eventuelle eksterne vedlegg som mangler lokalt vil bli lastet ned og lokale vedlegg som mangler eksternt vil bli lastet opp.\n\nDette valget er ikke nødvendig under normal bruk.
+zotero.preferences.sync.reset.fileSyncHistory.cleared=Filsynkroniseringshistorie for «%S» har blitt fjernet.
 
-zotero.preferences.search.rebuildIndex=Gjenopprett indeks
-zotero.preferences.search.rebuildWarning=Vil du gjenopprette indeksen? Dette kan ta en stund.\n\nHvis du kun vil indeksere elementer som ikke allerede er indeksert, bruk %S.
-zotero.preferences.search.clearIndex=Tøm indeksen
-zotero.preferences.search.clearWarning=Når indeksen er tømt, vil innhold i vedlegg ikke lenger være søkbart.\n\nNettlenkede vedlegg kan kun indekseres på nytt ved å besøke den enkelte nettsiden. For å la nettlenker være indeksert, velg %S.
-zotero.preferences.search.clearNonLinkedURLs=Fjern alt unntatt internettlenker
-zotero.preferences.search.indexUnindexed=indekser ikke-indekserte elementer
 zotero.preferences.export.quickCopy.citationStyles=Henvisningsstiler
 zotero.preferences.export.quickCopy.exportFormats=Eksportformat
 zotero.preferences.export.quickCopy.instructions=Hurtigkopi tillater deg å raskt eksportere elementer i et gitt format. Du kan kopiere valgte elementer til utklippstavlen ved å trykke %S eller dra elementer til en tekstboks i et annet program.
@@ -786,7 +758,7 @@ fileInterface.viewSupportedFormats=Vis støttede formater…
 fileInterface.untitledBibliography=Bibliografi uten tittel
 fileInterface.bibliographyHTMLTitle=Bibliografi
 fileInterface.importError=En feil oppstod under importen av den valgte filen. Forsikre deg om at filen er gyldig og forsøk igjen.
-fileInterface.importError.translator=En feil oppstod under importen av den valgte filen med “%S”. Forsikre deg om at filen er gyldig og forsøk igjen.
+fileInterface.importError.translator=En feil oppstod under importen av den valgte filen med «%S». Forsikre deg om at filen er gyldig og forsøk igjen.
 fileInterface.importClipboardNoDataError=Ingen importerbare data kunne leses fra utklippstavlen.
 fileInterface.noReferencesError=Elementene du valgte inneholder ingen referanser. Vennligst velg en eller flere referanser og prøv igjen.
 fileInterface.bibliographyGenerationError=En feil oppstod under opprettingen av bibliografien. Prøv igjen.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Du må sette inn en henvisning for du kan u
 integration.error.mustInsertBibliography=Du må sette inn en bibliografi før du utfører denne handlingen.
 integration.error.cannotInsertHere=Zotero felt kan ikke settes inn her.
 integration.error.notInCitation=Du må plassere markøren i en Zotero henvisning for å redigere den.
+integration.error.inBibliography=For å sette inn en henvisning, plasser markøren i selve teksten. For å redigere litteraturlisten direkte, bruk %S.
 integration.error.noBibliography=Den nåværende bibliografiske stilen inkluderer ikke en bibliografi. Hvis du ønsker å legge til en bibliografi må du velge en annen bibliografisk stil.
 integration.error.deletePipe=Kanalen som Zotero bruker for å kommunisere med tekstbehandleren kunne ikke initialiseres. Vil du la Zotero forsøke å rette feilen? Du vil bli bedt om å angi ditt passord.
 integration.error.invalidStyle=Stilen du har valgt ser ikke ut til å være gyldig. Hvis du har opprettet stilen selv, sørg for at stilen valideres i henhold til kravene beskrevet på https://github.com/citation-style-language/styles/wiki/Validation. Alternativt, forsøk med en annen stil.
@@ -903,8 +876,8 @@ integration.error.misconfiguredWordStartupFolder.some=%S kunne ikke installere W
 integration.error.misconfiguredWordStartupFolder.all=%S kunne ikke installere Word-tillegget fordi plassering for oppstartmappe for Word er feilkonfigurert.
 integration.error.misconfiguredWordStartupFolder.fix=Tillegget vil kanskje ikke vises i Word før du tilbakestiller oppstartmappen til standard plassering.
 integration.error.macWordSBPermissionsMissing.title=Manglende tilgang
-integration.error.macWordSBPermissionsMissing=Zotero har ikke tillatelse til å kontrollere Word. Slik gir du denne tillatelsen:\n\n1) Åpne Systemvalg\n2) Velg “Sikkerhet og personvern” i venstre kolonne\n3) Velg “Automatisering”\n4) Finn “Zotero” og klikk på pilen for å utvide den\n5) Sørg for at “Microsoft Word” er aktivert under “Zotero”\n6) Start Word på nytt
-integration.error.macWordSBPermissionsMissing.pre2016=Hvis “Microsoft Word” ikke vises under “Automatisering,” sjekk at du kjører Word 2011 versjon 14.77 eller nyere.
+integration.error.macWordSBPermissionsMissing=Zotero har ikke tillatelse til å kontrollere Word. Slik gir du denne tillatelsen:\n\n1) Åpne Systemvalg\n2) Velg «Sikkerhet og personvern» i venstre kolonne\n3) Velg «Automatisering»\n4) Finn «Zotero» og klikk på pilen for å utvide den\n5) Sørg for at «Microsoft Word» er aktivert under «Zotero»\n6) Start Word på nytt
+integration.error.macWordSBPermissionsMissing.pre2016=Hvis «Microsoft Word» ikke vises under «Automatisering,» sjekk at du kjører Word 2011 versjon 14.77 eller nyere.
 integration.error.m1UpgradeOS.title=Oppgradering av macOS er påkrevd
 integration.error.m1UpgradeOS=Det å legge inn henvisninger i Word på en Apple Silicon Mac med macOS versjon 11.3 eller tidligere støttes ikke og kan føre til at %S fryser. Oppdater macOS til versjon 11.4 eller nyere.
 integration.error.viewTroubleshootingInfo=Vil du se instruksjoner for feilsøking?
@@ -996,11 +969,11 @@ sync.error.checkConnection=Feil ved tilkobling til server. Sjekk internettforbin
 sync.error.emptyResponseServer=Tom respons fra server.
 sync.error.invalidCharsFilename=Filnavnet '%S' inneholder ugyldige tegn.\n\nEndre navn og prøv igjen. Hvis du endrer navn på filen via operativsystemet, må du oppdatere kobling til filen.
 sync.error.apiKeyInvalid=%S kunne ikke verifisere din konto. Angi kontodetaljer på nytt.
-sync.error.collectionTooLong=Navn på samlingen “%S” er for langt til å synkronisere. Forkort navnet og synkroniser på nytt.
-sync.error.fieldTooLong=%1$S verdien “%2$S” i et av elementene dine er for lang til å synkroniseres. Forkort feltet og synkroniser igjen.
-sync.error.creatorTooLong=Navnet “%S” for opphaver i et av dine elementer er for langt til å kunne synkroniseres. Forkort feltet og synkroniser på nytt.
+sync.error.collectionTooLong=Navn på samlingen «%S» er for langt til å synkronisere. Forkort navnet og synkroniser på nytt.
+sync.error.fieldTooLong=%1$S verdien «%2$S» i et av elementene dine er for lang til å synkroniseres. Forkort feltet og synkroniser igjen.
+sync.error.creatorTooLong=Navnet «%S» for opphaver i et av dine elementer er for langt til å kunne synkroniseres. Forkort feltet og synkroniser på nytt.
 sync.error.noteEmbeddedImage=Notater med innebygde bilder kan for øyeblikket ikke synkroniseres. Synkronisering av innebygde bilder kan bli støttet i en fremtidig versjon.
-sync.error.noteTooLong=Notatet “%S” er for langt til å kunne synkronisere. Forkort notatet og synkroniser på nytt.
+sync.error.noteTooLong=Notatet «%S» er for langt til å kunne synkronisere. Forkort notatet og synkroniser på nytt.
 sync.error.reportSiteIssuesToForums=Hvis du mottar denne meldingen gjentatte ganger for elementer som er lagret fra et bestemt nettsted, kan du rapportere dette problemet i %S-foruma.
 sync.error.invalidDataError=Noe data i % S kunne ikke lastes ned. Det kan ha blitt lagret med en nyere versjon av % S.
 sync.error.invalidDataError.otherData=Andre data vil fortsette å synkronisere.
@@ -1011,9 +984,9 @@ account.unlinkWarning.button=Logg ut
 account.warning.emptyLibrary=Du er i ferd med å synkronisere til en tom %1$S database. Dette kan skje hvis du ved et uhell slettet %2$S filen i din %1$S datamappe eller plasseringen for din datamappe har blitt endret.
 account.warning.emptyLibrary.dataWillBeDownloaded=Hvis du fortsetter vil data i ‘%1$S’ kontoen bli lastet ned til komputeren. Biblioteket ditt på nett vil ikke bli påvirket.
 account.warning.existingDataElsewhere=Hvis dine  %S-data finnes et annet sted på denne datamaskinen bør du flytte de til gjeldende datamappe eller endre datamappeplassering til mappe for dine eksisterende data.
-account.lastSyncWithDifferentAccount=Denne %1$S databasen ble sist synkronisert med en annen konto (“%2$S”) enn den du nå forsøker å synkronisere med (“%3$S”). Hvis du fortsetter vil alle %1$S biblioteker tilknyttet kontoen “%2$S” bli fjernet fra denne datamaskinen.
-account.lastSyncWithDifferentAccount.beforeContinuing=For du fortsetter, sørg for at alle data og filer som du ønsker å ta vare på har blitt synkronisert med “%S” kontoen og at du har en sikkerhetskopi av din %S datamappe.
-account.confirmDelete=Fjern alle data for “%S” fra denne datamaskinen
+account.lastSyncWithDifferentAccount=Denne %1$S databasen ble sist synkronisert med en annen konto («%2$S») enn den du nå forsøker å synkronisere med («%3$S»). Hvis du fortsetter vil alle %1$S biblioteker tilknyttet kontoen «%2$S» bli fjernet fra denne datamaskinen.
+account.lastSyncWithDifferentAccount.beforeContinuing=For du fortsetter, sørg for at alle data og filer som du ønsker å ta vare på har blitt synkronisert med «%S» kontoen og at du har en sikkerhetskopi av din %S datamappe.
+account.confirmDelete=Fjern alle data for «%S» fra denne datamaskinen
 account.confirmDelete.button=Bytt kontoer
 
 sync.conflict.autoChange.alert=En eller flere lokalt slettede Zotero %S har blitt endret eksternt etter siste synkronisering.
@@ -1397,7 +1370,7 @@ pdfReader.toggleSidebar=Slå av/på sidepanel
 pdfReader.findInDocument=Finn i dokument
 pdfReader.toggleContextPane=Slå av/på kontekstruten
 pdfReader.highlightAll=Uthev alle
-pdfReader.matchCase=Sorter etter
+pdfReader.matchCase=Bruk store og små bokstaver
 pdfReader.wholeWords=Hele ord
 pdfReader.appearance=Utseende
 pdfReader.epubAppearance.lineHeight=Linjeavstand
@@ -1443,7 +1416,7 @@ spellCheck.checkSpelling=Kontroller rettskriving
 spellCheck.addRemoveDictionaries=Legg til/fjern ordbøker…
 spellCheck.dictionaryManager.title=Legg til/fjern ordbøker
 spellCheck.dictionaryManager.updateAvailable=%S (oppdatering tilgjengelig)
-spellCheck.dictionaryManager.error.unableToInstall=Kan ikke installere “%S”:
+spellCheck.dictionaryManager.error.unableToInstall=Kan ikke installere «%S»:
 
 tabs.move=Flytt fane
 tabs.moveToStart=Flytt til start
@@ -1453,6 +1426,6 @@ tabs.duplicate=Dupliser fane
 tabs.undoClose=Åpne lukket fane på nytt;Åpne lukkede faner på nytt
 tabs.closeOther=Lukk andre faner
 
-addons.emptyListMessage=Last ned programtillegg fra [katalogen for programtillegg for Zotero].
+addons.emptyListMessage=Last ned programtillegg fra [mappen for programtillegg for Zotero].
 addons.remove.title=Fjern %S?
 addons.remove.text=Er du sikker på at du vil fjerne %1$S fra %2$S?
diff --git a/chrome/locale/nl-NL/zotero/integration.ftl b/chrome/locale/nl-NL/zotero/integration.ftl
index efab5c2d48..84dbe77d3a 100644
--- a/chrome/locale/nl-NL/zotero/integration.ftl
+++ b/chrome/locale/nl-NL/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Auteur weglaten
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotheek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/nl-NL/zotero/preferences.ftl b/chrome/locale/nl-NL/zotero/preferences.ftl
index 5bd7025f07..2c9b576d05 100644
--- a/chrome/locale/nl-NL/zotero/preferences.ftl
+++ b/chrome/locale/nl-NL/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synchroniseer
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/nl-NL/zotero/searchbox.dtd b/chrome/locale/nl-NL/zotero/searchbox.dtd
index 24285c66b8..dce8ba0a9b 100644
--- a/chrome/locale/nl-NL/zotero/searchbox.dtd
+++ b/chrome/locale/nl-NL/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Naam:">
 
-<!ENTITY zotero.search.searchInLibrary "Zoek in bibliotheek:">
-
 <!ENTITY zotero.search.joinMode.prefix "Moet voldoen aan">
 <!ENTITY zotero.search.joinMode.any "één van de">
 <!ENTITY zotero.search.joinMode.all "alle">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dagen">
 <!ENTITY zotero.search.date.units.months "maanden">
 <!ENTITY zotero.search.date.units.years "jaren">
-
-<!ENTITY zotero.search.search "Zoeken">
-<!ENTITY zotero.search.clear "Wissen">
-<!ENTITY zotero.search.saveSearch "Zoekopdracht bewaren">
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index 9d97f8cf98..649824ba1d 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Item verwijderen…">
 <!ENTITY zotero.toolbar.newGroup "Nieuwe groep…">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nieuwe deelverzameling…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nieuwe bewaarde zoekopdracht…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Prullenbak legen">
 <!ENTITY zotero.toolbar.tagSelector.label "Labelkiezer tonen/verbergen">
 <!ENTITY zotero.toolbar.actions.label "Acties">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Voorkeuren…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Ondersteuning en documentatie">
 <!ENTITY zotero.toolbar.about.label "Over Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Uitgebreid zoeken">
 <!ENTITY zotero.toolbar.openURL.label "Opzoeken">
 <!ENTITY zotero.toolbar.openURL.tooltip "Via uw lokale bibliotheek opzoeken">
 
diff --git a/chrome/locale/nl-NL/zotero/zotero.ftl b/chrome/locale/nl-NL/zotero/zotero.ftl
index 11995241c0..6d226be269 100644
--- a/chrome/locale/nl-NL/zotero/zotero.ftl
+++ b/chrome/locale/nl-NL/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Afdrukken
 general-remove = Verwijderen
 general-add = Toevoegen
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Annuleren
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = In bibliotheek tonen
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Opslaan
 general-clear = Wissen
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Terug
 general-edit = Bewerken
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Grijs
 general-black = Zwart
 general-loading = Laden…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citation Style:
 language-label = Taal:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Verzameling Hernoemen
-collections-menu-edit-saved-search =
-    .label = Bewaarde zoekopdracht bewerken
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Bewaarde zoekopdracht bewerken
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Verplaats Naar
 collections-menu-copy-collection =
     .label = Kopieer Naar
+collections-menu-export =
+    .label = Exporteren…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Verplaats naar beneden
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Snelzoeken
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Uitgebreid zoeken
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Zoeken
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Velden:
 search-conditions-collection = Verzameling
 search-conditions-savedSearch = Bewaarde zoekopdracht
 search-conditions-itemTypeID = Item Type
 search-conditions-tag = Label
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notitie
 search-conditions-childNote = Begeleidende aantekening
 search-conditions-creator = Maker
@@ -715,10 +897,26 @@ search-conditions-dateModified = Datum bewerking
 search-conditions-fulltextContent = Bijlage-inhoud
 search-conditions-programmingLanguage = Programmeertaal
 search-conditions-fileTypeID = Bijlage bestandstype
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Titel, Maker, Jaar
+search-conditions-submenu-attachment = Bijlage
+search-conditions-submenu-annotation = Annotatie
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Bestandstype
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Auteur
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentatie
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Installeren
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Zoeken
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Opslaan
+save-search-name-title = Zoekopdracht bewaren
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Verzameling Hernoemen
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Aantekening wijzigen
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Item-type veranderen
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index eeac51419e..52cd39b60e 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 jaar geleden
 date.relative.yearsAgo.multiple=%S jaar geleden
 
 pane.collections.title=Collections
-pane.collections.delete.title=Verzameling verwijderen
-pane.collections.delete=Weet u zeker dat u de geselecteerde verzameling wil verwijderen?
-pane.collections.delete.keepItems=Items in deze verzameling zullen niet worden verwijderd.
-pane.collections.deleteWithItems.title=Verzameling en Items verwijderen
-pane.collections.deleteWithItems=Weet u zeker dat u de geselecteerde verzameling wil verwijderen en alle items wil verplaatsen naar de Prullenbak?
 pane.feed.deleteWithItems.title=Afmelden
 pane.feed.deleteWithItems=Weet u zeker dat u zich wilt afmelden van deze feed?
 
-pane.collections.deleteSearch.title=Zoekopdracht verwijderen
-pane.collections.deleteSearch=Weet u zeker dat u de geselecteerde zoekopdracht wil verwijderen?
 pane.collections.emptyTrash=Weet u zeker dat u de items in de Prullenbak permanent wil wissen?
 pane.collections.newSavedSeach=Nieuwe bewaarde zoekopdracht
 pane.collections.savedSearchName=Geef een naam aan deze bewaarde zoekopdracht:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Dubbele items
 pane.collections.removeLibrary=Bibliotheek verwijderen
 pane.collections.removeLibrary.text=Weet u zeker dat u ‘%$’ permanent van uw computer wilt verwijderen?
 
-pane.collections.menu.duplicate.savedSearch=Bewaarde Zoekopdracht Dupliceren
 pane.collections.menu.remove.library=Bibliotheek verwijderen…
-pane.collections.menu.delete.collection=Verzameling verwijderen...
-pane.collections.menu.delete.collectionAndItems=Verzameling en Items verwijderen
-pane.collections.menu.delete.savedSearch=Bewaarde Zoekopdracht verwijderen
-pane.collections.menu.delete.feedAndItems=Afmelden van feed…
-pane.collections.menu.export.collection=Verzameling exporteren…
-pane.collections.menu.export.savedSearch=Bewaarde zoekopdracht exporteren…
-pane.collections.menu.export.feed=Feed exporteren…
-pane.collections.menu.createBib.collection=Bibliografie aanmaken van verzameling…
-pane.collections.menu.createBib.savedSearch=Bibliografie aanmaken van bewaarde zoekopdracht…
-pane.collections.menu.createBib.feed=Bibliografie aanmaken van feed…
 pane.collections.showCollectionInLibrary=Toon verzameling in bibliotheek
 
-pane.collections.menu.generateReport.collection=Rapport aanmaken van verzameling…
-pane.collections.menu.generateReport.savedSearch=Rapport aanmaken van bewaarde zoekopdracht…
-pane.collections.menu.generateReport.feed=Rapport aanmaken van feed…
-
 pane.collections.menu.refresh.feed=Feed vernieuwen
 pane.collections.menu.refresh.allFeeds=Alle feeds vernieuwen
 pane.collections.menu.markAsRead.feed=Markeer feed als gelezen
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox moet herstart worden om
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Index herbouwen
-zotero.preferences.search.rebuildWarning=Wilt u de hele index herbouwen? Dit kan even duren.\n\nOm enkel items te indexeren die nog niet geïndexeerd zijn, gebruik %S.
-zotero.preferences.search.clearIndex=Index wissen
-zotero.preferences.search.clearWarning=Na het wissen van de index is het niet meer mogelijk de inhoud van bijlages te doorzoeken.\n\nWebkoppeling-bijlages kunnen niet opnieuw worden geïndexeerd zonder de webpagina opnieuw te bezoeken. Om de indexering van webkoppelingen te behouden, kies %S.
-zotero.preferences.search.clearNonLinkedURLs=Alles wissen behalve webkoppelingen
-zotero.preferences.search.indexUnindexed=Indexeer de niet-geïndexeerde items
 zotero.preferences.export.quickCopy.citationStyles=Citeerstijlen
 zotero.preferences.export.quickCopy.exportFormats=Exportformaten
 zotero.preferences.export.quickCopy.instructions=Met Snelle Kopie kunt u geselecteerde items naar het klembord kopiëren met behulp van de sneltoets (%S) of door items naar een tekstvak op een webpagina te slepen.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=U moet eerst een verwijzing toevoegen voord
 integration.error.mustInsertBibliography=U moet eerst een bibliografie toevoegen voordat u deze actie kunt uitvoeren.
 integration.error.cannotInsertHere=Zotero-velden kunnen hier niet worden toegevoegd.
 integration.error.notInCitation=U moet de cursor binnen een Zotero-verwijzing plaatsen om deze te kunnen bewerken.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=De huidige citeerstijl bevat geen bibliografie. Kies een andere stijl als u een bibliografie wilt toevoegen.
 integration.error.deletePipe=Zotero kon geen communicatiekanaal opzetten met de tekstverwerker. Wilt u dat Zotero probeert deze fout te corrigeren? Hiervoor wordt u om uw wachtwoord gevraagd.
 integration.error.invalidStyle=De door u geselecteerd citeerstijl lijkt niet correct te zijn. Als u deze citeerstijl zelf heeft gemaakt controleer of de stijl valideert zoals beschreven op https://github.com/citation-style-language/styles/wiki/Validation. U kunt ook een andere stijl selecteren.
diff --git a/chrome/locale/nn-NO/zotero/about.dtd b/chrome/locale/nn-NO/zotero/about.dtd
index 4a9c694eb5..3f1fe9059f 100644
--- a/chrome/locale/nn-NO/zotero/about.dtd
+++ b/chrome/locale/nn-NO/zotero/about.dtd
@@ -2,12 +2,12 @@
 <!ENTITY zotero.whatsNew "Kva er nytt">
 <!ENTITY zotero.createdby "Laga av:">
 <!ENTITY zotero.director "Leiar:">
-<!ENTITY zotero.directors "Regissørar:">
+<!ENTITY zotero.directors "Leiarar:">
 <!ENTITY zotero.developers "Utviklarar:">
 <!ENTITY zotero.alumni "Tidlegare deltakarar:">
 <!ENTITY zotero.about.localizations "Omsetjingar:">
-<!ENTITY zotero.about.additionalSoftware "Third-Party Software:">
+<!ENTITY zotero.about.additionalSoftware "Programvare frå tredjepart:">
 <!ENTITY zotero.thanks "Særskild takk til:">
 <!ENTITY zotero.about.close "Lukk">
-<!ENTITY zotero.moreCreditsAndAcknowledgements "Meir godskriving og takk">
+<!ENTITY zotero.moreCreditsAndAcknowledgements "Ytterlegare takk, heider og ære">
 <!ENTITY zotero.citationProcessing "Siterings- og bibliografihandsaming">
diff --git a/chrome/locale/nn-NO/zotero/connector.json b/chrome/locale/nn-NO/zotero/connector.json
index 10099075af..aa9dba9724 100644
--- a/chrome/locale/nn-NO/zotero/connector.json
+++ b/chrome/locale/nn-NO/zotero/connector.json
@@ -2,6 +2,12 @@
   "general_more": {
     "message": "Meir …"
   },
+  "general_moreInfo": {
+    "message": "Meir informasjon..."
+  },
+  "general_needHelp": {
+    "message": "Treng du hjelp?"
+  },
   "general_done": {
     "message": "Ferdig"
   },
@@ -29,18 +35,63 @@
   "general_deselectAll": {
     "message": "Fjern merking"
   },
+  "general_pleaseWait": {
+    "message": "Ver vennleg å vente..."
+  },
   "general_copyToClipboard": {
     "message": "Kopier til utklippstavle"
   },
+  "itemType_pdf": {
+    "message": "PDF-vedlegg"
+  },
+  "itemType_epub": {
+    "message": "EPUB-vedlegg"
+  },
+  "itemType_snapshot": {
+    "message": "Snøggbilete"
+  },
   "itemType_note": {
     "message": "Notat"
   },
+  "itemType_link": {
+    "message": "Nettlenke"
+  },
   "itemType_attachment": {
     "message": "Vedlegg"
   },
   "progressWindow_savingTo": {
     "message": "Lagrar til"
   },
+  "progressWindow_detailsBtnView": {
+    "message": "Vis detaljar"
+  },
+  "progressWindow_detailsBtnHide": {
+    "message": "Gøym detaljar"
+  },
+  "progressWindow_collectionSelector": {
+    "message": "Val av mål-samling"
+  },
+  "progressWindow_savingItems": {
+    "message": "Lagrar $1 element. $2"
+  },
+  "progressWindow_savingItem": {
+    "message": "Lagrar element $1"
+  },
+  "progressWindow_saveItem": {
+    "message": "Element $1: $2"
+  },
+  "progressWindow_downloadComplete": {
+    "message": "Lagra $1"
+  },
+  "progressWindow_downloadFailed": {
+    "message": "Kunne ikkje laste ned $1"
+  },
+  "progressWindow_allDone": {
+    "message": "Lagring ferdig - stenger dialogen."
+  },
+  "progressWindow_alreadySaved": {
+    "message": "Element frå denne nettsida er allerede lagra."
+  },
   "progressWindow_tagPlaceholder": {
     "message": "merke (skilde med komma)"
   },
diff --git a/chrome/locale/nn-NO/zotero/integration.ftl b/chrome/locale/nn-NO/zotero/integration.ftl
index 351ba96513..9a830a387d 100644
--- a/chrome/locale/nn-NO/zotero/integration.ftl
+++ b/chrome/locale/nn-NO/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index f4b1bffc01..ce23e00875 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -11,7 +11,7 @@
 
 <!ENTITY zotero.preferences.interface "Grensesnitt">
 <!ENTITY zotero.preferences.fileHandling "File Handling">
-<!ENTITY zotero.preferences.automaticSnapshots "Ta snapshot automatisk når du genererer element frå nettsider">
+<!ENTITY zotero.preferences.automaticSnapshots "Ta snøggbilete automatisk når du genererer element frå nettsider">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "Lagra tilknytte PDF-filer og andre filer ved lagring av element">
 <!ENTITY zotero.preferences.autoRenameFiles.renameLinked "Rename linked files">
 <!ENTITY zotero.preferences.fileHandler.openPDFsUsing "Open PDFs using">
diff --git a/chrome/locale/nn-NO/zotero/preferences.ftl b/chrome/locale/nn-NO/zotero/preferences.ftl
index fd18442c16..a198d5b86e 100644
--- a/chrome/locale/nn-NO/zotero/preferences.ftl
+++ b/chrome/locale/nn-NO/zotero/preferences.ftl
@@ -13,7 +13,7 @@ preferences-attachment-titles-show-filenames =
     .label = Show attachment filenames in the items list
 preferences-reader-title = Reader
 preferences-reader-open-epubs-using = Open EPUBs using
-preferences-reader-open-snapshots-using = Open snapshots using
+preferences-reader-open-snapshots-using = Opne snøggbilete med
 preferences-reader-open-in-new-window =
     .label = Open files in new windows instead of tabs
 preferences-reader-auto-disable-tool =
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Aktiver verktøy for toveis tekstredigering
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synkroniser
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/nn-NO/zotero/searchbox.dtd b/chrome/locale/nn-NO/zotero/searchbox.dtd
index 34cb40547f..015cbe9b6c 100644
--- a/chrome/locale/nn-NO/zotero/searchbox.dtd
+++ b/chrome/locale/nn-NO/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Namn:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "Finn">
 <!ENTITY zotero.search.joinMode.any "minst ein">
 <!ENTITY zotero.search.joinMode.all "alle">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dagar">
 <!ENTITY zotero.search.date.units.months "månader">
 <!ENTITY zotero.search.date.units.years "år">
-
-<!ENTITY zotero.search.search "Søk">
-<!ENTITY zotero.search.clear "Fjern">
-<!ENTITY zotero.search.saveSearch "Lagra søk">
diff --git a/chrome/locale/nn-NO/zotero/standalone.dtd b/chrome/locale/nn-NO/zotero/standalone.dtd
index 52fc75da3c..847a975995 100644
--- a/chrome/locale/nn-NO/zotero/standalone.dtd
+++ b/chrome/locale/nn-NO/zotero/standalone.dtd
@@ -22,8 +22,8 @@
 <!ENTITY closeCmd.label "Lukk">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "L">
-<!ENTITY manageAttachments.label "Manage Attachments">
-<!ENTITY convertToStored.label "Convert Linked Files to Stored Files…">
+<!ENTITY manageAttachments.label "Handsama vedlegg">
+<!ENTITY convertToStored.label "Gjer om lenkja filer til lagra filer...">
 <!ENTITY importCmd.label "Importer …">
 <!ENTITY importCmd.key "I">
 <!ENTITY importFromClipboardCmd.label "Importer frå utklippstavla">
@@ -34,7 +34,7 @@
 
 <!ENTITY copyCitationCmd.label "Kopier sitering">
 <!ENTITY copyBibliographyCmd.label "Kopier bibliografi">
-<!ENTITY copyNoteCmd.label "Copy Note">
+<!ENTITY copyNoteCmd.label "Kopier notat">
 
 <!ENTITY bidiSwitchPageDirectionItem.label "Byt sideretning">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
@@ -61,7 +61,7 @@
 
 <!ENTITY toolsMenu.label "Verktøy">
 <!ENTITY toolsMenu.accesskey "V">
-<!ENTITY installConnector.label "Install Browser Connector">
+<!ENTITY installConnector.label "Install Browser Connector…">
 <!ENTITY installConnector.accesskey "K">
 <!ENTITY addons.label "Tillegg">
 <!ENTITY developer.label "Developer">
diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd
index 7904787ff0..cdbed9673d 100644
--- a/chrome/locale/nn-NO/zotero/zotero.dtd
+++ b/chrome/locale/nn-NO/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Fjern element …">
 <!ENTITY zotero.toolbar.newGroup "New Group …">
 <!ENTITY zotero.toolbar.newSubcollection.label "Ny undersamling …">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nytt lagra søk …">
 <!ENTITY zotero.toolbar.emptyTrash.label "Tøm søppelbøtta">
 <!ENTITY zotero.toolbar.tagSelector.label "Vis/skjul taggsamling">
 <!ENTITY zotero.toolbar.actions.label "Handlingar">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Innstillingar …">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Støtte og dokumentasjon">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Avansert søk">
 <!ENTITY zotero.toolbar.openURL.label "Lokaliser">
 <!ENTITY zotero.toolbar.openURL.tooltip "Finn gjennom det lokale biblioteket ditt">
 
@@ -120,7 +118,7 @@
 <!ENTITY zotero.toolbar.attachment.linked "Lenkje til fil …">
 <!ENTITY zotero.toolbar.attachment.add "Lagre kopi av fil …">
 <!ENTITY zotero.toolbar.attachment.weblink "Lagre lenkje til gjeldande side">
-<!ENTITY zotero.toolbar.attachment.snapshot "Lag snapshot av gjeldande side">
+<!ENTITY zotero.toolbar.attachment.snapshot "Lag snøggbilete av gjeldande side">
 <!ENTITY zotero.toolbar.context.item "Item">
 <!ENTITY zotero.toolbar.context.notes "Notat">
 
diff --git a/chrome/locale/nn-NO/zotero/zotero.ftl b/chrome/locale/nn-NO/zotero/zotero.ftl
index ad66f2524d..014032f2e3 100644
--- a/chrome/locale/nn-NO/zotero/zotero.ftl
+++ b/chrome/locale/nn-NO/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Skriv ut
 general-remove = Fjern
 general-add = Legg til
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Avbryt
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Vis i bibliotek
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Lagra
 general-clear = Tøm
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Rediger
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Grå
 general-black = Svart
 general-loading = Lastar …
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Siteringsstil:
 language-label = Språk:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Rediger lagra søk
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Rediger lagra søk
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Eksporter …
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Hurtigsøk
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Avansert søk
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Finn
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Felt:
 search-conditions-collection = Samling
 search-conditions-savedSearch = Lagra søk
 search-conditions-itemTypeID = Type
 search-conditions-tag = Tagg
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notat
 search-conditions-childNote = Underordna notat
 search-conditions-creator = Namn
@@ -715,10 +897,26 @@ search-conditions-dateModified = Sist endra
 search-conditions-fulltextContent = Vedlegginnhald
 search-conditions-programmingLanguage = Programmeringsspråk
 search-conditions-fileTypeID = Vedlegget sin filtype
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Vedlegg
+search-conditions-submenu-annotation = Kommentar
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Filtype
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Type
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Forfattar
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = PDF
 file-type-presentation = Presentasjon
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Installer
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Søk
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Lagra
+save-search-name-title = Lagra søk
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Rediger notat
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Endre type
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index 1a3fc0e008..b258814a2f 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -20,22 +20,22 @@ general.serverError=The server returned an error. Please try again.
 general.pleaseRestart=Ver god og start %S om att.
 general.pleaseRestartAndTryAgain=Start %S om att og prøv på nytt.
 general.checkForUpdate=Sjå etter oppdateringar
-general.checkForUpdates=Check for Updates
+general.checkForUpdates=Sjå etter oppdateringar
 general.actionCannotBeUndone=Dette kan ikkje angrast.
 general.install=Installer
 general.updateAvailable=Oppdatering tilgjengeleg
-general.downloading=Downloading %S…
-general.downloading.quoted=Downloading “%S”…
-general.noUpdatesFound=No Updates Found
-general.isUpToDate=%S is up to date.
+general.downloading=Lastar ned %S…
+general.downloading.quoted=Lastar ned “%S”…
+general.noUpdatesFound=Fann ingen oppdateringar
+general.isUpToDate=%S er oppdatert.
 general.upgrade=Oppgrader
 general.yes=Ja
 general.no=Nei
-general.notNow=Not Now
+general.notNow=Ikkje no
 general.passed=Lukkast
 general.failed=Feila
 general.and=og
-general.andJoiner=%S and %S
+general.andJoiner=%S og %S
 general.etAl=m.fl.
 general.accessDenied=Tilgang nekta
 general.permissionDenied=Ikkje lov
@@ -50,15 +50,15 @@ general.update=Update
 general.moreInformation=Meir informasjon
 general.learnMore=Les meir
 general.seeForMoreInformation=Sjå %S for meir informasjon
-general.open=Open %S
+general.open=Opne %S
 general.close=Close
 general.enable=Slå på
 general.disable=Slå av
 general.reset=Nullstill
-general.hide=Hide
+general.hide=Gøym
 general.quit=Avslutt
-general.useDefault=Use Default
-general.openDocumentation=Open Documentation
+general.useDefault=Bruk standard
+general.openDocumentation=Opne dokumentasjon
 general.numMore=%S more…
 general.openPreferences=Open Preferences
 general.keys.ctrlShift=Ctrl+Shift+
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 år sidan
 date.relative.yearsAgo.multiple=%S år sidan
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Er du sikker på at du vil sletta den valde samlinga?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Er du sikker på at du vil sletta den valde samlinga og flytta alle oppføringane i den til søppelkorga?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Er du sikker på at du vil sletta det valde søket?
 pane.collections.emptyTrash=Er du sikker på at du vil sletta oppføringane i søppelkorga? Slettinga kan ikkje reverserast.
 pane.collections.newSavedSeach=Nytt lagra søk
 pane.collections.savedSearchName=Oppgje namn på dette lagra søket:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Eksporter samling …
-pane.collections.menu.export.savedSearch=Eksporter lagra søk …
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Lag rapport frå samling …
-pane.collections.menu.generateReport.savedSearch=Lag rapport frå lagra søk …
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -430,7 +408,7 @@ pane.item.attachments.autoRelink.locateManually=Locate Manually…
 pane.item.attachments.autoRelink.relinkAll=Relink All
 pane.item.attachments.has=Has attachment
 pane.item.attachments.hasPDF=Has PDF attachment
-pane.item.attachments.hasSnapshot=Has snapshot
+pane.item.attachments.hasSnapshot=Har snøggbilete
 pane.item.attachments.hasEPUB=Has EPUB attachment
 pane.item.attachments.hasImage=Has image attachment
 pane.item.attachments.hasVideo=Has video attachment
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox må omstartast for å fu
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Generer register på nytt
-zotero.preferences.search.rebuildWarning=Vil du generera registret på nytt? Dette kan ta eit bel.\n\nHvis du berre vil registrera element som ikkje allereie er registrert, bruk %S.
-zotero.preferences.search.clearIndex=Tøm registret
-zotero.preferences.search.clearWarning=Når registret er tømt, vil vedlagd material ikkje lenger vera søkbart.\n\nInternett-lenkjer kan berre registrerast på nytt ved å vitja den einskilde nettsida. For å halda på Internett-lenkjer, vel %S.
-zotero.preferences.search.clearNonLinkedURLs=Tøm alt unntatt Internett-lenkjar
-zotero.preferences.search.indexUnindexed=Registrer uregistrerte element
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Eksportformat
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -854,7 +826,7 @@ annotations.close.tooltip=Slett kommentar
 annotations.move.tooltip=Flytt kommentar
 annotations.collapse.tooltip=Skjul kommentar
 annotations.expand.tooltip=Vis kommentar
-annotations.oneWindowWarning=Kommentarar til eit snapshot kan berre opnast i eitt nettlesarvindauge samstundes. Dette snapshotet vert opna utan kommentarar.
+annotations.oneWindowWarning=Kommentarar til eit snøggbilete kan berre opnast i eitt nettlesarvindauge samstundes. Dette snøggbiletet vert opna utan kommentarar.
 
 integration.fields.label=Fields (recommended)
 integration.referenceMarks.label=ReferenceMarks (recommended)
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=Du må leggja til ein bibliografi før du kan utføra denne handlinga.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=Du må plassera peikaren på eit Zotero-sitat for å endra det.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
@@ -1177,7 +1150,7 @@ locate.online.label=Sjå online
 locate.pdf.label=Open PDF
 locate.pdfNewWindow.label=Open PDF in New Window
 locate.pdfNewTab.label=Open PDF in New Tab
-locate.snapshot.label=Sjå augneblinksbilete
+locate.snapshot.label=Sjå snøggbilete
 locate.file.label=Opne fil
 locate.externalViewer.label=Open in External Viewer
 locate.internalViewer.label=Open in Internal Viewer
diff --git a/chrome/locale/pl-PL/zotero/integration.ftl b/chrome/locale/pl-PL/zotero/integration.ftl
index b828d91dc5..788dda1246 100644
--- a/chrome/locale/pl-PL/zotero/integration.ftl
+++ b/chrome/locale/pl-PL/zotero/integration.ftl
@@ -29,6 +29,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Przyrostek
 integration-citationDialog-details-prefix = Przedrostek
 integration-citationDialog-details-suppressAuthor = Pomiń autora
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Dołącz komentarze
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -51,6 +52,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Utrzymaj źródła posortowane
+integration-citationDialog-preview-empty = Podgląd
+integration-citationDialog-preview-error = Podgląd nie jest dostępny
+integration-citationDialog-btn-displayPreview =
+    .title = Wyświetl podgląd cytowania
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteka
@@ -73,6 +78,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Wciśnij Tab, aby wybrać elementy, które mają być dodane do tego cytowania. Wciśnij Escape, aby zapobiec zmianom i zamknąć ten komunikat.
+integration-citationDialog-just-added-input-placeholder = Wpisz "10-15", aby zacytować strony lub wyszukaj elementy
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -98,7 +108,7 @@ integration-citationDialog-bubble-empty = (brak tytułu)
 integration-citationDialog-add-to-citation = Dodaj do cytowania
 integration-citationDialog-annotations-filter =
     .placeholder = Filtruj adnotacje
-integration-citationDialog-annotations-empty = Select an item, attachment, or annotation to view annotation details
+integration-citationDialog-annotations-empty = Wybierz element, załącznik lub adnotację, aby wyświetlić szczegóły adnotacji
 integration-prefs-displayAs-label = Wyświetl cytowania jako:
 integration-prefs-footnotes =
     .label = Przypisy dolne
@@ -128,8 +138,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Dokonano zmian w
 integration-warning-discard-changes = Porzuć zmiany
 integration-warning-command-is-running = Polecenie integracji z edytorem tekstów jest już uruchomione.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/pl-PL/zotero/preferences.ftl b/chrome/locale/pl-PL/zotero/preferences.ftl
index 8e9a2ca88a..63b930f111 100644
--- a/chrome/locale/pl-PL/zotero/preferences.ftl
+++ b/chrome/locale/pl-PL/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Język i region
 preferences-advanced-enable-bidi-ui =
     .label = Włącz narzędzia edytowania tekstu dwukierunkowego
+preferences-advanced-data-dir =
+    .value = Katalog danych:
 preferences-advanced-reset-data-dir =
     .label = Przywróć do domyślnej lokalizacji...
 preferences-advanced-custom-data-dir =
@@ -77,13 +79,13 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Domyślny: { $directory })
     .aria-label = Domyślna lokalizacja
-preferences-pane-account = Account
+preferences-pane-account = Konto
 -preferences-sync-data-syncing = Synchronizacja danych
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synchronizacja
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -127,3 +129,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = usuń dane lokalne
 preferences-account-switch-accept = Usuń dane i uruchom ponownie
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/pl-PL/zotero/reader.ftl b/chrome/locale/pl-PL/zotero/reader.ftl
index 0d86318de8..b6e9766b7c 100644
--- a/chrome/locale/pl-PL/zotero/reader.ftl
+++ b/chrome/locale/pl-PL/zotero/reader.ftl
@@ -229,7 +229,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Wystąpił nieznany błąd.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Nie można się połączyć z usługą Read Aloud. Sprawdź swoje połączenie internetowe.
 reader-read-aloud-error-daily-limit-exceeded = Osiągnięto twój dzienny limit dla głosów { -app-name }.
 reader-read-aloud-retry = Ponów
 reader-read-aloud-first-run-title = Wybierz swój preferowany głos Read Aloud:
diff --git a/chrome/locale/pl-PL/zotero/searchbox.dtd b/chrome/locale/pl-PL/zotero/searchbox.dtd
index 878b5906c0..2ba54bb5c7 100644
--- a/chrome/locale/pl-PL/zotero/searchbox.dtd
+++ b/chrome/locale/pl-PL/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nazwa:">
 
-<!ENTITY zotero.search.searchInLibrary "Wyszukaj w bibliotece:">
-
 <!ENTITY zotero.search.joinMode.prefix "Zawiera">
 <!ENTITY zotero.search.joinMode.any "jakikolwiek">
 <!ENTITY zotero.search.joinMode.all "wszystkie">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dni">
 <!ENTITY zotero.search.date.units.months "miesiące(y)">
 <!ENTITY zotero.search.date.units.years "lat(a)">
-
-<!ENTITY zotero.search.search "Szukaj">
-<!ENTITY zotero.search.clear "Wyczyść">
-<!ENTITY zotero.search.saveSearch "Zapisz wyszukiwanie">
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index 4bf2f68f87..13970a5696 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Usuń element...">
 <!ENTITY zotero.toolbar.newGroup "Nowa grupa...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nowa subkolekcja...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nowe zapisane wyszukiwanie...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Opróżnij Kosz">
 <!ENTITY zotero.toolbar.tagSelector.label "Wyświetl/Ukryj selektor etykiet">
 <!ENTITY zotero.toolbar.actions.label "Funkcje">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Ustawienia...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Wsparcie i dokumentacja">
 <!ENTITY zotero.toolbar.about.label "Zotero - informacje">
-<!ENTITY zotero.toolbar.advancedSearch "Wyszukiwanie zaawansowane">
 <!ENTITY zotero.toolbar.openURL.label "Wyszukaj lokalnie">
 <!ENTITY zotero.toolbar.openURL.tooltip "Wyszukuje w katalogu lokalnej biblioteki">
 
diff --git a/chrome/locale/pl-PL/zotero/zotero.ftl b/chrome/locale/pl-PL/zotero/zotero.ftl
index aef7c63b16..7d31fe617b 100644
--- a/chrome/locale/pl-PL/zotero/zotero.ftl
+++ b/chrome/locale/pl-PL/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Drukuj
 general-remove = Usuń
 general-add = Dodaj
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Pokaż instrukcje dla rozwiązywania
 general-go-back = Wróć
 general-accept = Akceptuj
 general-cancel = Anuluj
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Pokaż w Bibliotece
 general-restartApp = Uruchom ponownie { -app-name }
 general-restartInTroubleshootingMode = Uruchom ponownie w trybie rozwiązywania problemów
 general-save = Zapisz
 general-clear = Wyczyść
+clear-button =
+    .label = { general-clear }
 general-update = Zaktualizuj
 general-back = Wstecz
 general-edit = Edytuj
@@ -76,6 +86,8 @@ general-maroon = Kasztanowy
 general-gray = Szary
 general-black = Czarny
 general-loading = Wczytywanie...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Styl cytowania:
 language-label = Język:
 menu-custom-group-submenu =
@@ -164,14 +176,112 @@ collections-menu-show-recently-read =
     .label = Pokaż { recently-read }
 item-menu-remove-from-recently-read =
     .label = Usuń z { recently-read }…
-collections-menu-rename-collection =
-    .label = Zmień nazwę kolekcji
-collections-menu-edit-saved-search =
-    .label = Edytuj wynik wyszukiwania
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } wybrana kolekcja
+        [few] { $count } wybrane kolekcje
+        [many] { $count } wybranych kolekcji
+       *[other] { $count } wybranych kolekcji
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Zmień nazwę
+edit-saved-search = Edytuj wynik wyszukiwania
+collections-menu-edit-search =
+    .label = Edytuj wyszukiwanie
+collections-menu-duplicate-search =
+    .label = Duplikuj wyszukiwanie
 collections-menu-move-collection =
     .label = Przenieś do
 collections-menu-copy-collection =
     .label = Skopiuj do
+collections-menu-export =
+    .label = Eksportuj...
+collections-menu-generate-report =
+    .label = Generuj raport...
+collections-menu-create-bibliography =
+    .label = Stwórz bibliografię...
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Przenieś w dół
 item-creator-moveToTop =
@@ -284,6 +394,7 @@ import-online-relink-only =
     .label = Zlinkuj ponownie cytowania Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } nie może się połączyć z  { $targetApp }. Proszę, sprawdź swoje połączenie internetowe i spróbuj ponownie.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -635,6 +746,18 @@ quicksearch-input =
     .aria-label = Szybkie wyszukiwanie
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Wyszukiwanie zaawansowane
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Zamknij zaawansowane wyszukiwanie
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Wyświetl jako
 item-pane-header-none =
@@ -702,9 +825,64 @@ architecture-x64-on-arm64-action = Pobierz { -app-name } dla ARM64
 first-run-guidance-authorMenu = { -app-name } pozwala ci także podać edytorów i tłumaczy. Możesz zmienić autora na edytora lub tłumacza, wybierając z tego menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Usuń warunek
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Dodaj warunek
+advanced-search-group-btn =
+    .tooltiptext = Dodaj grupę warunków
+advanced-search-remove-group-btn =
+    .tooltiptext = Usuń grupę
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Typ wyniku
+advanced-search-result-level-prefix-root =
+    .value = Znajdź
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = adnotacje
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Wyszukiwanie warunkowe
     .label = { $label }
@@ -714,11 +892,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Wartość
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Pola:
 search-conditions-collection = Kolekcja
 search-conditions-savedSearch = Zapisane wyszukiwanie
 search-conditions-itemTypeID = Typ elementu
 search-conditions-tag = Etykieta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notatka
 search-conditions-childNote = Notatka podrzędna
 search-conditions-creator = Twórca
@@ -737,10 +921,26 @@ search-conditions-dateModified = Data modyfikacji
 search-conditions-fulltextContent = Zawartość załącznika
 search-conditions-programmingLanguage = Język programowania
 search-conditions-fileTypeID = Typ pliku załącznika
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Ostatnio czytany załącznik
 search-conditions-annotationText = Tekst adnotacji
 search-conditions-annotationComment = Komentarz adnotacji
+search-conditions-annotationType = Typ adnotacji
+search-conditions-annotationColor = Kolor adnotacji
+search-conditions-annotationAuthor = Autor adnotacji
 search-conditions-anyField = Dowolne pole
+search-conditions-titleCreatorYear = Tytuł, Twórca, Rok
+search-conditions-submenu-attachment = Załącznik
+search-conditions-submenu-annotation = Adnotacja
+search-conditions-short-fulltextContent = Zawartość
+search-conditions-short-fileTypeID = Typ pliku
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Ostatnio czytany
+search-conditions-short-annotationText = Tekst
+search-conditions-short-annotationComment = Komentarz
+search-conditions-short-annotationType = Typ
+search-conditions-short-annotationColor = Kolor
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } plik dodany
@@ -778,6 +978,9 @@ file-type-video = Wideo
 file-type-presentation = Prezentacja
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = <span data-l10n-name="post-upgrade-appver">{ -app-name } został zaktualizowany do wersji { $version }</span>! Dowiedz się <a data-l10n-name="new-features-link">co nowego?</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -786,18 +989,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Wklej i wyszukaj
 mac-word-plugin-install-message = Do instalacji wtyczki Word wymagany jest dostęp Zotero do danych Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Zainstaluj wtyczkę Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Zainstaluj
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } teraz automatycznie synchronizuje nazwy plików załączników podczas dokonywania zmian w elementach.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = Łącznik { -app-name } musi zostać zaktualizowany, aby działać z tą wersją { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migracja nowych pól z pola Dodatkowe
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Podziel znaczniki
 long-tag-fixer-button-dont-split =
@@ -811,3 +1019,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = Ta wtyczka została wyłączona przez { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Wyszukiwanie
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Zapisz
+save-search-name-title = Zapisz wyszukiwanie
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Edycja wsadowa
+item-pane-batch-editing-enable =
+    .label = Edytuj wiele elementów...
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Zmień nazwę kolekcji
+undo-action-move-collection = Przenieś kolekcję
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Zmień etykietę
+undo-action-split-tag = Podziel etykietę
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Usuń wszystkie etykiety
+undo-action-edit-note = Edytowanie notatki
+undo-action-add-creator = Dodaj twórcę
+undo-action-remove-creator = Usuń twórcę
+undo-action-edit-creator = Edytuj twórcę
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Zmień typ elementu
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Dodaj powiązane
+undo-action-remove-related = Usuń powiązane
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 263bf739f9..ec81f0fb22 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 rok temu
 date.relative.yearsAgo.multiple=%S lat temu
 
 pane.collections.title=Kolekcje
-pane.collections.delete.title=Usuń kolekcję
-pane.collections.delete=Czy na pewno chcesz usunąć zaznaczoną kolekcję?
-pane.collections.delete.keepItems=Elementy zawarte w tej kolekcji nie zostaną usunięte.
-pane.collections.deleteWithItems.title=Usuń kolekcję i elementy
-pane.collections.deleteWithItems=Czy na pewno chcesz usunąć wybraną kolekcję i przenieść wszystkie elementy zawarte w niej do Kosza?
 pane.feed.deleteWithItems.title=Anuluj subskrypcję
 pane.feed.deleteWithItems=Czy na pewno chcesz anulować subskrypcję tego kanału?
 
-pane.collections.deleteSearch.title=Usuń wyszukiwanie
-pane.collections.deleteSearch=Czy na pewno chcesz usunąć zaznaczone wyszukiwanie?
 pane.collections.emptyTrash=Czy na pewno chcesz trwale usunąć elementy z Kosza?
 pane.collections.newSavedSeach=Nowy wynik wyszukiwania
 pane.collections.savedSearchName=Wprowadź nazwę dla tego wyniku wyszukiwania:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Zduplikowane elementy
 pane.collections.removeLibrary=Usuń bibliotekę
 pane.collections.removeLibrary.text=Czy na pewno trwale usunąć „%S” z tego komputera?
 
-pane.collections.menu.duplicate.savedSearch=Duplikuj zapisane wyszukiwanie
 pane.collections.menu.remove.library=Usuń bibliotekę...
-pane.collections.menu.delete.collection=Usuń kolekcję...
-pane.collections.menu.delete.collectionAndItems=Usuń kolekcję i elementy...
-pane.collections.menu.delete.savedSearch=Usuń zapisane wyszukiwanie...
-pane.collections.menu.delete.feedAndItems=Anuluj subskrypcję kanału...
-pane.collections.menu.export.collection=Eksportuj kolekcję...
-pane.collections.menu.export.savedSearch=Eksportuj wynik wyszukiwania...
-pane.collections.menu.export.feed=Eksportuj kanał...
-pane.collections.menu.createBib.collection=Utwórz bibliografię z kolekcji...
-pane.collections.menu.createBib.savedSearch=Utwórz bibliografię z wyniku wyszukiwania...
-pane.collections.menu.createBib.feed=Utwórz bibliografię z kanału...
 pane.collections.showCollectionInLibrary=Pokaż kolekcję w bibliotece
 
-pane.collections.menu.generateReport.collection=Utwórz raport z kolekcji...
-pane.collections.menu.generateReport.savedSearch=Utwórz raport z wyniku wyszukiwania...
-pane.collections.menu.generateReport.feed=Utwórz raport z kanału...
-
 pane.collections.menu.refresh.feed=Odśwież kanał
 pane.collections.menu.refresh.allFeeds=Odśwież wszystkie kanały
 pane.collections.menu.markAsRead.feed=Oznacz kanał jako przeczytany
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox musi być uruchomiony po
 zotero.preferences.sync.reset.fileSyncHistory=W trakcie następnej synchronizacji, %1$S sprawdzi wszystkie pliki załączników w „%2$S” z usługą przechowywania. Wszystkie brakujące lokalnie pliki załączników zostaną pobrane z serwera, a lokalne pliki załączników, których brak jest w usłudze, zostaną tam przesłane.\n\nTa opcja nie jest potrzebna podczas normalnego użytkowania programu.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Historia synchronizacji plików w „%S” została wyczyszczona.
 
-zotero.preferences.search.rebuildIndex=Odbuduj indeks
-zotero.preferences.search.rebuildWarning=Czy chcesz odbudować cały indeks? Może to potrwać chwilę.\n\nAby zindeksować elementy, które nie zostały jeszcze zindeksowane, użyj %S.
-zotero.preferences.search.clearIndex=Wyczyść indeks
-zotero.preferences.search.clearWarning=Po wyczyszczeniu indeksu niemożliwe będzie przeszukiwanie zawartości załączników.\n\nZałączniki, które są odnośnikami do stron internetowych, nie mogą zostać powtórnie zindeksowane bez ponownego odwiedzenia tych stron. Aby pozostawić odnośniki do stron internetowych zindeksowane, wybierz %S.
-zotero.preferences.search.clearNonLinkedURLs=Wyczyść wszystko oprócz odnośników do stron internetowych.
-zotero.preferences.search.indexUnindexed=Zindeksuj niezindeksowane elementy
 zotero.preferences.export.quickCopy.citationStyles=Style cytowania
 zotero.preferences.export.quickCopy.exportFormats=Eksportuj formaty
 zotero.preferences.export.quickCopy.instructions=Szybka kopia pozwala na szybkie wyeksportowanie elementów do danego formatu. Możesz skopiować wybrane elementy do schowka poprzez użycie skrótu klawiaturowego %S lub poprzez przeciągnięcie elementów w obszar pola tekstowego w innym programie.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Musisz wstawić cytowanie przed wykonaniem
 integration.error.mustInsertBibliography=Musisz wstawić bibliografię przed wykonaniem tej operacji.
 integration.error.cannotInsertHere=Pola Zotero nie mogą być wstawione w tym miejscu.
 integration.error.notInCitation=Należy umieścić kursor w cytowaniu Zotero, aby je edytować.
+integration.error.inBibliography=Aby wstawić cytowanie, umieść kursor w treści tekstu. Aby bezpośrednio edytować bibliografię, użyj %S.
 integration.error.noBibliography=Bieżący styl bibliograficzny nie definiuje bibliografii. Jeśli chcesz dodać bibliografię, wybierz proszę inny styl.
 integration.error.deletePipe=Nie można było utworzyć potoku używanego przez Zotero do komunikacji z edytorem tekstu. Czy chcesz, aby Zotero spróbowało usunąć ten błąd? Zostaniesz poproszony o swoje hasło.
 integration.error.invalidStyle=Styl, który wybrałeś, wydaje się niepoprawny. Jeżeli utworzyłeś go samodzielnie, upewnij się, że jest on poprawny, korzystając ze strony http://zotero.org/support/dev/citation_styles. Możesz również spróbować wybrać inny styl.
diff --git a/chrome/locale/pt-BR/zotero/fileRenaming.ftl b/chrome/locale/pt-BR/zotero/fileRenaming.ftl
index e5b38209ea..c797d19e04 100644
--- a/chrome/locale/pt-BR/zotero/fileRenaming.ftl
+++ b/chrome/locale/pt-BR/zotero/fileRenaming.ftl
@@ -40,6 +40,6 @@ file-renaming-preview-window =
     .title = Renomear arquivos
 file-renaming-preview-window-loading = Carregando...
 file-renaming-preview-window-intro = { -app-name } irá renomear oa seguintes arquivos na sua biblioteca para corresponder aos seus itens pai:
-file-renaming-preview-window-intro-library = { -app-name } will rename the following files in "{ $library }" to match their parent items:
+file-renaming-preview-window-intro-library = { -app-name } irá renomear os seguintes arquivos em "{ $library }" para corresponder com seus itens pais:
 file-renaming-preview-window-renaming = Renomeando...
 file-renaming-preview-window-no-files = Todos os nomes de arquivo já correspondem aos itens pai. Nenhuma mudança é necessária.
diff --git a/chrome/locale/pt-BR/zotero/integration.ftl b/chrome/locale/pt-BR/zotero/integration.ftl
index 30b5b9433a..a67752576f 100644
--- a/chrome/locale/pt-BR/zotero/integration.ftl
+++ b/chrome/locale/pt-BR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Sufixo
 integration-citationDialog-details-prefix = Prefixo
 integration-citationDialog-details-suppressAuthor = Omitir autor
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Incluir comentários
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Manter as fontes ordenadas
+integration-citationDialog-preview-empty = Visualização
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Pressione Tab para selecionar itens e adicionar a esta citação. Pressione Escape para descartar as alterações e fechar a caixa.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Você fez altera
 integration-warning-discard-changes = Descartar alterações
 integration-warning-command-is-running = Um comando de integração de processador de texto já está em funcionamento.
 first-run-guidance-citationDialog =
-    Digite um título, autor e/ou ano para buscar por uma referência.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Depois que tiver feito sua seleção, clique no balão e selecione pelo teclado e pressione ↓/Espaço para mostrar as opções de citação como número de página, prefixo e sufixo.
-    
-    Você também pode adicionar o número da página ou outro localizador ao incluir com os termos da busca (ex.: “história { $locator }”) ou digitando depois do balão e pressionando { return-or-enter }.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/pt-BR/zotero/preferences.ftl b/chrome/locale/pt-BR/zotero/preferences.ftl
index 45492c236f..25330a67b8 100644
--- a/chrome/locale/pt-BR/zotero/preferences.ftl
+++ b/chrome/locale/pt-BR/zotero/preferences.ftl
@@ -6,7 +6,7 @@ preferences-auto-recognize-files =
 preferences-file-renaming-title = Renomeação do arquivo
 preferences-file-renaming-intro = { -app-name } pode renomear arquivos automaticamente a partir dos detalhes do item pai (título, autor, etc.) e manter o nome do arquivo sincronizado durante as mudanças. Arquivos baixados são sempre nomeados inicialmente com base nos detalhes do item pai.
 preferences-file-renaming-configure-button =
-    .label = Configure File Renaming…
+    .label = Configurar renomeação de arquivo...
 preferences-attachment-titles-title = Títulos de anexos
 preferences-attachment-titles-intro = Os títulos dos anexos estão <label data-l10n-name="wiki-link">diferentes dos títulos dos arquivos</label>. Para alguns recursos, { -app-name } pode mostrar o nome do arquivo ao invés do título do anexo na lista de itens.
 preferences-attachment-titles-show-filenames =
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Idioma e Região
 preferences-advanced-enable-bidi-ui =
     .label = Habilitar funções de edição de texto bidirecional
+preferences-advanced-data-dir =
+    .value = Diretório de dados:
 preferences-advanced-reset-data-dir =
     .label = Reverta para localização padrão...
 preferences-advanced-custom-data-dir =
@@ -77,13 +79,13 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Padrão: { $directory })
     .aria-label = Localização predefinida
-preferences-pane-account = Account
+preferences-pane-account = Conta
 -preferences-sync-data-syncing = Sincronização de dados
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sincronização
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -126,3 +128,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/pt-BR/zotero/reader.ftl b/chrome/locale/pt-BR/zotero/reader.ftl
index 26f75231b1..f2a60b683f 100644
--- a/chrome/locale/pt-BR/zotero/reader.ftl
+++ b/chrome/locale/pt-BR/zotero/reader.ftl
@@ -258,7 +258,7 @@ reader-read-aloud-annotation-popup-move = Move annotation by sentence
 reader-read-aloud-annotation-popup-extend = Extend annotation by sentence
 reader-read-aloud-annotation-popup-delete = Remover
 reader-read-aloud-annotation-popup-done = Feito
-reader-read-aloud-annotation-popup-change-color = Change color
+reader-read-aloud-annotation-popup-change-color = Alterar cor
 reader-read-aloud-annotation-popup-highlight = Highlight
 reader-read-aloud-annotation-popup-underline = Sublinhado
 reader-tab-audio-play =
diff --git a/chrome/locale/pt-BR/zotero/searchbox.dtd b/chrome/locale/pt-BR/zotero/searchbox.dtd
index abf5342b8d..1406f611a0 100644
--- a/chrome/locale/pt-BR/zotero/searchbox.dtd
+++ b/chrome/locale/pt-BR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nome:">
 
-<!ENTITY zotero.search.searchInLibrary "Pesquisar na biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Corresponder a">
 <!ENTITY zotero.search.joinMode.any "qualquer um dos">
 <!ENTITY zotero.search.joinMode.all "todos os">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dias">
 <!ENTITY zotero.search.date.units.months "meses">
 <!ENTITY zotero.search.date.units.years "anos">
-
-<!ENTITY zotero.search.search "Pesquisar">
-<!ENTITY zotero.search.clear "Limpar">
-<!ENTITY zotero.search.saveSearch "Salvar pesquisa">
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index 9d9ac6fb26..17f0f8b019 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Remover item...">
 <!ENTITY zotero.toolbar.newGroup "Novo grupo...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nova subcoleção...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nova pesquisa salva...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Esvaziar a lixeira">
 <!ENTITY zotero.toolbar.tagSelector.label "Exibir/ocultar o seletor de etiquetas">
 <!ENTITY zotero.toolbar.actions.label "Ações">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferências...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suporte e documentação">
 <!ENTITY zotero.toolbar.about.label "Sobre o Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Pesquisa avançada">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Pesquisar na sua biblioteca local">
 
diff --git a/chrome/locale/pt-BR/zotero/zotero.ftl b/chrome/locale/pt-BR/zotero/zotero.ftl
index 4f51a5c382..8bf0ba17cb 100644
--- a/chrome/locale/pt-BR/zotero/zotero.ftl
+++ b/chrome/locale/pt-BR/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimir
 general-remove = Remover
 general-add = Adicionar
@@ -37,14 +43,18 @@ general-tag = Etiqueta
 general-got-it = Got It
 general-done = Feito
 general-view-troubleshooting-instructions = Ver instruções de resolução de problemas
-general-go-back = Retroceder
+general-go-back = Voltar
 general-accept = Aceitar
 general-cancel = Cancelar
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Mostrar na biblioteca
 general-restartApp = Reiniciar { -app-name }
 general-restartInTroubleshootingMode = Reiniciar no modo de resolução de erros
 general-save = Salvar
 general-clear = Limpar
+clear-button =
+    .label = { general-clear }
 general-update = Atualizar
 general-back = Voltar
 general-edit = Editar
@@ -76,6 +86,8 @@ general-maroon = Marrom
 general-gray = Cinza
 general-black = Preto
 general-loading = Carregando...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Estilo da citação:
 language-label = Idioma:
 menu-custom-group-submenu =
@@ -163,14 +175,111 @@ collections-menu-show-recently-read =
     .label = Mostrar { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remover dos { recently-read }…
-collections-menu-rename-collection =
-    .label = Renomear coleção
-collections-menu-edit-saved-search =
-    .label = Editar pesquisa salva
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } coleção selecionada
+        [many] { $count } coleções selecionadas
+       *[other] { $count } coleções selecionadas
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editar pesquisa salva
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Mover para
 collections-menu-copy-collection =
     .label = Copiar para
+collections-menu-export =
+    .label = Exportar...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mover para baixo
 item-creator-moveToTop =
@@ -283,6 +392,7 @@ import-online-relink-only =
     .label = Religar citações do Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } não conseguiu se conectar ao { $targetApp }. Por favor, verifique sua conexão com a internet e tente novamente.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -292,7 +402,7 @@ items-table-cell-notes =
         }
 items-column-added-by = Adicionado por
 items-column-modified-by = Modificado por
-items-column-last-read = Last Read
+items-column-last-read = Última leitura
 report-error =
     .label = Relatar erro...
 rtfScan-wizard =
@@ -628,6 +738,18 @@ quicksearch-input =
     .aria-label = Pesquisa rápida
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Pesquisa avançada
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Ver como
 item-pane-header-none =
@@ -689,11 +811,66 @@ architecture-warning-action = Baixar { -app-name } 64-bit
 architecture-x64-on-arm64-message = { -app-name } está sendo executado em modo emulado. Uma versão nativa do { -app-name } será mais eficientemente.
 architecture-x64-on-arm64-action = Baixar { -app-name } para ARM64
 first-run-guidance-authorMenu = { -app-name } permite que você especifique editores e tradutores também. Você pode transformar um autor em um editor ou tradutor selecionando a partir deste menu.
-first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
+first-run-guidance-readAloud = { -app-name } agora pode ler seus documentos utilizando vozes com entonação natural.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Buscar
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotações
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Critérios de busca
     .label = { $label }
@@ -703,11 +880,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valor
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Campos:
 search-conditions-collection = Coleção
 search-conditions-savedSearch = Pesquisa salva
 search-conditions-itemTypeID = Tipo do item
 search-conditions-tag = Etiqueta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota associada
 search-conditions-creator = Autor
@@ -726,10 +909,26 @@ search-conditions-dateModified = Data de modificação
 search-conditions-fulltextContent = Conteúdo do anexo
 search-conditions-programmingLanguage = Linguagem de programação
 search-conditions-fileTypeID = Tipo de arquivo anexo
-search-conditions-lastRead = Attachment Last Read
+search-conditions-attachmentStorageType = Attachment Storage Type
+search-conditions-lastRead = Último anexo lido
 search-conditions-annotationText = Anotação de texto
 search-conditions-annotationComment = Anotação de comentário
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Todos os campos
+search-conditions-titleCreatorYear = Título, autor, ano
+search-conditions-submenu-attachment = Anexo
+search-conditions-submenu-annotation = Anotação
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tipo de arquivo
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Última leitura
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tipo
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } arquivo adicionado
@@ -764,6 +963,9 @@ file-type-video = Vídeo
 file-type-presentation = Apresentação
 file-type-document = Documento
 file-type-ebook = Livro eletrônico
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Foi atualizado para <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Descubra <a data-l10n-name="new-features-link">as novidades</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -772,18 +974,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Colar e buscar
 mac-word-plugin-install-message = Zotero precisa acessar os dados do Word para instalar a extensão do Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Instalar Extensão do Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalar
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name }  agora mantém nomes de arquivos de anexos automaticamente sincronizados a medida que faz alteração nos itens.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = O conector do { -app-name } deve ser atualizado para funcionar com esta versão do { -app-name }.
 userjs-pref-warning = Algumas configurações do { -app-name } foram substituídas utilizando um método sem suporte. { -app-name } irá revertê-las e reiniciar.
 migrate-extra-fields-progress-message = Migrando novos campos a partir do campo Extra
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Dividir etiquetas
 long-tag-fixer-button-dont-split =
@@ -800,5 +1007,142 @@ normalize-attachment-titles-text =
 banner-close-button =
     .aria-label = Dispensar notificação
 plugins-blocked-plugin =
-    .message = This plugin has been disabled by { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+    .message = Este complemento foi desabilitado por { -app-name }.
+data-dir-unsupported-storage = Isto pode acontecer se o diretório de dados do { -app-name } estiver em uma pasta de armazenamento na nuvem (OneDrive, Dropbox, etc.) ou em uma rede de compartilhamento.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Pesquisa
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Salvar
+save-search-name-title = Salvar pesquisa
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Renomear coleção
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Editar Nota
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Mudar tipo do item
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index 8b5c31f0f1..323cc820f4 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 ano atrás
 date.relative.yearsAgo.multiple=%S anos atrás
 
 pane.collections.title=Coleções
-pane.collections.delete.title=Remover Coleção
-pane.collections.delete=Deseja realmente excluir a coleção selecionada?
-pane.collections.delete.keepItems=Itens no interior dessa coleção não serão deletados.
-pane.collections.deleteWithItems.title=Remover Coleção e Itens
-pane.collections.deleteWithItems=Você está certo de que deseja apagar a coleção selecionada e mover todos os itens para a Lixeira?
 pane.feed.deleteWithItems.title=Cancelar assinatura
 pane.feed.deleteWithItems=Tem certeza que deseja cancelar a assinatura dessa fonte?
 
-pane.collections.deleteSearch.title=Remover Busca
-pane.collections.deleteSearch=Deseja realmente excluir a pesquisa selecionada?
 pane.collections.emptyTrash=Deseja realmente remover permanentemente os itens da Lixeira?
 pane.collections.newSavedSeach=Nova pesquisa salva
 pane.collections.savedSearchName=Digite um nome para essa pesquisa salva:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Itens duplicados
 pane.collections.removeLibrary=Remover biblioteca
 pane.collections.removeLibrary.text=Tem certeza que você deseja remover “%S” permanentemente do seu computador?
 
-pane.collections.menu.duplicate.savedSearch=Duplicar a pesquisa salva
 pane.collections.menu.remove.library=Remover biblioteca…
-pane.collections.menu.delete.collection=Remover Coleção...
-pane.collections.menu.delete.collectionAndItems=Remover Coleção e Itens...
-pane.collections.menu.delete.savedSearch=Remover Busca Salva...
-pane.collections.menu.delete.feedAndItems=Cancelando a assinatura da fonte...
-pane.collections.menu.export.collection=Exportar a coleção...
-pane.collections.menu.export.savedSearch=Exportar a pesquisa salva...
-pane.collections.menu.export.feed=Exportar a fonte...
-pane.collections.menu.createBib.collection=Criar bibliografia a partir da coleção...
-pane.collections.menu.createBib.savedSearch=Criar bibliografia a partir da pesquisa salva...
-pane.collections.menu.createBib.feed=Criar bibliografia a partir da fonte...
 pane.collections.showCollectionInLibrary=Exibir Coleção na Biblioteca
 
-pane.collections.menu.generateReport.collection=Gerar relatório a partir da coleção...
-pane.collections.menu.generateReport.savedSearch=Gerar relatório a partir de pesquisa salva...
-pane.collections.menu.generateReport.feed=Gerar relatório a partir da fonte...
-
 pane.collections.menu.refresh.feed=Atualizar a fonte
 pane.collections.menu.refresh.allFeeds=Atualizar todos os Feeds
 pane.collections.menu.markAsRead.feed=Marcar a fonte como lida
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=O Firefox deve ser reiniciado pa
 zotero.preferences.sync.reset.fileSyncHistory=Durante a próxima sincronização, %1$S verificará todos os arquivos anexos em “%2$S” comparando-os com os do serviço de armazenamento. Serão baixados quaisquer arquivos de anexo que estejam em falta localmente e serão carregados quaisquer arquivos de anexo locais que estão em falta remotamente.\n\nEsta opção não é necessária em uma utilização normal.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=O histórico de sincronização de arquivos para “%S” foi limpo.
 
-zotero.preferences.search.rebuildIndex=Reconstruir índice
-zotero.preferences.search.rebuildWarning=Deseja reconstruir todo o índice? Isto pode levar algum tempo.\n\nPara indexar apenas os itens que ainda não foram indexados, use %S.
-zotero.preferences.search.clearIndex=Limpar índice
-zotero.preferences.search.clearWarning=Após a limpeza do índice, o conteúdo dos anexos não aparecerá mais nas pesquisas.\n\nAnexos de links na internet não poderão ser reindexados sem uma nova visita ao site. Para manter a indexação de links na internet, escolha %S.
-zotero.preferences.search.clearNonLinkedURLs=Limpar tudo exceto links na internet
-zotero.preferences.search.indexUnindexed=Indexar itens não-indexados
 zotero.preferences.export.quickCopy.citationStyles=Estilo de citação
 zotero.preferences.export.quickCopy.exportFormats=Formatos de exportação
 zotero.preferences.export.quickCopy.instructions=A Cópia Rápida permite-lhe exportar rapidamente itens num dado formato. Pode copiar para os recortes as referências seleccionadas pressionando %S, mas também pode arrastar directamente os itens para uma caixa de texto de um outro programa.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Você deve inserir uma citação antes de e
 integration.error.mustInsertBibliography=Você deve inserir uma bibliografia antes de executar esta operação.
 integration.error.cannotInsertHere=Campos Zotero não podem ser inseridos aqui.
 integration.error.notInCitation=Você deve posicionar o cursor sobre uma citação Zotero para editá-la.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=O estilo bibliográfico atual não define uma bibliografia. Se você pretende inserir uma bibliografia, por favor, escolha outro estilo.
 integration.error.deletePipe=O canal utilizado pelo Zotero para se comunicar com o processador de texto não pode ser inicializado. Você gostaria que o Zotero tentasse resolver este erro? Sua senha será pedida.
 integration.error.invalidStyle=O estilo que você selecionou não parece ser válido. Se você mesmo criou esse estilo, por favor, certifique-se de que ele satisfaz as condições de validação tal qual descrito em http://zotero.org/support/dev/citation_styles. Como alternativa, tente selecionar outro estilo.
diff --git a/chrome/locale/pt-PT/zotero/fileRenaming.ftl b/chrome/locale/pt-PT/zotero/fileRenaming.ftl
index 4634aeb7b2..fddea52fb2 100644
--- a/chrome/locale/pt-PT/zotero/fileRenaming.ftl
+++ b/chrome/locale/pt-PT/zotero/fileRenaming.ftl
@@ -40,6 +40,6 @@ file-renaming-preview-window =
     .title = Renomear arquivos
 file-renaming-preview-window-loading = A Carregar...
 file-renaming-preview-window-intro = { -app-name } irá renomear oa seguintes arquivos na sua biblioteca para corresponder aos seus itens pai:
-file-renaming-preview-window-intro-library = { -app-name } will rename the following files in "{ $library }" to match their parent items:
+file-renaming-preview-window-intro-library = { -app-name } irá renomear os seguintes arquivos em "{ $library }" para corresponder com seus itens pais:
 file-renaming-preview-window-renaming = Renomeando...
 file-renaming-preview-window-no-files = Todos os nomes de arquivo já correspondem aos itens pai. Nenhuma mudança é necessária.
diff --git a/chrome/locale/pt-PT/zotero/integration.ftl b/chrome/locale/pt-PT/zotero/integration.ftl
index 6a54e6db7c..aeca8c8bce 100644
--- a/chrome/locale/pt-PT/zotero/integration.ftl
+++ b/chrome/locale/pt-PT/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Sufixo
 integration-citationDialog-details-prefix = Prefixo
 integration-citationDialog-details-suppressAuthor = Omitir Autor
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Incluir comentários
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Manter as fontes ordenadas
+integration-citationDialog-preview-empty = Visualização
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Biblioteca
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Pressione Tab para selecionar itens e adicionar a esta citação. Pressione Escape para descartar as alterações e fechar a caixa.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Você fez altera
 integration-warning-discard-changes = Descartar alterações
 integration-warning-command-is-running = Um comando de integração de processador de texto já está em funcionamento.
 first-run-guidance-citationDialog =
-    Digite um título, autor e/ou ano para buscar por uma referência.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Depois que tiver feito sua seleção, clique no balão e selecione pelo teclado e pressione ↓/Espaço para mostrar as opções de citação como número de página, prefixo e sufixo.
-    
-    Você também pode adicionar o número da página ou outro localizador ao incluir com os termos da busca (ex.: “história { $locator }”) ou digitando depois do balão e pressionando { return-or-enter }.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/pt-PT/zotero/preferences.ftl b/chrome/locale/pt-PT/zotero/preferences.ftl
index 3d82bd706a..a26038ddce 100644
--- a/chrome/locale/pt-PT/zotero/preferences.ftl
+++ b/chrome/locale/pt-PT/zotero/preferences.ftl
@@ -6,7 +6,7 @@ preferences-auto-recognize-files =
 preferences-file-renaming-title = Renomeação do arquivo
 preferences-file-renaming-intro = { -app-name } pode renomear arquivos automaticamente a partir dos detalhes do item pai (título, autor, etc.) e manter o nome do arquivo sincronizado durante as mudanças. Arquivos baixados são sempre nomeados inicialmente com base nos detalhes do item pai.
 preferences-file-renaming-configure-button =
-    .label = Configure File Renaming…
+    .label = Configurar renomeação de arquivo...
 preferences-attachment-titles-title = Títulos de anexos
 preferences-attachment-titles-intro = Os títulos dos anexos estão <label data-l10n-name="wiki-link">diferentes dos títulos dos arquivos</label>. Para alguns recursos, { -app-name } pode mostrar o nome do arquivo ao invés do título do anexo na lista de itens.
 preferences-attachment-titles-show-filenames =
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Língua e Região
 preferences-advanced-enable-bidi-ui =
     .label = Habilitar funções de edição de texto bidirecional
+preferences-advanced-data-dir =
+    .value = Diretório de dados:
 preferences-advanced-reset-data-dir =
     .label = Reverta para localização padrão...
 preferences-advanced-custom-data-dir =
@@ -77,13 +79,13 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Padrão: { $directory })
     .aria-label = Localização predefinida
-preferences-pane-account = Account
+preferences-pane-account = Conta
 -preferences-sync-data-syncing = Sincronização de Dados
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sincronização
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -126,3 +128,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/pt-PT/zotero/reader.ftl b/chrome/locale/pt-PT/zotero/reader.ftl
index 2d46b59fbf..784f1f279c 100644
--- a/chrome/locale/pt-PT/zotero/reader.ftl
+++ b/chrome/locale/pt-PT/zotero/reader.ftl
@@ -258,7 +258,7 @@ reader-read-aloud-annotation-popup-move = Move annotation by sentence
 reader-read-aloud-annotation-popup-extend = Extend annotation by sentence
 reader-read-aloud-annotation-popup-delete = Remover
 reader-read-aloud-annotation-popup-done = Feito
-reader-read-aloud-annotation-popup-change-color = Change color
+reader-read-aloud-annotation-popup-change-color = Alterar cor
 reader-read-aloud-annotation-popup-highlight = Highlight
 reader-read-aloud-annotation-popup-underline = Sublinhado
 reader-tab-audio-play =
diff --git a/chrome/locale/pt-PT/zotero/searchbox.dtd b/chrome/locale/pt-PT/zotero/searchbox.dtd
index e1080407eb..b7ba637cb7 100644
--- a/chrome/locale/pt-PT/zotero/searchbox.dtd
+++ b/chrome/locale/pt-PT/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nome:">
 
-<!ENTITY zotero.search.searchInLibrary "Procurar na biblioteca:">
-
 <!ENTITY zotero.search.joinMode.prefix "Fazer corresponder">
 <!ENTITY zotero.search.joinMode.any "qualquer dos">
 <!ENTITY zotero.search.joinMode.all "todos os">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dias">
 <!ENTITY zotero.search.date.units.months "meses">
 <!ENTITY zotero.search.date.units.years "anos">
-
-<!ENTITY zotero.search.search "Procurar">
-<!ENTITY zotero.search.clear "Limpar">
-<!ENTITY zotero.search.saveSearch "Guardar a Procura">
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index befbf00685..6400a3e23d 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Remover Item...">
 <!ENTITY zotero.toolbar.newGroup "Novo Grupo...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nova Subcolecção...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nova Procura Guardada...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Esvaziar Lixo">
 <!ENTITY zotero.toolbar.tagSelector.label "Mostrar/Esconder Selector de Etiquetas">
 <!ENTITY zotero.toolbar.actions.label "Acções">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferências...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suporte e Documentação">
 <!ENTITY zotero.toolbar.about.label "Acerca do Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Procura Avançada">
 <!ENTITY zotero.toolbar.openURL.label "Localizar">
 <!ENTITY zotero.toolbar.openURL.tooltip "Encontrar através da sua biblioteca local">
 
diff --git a/chrome/locale/pt-PT/zotero/zotero.ftl b/chrome/locale/pt-PT/zotero/zotero.ftl
index 9fecafb746..56bcdf8219 100644
--- a/chrome/locale/pt-PT/zotero/zotero.ftl
+++ b/chrome/locale/pt-PT/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimir
 general-remove = Remover
 general-add = Adicionar
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Ver instruções de resolução de p
 general-go-back = Retroceder
 general-accept = Aceitar
 general-cancel = Cancelar
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Mostrar na Biblioteca
 general-restartApp = Reiniciar { -app-name }
 general-restartInTroubleshootingMode = Reiniciar no modo de resolução de erros
 general-save = Guardar
 general-clear = Limpar
+clear-button =
+    .label = { general-clear }
 general-update = Atualizar
 general-back = Retroceder
 general-edit = Editar
@@ -76,6 +86,8 @@ general-maroon = marrom
 general-gray = Cinza
 general-black = Preto
 general-loading = A Carregar...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Estilo de Citação:
 language-label = Língua:
 menu-custom-group-submenu =
@@ -163,14 +175,111 @@ collections-menu-show-recently-read =
     .label = Mostrar { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remover dos { recently-read }…
-collections-menu-rename-collection =
-    .label = Renomear coleção
-collections-menu-edit-saved-search =
-    .label = Editar Procura Guardada
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } coleção selecionada
+        [many] { $count } coleções selecionadas
+       *[other] { $count } coleções selecionadas
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editar Procura Guardada
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Mover para
 collections-menu-copy-collection =
     .label = Copiar para
+collections-menu-export =
+    .label = Exportar...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mover Para Baixo
 item-creator-moveToTop =
@@ -283,6 +392,7 @@ import-online-relink-only =
     .label = Religar citações do Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } não conseguiu se conectar ao { $targetApp }. Por favor, verifique sua conexão com a internet e tente novamente.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -292,7 +402,7 @@ items-table-cell-notes =
         }
 items-column-added-by = Adicionado por
 items-column-modified-by = Modificado por
-items-column-last-read = Last Read
+items-column-last-read = Última leitura
 report-error =
     .label = Reportar Erro...
 rtfScan-wizard =
@@ -628,6 +738,18 @@ quicksearch-input =
     .aria-label = Procura Rápida
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Procura Avançada
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Ver como
 item-pane-header-none =
@@ -689,11 +811,66 @@ architecture-warning-action = Baixar { -app-name } 64-bit
 architecture-x64-on-arm64-message = { -app-name } está sendo executado em modo emulado. Uma versão nativa do { -app-name } será mais eficientemente.
 architecture-x64-on-arm64-action = Descarregar { -app-name } para ARM64
 first-run-guidance-authorMenu = { -app-name } permite que você especifique editores e tradutores também. Você pode transformar um autor em um editor ou tradutor selecionando a partir deste menu.
-first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
+first-run-guidance-readAloud = { -app-name } agora pode ler seus documentos utilizando vozes com entonação natural.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Localizar
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotações
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Critérios de busca
     .label = { $label }
@@ -703,11 +880,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Valor
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Campos:
 search-conditions-collection = Colecção
 search-conditions-savedSearch = Procura Guardada
 search-conditions-itemTypeID = Tipo de Item
 search-conditions-tag = Etiqueta
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Nota
 search-conditions-childNote = Nota Descendente
 search-conditions-creator = Criador
@@ -726,10 +909,26 @@ search-conditions-dateModified = Data de Modificação
 search-conditions-fulltextContent = Conteúdo de Anexo
 search-conditions-programmingLanguage = Linguagem de Programação
 search-conditions-fileTypeID = Tipo de Arquivo Anexo
-search-conditions-lastRead = Attachment Last Read
+search-conditions-attachmentStorageType = Attachment Storage Type
+search-conditions-lastRead = Último anexo lido
 search-conditions-annotationText = Texto da Anotação
 search-conditions-annotationComment = Comentário da Anotação
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Todos os campos
+search-conditions-titleCreatorYear = Título, Criador, Ano
+search-conditions-submenu-attachment = Anexo
+search-conditions-submenu-annotation = Anotação
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tipo do Arquivo
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Última leitura
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tipo
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } arquivo adicionado
@@ -764,6 +963,9 @@ file-type-video = Vídeo
 file-type-presentation = Apresentação
 file-type-document = Documento
 file-type-ebook = e-book
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Foi atualizado para { -app-name } { $version }! Descubra as novidades.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -772,18 +974,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Colar e buscar
 mac-word-plugin-install-message = Zotero precisa acessar os dados do Word para instalar a extensão do Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Instalar Extensão do Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalar
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name }  agora mantém nomes de arquivos de anexos automaticamente sincronizados a medida que faz alteração nos itens.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = O conector do { -app-name } deve ser atualizado para funcionar com esta versão do { -app-name }.
 userjs-pref-warning = Algumas configurações do { -app-name } foram substituídas utilizando um método sem suporte. { -app-name } irá revertê-las e reiniciar.
 migrate-extra-fields-progress-message = Migrando novos campos a partir do campo Extra
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Dividir etiquetas
 long-tag-fixer-button-dont-split =
@@ -800,5 +1007,142 @@ normalize-attachment-titles-text =
 banner-close-button =
     .aria-label = Dispensar notificação
 plugins-blocked-plugin =
-    .message = This plugin has been disabled by { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+    .message = Este complemento foi desabilitado por { -app-name }.
+data-dir-unsupported-storage = Isto pode acontecer se o diretório de dados do { -app-name } estiver em uma pasta de armazenamento na nuvem (OneDrive, Dropbox, etc.) ou em uma rede de compartilhamento.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Procurar
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Guardar
+save-search-name-title = Guardar a Procura
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Renomear coleção
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Editar Nota
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Alterar Tipo de Item
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index 45b920b66b..fc803681d1 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=há 1 ano
 date.relative.yearsAgo.multiple=há %S anos
 
 pane.collections.title=Coleções
-pane.collections.delete.title=Remover Colecção
-pane.collections.delete=Quer mesmo remover a colecção seleccionada?
-pane.collections.delete.keepItems=Os itens dentro desta colecção não serão removidos.
-pane.collections.deleteWithItems.title=Remover Colecção e Itens
-pane.collections.deleteWithItems=Quer mesmo remover a colecção seleccionada e colocar no Lixo todos os seus itens?
 pane.feed.deleteWithItems.title=Cancelar Subscrição
 pane.feed.deleteWithItems=Quer mesmo cancelar a sua subscrição deste feed?
 
-pane.collections.deleteSearch.title=Remover Pesquisa
-pane.collections.deleteSearch=Quer mesmo remover a procura seleccionada?
 pane.collections.emptyTrash=Quer mesmo remover permanentemente todos os itens no Lixo?
 pane.collections.newSavedSeach=Nova Procura Guardada
 pane.collections.savedSearchName=Introduza um nome para esta procura guardada:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Itens duplicados
 pane.collections.removeLibrary=Remover Biblioteca
 pane.collections.removeLibrary.text=Tem a certeza que deseja remover permanentemente “%S” deste computador?
 
-pane.collections.menu.duplicate.savedSearch=Pesquisa Guardada Duplicada
 pane.collections.menu.remove.library=Remover Biblioteca
-pane.collections.menu.delete.collection=Remover Colecção...
-pane.collections.menu.delete.collectionAndItems=Remover Colecção e Itens...
-pane.collections.menu.delete.savedSearch=Remover Pesquisa Guardada...
-pane.collections.menu.delete.feedAndItems=Cancelar Subscrição de Feed…
-pane.collections.menu.export.collection=Exportar Colecção...
-pane.collections.menu.export.savedSearch=Exportar Procura Guardada...
-pane.collections.menu.export.feed=Exportar Feed…
-pane.collections.menu.createBib.collection=Criar Bibliografia a partir de Colecção…
-pane.collections.menu.createBib.savedSearch=Criar Bibliografia a partir de Procura Guardada…
-pane.collections.menu.createBib.feed=Criar Bibliografia a partir de Feed…
 pane.collections.showCollectionInLibrary=Mostrar Colecção na Biblioteca
 
-pane.collections.menu.generateReport.collection=Gerar Relatório a Partir de Colecção...
-pane.collections.menu.generateReport.savedSearch=Gerar Relatório a Partir de Procura Guardada...
-pane.collections.menu.generateReport.feed=Gerar Relatório a partir de Feed…
-
 pane.collections.menu.refresh.feed=Recarregar Feed
 pane.collections.menu.refresh.allFeeds=Atualizar todos os Feeds
 pane.collections.menu.markAsRead.feed=Marcar Feed como Lido
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=O Firefox tem de ser reiniciado
 zotero.preferences.sync.reset.fileSyncHistory=Durante a próxima sincronização, %1$S verificará todos os arquivos de anexo em “%2$S” comparando-os com os do serviço de armazenamento. Serão descarregados quaisquer arquivos de anexo que estejam em falta localmente e serão carregados quaisquer arquivos de anexo locais que estão em falta remotamente.\n\nEsta opção não é necessária durante a utilização normal.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=O histórico de sincronização de arquivos para “%S” foi limpo.
 
-zotero.preferences.search.rebuildIndex=Reconstruir Índice
-zotero.preferences.search.rebuildWarning=Quer reconstruir todo o índice? Pode ser demorado.\n\nPara indexar apenas itens que não tenham ainda sido indexados, use %S.
-zotero.preferences.search.clearIndex=Limpar Índice
-zotero.preferences.search.clearWarning=Depois de limpar o índice, não será possível pesquisar no conteúdo dos anexos.\n\nAnexos do tipo ligação à Web não podem ser indexados de novo sem que a página seja revisitada. Para preservar os índices das ligações web use %S.
-zotero.preferences.search.clearNonLinkedURLs=Limpar Tudo Excepto Ligações Web
-zotero.preferences.search.indexUnindexed=Indexar Itens Não Indexados
 zotero.preferences.export.quickCopy.citationStyles=Estilos de Citação
 zotero.preferences.export.quickCopy.exportFormats=Formatos de Exportação
 zotero.preferences.export.quickCopy.instructions=A Cópia Rápida permite-lhe exportar rapidamente itens num dado formato. Pode copiar para os recortes as referências seleccionadas pressionando %S, mas também pode arrastar directamente os itens para uma caixa de texto de um outro programa.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Tem de inserir uma citação antes de execu
 integration.error.mustInsertBibliography=Tem de inserir uma bibliografia antes de executar esta operação.
 integration.error.cannotInsertHere=Não se pode inserir campos Zotero neste local.
 integration.error.notInCitation=Tem de colocar o cursor numa citação Zotero para a editar.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=O estilo bibliográfico actual não define uma bibliografia. Se desejar inserir uma bibliografia, por favor escolha um outro estilo.
 integration.error.deletePipe=Não foi possível inicializar o canal que o Zotero usa para comunicar com o processador de texto. Quer que o Zotero tente corrigir este erro? Ser-lhe-á pedida a sua palavra-passe.
 integration.error.invalidStyle=O estilo que seleccionou não parece ser válido. Se foi você que o criou, assegure-se por favor de que o validou tal como descrito em http://zotero.org/support/dev/citation_styles. Em alternativa pode escolher outro estilo.
diff --git a/chrome/locale/ro-RO/zotero/integration.ftl b/chrome/locale/ro-RO/zotero/integration.ftl
index df7d1d80c3..0cf5dce2e9 100644
--- a/chrome/locale/ro-RO/zotero/integration.ftl
+++ b/chrome/locale/ro-RO/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omiet autor
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotecă
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ro-RO/zotero/preferences.ftl b/chrome/locale/ro-RO/zotero/preferences.ftl
index 55964260bb..602b2680b0 100644
--- a/chrome/locale/ro-RO/zotero/preferences.ftl
+++ b/chrome/locale/ro-RO/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Sincronizare
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ro-RO/zotero/searchbox.dtd b/chrome/locale/ro-RO/zotero/searchbox.dtd
index e4aa35ccc0..f83188fbb7 100644
--- a/chrome/locale/ro-RO/zotero/searchbox.dtd
+++ b/chrome/locale/ro-RO/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Nume:">
 
-<!ENTITY zotero.search.searchInLibrary "Caută în bibliotecă:">
-
 <!ENTITY zotero.search.joinMode.prefix "Potrivire">
 <!ENTITY zotero.search.joinMode.any "oricare">
 <!ENTITY zotero.search.joinMode.all "toate">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "zile">
 <!ENTITY zotero.search.date.units.months "luni">
 <!ENTITY zotero.search.date.units.years "ani">
-
-<!ENTITY zotero.search.search "Caută">
-<!ENTITY zotero.search.clear "Șterge">
-<!ENTITY zotero.search.saveSearch "Salvează căutarea">
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index 6cb6ea6232..edea62a782 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Șterge înregistrare...">
 <!ENTITY zotero.toolbar.newGroup "Grup nou...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Subcolecție nouă...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Căutare salvată nouă...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Golire coș de gunoi">
 <!ENTITY zotero.toolbar.tagSelector.label "Arată/Ascunde selectorul de etichete">
 <!ENTITY zotero.toolbar.actions.label "Acțiuni">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Preferințe...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Suport și documentație">
 <!ENTITY zotero.toolbar.about.label "Despre Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Căutare avansată">
 <!ENTITY zotero.toolbar.openURL.label "Localizare">
 <!ENTITY zotero.toolbar.openURL.tooltip "Găsește în biblioteca ta locală">
 
diff --git a/chrome/locale/ro-RO/zotero/zotero.ftl b/chrome/locale/ro-RO/zotero/zotero.ftl
index 3e8f55bdf5..aa06a83473 100644
--- a/chrome/locale/ro-RO/zotero/zotero.ftl
+++ b/chrome/locale/ro-RO/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Imprimare
 general-remove = Șterge
 general-add = Adaugă
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Renunță
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Afișează în bibliotecă
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Salvează
 general-clear = Șterge
+clear-button =
+    .label = { general-clear }
 general-update = Actualizare
 general-back = Înapoi
 general-edit = Editare
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gri
 general-black = Black
 general-loading = Se încarcă...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Stil de citare:
 language-label = Limbă:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Editează căutarea salvată
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Editează căutarea salvată
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Mută în jos
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Căutare rapidă
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Căutare avansată
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Găsește
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = adnotări
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Câmpuri:
 search-conditions-collection = Colecție
 search-conditions-savedSearch = Căutare salvată
 search-conditions-itemTypeID = Tip de înregistrare
 search-conditions-tag = Etichetă
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Notă
 search-conditions-childNote = Subnotă
 search-conditions-creator = Creator
@@ -715,10 +897,26 @@ search-conditions-dateModified = Data modificării
 search-conditions-fulltextContent = Conținut anexă
 search-conditions-programmingLanguage = Limbaj de programare
 search-conditions-fileTypeID = Tip fișier anexat
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Text adnotare
 search-conditions-annotationComment = Comentariu adnotare
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Orice câmp
+search-conditions-titleCreatorYear = Titlu, creator, an
+search-conditions-submenu-attachment = Anexă
+search-conditions-submenu-annotation = Adnotare
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Tip de fișier
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tip
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Prezentare
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Instalează
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Caută
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Salvează
+save-search-name-title = Salvează căutarea
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Editează notă
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Schimbă tipul înregistrării
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index 998c2103c7..d60de3282e 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=cu un an în urmă
 date.relative.yearsAgo.multiple=cu %S ani în urmă
 
 pane.collections.title=Colecții
-pane.collections.delete.title=Șterge colecția
-pane.collections.delete=Sigur vrei să ștergi colecția selectată?
-pane.collections.delete.keepItems=Înregistrările din această colecție nu pot fi șterse.
-pane.collections.deleteWithItems.title=Șterge colecție și înregistrări
-pane.collections.deleteWithItems=Sigur vrei să ștergi colecția selectată și să muți toate înregistrările din ea în coșul de gunoi?
 pane.feed.deleteWithItems.title=Dezabonare
 pane.feed.deleteWithItems=Sigur doriți să vă dezabonați de la acest flux?
 
-pane.collections.deleteSearch.title=Șterge căutarea
-pane.collections.deleteSearch=Sigur vrei să ștergi căutarea selectată?
 pane.collections.emptyTrash=Sigur vrei să arunci înregistrările în coșul de gunoi?
 pane.collections.newSavedSeach=Căutare salvată nouă
 pane.collections.savedSearchName=Introdu un nume pentru această căutare salvată:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Înregistrări duplicate
 pane.collections.removeLibrary=Șterge biblioteca
 pane.collections.removeLibrary.text=Sigur vrei să ștergi pentru totdeauna “%S” de pe acest calculator?
 
-pane.collections.menu.duplicate.savedSearch=Fă un duplicat căutării salvate
 pane.collections.menu.remove.library=Șterge biblioteca...
-pane.collections.menu.delete.collection=Șterge colecția...
-pane.collections.menu.delete.collectionAndItems=Șterge colecția și înregistrările...
-pane.collections.menu.delete.savedSearch=Șterge căutarea salvată...
-pane.collections.menu.delete.feedAndItems=Dezabonează-te de la flux...
-pane.collections.menu.export.collection=Exportă colecția...
-pane.collections.menu.export.savedSearch=Exportă căutarea salvată...
-pane.collections.menu.export.feed=Exportă flux...
-pane.collections.menu.createBib.collection=Creează bibliografie din colecție...
-pane.collections.menu.createBib.savedSearch=Creează bibliografie dintr-o căutare salvată...
-pane.collections.menu.createBib.feed=Creează bibliografie din flux...
 pane.collections.showCollectionInLibrary=Afișează colecțiile în bibliotecă.
 
-pane.collections.menu.generateReport.collection=Generează un raport din colecție...
-pane.collections.menu.generateReport.savedSearch=Generează un raport din căutarea salvată...
-pane.collections.menu.generateReport.feed=Generează raport din flux...
-
 pane.collections.menu.refresh.feed=Reîmprospătare flux
 pane.collections.menu.refresh.allFeeds=Reîmprospătează toate câmpurile
 pane.collections.menu.markAsRead.feed=Marchează fluxul ca citit
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox trebuie repornit pentru
 zotero.preferences.sync.reset.fileSyncHistory=La următoarea sincronizare, %1$S va verifica toate fișierele anexate din “%2$S” cu cele din serviciul de depozitare. Orice fișier anexat care lipsește local va fi descărcat și fișierele locale anexate care lipsesc vor fi încărcate la distanță.\n\nAceastă opțiune nu este necesară în timpul unei utilizări normale.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Istoria fișierului de sincronizare “%S” a fost ștearsă.
 
-zotero.preferences.search.rebuildIndex=Reconstruire index
-zotero.preferences.search.rebuildWarning=Vrei să reconstruiești întregul index? Asta poate dura ceva timp.\n\nPentru a indexa doar înregistrările care nu au fost indexate, folosește %S.
-zotero.preferences.search.clearIndex=Golire index
-zotero.preferences.search.clearWarning=După golirea indexului, conținutul anexat nu va mai putea fi căutat.\n\nLegăturile web anexate nu pot fi reindexate fără revizitarea paginilor. Pentru a păstra legăturile indexate, alege %S.
-zotero.preferences.search.clearNonLinkedURLs=Golește tot, cu excepția legăturilor web
-zotero.preferences.search.indexUnindexed=Indexare înregistrări neindexate
 zotero.preferences.export.quickCopy.citationStyles=Stiluri de citare
 zotero.preferences.export.quickCopy.exportFormats=Formate de export
 zotero.preferences.export.quickCopy.instructions=Copierea rapidă îți permite să exporți rapid înregistrările într-un format dat. Poți copia în memoria clipboard înregistrările selectate apăsând %S sau poți trage înregistrările direct în caseta de text a altui program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Trebuie să introduci o citare înainte de
 integration.error.mustInsertBibliography=Trebuie să introduci o bibliografie înainte de executa această operație.
 integration.error.cannotInsertHere=Câmpurile Zotero nu pot fi inserate aici.
 integration.error.notInCitation=Trebuie să plasezi cursorul într-o citare Zotero, pentru a o edita.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Stilul bibliografic curent nu are definită o bibliografie. Dacă vrei să adaugi o bibliografie, te rog să alegi un alt stil.
 integration.error.deletePipe=Legătura pe care Zotero o folosește pentru a comunica cu procesorul de text nu a putut fi inițializată. Vrei ca Zotero să încerce să corecteze această eroare? Ți se va cere parola.
 integration.error.invalidStyle=Stilul pe care l-ai selectat nu pare a fi valid. Dacă tu ești creatorul acestui stil, te rog asigură-te că trece validarea, așa cum e descris la https://github.com/citation-style-language/styles/wiki/Validation. Ca alternativă, încearcă să selectezi un alt stil.
diff --git a/chrome/locale/ru-RU/zotero/integration.ftl b/chrome/locale/ru-RU/zotero/integration.ftl
index 5b180cee24..a642c81983 100644
--- a/chrome/locale/ru-RU/zotero/integration.ftl
+++ b/chrome/locale/ru-RU/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Суффикс
 integration-citationDialog-details-prefix = Префикс
 integration-citationDialog-details-suppressAuthor = Не выводить автора
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Добавить комментарии
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -53,6 +54,10 @@ integration-citationDialog-lib-message-annotations =
        *[true] Нет элементов с аннотациями, которые совпадают с текущим поиском
     }
 integration-citationDialog-settings-keepSorted = Удерживать источники отсортированными
+integration-citationDialog-preview-empty = Предпросмотр
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Библиотека
@@ -75,6 +80,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Нажмите Tab для выбора записей, которые будут добавлены к цитированию. Нажмите Escape, чтобы отменить изменения и закрыть диалог.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -130,8 +140,6 @@ integration-warning-documentPreferences-changes-will-be-lost = Вы внесли
 integration-warning-discard-changes = Отменить изменения
 integration-warning-command-is-running = Команда интеграции Текстового Процессора уже запущена.
 first-run-guidance-citationDialog =
-    Введите название, автора и/или год для поиска отсылки.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
-    Чтобы выбрать запись, нажмите на неё или выберите с помощью клавиатуры и нажмите ↓/Space, чтобы показать опции цитирования, такие как номер страницы, префикс и суффикс.
-    
-    Также, вы можете добавить номер страницы или другой локатор, включив его в ваш поисковый запрос (напр., “история { $locator }”) или введя его после выбора записи, нажав { return-or-enter }.
+    You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ru-RU/zotero/preferences.ftl b/chrome/locale/ru-RU/zotero/preferences.ftl
index ab736de95e..98aa734a26 100644
--- a/chrome/locale/ru-RU/zotero/preferences.ftl
+++ b/chrome/locale/ru-RU/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Язык и Регион
 preferences-advanced-enable-bidi-ui =
     .label = Включить утилиты редактирования двунаправленного текста
+preferences-advanced-data-dir =
+    .value = Каталог данных:
 preferences-advanced-reset-data-dir =
     .label = Вернуться к умолчальному расположению…
 preferences-advanced-custom-data-dir =
@@ -77,18 +79,18 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (Default: { $directory })
     .aria-label = Умолчальное расположение
-preferences-pane-account = Account
+preferences-pane-account = Учётная запись
 -preferences-sync-data-syncing = Синхронизация данных
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Войдите в аккаунт { -app-name }, чтобы синхронизировать данные между устройствами, сотрудничать с другими и многого другого.
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = Синхронизировать
+preferences-sync-settings-intro = { -app-name } может синхронизировать данные и файлы вашей библиотеки между устройствами. <label data-l10n-name="sync-link">Узнать больше</label>
+preferences-sync-reset-heading = Сброс синхронизации
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = Синхронизировать файлы вложений в групповых библиотеках с помощью { -app-name } хранилища
+preferences-sync-fileSyncing-tos = Используя { -app-name } хранилище, вы соглашаетесь соблюдать его <label data-l10n-name="terms-link">условия и положения</label>.
 preferences-account-log-out =
     .label = Выйти...
 preferences-sync-reset-restore-to-server-body = { -app-name } будет заменено “{ $libraryName }” в { $domain } данными с этого компьютера.
@@ -105,7 +107,7 @@ preferences-sync-reset-restore-to-server-remaining-items-text =
     }
 preferences-sync-reset-restore-to-server-checkbox-label =
     { $remoteItemsDeletedCount ->
-        [one] Удалить { $remoteItemsDeletedCount } запись
+        [one] Удалить 1 запись
         [few] Удалить { $remoteItemsDeletedCount } записи
         [many] Удалить { $remoteItemsDeletedCount } записей
        *[other] Удалить { $remoteItemsDeletedCount } записей
@@ -127,3 +129,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Переход на другой аккаунт удалит все данные { -app-name } на этом компьютере. Перед тем как продолжить, убедитесь, что все данные и файлы, которые вы хотите сохранить, синхронизированы с аккаунтом "{ $username }" или у вас есть резервная копия каталога данных { -app-name }.
 preferences-account-switch-confirmation-text = Удаление локальных данных
 preferences-account-switch-accept = Удалите данные и перезапустите
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ru-RU/zotero/reader.ftl b/chrome/locale/ru-RU/zotero/reader.ftl
index 285b2499fd..ab6c05b9d2 100644
--- a/chrome/locale/ru-RU/zotero/reader.ftl
+++ b/chrome/locale/ru-RU/zotero/reader.ftl
@@ -229,7 +229,7 @@ reader-read-aloud-quota-exceeded-message =
     }.
 reader-read-aloud-error = { general-error }
 reader-read-aloud-error-unknown = Произошла неизвестная ошибка.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-network = Не удаётся подключиться к сервису Read Aloud. Пожалуйста, проверьте своё интернет-соединение.
 reader-read-aloud-error-daily-limit-exceeded = Вы превысили свой дневной лимит для голосов { -app-name }.
 reader-read-aloud-retry = Пробовать снова
 reader-read-aloud-first-run-title = Выберите предпочитаемый голос для чтения вслух:
diff --git a/chrome/locale/ru-RU/zotero/searchbox.dtd b/chrome/locale/ru-RU/zotero/searchbox.dtd
index 4c9e80d403..5cafd99f09 100644
--- a/chrome/locale/ru-RU/zotero/searchbox.dtd
+++ b/chrome/locale/ru-RU/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Название:">
 
-<!ENTITY zotero.search.searchInLibrary "Искать в библиотеке:">
-
 <!ENTITY zotero.search.joinMode.prefix "Совпадения">
 <!ENTITY zotero.search.joinMode.any "любые">
 <!ENTITY zotero.search.joinMode.all "все">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "дни">
 <!ENTITY zotero.search.date.units.months "месяцы">
 <!ENTITY zotero.search.date.units.years "года">
-
-<!ENTITY zotero.search.search "Искать">
-<!ENTITY zotero.search.clear "Очистить">
-<!ENTITY zotero.search.saveSearch "Сохранить поиск">
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index 0d80906d2d..33a6c99563 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Удалить запись...">
 <!ENTITY zotero.toolbar.newGroup "Новая группа…">
 <!ENTITY zotero.toolbar.newSubcollection.label "Новая вложенная коллекция…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Новый отбор…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Очистить корзину">
 <!ENTITY zotero.toolbar.tagSelector.label "Показать/спрятать панель выбора тегов">
 <!ENTITY zotero.toolbar.actions.label "Действия">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Настройки…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Поддержка и документация">
 <!ENTITY zotero.toolbar.about.label "О Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Расширенный поиск">
 <!ENTITY zotero.toolbar.openURL.label "Найти">
 <!ENTITY zotero.toolbar.openURL.tooltip "Найти в библиотеке на этом компьютере">
 
diff --git a/chrome/locale/ru-RU/zotero/zotero.ftl b/chrome/locale/ru-RU/zotero/zotero.ftl
index 3680ebd588..f0e3827796 100644
--- a/chrome/locale/ru-RU/zotero/zotero.ftl
+++ b/chrome/locale/ru-RU/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Распечатать
 general-remove = Удалить
 general-add = Добавить
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Показать инструкци
 general-go-back = Вернуться
 general-accept = Принять
 general-cancel = Отменить
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Показать в библиотеке
 general-restartApp = Перезапустить { -app-name }
 general-restartInTroubleshootingMode = Перезапустить в режиме отладки
 general-save = Сохранить:
 general-clear = Очистить
+clear-button =
+    .label = { general-clear }
 general-update = Обновить
 general-back = Назад
 general-edit = Редактировать
@@ -76,6 +86,8 @@ general-maroon = Тёмно-бордовый
 general-gray = Серый
 general-black = Чёрный
 general-loading = Загрузка...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Стиль цитирования:
 language-label = Язык:
 menu-custom-group-submenu =
@@ -164,14 +176,112 @@ collections-menu-show-recently-read =
     .label = Показать { recently-read }
 item-menu-remove-from-recently-read =
     .label = Удалить из { recently-read }…
-collections-menu-rename-collection =
-    .label = Переименовать коллекцию
-collections-menu-edit-saved-search =
-    .label = Редактировать сохранённый поиск
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } коллекция выбрана
+        [few] { $count } коллекции выбрано
+        [many] { $count } коллекций выбрано
+       *[other] { $count } коллекций выбрано
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Редактировать сохранённый поиск
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Переместить в
 collections-menu-copy-collection =
     .label = Копировать в
+collections-menu-export =
+    .label = Экспорт…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Переместить вниз
 item-creator-moveToTop =
@@ -284,6 +394,7 @@ import-online-relink-only =
     .label = Заменить ссылки на цитирования из Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } не смог подсоединиться к { $targetApp }. Пожалуйста, проверьте своё подключение к интернету и попробуйте снова.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -633,6 +744,18 @@ quicksearch-input =
     .aria-label = Быстрый поиск
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Расширенный поиск
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Показать как
 item-pane-header-none =
@@ -704,9 +827,64 @@ architecture-x64-on-arm64-action = Скачать { -app-name } для ARM64
 first-run-guidance-authorMenu = { -app-name } позволяет также указать редакторов и переводчиков. Вы можете превратить автора в редактора или переводчика, выбрав это меню.
 first-run-guidance-readAloud = { -app-name } теперь может читать ваши документы с естественным звучанием голоса.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Найти
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = аннотации
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Условия поиска
     .label = { $label }
@@ -716,11 +894,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Значение
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Поля:
 search-conditions-collection = Коллекция
 search-conditions-savedSearch = Сохранённый поиск
 search-conditions-itemTypeID = Тип записи
 search-conditions-tag = Тег
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Заметка
 search-conditions-childNote = Дочерняя заметка
 search-conditions-creator = Автор
@@ -739,10 +923,26 @@ search-conditions-dateModified = Дата изменения
 search-conditions-fulltextContent = Содержание Вложения
 search-conditions-programmingLanguage = Язык программирования
 search-conditions-fileTypeID = Тип Вложения
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Вложение Последнее прочитанное
 search-conditions-annotationText = Текст аннотации
 search-conditions-annotationComment = Комментарий к аннотации
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Любое поле
+search-conditions-titleCreatorYear = Название, Автор, Год
+search-conditions-submenu-attachment = Вложение
+search-conditions-submenu-annotation = Аннотация
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Тип файла
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Последнее прочитанное
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Тип
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Автор
 find-pdf-files-added =
     { $count ->
         [one] Добавлен { $count } файл
@@ -780,6 +980,9 @@ file-type-video = Видео
 file-type-presentation = Презентация
 file-type-document = Документ
 file-type-ebook = Электронная книга
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Вы проапгрейдились до <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Узнайте <a data-l10n-name="new-features-link">что нового</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -788,18 +991,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Вставить и Искать
 mac-word-plugin-install-message = Zotero необходим доступ к данным Word для установки плагина для Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Установить плагин для Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Установить
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } теперь автосинхронизирует имена файлов вложений при внесении изменений в элементы.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = { -app-name } коннектор должен быть обновлён для работы с этой версией { -app-name }.
 userjs-pref-warning = Некоторые настройки { -app-name } были переопределены с помощью неподдерживаемого метода. { -app-name } отменяет их и перезапускает.
 migrate-extra-fields-progress-message = Перенос новых полей из Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Разделить теги
 long-tag-fixer-button-dont-split =
@@ -817,4 +1025,141 @@ banner-close-button =
     .aria-label = Скрыть уведомление
 plugins-blocked-plugin =
     .message = Этот плагин был отключён { -app-name }.
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = Это может произойти, если каталог данных { -app-name } находится в папке облачного хранилища (OneDrive, Dropbox и т. д.) или в общей сетевой папке.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Поиск
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Сохранить:
+save-search-name-title = Сохранить поиск
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Переименовать коллекцию
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Редактировать заметку
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Изменить тип записи
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index 3207125e9e..a94f369370 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 год назад
 date.relative.yearsAgo.multiple=%S года(лет) назад
 
 pane.collections.title=Коллекции
-pane.collections.delete.title=Удалить коллекцию
-pane.collections.delete=Вы уверены, что хотите удалить выбранную коллекцию?
-pane.collections.delete.keepItems=Записи в этой коллекции не будут удалены.
-pane.collections.deleteWithItems.title=Удалить коллекцию и записи
-pane.collections.deleteWithItems=Вы уверены, что хотите удалить выбранную коллекцию и переместить в Корзину все записи в ней?
 pane.feed.deleteWithItems.title=Отменить подписку
 pane.feed.deleteWithItems=Вы уверены что хотите отменить подписку на эту новостную ленту?
 
-pane.collections.deleteSearch.title=Удалить поиск
-pane.collections.deleteSearch=Вы уверены, что хотите удалить выбранный поиск?
 pane.collections.emptyTrash=Вы уверены, что хотите навсегда удалить документы из Корзины?
 pane.collections.newSavedSeach=Новый сохранённый поиск
 pane.collections.savedSearchName=Введите имя для этого сохранённого поиска:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Дубликаты записей
 pane.collections.removeLibrary=Удалить библиотеку
 pane.collections.removeLibrary.text=Вы уверены что хотите окончательно удалить “%S” с этого компьютера?
 
-pane.collections.menu.duplicate.savedSearch=Дублировать сохранённый поиск
 pane.collections.menu.remove.library=Удалить библиотеку…
-pane.collections.menu.delete.collection=Удалить коллекцию…
-pane.collections.menu.delete.collectionAndItems=Удалить коллекцию и записи…
-pane.collections.menu.delete.savedSearch=Удалить сохранённый поиск…
-pane.collections.menu.delete.feedAndItems=Отписаться от новостной ленты…
-pane.collections.menu.export.collection=Экспортировать коллекцию…
-pane.collections.menu.export.savedSearch=Экспортировать сохранённый поиск…
-pane.collections.menu.export.feed=Экспортировать новостную ленту…
-pane.collections.menu.createBib.collection=Создать библиографию из коллекции…
-pane.collections.menu.createBib.savedSearch=Создать библиографию на основе сохранённого поиска…
-pane.collections.menu.createBib.feed=Создать библиографию из новостной ленты…
 pane.collections.showCollectionInLibrary=Показать коллекцию в библиотеке
 
-pane.collections.menu.generateReport.collection=Сгенерировать отчёт из коллекции…
-pane.collections.menu.generateReport.savedSearch=Создать отчёт из сохранённого поиска…
-pane.collections.menu.generateReport.feed=Создать отчёт из новостной ленты…
-
 pane.collections.menu.refresh.feed=Обновить новостную ленту
 pane.collections.menu.refresh.allFeeds=Обновить все новостные ленты
 pane.collections.menu.markAsRead.feed=Пометить новостную ленту как прочитанную
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Необходимо перез
 zotero.preferences.sync.reset.fileSyncHistory=При следующей синхронизации %1$S сличит все связанные файлы в «%2$S» с данными хранилища. Все файлы, отсутствующие в локальном каталоге будут загружены, а отсутствующие в хранилище — выгружены.\n\nОбычно эта опция не нужна при нормальном использовании.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=История синхронизации файла “%S” очищена.
 
-zotero.preferences.search.rebuildIndex=Перестроить индекс
-zotero.preferences.search.rebuildWarning=Вы хотите перестроить весь индекс? Это займёт некоторое время.\n\nЧтобы проиндексировать только непроиндексированные записи, используйте %S.
-zotero.preferences.search.clearIndex=Очистить индекс
-zotero.preferences.search.clearWarning=После очистки индекса невозможно будет осуществлять поиск во вложениях.\n\nВеб-ссылки на вложения не могут быть переиндексированы без посещения веб-страницы. Чтобы оставить ссылки проиндексированными, выберите %S
-zotero.preferences.search.clearNonLinkedURLs=Очистить всё кроме веб-ссылок
-zotero.preferences.search.indexUnindexed=Проиндексировать непроиндексированные записи
 zotero.preferences.export.quickCopy.citationStyles=Стили цитирования
 zotero.preferences.export.quickCopy.exportFormats=Форматы экспорта
 zotero.preferences.export.quickCopy.instructions=Quick Copy позволяет быстро экспортировать запись в выбранном  формате. Вы можете скопировать выделенные записи в буфер обмена нажав %S или перетащив прямо в область редактирования в другой программе.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Вы должны добавить хотя
 integration.error.mustInsertBibliography=Вы должны вставить библиографию перед выполнением этой операции.
 integration.error.cannotInsertHere=Сюда нельзя вставить поля Zotero.
 integration.error.notInCitation=Вы должны поместить курсор внутрь цитаты Zotero, чтобы редактировать её.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Текущий стиль цитирования не определяет библиографию. Если вы хотите добавить библиографию, пожалуйста, выберите другой стиль.
 integration.error.deletePipe=Не получилось инициализировать конвейер, который Zotero использует для взаимодействия с текстовым процессором. Вы хотите, чтобы Zotero попробовал исправить эту ошибку? Для этого вам потребуется ввести пароль.
 integration.error.invalidStyle=Выбранный стиль не является допустимым. Если вы сами создали этот стиль, пожалуйста, убедитесь, что он проходит проверку, описанную в https://github.com/citation-style-language/styles/wiki/Validation. Или попробуйте выбрать другой стиль.
diff --git a/chrome/locale/sk-SK/zotero/integration.ftl b/chrome/locale/sk-SK/zotero/integration.ftl
index cb586079c4..1447d533e4 100644
--- a/chrome/locale/sk-SK/zotero/integration.ftl
+++ b/chrome/locale/sk-SK/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Vynechať autora
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Knižnica
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/sk-SK/zotero/preferences.ftl b/chrome/locale/sk-SK/zotero/preferences.ftl
index a431e4491a..09b11508af 100644
--- a/chrome/locale/sk-SK/zotero/preferences.ftl
+++ b/chrome/locale/sk-SK/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synchronizovať
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/sk-SK/zotero/searchbox.dtd b/chrome/locale/sk-SK/zotero/searchbox.dtd
index 9b5d536879..6e6a943d96 100644
--- a/chrome/locale/sk-SK/zotero/searchbox.dtd
+++ b/chrome/locale/sk-SK/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Meno:">
 
-<!ENTITY zotero.search.searchInLibrary "Hľadať v knižnici:">
-
 <!ENTITY zotero.search.joinMode.prefix "Zodpovedá">
 <!ENTITY zotero.search.joinMode.any "ktorémukoľvek">
 <!ENTITY zotero.search.joinMode.all "všetkým">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dni">
 <!ENTITY zotero.search.date.units.months "mesiace">
 <!ENTITY zotero.search.date.units.years "roky">
-
-<!ENTITY zotero.search.search "Hľadať">
-<!ENTITY zotero.search.clear "Vymazať">
-<!ENTITY zotero.search.saveSearch "Uložiť vyhľadávanie">
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index 133a384d45..e86920162b 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Odstrániť záznam...">
 <!ENTITY zotero.toolbar.newGroup "Nová skupina...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nová sub-kolekcia...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Nové uložené hľadanie...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Vysypať kôš">
 <!ENTITY zotero.toolbar.tagSelector.label "Ukázať/skryť výber značiek">
 <!ENTITY zotero.toolbar.actions.label "Akcie">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Možnosti...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora a dokumentácia">
 <!ENTITY zotero.toolbar.about.label "O Zotere">
-<!ENTITY zotero.toolbar.advancedSearch "Pokročilé vyhľadávanie">
 <!ENTITY zotero.toolbar.openURL.label "Nájsť">
 <!ENTITY zotero.toolbar.openURL.tooltip "Nájdi v lokálnej knižnici">
 
diff --git a/chrome/locale/sk-SK/zotero/zotero.ftl b/chrome/locale/sk-SK/zotero/zotero.ftl
index 25b31fe02f..b4c9a08e65 100644
--- a/chrome/locale/sk-SK/zotero/zotero.ftl
+++ b/chrome/locale/sk-SK/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Tlačiť
 general-remove = Odstrániť
 general-add = Pridať
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Zrušiť
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Zobraziť v knižnici
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Uložiť
 general-clear = Vymazať
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Späť
 general-edit = Upraviť
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Čierna
 general-loading = Nahrávam...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Citačný štýl:
 language-label = Jazyk:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Upraviť uložené vyhľadávanie
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Upraviť uložené vyhľadávanie
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Export...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Presunúť nadol
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Rýchle vyhľadávanie
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Pokročilé vyhľadávanie
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Hľadať
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = anotácie
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Polia:
 search-conditions-collection = Kolekcia
 search-conditions-savedSearch = Uložené vyhľadávanie
 search-conditions-itemTypeID = Typ záznamu
 search-conditions-tag = Značka
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Poznámka
 search-conditions-childNote = Vnorená poznámka
 search-conditions-creator = Autor
@@ -715,10 +897,26 @@ search-conditions-dateModified = Zmenené
 search-conditions-fulltextContent = Obsah prílohy
 search-conditions-programmingLanguage = Programovací jazyk
 search-conditions-fileTypeID = Typ priloženého súboru
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Text anotácie
 search-conditions-annotationComment = Komentár k anotácii
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Titul, Autor, Rok
+search-conditions-submenu-attachment = Príloha
+search-conditions-submenu-annotation = Anotácia
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Typ súboru
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Druh rukopisu
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Autor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Prezentácia
 file-type-document = Dokument
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Inštalovať
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Hľadať
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Uložiť
+save-search-name-title = Uložiť vyhľadávanie
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Upraviť poznámku
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Zmeniť typ záznamu
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index 12c60bcbc8..de4c072d21 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=pred rokom
 date.relative.yearsAgo.multiple=pred %S rokmi
 
 pane.collections.title=Collections
-pane.collections.delete.title=Vymazať kolekciu
-pane.collections.delete=Naozaj chcete vymazať vybranú kolekciu?
-pane.collections.delete.keepItems=Záznamy tejto kolekcie sa nevymažú.
-pane.collections.deleteWithItems.title=Vymazať kolekciu a záznamy
-pane.collections.deleteWithItems=Naozaj chcete vymazať vybranú kolekciu a presunúť všetky jej záznamy do koša?
 pane.feed.deleteWithItems.title=Zrušiť odber
 pane.feed.deleteWithItems=Naozaj chcete zrušiť odber týchto RSS správ?
 
-pane.collections.deleteSearch.title=Vymazať hľadanie
-pane.collections.deleteSearch=Naozaj chcete vymazať vybrané vyhľadávanie?
 pane.collections.emptyTrash=Naozaj chcete permanentne odstrániť záznamy umiestnené v koši?
 pane.collections.newSavedSeach=Nové uložené vyhľadávanie
 pane.collections.savedSearchName=Vložte názov pre toto uložené vyhľadávanie:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicitné záznamy
 pane.collections.removeLibrary=Odstrániť knižnicu
 pane.collections.removeLibrary.text=Naozaj chcete permanentne odstrániť “%S” z tohto počítača?
 
-pane.collections.menu.duplicate.savedSearch=Duplikovať uložené vyhľadávanie
 pane.collections.menu.remove.library=Odstrániť knižnicu...
-pane.collections.menu.delete.collection=Vymazať kolekciu...
-pane.collections.menu.delete.collectionAndItems=Vymazať kolekciu a záznamy...
-pane.collections.menu.delete.savedSearch=Vymazať uložené hľadanie...
-pane.collections.menu.delete.feedAndItems=Zrušiť odber z RSS správ...
-pane.collections.menu.export.collection=Exportovať kolekciu...
-pane.collections.menu.export.savedSearch=Exportovať uložené vyhľadávanie...
-pane.collections.menu.export.feed=Exportovať RSS správu...
-pane.collections.menu.createBib.collection=Vytvoriť bibliografiu z kolekcie...
-pane.collections.menu.createBib.savedSearch=Vytvoriť bibliografiu z uloženého vyhľadávania...
-pane.collections.menu.createBib.feed=Vytvoriť bibliografiu z RSS správy...
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Vytvoriť výkaz z kolekcie...
-pane.collections.menu.generateReport.savedSearch=Vyvoriť výkaz z uloženého vyhľadávania...
-pane.collections.menu.generateReport.feed=Vytvoriť výkaz z RSS správy...
-
 pane.collections.menu.refresh.feed=Obnoviť RSS správu
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Označiť RSS správy ako prečítané
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Pre dokončenie procesu obnovy j
 zotero.preferences.sync.reset.fileSyncHistory=Pri nasledujúcej synchronizácii, %1$S skontroluje všetky súbory príloh v “%2$S” v porovnaní s úložiskom. Všetky vzdialené súbory príloh, ktoré chýbajú lokálne, sa stiahnu a lokálne súbory príloh, ktoré chýbajú vzdialene, sa natiahnu.\n\nTáto možnosť nie je nutná pri normálnej prevádzke.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=História synchronizácie súborov pre “%S” bola vymazaná.
 
-zotero.preferences.search.rebuildIndex=Znovu vytvoriť index
-zotero.preferences.search.rebuildWarning=Naozaj chcete znovu vytvoriť celý index? Môže to chvíľu trvať.\n\nAk chcete indexovať iba záznamy, ktoré neboli indexované, použite %S.
-zotero.preferences.search.clearIndex=Vymazať index
-zotero.preferences.search.clearWarning=Po vymazaní indexu nebude možné vyhľadávať v prílohách.\n\nInternetové odkazy nie je možné znovu indexovať bez navštívenia daných stránok. Ak chcete internetové odkazy ponechať indexované, zvoľte %S.
-zotero.preferences.search.clearNonLinkedURLs=Vymazať všetko okrem internetových odkazov
-zotero.preferences.search.indexUnindexed=Indexovať neindexované záznamy
 zotero.preferences.export.quickCopy.citationStyles=Citačné štýly
 zotero.preferences.export.quickCopy.exportFormats=Formáty pre export
 zotero.preferences.export.quickCopy.instructions=Rýchle kopírovanie vám umožňuje rýchly export záznamov v danom formáte. Vybrané záznamy môžete kopírovať do schránky stlačením klávesu %S alebo ich potiahnutím do textového poľa iného programu.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Skôr ako môže byť vykonaná táto oper
 integration.error.mustInsertBibliography=Skôr ako môže byť vykonaná táto operácia musíte vložiť bibliografiu.
 integration.error.cannotInsertHere=Na toto miesto nie je možné vkladať polia Zotero.
 integration.error.notInCitation=Aby ste citáciu mohli upravovať, musíte do nej umiestniť kurzor.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Aktuálne zvolený štýl neobsahuje definíciu pre bibliografiu. Ak chcete vložiť bibliografiu, prosím zvoľte si iný citačný štýl.
 integration.error.deletePipe=Súčasť, ktorú Zotero používa na komunikáciu s textovým editorom sa nepodarilo naštartovať. Želáte si, aby Zotero skúsil napraviť túto poruchu? Budete vyzvaní zadať heslo.
 integration.error.invalidStyle=Zdá sa, že vybraný štýl nie je platný. Ak ste vytvorili tento štýl sami, uistite sa prosím, že prešiel overením podľa pravidiel na http://zotero.org/support/dev/citation_styles. Prípadne skúste zvoliť iný štýl.
diff --git a/chrome/locale/sl-SI/zotero/integration.ftl b/chrome/locale/sl-SI/zotero/integration.ftl
index c27bc80ca2..dd484a0cf0 100644
--- a/chrome/locale/sl-SI/zotero/integration.ftl
+++ b/chrome/locale/sl-SI/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Izpusti avtorja
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Predogled
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Knjižnica
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/sl-SI/zotero/preferences.ftl b/chrome/locale/sl-SI/zotero/preferences.ftl
index de1a2f32a6..dd17dd3e1f 100644
--- a/chrome/locale/sl-SI/zotero/preferences.ftl
+++ b/chrome/locale/sl-SI/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Jezik in področje
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Uskladi
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/sl-SI/zotero/searchbox.dtd b/chrome/locale/sl-SI/zotero/searchbox.dtd
index e554f9056e..a2dfc0ab70 100644
--- a/chrome/locale/sl-SI/zotero/searchbox.dtd
+++ b/chrome/locale/sl-SI/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Ime:">
 
-<!ENTITY zotero.search.searchInLibrary "Išči v knjižnici:">
-
 <!ENTITY zotero.search.joinMode.prefix "Ujemanje">
 <!ENTITY zotero.search.joinMode.any "s katerimkoli">
 <!ENTITY zotero.search.joinMode.all "z vsemi">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dni">
 <!ENTITY zotero.search.date.units.months "mesecev">
 <!ENTITY zotero.search.date.units.years "let">
-
-<!ENTITY zotero.search.search "Išči">
-<!ENTITY zotero.search.clear "Počisti">
-<!ENTITY zotero.search.saveSearch "Shrani iskanje">
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index b7da0f9c9e..36b24b3bd3 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Odstrani vnos ...">
 <!ENTITY zotero.toolbar.newGroup "Nova skupina ...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Nova podzbirka ...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Novo shranjeno iskanje ...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Izprazni koš">
 <!ENTITY zotero.toolbar.tagSelector.label "Pokaži/skrij izbirnik značk">
 <!ENTITY zotero.toolbar.actions.label "Dejanja">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Nastavitve ...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Podpora in dokumentacija">
 <!ENTITY zotero.toolbar.about.label "O Zoteru">
-<!ENTITY zotero.toolbar.advancedSearch "Napredno izkanje">
 <!ENTITY zotero.toolbar.openURL.label "Najdi">
 <!ENTITY zotero.toolbar.openURL.tooltip "Poišči v krajevni knjižnici">
 
diff --git a/chrome/locale/sl-SI/zotero/zotero.ftl b/chrome/locale/sl-SI/zotero/zotero.ftl
index 786ab24470..9a30401252 100644
--- a/chrome/locale/sl-SI/zotero/zotero.ftl
+++ b/chrome/locale/sl-SI/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Vračalka
        *[other] Vračalka
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Natisni
 general-remove = Odstrani
 general-add = Dodaj
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Pokaži navodila za reševanje teža
 general-go-back = Pojdi nazaj
 general-accept = Accept
 general-cancel = Prekliči
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Pokaži v knjižnici
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Shrani
 general-clear = Počisti
+clear-button =
+    .label = { general-clear }
 general-update = Posodobi
 general-back = Nazaj
 general-edit = Uredi
@@ -76,6 +86,8 @@ general-maroon = Kostanjeva
 general-gray = Siva
 general-black = Črna
 general-loading = Nalaganje ...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Slog citiranja:
 language-label = Jezik:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Preimenuj zbirko
-collections-menu-edit-saved-search =
-    .label = Uredi shranjeno iskanje
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Uredi shranjeno iskanje
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Premakni v
 collections-menu-copy-collection =
     .label = Kopiraj v
+collections-menu-export =
+    .label = Izvozi ...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Premakni navzdol
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Ponovno poveži citate Mendeley Desktop
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Hitro iskanje
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Napredno izkanje
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Pokaži kot
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Prenesi { -app-name } za ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Najdi
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = zaznamki
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Iskalni pogoj
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Vrednost
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Polja:
 search-conditions-collection = Zbirka
 search-conditions-savedSearch = Shranjeno iskanje
 search-conditions-itemTypeID = Vrsta vnosa
 search-conditions-tag = Značka
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Opomba
 search-conditions-childNote = Podrejena opomba
 search-conditions-creator = Ustvaril
@@ -715,10 +897,26 @@ search-conditions-dateModified = Datum spremembe
 search-conditions-fulltextContent = Vsebina priponke
 search-conditions-programmingLanguage = Programski jezik
 search-conditions-fileTypeID = Vrsta datoteke priponke
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Besedilo zaznamka
 search-conditions-annotationComment = Komentar zaznamka
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Poljubno polje
+search-conditions-titleCreatorYear = Naslov, avtor, leto
+search-conditions-submenu-attachment = Priponka
+search-conditions-submenu-annotation = Zaznamek
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Vrsta datoteke
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Vrsta
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Avtor
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Predstavitev
 file-type-document = Dokument
 file-type-ebook = E-knjiga
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Prilepi in išči
 mac-word-plugin-install-message = Zotero potrebuje dostop do podatkov Word za namestitev vstavka za Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Namesti dodatek za Word
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Namesti
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Išči
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Shrani
+save-search-name-title = Shrani iskanje
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Preimenuj zbirko
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Uredi opombo
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Spremeni vrsto vnosa
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index 9660e128c5..2db199f0f5 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=pred 1 letom
 date.relative.yearsAgo.multiple=pred %S leti
 
 pane.collections.title=Zbirke
-pane.collections.delete.title=Izbriši zbirko
-pane.collections.delete=Ste prepričani, da želite izbrisati izbrano zbirko?
-pane.collections.delete.keepItems=Vnosi iz te zbirke ne bodo izbrisani.
-pane.collections.deleteWithItems.title=Izbriši zbirko in vnose
-pane.collections.deleteWithItems=Ste prepričani, da želite izbrisati izbrano zbirko in premakniti vse vnose v koš?
 pane.feed.deleteWithItems.title=Odnaroči
 pane.feed.deleteWithItems=Ste prepričani, da se želite odnaročiti s tega vira?
 
-pane.collections.deleteSearch.title=Izbriši iskanje
-pane.collections.deleteSearch=Ste prepričani, da želite izbrisati izbrano iskanje?
 pane.collections.emptyTrash=Ste prepričani, da želite trajno odstraniti vnose iz koša?
 pane.collections.newSavedSeach=Novo shranjeno iskanje
 pane.collections.savedSearchName=Vnesite ime za to shranjeno iskanje:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Podvoji vnose
 pane.collections.removeLibrary=Odstrani knjižnico
 pane.collections.removeLibrary.text=Ste prepričani, da želite zavedno odstraniti »%S« s tega računalnika?
 
-pane.collections.menu.duplicate.savedSearch=Podvoji shranjeno iskanje
 pane.collections.menu.remove.library=Odstrani knjižnico ...
-pane.collections.menu.delete.collection=Izbriši zbirko ...
-pane.collections.menu.delete.collectionAndItems=Izbriši zbirko in vnose ...
-pane.collections.menu.delete.savedSearch=Izbriši shranjeno iskanje ...
-pane.collections.menu.delete.feedAndItems=Odnaroči se z vira ...
-pane.collections.menu.export.collection=Izvozi zbirko ...
-pane.collections.menu.export.savedSearch=Izvozi shranjeno iskanje ...
-pane.collections.menu.export.feed=Izvozi vir ...
-pane.collections.menu.createBib.collection=Ustvari bibliografijo iz zbirke ...
-pane.collections.menu.createBib.savedSearch=Ustvari bibliografijo iz shranjenega iskanja ...
-pane.collections.menu.createBib.feed=Ustvari bibliografijo iz vira ...
 pane.collections.showCollectionInLibrary=Pokaži zbirko v knjižnici
 
-pane.collections.menu.generateReport.collection=Ustvari poročilo iz zbirke ...
-pane.collections.menu.generateReport.savedSearch=Ustvari poročilo iz shranjenega iskanja ...
-pane.collections.menu.generateReport.feed=Tvori poročilo iz vira ...
-
 pane.collections.menu.refresh.feed=Osveži vir
 pane.collections.menu.refresh.allFeeds=Osveži vse vire
 pane.collections.menu.markAsRead.feed=Označi vir kot prebran
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Za dokončanje postopke obnove m
 zotero.preferences.sync.reset.fileSyncHistory=Ob naslednjem usklajevanju bo %S preveril vse datoteke priponk v »%2$S« s storitvijo shrambe. Vse oddaljene datoteke priponk, ki niso hranjene krajevno, bodo prejete, krajevne datoteke priponk, ki jih ni na strežniku, pa bodo tjakaj naložene.\n\nTa možnost ni obvezna za navadno rabo.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Zgodovina usklajevanja datotek za »%S« je počiščena.
 
-zotero.preferences.search.rebuildIndex=Ponovno izdelaj kazalo
-zotero.preferences.search.rebuildWarning=Želite ponovno izdelati celotno kazalo? To je lahko zamudno.\n\nZa indeksiranje samo tistih vnosov, ki niso bili v kazalu, uporabite %S.
-zotero.preferences.search.clearIndex=Počisti kazalo
-zotero.preferences.search.clearWarning=Po čiščenju kazala po vsebini priponk več ne bo mogoče iskati.\n\nPriponke s spletnih povezav ne morejo biti ponovno indeksirane brez obiska teh strani. Če želite ohraniti spletne povezave indeksirane, izberite %S.
-zotero.preferences.search.clearNonLinkedURLs=Počisti vse razen spletnih povezav
-zotero.preferences.search.indexUnindexed=Indeksiraj neindeksirane vnose
 zotero.preferences.export.quickCopy.citationStyles=Slogi navajanja
 zotero.preferences.export.quickCopy.exportFormats=Vrste izvoza
 zotero.preferences.export.quickCopy.instructions=Hitro kopiranje omogoča hitri izvoz elementov v danem zapisu. Izbrane elemente lahko kopirate na odložišče s pritiskom tipke za bližnjico %S ali vleko vnosov v besedilno polje v drugem programu.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Citat morate vstaviti pred izvajanjem tega
 integration.error.mustInsertBibliography=Bibliografijo morate vstaviti pred izvajanjem tega dejanja.
 integration.error.cannotInsertHere=Polj Zotero ne morete vstaviti semkaj.
 integration.error.notInCitation=Če želite citat Zotero urejati, morate vanj postaviti kazalko.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Trenutni slog bibliografije ne določa bibliografije. Če želite dodati bibliografijo, izberite drug slog.
 integration.error.deletePipe=Kanala, ki ga Zotero uporablja za komuniciranje z urejevalnikom besedil, ni mogoče inicializirati. Želite, da Zotero skuša odpraviti to napako? Vnesti boste morali geslo.
 integration.error.invalidStyle=Slog, ki ste ga izbrali, se ne zdi veljaven. Če ste ta slog ustvarili sami, zagotovite, da uspešno prestane preverjanje, kot je opisano na naslovu http://zotero.org/support/dev/citation_styles. Sicer raje izberite drug slog.
diff --git a/chrome/locale/sr-RS/zotero/integration.ftl b/chrome/locale/sr-RS/zotero/integration.ftl
index ceebdc6952..918e10307d 100644
--- a/chrome/locale/sr-RS/zotero/integration.ftl
+++ b/chrome/locale/sr-RS/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Прескочи аутора
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Преглед
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Библиотека
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/sr-RS/zotero/preferences.ftl b/chrome/locale/sr-RS/zotero/preferences.ftl
index bc4ab01e6f..f38475d960 100644
--- a/chrome/locale/sr-RS/zotero/preferences.ftl
+++ b/chrome/locale/sr-RS/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Језик и регион
 preferences-advanced-enable-bidi-ui =
     .label = Омогући алате за двосмерно уређивање текста
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Усклади
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/sr-RS/zotero/searchbox.dtd b/chrome/locale/sr-RS/zotero/searchbox.dtd
index 8841901970..22e6a31c7e 100644
--- a/chrome/locale/sr-RS/zotero/searchbox.dtd
+++ b/chrome/locale/sr-RS/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Име:">
 
-<!ENTITY zotero.search.searchInLibrary "Потражи у библиотеци:">
-
 <!ENTITY zotero.search.joinMode.prefix "Поклопи">
 <!ENTITY zotero.search.joinMode.any "било шта">
 <!ENTITY zotero.search.joinMode.all "све">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "дани">
 <!ENTITY zotero.search.date.units.months "месеци">
 <!ENTITY zotero.search.date.units.years "године">
-
-<!ENTITY zotero.search.search "Претражи">
-<!ENTITY zotero.search.clear "Очисти">
-<!ENTITY zotero.search.saveSearch "Сачувај претрагу">
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index 6b853c5347..69046f7133 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Уклони ставку…">
 <!ENTITY zotero.toolbar.newGroup "Нова група…">
 <!ENTITY zotero.toolbar.newSubcollection.label "Нова подзбирка…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Нова сачувана претрага…">
 <!ENTITY zotero.toolbar.emptyTrash.label "Испразни корпу за отпатке">
 <!ENTITY zotero.toolbar.tagSelector.label "Покажи/сакриј изборника ознаке">
 <!ENTITY zotero.toolbar.actions.label "Радње">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Поставке…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Подршка и документација">
 <!ENTITY zotero.toolbar.about.label "О програму Зотеро">
-<!ENTITY zotero.toolbar.advancedSearch "Напредна претрага">
 <!ENTITY zotero.toolbar.openURL.label "Пронађи">
 <!ENTITY zotero.toolbar.openURL.tooltip "Налази ставу у вашој локалној библиотеци">
 
diff --git a/chrome/locale/sr-RS/zotero/zotero.ftl b/chrome/locale/sr-RS/zotero/zotero.ftl
index 788768d27a..75f396e3cd 100644
--- a/chrome/locale/sr-RS/zotero/zotero.ftl
+++ b/chrome/locale/sr-RS/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Штампај
 general-remove = Уклони
 general-add = Додај
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Погледај упутства з
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Откажи
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Прикажи у библиотеци
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Покрени у режиму за тражење проблема
 general-save = Сачувај
 general-clear = Очисти
+clear-button =
+    .label = { general-clear }
 general-update = Ажурирање
 general-back = Назад
 general-edit = Уређивање
@@ -76,6 +86,8 @@ general-maroon = Смеђе
 general-gray = Сиво
 general-black = Црно
 general-loading = Учитавам…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Стил цитата:
 language-label = Језик:
 menu-custom-group-submenu =
@@ -162,14 +174,111 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Преименуј збирку
-collections-menu-edit-saved-search =
-    .label = Уреди сачувану претрагу
+items-section-collections-selected =
+    { $count ->
+        [one] Изабрана је { $count } збирка
+        [few] Изабране су { $count } збирке
+       *[other] Изабрано је { $count } збирки
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Уреди сачувану претрагу
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Премести у
 collections-menu-copy-collection =
     .label = Копирај у
+collections-menu-export =
+    .label = Извоз…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Премести доле
 item-creator-moveToTop =
@@ -282,6 +391,7 @@ import-online-relink-only =
     .label = Поново повежи цитате из Мендељејева
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } не може да се повеже на { $targetApp }. Проверите везу са интернетом и покушајте поново.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -627,6 +737,18 @@ quicksearch-input =
     .aria-label = Брза претрага
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Напредна претрага
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Прегледај као
 item-pane-header-none =
@@ -690,9 +812,64 @@ architecture-x64-on-arm64-action = Преузми { -app-name } за АРМ64
 first-run-guidance-authorMenu = { -app-name } вам дозвољава да унесете уредника и преводиоца. Можете да поставите аутора за уредника или преводиоца из овог менија.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Нађи
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = напомене
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Услов за претрагу
     .label = { $label }
@@ -702,11 +879,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Вредност
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Поља:
 search-conditions-collection = Колекција
 search-conditions-savedSearch = Сачувана претрага
 search-conditions-itemTypeID = Врста ставке
 search-conditions-tag = Ознака
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Белешка
 search-conditions-childNote = Подбелешка
 search-conditions-creator = Аутор
@@ -725,10 +908,26 @@ search-conditions-dateModified = Датум промене
 search-conditions-fulltextContent = Садржај прилога
 search-conditions-programmingLanguage = Програмски језик
 search-conditions-fileTypeID = Врста приложене датотеке
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Текст напомене
 search-conditions-annotationComment = Коментар напомене
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Сва поља
+search-conditions-titleCreatorYear = Наслов, аутор, година
+search-conditions-submenu-attachment = Прилог
+search-conditions-submenu-annotation = Напомена
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Врста датотеке
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Врста
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Аутор
 find-pdf-files-added =
     { $count ->
         [one] { $count } поље је додато
@@ -762,6 +961,9 @@ file-type-video = Видео
 file-type-presentation = Презентација
 file-type-document = Документ
 file-type-ebook = Е-књига
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -770,18 +972,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Убаци и претражи
 mac-word-plugin-install-message = Зотеро треба да приступи подацима програма Word како би инсталирао прикључак за Word.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Инсталирај Word прикључак
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Инсталирај
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -800,3 +1007,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Претрага
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Сачувај
+save-search-name-title = Сачувај претрагу
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Преименуј збирку
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Уреди белешку
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Промени врсту ставке
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index a804b0d772..8b5700e70a 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=Прошле године
 date.relative.yearsAgo.multiple=Пре %S година
 
 pane.collections.title=Збирке
-pane.collections.delete.title=Обриши збирку
-pane.collections.delete=Да ли желите да избришете изабране збирке?
-pane.collections.delete.keepItems=Ставке унутар ове збирке неће бити обрисане
-pane.collections.deleteWithItems.title=Обриши збирку и ставке
-pane.collections.deleteWithItems=Да ли желите да избришете изабрану збирку и преместити све њене ставке у Смеће?
 pane.feed.deleteWithItems.title=Прекини претплату
 pane.feed.deleteWithItems=Да ли заиста желите да прекинете претплату на овај довод?
 
-pane.collections.deleteSearch.title=Брисање претраге
-pane.collections.deleteSearch=Да ли желите да избришете изабране претраге?
 pane.collections.emptyTrash=Да ли желите да трајно избришете ставке из Смећа?
 pane.collections.newSavedSeach=Нова сачувана претрага
 pane.collections.savedSearchName=Унесите назив за ову сачувану претрагу:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Дуплиране ставке
 pane.collections.removeLibrary=Уклони библиотеку
 pane.collections.removeLibrary.text=Да ли желите да трајно уклоните „%S“ са вашег рачунара?
 
-pane.collections.menu.duplicate.savedSearch=Удвостручи сачувану претрагу
 pane.collections.menu.remove.library=Уклони библиотеку…
-pane.collections.menu.delete.collection=Обриши збирку…
-pane.collections.menu.delete.collectionAndItems=Обриши збирку и ставке…
-pane.collections.menu.delete.savedSearch=Обриши сачувану претрагу…
-pane.collections.menu.delete.feedAndItems=Одјави се са довода…
-pane.collections.menu.export.collection=Извези збирку…
-pane.collections.menu.export.savedSearch=Извези сачувану претрагу…
-pane.collections.menu.export.feed=Извези довод…
-pane.collections.menu.createBib.collection=Направи библиографију од збирке…
-pane.collections.menu.createBib.savedSearch=Направи бибилиографију од сачуване претраге…
-pane.collections.menu.createBib.feed=Направи библиографију из довода…
 pane.collections.showCollectionInLibrary=Прикажи збирку у билиотеци
 
-pane.collections.menu.generateReport.collection=Напиши извештај на основу збирке...
-pane.collections.menu.generateReport.savedSearch=Напиши извештај на основу сачуване претраге...
-pane.collections.menu.generateReport.feed=Направи извештај на основу довода…
-
 pane.collections.menu.refresh.feed=Освежи довод
 pane.collections.menu.refresh.allFeeds=Освежи све доводе
 pane.collections.menu.markAsRead.feed=Означи довод као прочитан
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Морате покренути
 zotero.preferences.sync.reset.fileSyncHistory=Приликом следећег усклађивања, %1$S ће упоредити све приложене датотеке у „%2$S“ са онима на сервису за складиштење. Сви прилози који недостају у локалу ће бити преузети, док ће локалне датотеке бити послате на сервис.\n\nОва опција није неопходна приликом редовног коришћења.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Очишћен је историјат усклађивања за „%S“.
 
-zotero.preferences.search.rebuildIndex=Поново изгради индекс
-zotero.preferences.search.rebuildWarning=Да ли желите изградити читав индекс? Ово може потрајати.\n\nДа би индексирали само ставке које нису биле индексиране користите %S.
-zotero.preferences.search.clearIndex=Очисти индекс
-zotero.preferences.search.clearWarning=После чишћења индекса, нећете моћи да претражите садржај приложених датотека.\n\nПрилози у облику везе на вебу се могу индексирати само ако посетите веб страницу. Ако желите да оставите индексе веб прилоге, изаберите %S.
-zotero.preferences.search.clearNonLinkedURLs=Избриши све осим веб прилога
-zotero.preferences.search.indexUnindexed=Индексирај неиндексиране ставке
 zotero.preferences.export.quickCopy.citationStyles=Стилови цитата
 zotero.preferences.export.quickCopy.exportFormats=Формат за извоз
 zotero.preferences.export.quickCopy.instructions=Брзо копирање вам дозвољава да брзо извезете ставке у жељени формат. Можете копирати изабране ставке у оставу притиском на %S и превлачењем ставки директно у текстуално поље унутар другог програма.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Морате уметнути цитат п
 integration.error.mustInsertBibliography=Морате уметнути библиографију пре покретања ове радње.
 integration.error.cannotInsertHere=Не можете да уметнете Зотерова поља овде.
 integration.error.notInCitation=Морате да поставите курсор на Зотеров цитат како би га изменили.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Тренутни стил библиографије не одређује библиографију. Уколико желите да додате библиографију, изаберите други стил.
 integration.error.deletePipe=Не могу да покренем цевовод који Зотеро користи за комуникацију са програмом за текст. Да ли желите да Зотеро покуша да исправи ову грешку? Бићете упитани да унесете вашу лозинку.
 integration.error.invalidStyle=Стил који сте изабрали не изгледа исправно. Уколико сте сами направили овај стил, проверите да ли он пролази тест који можете наћи на https://github.com/citation-style-language/styles/wiki/Validation. Поред тога, можете изабрати неки други стил.
diff --git a/chrome/locale/sv-SE/zotero/integration.ftl b/chrome/locale/sv-SE/zotero/integration.ftl
index 2803672e63..5004b590bd 100644
--- a/chrome/locale/sv-SE/zotero/integration.ftl
+++ b/chrome/locale/sv-SE/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Förhandsvisa
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Bibliotek
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Förkasta ändringar
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/sv-SE/zotero/preferences.ftl b/chrome/locale/sv-SE/zotero/preferences.ftl
index 3da8adbe22..8c61307d68 100644
--- a/chrome/locale/sv-SE/zotero/preferences.ftl
+++ b/chrome/locale/sv-SE/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Språk och region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Synkronisera
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/sv-SE/zotero/searchbox.dtd b/chrome/locale/sv-SE/zotero/searchbox.dtd
index 94f2cbd60d..987d22d81f 100644
--- a/chrome/locale/sv-SE/zotero/searchbox.dtd
+++ b/chrome/locale/sv-SE/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Namn:">
 
-<!ENTITY zotero.search.searchInLibrary "Sök i bibliotek:">
-
 <!ENTITY zotero.search.joinMode.prefix "Hitta">
 <!ENTITY zotero.search.joinMode.any "vilken som helst">
 <!ENTITY zotero.search.joinMode.all "alla">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "dagar">
 <!ENTITY zotero.search.date.units.months "månader">
 <!ENTITY zotero.search.date.units.years "år">
-
-<!ENTITY zotero.search.search "Sök">
-<!ENTITY zotero.search.clear "Rensa">
-<!ENTITY zotero.search.saveSearch "Spara sökning">
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index 2136c5ffb5..a013b13056 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Radera källa...">
 <!ENTITY zotero.toolbar.newGroup "Ny grupp...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Ny undersamling...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Ny sparad sökning...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Töm papperskorg">
 <!ENTITY zotero.toolbar.tagSelector.label "Visa/göm etikettväljare">
 <!ENTITY zotero.toolbar.actions.label "Åtgärder">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Inställningar...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hjälp och dokumentation">
 <!ENTITY zotero.toolbar.about.label "Om Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Avancerad sökning">
 <!ENTITY zotero.toolbar.openURL.label "Hitta">
 <!ENTITY zotero.toolbar.openURL.tooltip "Hitta på ditt lokala bibliotek">
 
diff --git a/chrome/locale/sv-SE/zotero/zotero.ftl b/chrome/locale/sv-SE/zotero/zotero.ftl
index 5657000b19..2c6754cf02 100644
--- a/chrome/locale/sv-SE/zotero/zotero.ftl
+++ b/chrome/locale/sv-SE/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Skriv ut
 general-remove = Ta bort
 general-add = Lägg till
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Gå bakåt
 general-accept = Acceptera
 general-cancel = Avbryt
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Visa i biblioteket
 general-restartApp = Starta om { -app-name }
 general-restartInTroubleshootingMode = Starta om i felsökningsläge
 general-save = Spara
 general-clear = Rensa
+clear-button =
+    .label = { general-clear }
 general-update = Uppdatera
 general-back = Bakåt
 general-edit = Redigera
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Grå
 general-black = Svart
 general-loading = Laddar…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Referensstil
 language-label = Språk:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Byt namn på samling
-collections-menu-edit-saved-search =
-    .label = Redigera sparad sökning
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Redigera sparad sökning
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Flytta till
 collections-menu-copy-collection =
     .label = Kopiera till
+collections-menu-export =
+    .label = Exportera...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Flytta ner
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Snabbsökning
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Avancerad sökning
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Visa som
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Hitta
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Värde
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Fält:
 search-conditions-collection = Samling
 search-conditions-savedSearch = Sparad sökning
 search-conditions-itemTypeID = Källtyp
 search-conditions-tag = Etikett
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Anteckning
 search-conditions-childNote = Underordnad anteckning
 search-conditions-creator = Skapare
@@ -715,10 +897,26 @@ search-conditions-dateModified = Ändringsdatum
 search-conditions-fulltextContent = Bilagans innehåll
 search-conditions-programmingLanguage = Programmeringsspråk
 search-conditions-fileTypeID = Bifogad filtyp
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Kommentarstext
 search-conditions-annotationComment = Kommentar
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Titel, skapare, år
+search-conditions-submenu-attachment = Bilaga
+search-conditions-submenu-annotation = Kommentar
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Filtyp
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Typ
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Författare
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Presentation
 file-type-document = Dokument
 file-type-ebook = E-bok
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Klistra in och sök
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Installera
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Sök
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Spara
+save-search-name-title = Spara sökning
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Byt namn på samling
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Redigera anteckning
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Ändra källtyp
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index 2186c17e13..4a4d0e1004 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 år sen
 date.relative.yearsAgo.multiple=%S år sen
 
 pane.collections.title=Samlingar
-pane.collections.delete.title=Radera samling
-pane.collections.delete=Är du säker på att du vill ta bort den valda samlingen?
-pane.collections.delete.keepItems=Källor i denna samling kommer inte att raderas
-pane.collections.deleteWithItems.title=Radera samling och källor
-pane.collections.deleteWithItems=Är du säker på att du vill radera de valda samlingarna och flytta alla källor i dem till papperskorgen?
 pane.feed.deleteWithItems.title=Avprenumerera
 pane.feed.deleteWithItems=Är du säker på att du vill avprenumerera från denna matning?
 
-pane.collections.deleteSearch.title=Radera sökning
-pane.collections.deleteSearch=Är du säker på att du vill radera den valda sökningen?
 pane.collections.emptyTrash=Är du säker på att du vill ta bort papperskorgens innehåll för alltid?
 pane.collections.newSavedSeach=Ny sparad sökning
 pane.collections.savedSearchName=Skriv in ett namn för den här sparade sökningen:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Källdubbletter
 pane.collections.removeLibrary=Radera biblioteket
 pane.collections.removeLibrary.text=Är du säker på att du permanent vill radera “%S” från denna dator?
 
-pane.collections.menu.duplicate.savedSearch=Dublett av sparad sökning
 pane.collections.menu.remove.library=Radera biblioteket…
-pane.collections.menu.delete.collection=Radera samling…
-pane.collections.menu.delete.collectionAndItems=Radera samling och källor…
-pane.collections.menu.delete.savedSearch=Radera sparad sökning…
-pane.collections.menu.delete.feedAndItems=Avprenumerera matning…
-pane.collections.menu.export.collection=Exportera samling...
-pane.collections.menu.export.savedSearch=Exportera sparad sökning...
-pane.collections.menu.export.feed=Exportera matning…
-pane.collections.menu.createBib.collection=Skapa källförteckning från samling…
-pane.collections.menu.createBib.savedSearch=Skapa källförteckning från sparad sökning…
-pane.collections.menu.createBib.feed=Skapa källförteckning från matning…
 pane.collections.showCollectionInLibrary=Visa Samling i Biblioteket
 
-pane.collections.menu.generateReport.collection=Skapa rapport från samling...
-pane.collections.menu.generateReport.savedSearch=Skapa rapport från sparad sökning...
-pane.collections.menu.generateReport.feed=Skapa rapport från matning…
-
 pane.collections.menu.refresh.feed=Uppdatera matning
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Markera matning som läst
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox måste startas om för a
 zotero.preferences.sync.reset.fileSyncHistory=Vid nästa synkronisering kommer %1$S jämföra alla bifogade filer i “%2$S” med dem i lagringstjänsten. Eventuella bifogade filer som saknas lokalt kommer att laddas ned, och lokala bifogade filer som saknas i lagringstjänsten kommer att laddas upp.\n\nDetta alternativ är inte nödvändigt vid normal användning.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=Synkroniseringshistoriken för “%S” har rensats.
 
-zotero.preferences.search.rebuildIndex=Bygg om index
-zotero.preferences.search.rebuildWarning=Vill du bygga om hela indexet? Det kan ta ett tag.\n\nFör att bara indexera källor som inte tidigare indexerats, använd %S.
-zotero.preferences.search.clearIndex=Nollställ index
-zotero.preferences.search.clearWarning=Efter att index har nollställts kommer bifogat innehåll inte längre vara sökbart.\n\nBifogade webblänkar kan inte indexeras om utan att sidan besöks igen. För att låta webblänkar fortsätta vara indexerade, välj %S.
-zotero.preferences.search.clearNonLinkedURLs=Nollställ allt utom webblänkar
-zotero.preferences.search.indexUnindexed=Indexera ej redan indexerade källor
 zotero.preferences.export.quickCopy.citationStyles=Referensstilar
 zotero.preferences.export.quickCopy.exportFormats=Exportformat
 zotero.preferences.export.quickCopy.instructions=Snabbkopiering ger dig möjligheten att snabbt exportera källor enligt ett valt format. Du kan kopiera valda källor till urklipp genom att trycka %S eller genom att dra källorna till en textinmatningsyta i ett annat program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Du måste sätta in en källhänvisning inn
 integration.error.mustInsertBibliography=Du måste sätta in en källförteckning innan du gör detta.
 integration.error.cannotInsertHere=Zoterofält kan inte sättas in här.
 integration.error.notInCitation=Du måste sätta markören i en Zoteroreferens för att ändra den.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Den nuvarande referensstilen definierar ingen källförteckning. Om du vill lägga till en källförteckning så välj en annan referensstil.
 integration.error.deletePipe=Förbindelsen som Zotero använder för att kommunicera med ordbehandlaren kunde inte startas. Vill du att Zotero ska försöka rätta till detta fel? Du kommer att tillfrågas om ditt lösenord.
 integration.error.invalidStyle=Den referensstil du har valt fungerar inte. Om du har skapat stilen själv, kontrollera att den fungerar enligt instruktionerna på https://github.com/citation-style-language/styles/wiki/Validation. Annars kan du välja en annan stil.
diff --git a/chrome/locale/ta/zotero/integration.ftl b/chrome/locale/ta/zotero/integration.ftl
index 1809150430..3097616a79 100644
--- a/chrome/locale/ta/zotero/integration.ftl
+++ b/chrome/locale/ta/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = எழுத்தாளரை ஓப்பு
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = நூலகம்
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/ta/zotero/preferences.ftl b/chrome/locale/ta/zotero/preferences.ftl
index 834558a3ec..edca83e802 100644
--- a/chrome/locale/ta/zotero/preferences.ftl
+++ b/chrome/locale/ta/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = ஒத்திசைவு
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/ta/zotero/searchbox.dtd b/chrome/locale/ta/zotero/searchbox.dtd
index e5fb94c424..6bfa764f2b 100644
--- a/chrome/locale/ta/zotero/searchbox.dtd
+++ b/chrome/locale/ta/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "பெயர்:">
 
-<!ENTITY zotero.search.searchInLibrary "நூலகத்தில் தேடு:">
-
 <!ENTITY zotero.search.joinMode.prefix "பொருத்துக">
 <!ENTITY zotero.search.joinMode.any "ஏதேனும்">
 <!ENTITY zotero.search.joinMode.all "அனைத்தும்">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "நாட்களில்">
 <!ENTITY zotero.search.date.units.months "மாதங்கள்">
 <!ENTITY zotero.search.date.units.years "ஆண்டுகள்">
-
-<!ENTITY zotero.search.search "தேடல்">
-<!ENTITY zotero.search.clear "அழி">
-<!ENTITY zotero.search.saveSearch "தேடலைச் சேமி">
diff --git a/chrome/locale/ta/zotero/zotero.dtd b/chrome/locale/ta/zotero/zotero.dtd
index 4ae478dbaa..3bbab848ad 100644
--- a/chrome/locale/ta/zotero/zotero.dtd
+++ b/chrome/locale/ta/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "உருப்படியை அகற்று…">
 <!ENTITY zotero.toolbar.newGroup "புதிய குழு…">
 <!ENTITY zotero.toolbar.newSubcollection.label "புதிய துணைக்குழு…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "புதிய சேமித்த தேடல்…">
 <!ENTITY zotero.toolbar.emptyTrash.label "வெற்று குப்பை">
 <!ENTITY zotero.toolbar.tagSelector.label "குறிச்சொல் தேர்வாளரைக் காட்டு/மறைக்கவும்">
 <!ENTITY zotero.toolbar.actions.label "செயல்கள்">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "விருப்பத்தேர்வுகள்…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "உதவி மற்றும் ஆவணங்கள்">
 <!ENTITY zotero.toolbar.about.label "சோட்டெரோ பற்றி">
-<!ENTITY zotero.toolbar.advancedSearch "மேம்பட்ட தேடல்">
 <!ENTITY zotero.toolbar.openURL.label "கண்டுபிடி">
 <!ENTITY zotero.toolbar.openURL.tooltip "உங்கள் உள்ளக நூலகம் மூலம் கண்டுபிடிக்கவும்">
 
diff --git a/chrome/locale/ta/zotero/zotero.ftl b/chrome/locale/ta/zotero/zotero.ftl
index 1228d08702..2136445542 100644
--- a/chrome/locale/ta/zotero/zotero.ftl
+++ b/chrome/locale/ta/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] நீக்கு
        *[other] பின்வெளி
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = அச்சிடு
 general-remove = அகற்று
 general-add = கூட்டு
@@ -34,17 +40,21 @@ general-open-settings = அமைப்புகள் திற
 general-settings = அமைப்புகள்…
 general-help = உதவி
 general-tag = குறிச்சொல்
-general-got-it = Got It
+general-got-it = அறிந்துகொண்டேன்
 general-done = முடிந்தது
 general-view-troubleshooting-instructions = பிழைகண்டறியும் வழிமுறைகளைப் பார்
 general-go-back = பின் செல்
 general-accept = ஏற்பு
 general-cancel = நீக்கறல்
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = நூலகத்தில் காண்பி
 general-restartApp = மறுதொடக்கம் { -app-name }
 general-restartInTroubleshootingMode = பிழைகண்டறியும் முறையில் மறுதொடக்கம்
 general-save = சேமி
 general-clear = அழி
+clear-button =
+    .label = { general-clear }
 general-update = புதுப்பிப்பு
 general-back = பின்
 general-edit = தொகு
@@ -76,6 +86,8 @@ general-maroon = மெரூன்
 general-gray = சாம்பல்
 general-black = கருப்பு
 general-loading = ஏற்றுகிறது…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = மேற்கோள் நடை:
 language-label = மொழி:
 menu-custom-group-submenu =
@@ -123,11 +135,11 @@ menu-view-columns-move-left =
 menu-view-columns-move-right =
     .label = நெடுவரிசையை வலது பக்கம் நகர்த்து
 menu-view-hide-context-annotation-rows =
-    .label = Hide Non-Matching Annotations
+    .label = பொருந்தாத சிறுகுறிப்புகளை மறை
 menu-view-note-font-size =
     .label = குறிப்பு எழுத்துரு அளவு
 menu-view-note-tab-font-size =
-    .label = Note Tab Font Size
+    .label = குறிப்பு தாவல் எழுத்துரு அளவு
 menu-show-tabs-menu =
     .label = தாவல்கள் பட்டியலைக் காட்டு
 menu-edit-copy-annotation =
@@ -157,19 +169,115 @@ zotero-toolbar-tabs-scroll-backwards =
     .title = பின்னோக்கி உருட்டு
 toolbar-add-attachment =
     .tooltiptext = { add-attachment }
-recently-read = Recently Read
+recently-read = அண்மையில் படித்தது
 collections-menu-show-recently-read =
-    .label = Show { recently-read }
+    .label = காட்டு { recently-read }
 item-menu-remove-from-recently-read =
-    .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = சேகரிப்பை மறுபெயரிடு
-collections-menu-edit-saved-search =
-    .label = சேமித்த தேடலைத் திருத்து
+    .label = { recently-read } இல் இருந்து நீக்கு…
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = சேமித்த தேடலைத் திருத்து
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = இதற்கு நகர்த்து
 collections-menu-copy-collection =
     .label = இதற்கு நகலெடு
+collections-menu-export =
+    .label = ஏற்றுமதி…
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = கீழே இறங்கு
 item-creator-moveToTop =
@@ -203,11 +311,11 @@ item-menu-viewAttachment =
 item-menu-add-file =
     .label = கோப்பு
 item-menu-add-linked-file =
-    .label = Linked File
+    .label = இணைகப்பட்ட கோப்பு
 item-menu-add-url =
-    .label = Web Link
+    .label = வலை இணைப்பு
 item-menu-change-parent-item =
-    .label = Change Parent Item…
+    .label = பெற்றோர் உருப்படியை மாற்று…
 item-menu-relate-items =
     .label = Relate Items
 view-online = நிகழ்நிலையில் காண்க
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = விரைவு தேடல்
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = மேம்பட்ட தேடல்
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = கண்டுபிடி
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = சிறுகுறிப்புகள்
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = புலங்கள்:
 search-conditions-collection = சேகரிப்பு
 search-conditions-savedSearch = சேமித்த தேடல்
 search-conditions-itemTypeID = உருப்படி வகை
 search-conditions-tag = குறிச்சொல்
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = குறிப்பு
 search-conditions-childNote = குழந்தை குறிப்பு
 search-conditions-creator = உருவாக்கியவர்
@@ -715,10 +897,26 @@ search-conditions-dateModified = மாற்றியமைக்கப்ப
 search-conditions-fulltextContent = இணைப்பு உள்ளடக்கம்
 search-conditions-programmingLanguage = நிரலாக்க மொழி
 search-conditions-fileTypeID = இணைப்புக் கோப்பு வகை
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = சிறுகுறிப்பு உரை
 search-conditions-annotationComment = சிறுகுறிப்பு கருத்து
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = எந்தப் புலமும்
+search-conditions-titleCreatorYear = தலைப்பு, உருவாக்கியவர், ஆண்டு
+search-conditions-submenu-attachment = இணைப்பு
+search-conditions-submenu-annotation = சிறுகுறி
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = கோப்பு வகை
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = வகை
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = நூலாசிரியர்
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = நிகழ்படம்
 file-type-presentation = விளக்கக்காட்சி
 file-type-document = ஆவணம்
 file-type-ebook = மின்புத்தகம்
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = நிறுவு
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = தேடல்
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = சேமி
+save-search-name-title = தேடலைச் சேமி
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = சேகரிப்பை மறுபெயரிடு
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Edit Note
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = உருப்படி வகையை மாற்று
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/ta/zotero/zotero.properties b/chrome/locale/ta/zotero/zotero.properties
index ab52ac0a7e..02e8f30506 100644
--- a/chrome/locale/ta/zotero/zotero.properties
+++ b/chrome/locale/ta/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 ஆண்டு முன்பு
 date.relative.yearsAgo.multiple=%S ஆண்டுகளுக்கு முன்பு
 
 pane.collections.title=சேகரிப்புகள்
-pane.collections.delete.title=சேகரிப்பை நீக்கு
-pane.collections.delete=தேர்ந்தெடுக்கப்பட்ட தொகுப்பை நீக்க விரும்புகிறீர்களா?
-pane.collections.delete.keepItems=இந்தச் சேகரிப்பில் உள்ள உருப்படிகள் நீக்கப்படாது.
-pane.collections.deleteWithItems.title=சேகரிப்பு மற்றும் உருப்படிகளை நீக்கு
-pane.collections.deleteWithItems=தேர்ந்தெடுக்கப்பட்ட சேகரிப்பை நீக்கி, அதற்குள் உள்ள அனைத்து பொருட்களையும் குப்பைக்கு நகர்த்த விரும்புகிறீர்களா?
 pane.feed.deleteWithItems.title=குழுவிலகவும்
 pane.feed.deleteWithItems=இந்த ஊட்டத்திலிருந்து நீங்கள் குழுவிலக விரும்புகிறீர்களா?
 
-pane.collections.deleteSearch.title=தேடலை நீக்கு
-pane.collections.deleteSearch=தேர்ந்தெடுக்கப்பட்ட தேடலை நீக்க விரும்புகிறீர்களா?
 pane.collections.emptyTrash=குப்பையில் உள்ள பொருட்களை நிரந்தரமாக அகற்ற விரும்புகிறீர்களா?
 pane.collections.newSavedSeach=புதிய சேமித்த தேடல்
 pane.collections.savedSearchName=இந்த சேமித்த தேடலுக்கு ஒரு பெயரை உள்ளிடவும்:
@@ -277,24 +270,9 @@ pane.collections.duplicate=நகல் உருப்படிகள்
 pane.collections.removeLibrary=நூலகத்தை அகற்று
 pane.collections.removeLibrary.text=இந்த கணினியிலிருந்து “%S” ஐ நிரந்தரமாக அகற்ற விரும்புகிறீர்களா?
 
-pane.collections.menu.duplicate.savedSearch=நகல் சேமித்த தேடல்
 pane.collections.menu.remove.library=நூலகத்தை அகற்று…
-pane.collections.menu.delete.collection=சேகரிப்பை நீக்கு…
-pane.collections.menu.delete.collectionAndItems=சேகரிப்பு மற்றும் உருப்படிகளை நீக்கு…
-pane.collections.menu.delete.savedSearch=சேமித்த தேடலை நீக்கு…
-pane.collections.menu.delete.feedAndItems=ஊட்டத்திலிருந்து குழுவிலகவும்…
-pane.collections.menu.export.collection=ஏற்றுமதி சேகரிப்பு…
-pane.collections.menu.export.savedSearch=ஏற்றுமதி சேமித்த தேடல்…
-pane.collections.menu.export.feed=ஏற்றுமதி ஊட்டம்…
-pane.collections.menu.createBib.collection=சேகரிப்பிலிருந்து நூலியல் உருவாக்கவும்…
-pane.collections.menu.createBib.savedSearch=சேமித்த தேடலில் இருந்து நூலியல் உருவாக்கவும்…
-pane.collections.menu.createBib.feed=ஊட்டத்திலிருந்து நூலியல் உருவாக்கு…
 pane.collections.showCollectionInLibrary=நூலகத்தில் சேகரிப்பைக் காட்டு
 
-pane.collections.menu.generateReport.collection=சேகரிப்பிலிருந்து அறிக்கையை உருவாக்குங்கள்…
-pane.collections.menu.generateReport.savedSearch=சேமித்த தேடலில் இருந்து அறிக்கையை உருவாக்குங்கள்…
-pane.collections.menu.generateReport.feed=ஊட்டத்திலிருந்து அறிக்கையை உருவாக்குங்கள்…
-
 pane.collections.menu.refresh.feed=ஊட்டத்தை புதுப்பிக்கவும்
 pane.collections.menu.refresh.allFeeds=அனைத்து ஊட்டங்களையும் புதுப்பிக்கவும்
 pane.collections.menu.markAsRead.feed=ஊட்டத்தை படித்தாக குறிக்கவும்
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=மீட்டெடுப்
 zotero.preferences.sync.reset.fileSyncHistory=அடுத்த ஒத்திசைவில், %1$S அனைத்து இணைப்பு கோப்புகளையும் சேமிப்பக சேவைக்கு எதிராக “%2$S” இல் சரிபார்க்கும். உள்நாட்டில் காணாமல் போன எந்தத் தொலைநிலை இணைப்புக் கோப்புகளும் பதிவிறக்கம் செய்யப்படும், மேலும் உள்ளக இணைப்புக் கோப்புகள் தொலைதூரத்தில் காணாமல் போகும். \n\n சாதாரண பயன்பாட்டின்போது இந்த விருப்பம் தேவையில்லை.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S” க்கான கோப்பு ஒத்திசைவு வரலாறு அழிக்கப்பட்டது.
 
-zotero.preferences.search.rebuildIndex=குறியீட்டை மீண்டும் உருவாக்குதல்
-zotero.preferences.search.rebuildWarning=முழு குறியீட்டை மீண்டும் உருவாக்க விரும்புகிறீர்களா? இதற்குச் சிறிது நேரம் ஆகலாம். \n\n குறியீட்டு குறியீட்டெண் இல்லாத உருப்படிகள் மட்டுமே, %S ஐப் பயன்படுத்தவும்.
-zotero.preferences.search.clearIndex=தெளிவான அட்டவணை
-zotero.preferences.search.clearWarning=குறியீட்டை அழித்தபிறகு, இணைப்பு உள்ளடக்கம் இனி தேடப்படாது. \n\n வலை இணைப்பு இணைப்புகளைப் பக்கத்தை மறுபரிசீலனை செய்யாமல் மறுசீரமைக்க முடியாது. வலை இணைப்புகளைக் குறியிட, %S ஐத் தேர்வுசெய்க.
-zotero.preferences.search.clearNonLinkedURLs=வலை இணைப்புகளைத் தவிர அனைத்தையும் அழிக்கவும்
-zotero.preferences.search.indexUnindexed=குறியீட்டு இணைக்கப்படாத உருப்படிகள்
 zotero.preferences.export.quickCopy.citationStyles=மேற்கோள் பாணிகள்
 zotero.preferences.export.quickCopy.exportFormats=ஏற்றுமதி வடிவங்கள்
 zotero.preferences.export.quickCopy.instructions=கொடுக்கப்பட்ட வடிவத்தில் பொருட்களை விரைவாக ஏற்றுமதி செய்ய விரைவான நகல் உங்களை அனுமதிக்கிறது. வேறொரு நிரலில் உள்ள உரை பெட்டியில் நேரடியாக %S அல்லது இழுத்துச் செல்வதன் மூலம் தேர்ந்தெடுக்கப்பட்ட உருப்படிகளை இடைநிலைபலகையில் நகலெடுக்கலாம்.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=இந்தச் செயல்பாட
 integration.error.mustInsertBibliography=இந்தச் செயல்பாட்டைச் செய்வதற்கு முன் நீங்கள் ஒரு நூலியல் செருக வேண்டும்.
 integration.error.cannotInsertHere=சோடெரோ புலங்களை இங்கே செருக முடியாது.
 integration.error.notInCitation=அதைத் திருத்த நிலைகாட்டியை ஒரு சோட்டெரோ மேற்கோளில் வைக்க வேண்டும்.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=தற்போதைய நூலியல் பாணி ஒரு நூலியல் வரையறுக்கவில்லை. நீங்கள் ஒரு நூலியல் சேர்க்க விரும்பினால், தயவுசெய்து மற்றொரு பாணியைத் தேர்வுசெய்க.
 integration.error.deletePipe=சொல் செயலி உடன் தொடர்பு கொள்ள சோட்டெரோ பயன்படுத்தும் குழாயைத் துவக்க முடியவில்லை. இந்தப் பிழையைச் சரிசெய்ய சோட்டெரோ முயற்சிக்க விரும்புகிறீர்களா? உங்கள் கடவுச்சொல்லுக்கு நீங்கள் கேட்கப்படுவீர்கள்.
 integration.error.invalidStyle=நீங்கள் தேர்ந்தெடுத்த பாணி செல்லுபடியாகும் என்று தோன்றவில்லை. இந்தப் பாணியை நீங்களே உருவாக்கியிருந்தால், https://github.com/citation-style-language/styles/wiki/Validation இல் விவரிக்கப்பட்டுள்ளபடி இது சரிபார்ப்பைக் கடந்து செல்வதை உறுதிசெய்க. மாற்றாக, மற்றொரு பாணியைத் தேர்ந்தெடுக்க முயற்சிக்கவும்.
diff --git a/chrome/locale/th-TH/zotero/integration.ftl b/chrome/locale/th-TH/zotero/integration.ftl
index 5758ea7007..76faca917b 100644
--- a/chrome/locale/th-TH/zotero/integration.ftl
+++ b/chrome/locale/th-TH/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = ไลบรารี่
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/th-TH/zotero/preferences.ftl b/chrome/locale/th-TH/zotero/preferences.ftl
index b056462c8d..96e76ea4e9 100644
--- a/chrome/locale/th-TH/zotero/preferences.ftl
+++ b/chrome/locale/th-TH/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = ประสานข้อมูล
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/th-TH/zotero/searchbox.dtd b/chrome/locale/th-TH/zotero/searchbox.dtd
index 5073a02f8b..15875f036c 100644
--- a/chrome/locale/th-TH/zotero/searchbox.dtd
+++ b/chrome/locale/th-TH/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "ชื่อ:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
-
 <!ENTITY zotero.search.joinMode.prefix "ตรงกับ">
 <!ENTITY zotero.search.joinMode.any "คำใดๆ">
 <!ENTITY zotero.search.joinMode.all "ทั้งหมด">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "วัน">
 <!ENTITY zotero.search.date.units.months "เดือน">
 <!ENTITY zotero.search.date.units.years "ปี">
-
-<!ENTITY zotero.search.search "ค้นหา">
-<!ENTITY zotero.search.clear "ล้าง">
-<!ENTITY zotero.search.saveSearch "บันทึกผลการค้นหา">
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index cc55c8b966..99ae11c994 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "ลบรายการ...">
 <!ENTITY zotero.toolbar.newGroup "กลุ่มใหม่...">
 <!ENTITY zotero.toolbar.newSubcollection.label "คอลเล็กชั่นย่อยใหม่...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "บันทึกผลการค้นหาใหม่...">
 <!ENTITY zotero.toolbar.emptyTrash.label "ล้างถังขยะ">
 <!ENTITY zotero.toolbar.tagSelector.label "แสดง/ซ่อนตัวเลือกแท็ก">
 <!ENTITY zotero.toolbar.actions.label "ปฏิบัติการ">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "ค่าตั้งพึงใจ...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "การสนับสนุนและเอกสาร">
 <!ENTITY zotero.toolbar.about.label "เกี่ยวกับ Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "ค้นหาแบบขั้นสูง">
 <!ENTITY zotero.toolbar.openURL.label "หาที่ตั้ง">
 <!ENTITY zotero.toolbar.openURL.tooltip "ค้นหาผ่านไลบรารี่ในเครื่องของคุณ">
 
diff --git a/chrome/locale/th-TH/zotero/zotero.ftl b/chrome/locale/th-TH/zotero/zotero.ftl
index 7cbadd3ef3..01cdc94458 100644
--- a/chrome/locale/th-TH/zotero/zotero.ftl
+++ b/chrome/locale/th-TH/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = พิมพ์
 general-remove = ลบออก
 general-add = เพิ่ม
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = ยกเลิก
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = แสดงในไลบรารี่
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = ล้าง
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = แก้ไข
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Loading…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = รูปแบบการอ้างอิง:
 language-label = Language:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = แก้ไขบันทึกผลการค้นหา
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = แก้ไขบันทึกผลการค้นหา
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = ส่งออก...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = เลื่อนลง
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = ค้นหาแบบเร็ว
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = ค้นหาแบบขั้นสูง
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = ค้นหา
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = เขตข้อมูล:
 search-conditions-collection = คอลเลกชัน
 search-conditions-savedSearch = การค้นหาที่บันทึกไว้
 search-conditions-itemTypeID = ประเภทรายการ
 search-conditions-tag = แท็ก
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = บันทึก
 search-conditions-childNote = บันทึกย่อย
 search-conditions-creator = ผู้สร้างสรรค์
@@ -715,10 +897,26 @@ search-conditions-dateModified = วันที่แก้ไข
 search-conditions-fulltextContent = เนื้อหาที่แนบ
 search-conditions-programmingLanguage = ภาษาโปรแกรม
 search-conditions-fileTypeID = ประเภทแฟ้มที่แนบ
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = แฟ้มแนบ
+search-conditions-submenu-annotation = ความเห็นประกอบ
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = ประเภทแฟ้ม
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = ประเภท
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = ผู้แต่ง
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = วีดิทัศน์
 file-type-presentation = การนำเสนอ
 file-type-document = Document
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = ติดตั้ง
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = ค้นหา
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = บันทึกผลการค้นหา
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = แก้ไขบันทึก
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = เปลี่ยนประเภทรายการ
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index d6649b960e..fd9c30839d 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 ปีก่อน
 date.relative.yearsAgo.multiple=%S ปีก่อน
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=คุณแน่ใจหรือว่าต้องการลบคอลเลกชันที่เลือก?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=คุณแน่ใจหรือว่าต้องการลบผลการค้นหาที่เลือก?
 pane.collections.emptyTrash=คุณแน่ใจหรือว่าต้องการลบรายการในถังขยะไปอย่างถาวร?
 pane.collections.newSavedSeach=บันทึกผลการค้นหาใหม่
 pane.collections.savedSearchName=ใส่ชื่อสำหรับบันทึกผลการค้นหานี้
@@ -277,24 +270,9 @@ pane.collections.duplicate=สร้างรายการที่เหม
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=ส่งออกคอลเลกชัน...
-pane.collections.menu.export.savedSearch=ส่งออกผลการค้นหาที่บันทึกไว้
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=สร้างรายงานจากคอลเลกชัน...
-pane.collections.menu.generateReport.savedSearch=สร้างรายงานจากการค้นหาที่บันทึกไว้...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Mark Feed as Read
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=สร้างดัชนีอีกครั้ง
-zotero.preferences.search.rebuildWarning=คุณต้องการสร้างดัชนีใหม่ทั้งหมดหรือไม่? อาจใช้เวลาสักครู่\n\nการทำดัชนีเฉพาะรายการที่ยังไม่ได้ทำให้ใช้ %S
-zotero.preferences.search.clearIndex=ล้างดัชนี
-zotero.preferences.search.clearWarning=หลังจากล้างดัชนีรายการแนบทั้งหลายจะไม่สามารถค้นหาได้อีกต่อไป\n\nลิงค์ของเว็บที่แนบไว้ไม่สามารถทำดัชนีใหม่ได้โดยไม่ไปที่หน้าเว็บนั้นอีก คงดัชนีลิงค์ของเว็บไว้ให้เลือก %S
-zotero.preferences.search.clearNonLinkedURLs=ล้างทั้งหมดยกเว้นลิงค์ของเว็บ
-zotero.preferences.search.indexUnindexed=ทำดัชนีรายการที่ยังไม่ได้ทำ
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=รูปแบบการส่งออก
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=คุณต้องแทรกการ
 integration.error.mustInsertBibliography=คุณต้องแทรกบรรณานุกรมก่อนทำสิ่งนี้
 integration.error.cannotInsertHere=เขตข้อมูล Zotero ไม่สามารถแทรกตรงนี้ได้
 integration.error.notInCitation=คุณต้องวางตัวชี้ตำแหน่งในจุดอ้างอิงของ Zotero เพื่อแก้ไข
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=รูปแบบบรรณานุกรมที่ใช้อยู่ไม่ได้กำหนดบรรณานุกรม ถ้าคุณหวังจะเพิ่มบรรณานุกรม โปรดเลือกรูปแบบการอ้างอิงอื่น
 integration.error.deletePipe=วิธีที่ Zotero ใช้สื่อสารกับโปรแกรมประมวลผลคำไม่สามารถเริ่มทำงานได้ คุณต้องการให้ Zotero พยายามแก้ไขความผิดพลาดนี้หรือไม่? คุณจะต้องป้อนรหัสผ่านของคุณ
 integration.error.invalidStyle=รูปแบบการอ้างอิงที่คุณเลือกไม่มีอยู่ ถ้าคุณสร้างรูปแบบการอ้างอิงนี้ด้วยตัวเอง โปรดแน่ใจว่าถูกต้องตามที่ได้อธิบายไว้ที่ http://zotero.org/support/dev/citation_styles คุณอาจเลือกรูปแบบการอ้างอิงอื่นแทน
diff --git a/chrome/locale/tr-TR/zotero/integration.ftl b/chrome/locale/tr-TR/zotero/integration.ftl
index 51ac5e1fbd..5014fcbfd6 100644
--- a/chrome/locale/tr-TR/zotero/integration.ftl
+++ b/chrome/locale/tr-TR/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Yazar Adını Sakla
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Önizleme
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Kitaplık
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/tr-TR/zotero/preferences.ftl b/chrome/locale/tr-TR/zotero/preferences.ftl
index a72920e7b8..62b2c9a55b 100644
--- a/chrome/locale/tr-TR/zotero/preferences.ftl
+++ b/chrome/locale/tr-TR/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Dil ve Bölge
 preferences-advanced-enable-bidi-ui =
     .label = Çift yönlü metin düzenleme hizmetlerini etkinleştir
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Varsayılan Konuma Geri Döndür
 preferences-advanced-custom-data-dir =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/tr-TR/zotero/searchbox.dtd b/chrome/locale/tr-TR/zotero/searchbox.dtd
index 7e151956d0..5bf5a8a0fe 100644
--- a/chrome/locale/tr-TR/zotero/searchbox.dtd
+++ b/chrome/locale/tr-TR/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "İsim:">
 
-<!ENTITY zotero.search.searchInLibrary "Kitaplıkta ara:">
-
 <!ENTITY zotero.search.joinMode.prefix "Aşağıdakilerden">
 <!ENTITY zotero.search.joinMode.any "herhangi birine">
 <!ENTITY zotero.search.joinMode.all "hepsine">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "gün">
 <!ENTITY zotero.search.date.units.months "ay">
 <!ENTITY zotero.search.date.units.years "yıl">
-
-<!ENTITY zotero.search.search "Arama">
-<!ENTITY zotero.search.clear "Temizle">
-<!ENTITY zotero.search.saveSearch "Aramayı Kaydet">
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index cf54ee43a3..812791a09d 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Eseri Kaldır...">
 <!ENTITY zotero.toolbar.newGroup "Yeni Grup...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Yeni Alt Derme...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Yeni Kaydedilen Arama...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Çöp Sepetini Boşalt">
 <!ENTITY zotero.toolbar.tagSelector.label "Etiket Seçiciyi Göster/Gizle">
 <!ENTITY zotero.toolbar.actions.label "Eylemler">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Tercihler...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Destek ve Belgeleme">
 <!ENTITY zotero.toolbar.about.label "Zotero Hakkında">
-<!ENTITY zotero.toolbar.advancedSearch "Gelişmiş Arama">
 <!ENTITY zotero.toolbar.openURL.label "Yerini Bul">
 <!ENTITY zotero.toolbar.openURL.tooltip "Yerel Kitaplığınızda Bul">
 
diff --git a/chrome/locale/tr-TR/zotero/zotero.ftl b/chrome/locale/tr-TR/zotero/zotero.ftl
index b8286f4f17..6ea8362e62 100644
--- a/chrome/locale/tr-TR/zotero/zotero.ftl
+++ b/chrome/locale/tr-TR/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Yazdır
 general-remove = Kaldır
 general-add = Ekle
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = Sorun Giderme Talimatlarını Göste
 general-go-back = Geri Git
 general-accept = Kabul Et
 general-cancel = İptal Et
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Kitaplıkta Göster
 general-restartApp = { -app-name } Uygulamasını Yeniden Başlat
 general-restartInTroubleshootingMode = Sorun Giderme Modunda Yeniden Başlat
 general-save = Kaydet
 general-clear = Temizle
+clear-button =
+    .label = { general-clear }
 general-update = Güncelle
 general-back = Geri
 general-edit = Düzenle
@@ -76,6 +86,8 @@ general-maroon = Bordo
 general-gray = Gri
 general-black = Siyah
 general-loading = Yükleniyor...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Alıntı Stili:
 language-label = Dil:
 menu-custom-group-submenu =
@@ -123,7 +135,7 @@ menu-view-columns-move-left =
 menu-view-columns-move-right =
     .label = Sütunu Sağa Taşı
 menu-view-hide-context-annotation-rows =
-    .label = Hide Non-Matching Annotations
+    .label = Eşleşmeyen Açıklamaları Gizle
 menu-view-note-font-size =
     .label = Not Yazı Tipi Boyutu
 menu-view-note-tab-font-size =
@@ -157,19 +169,115 @@ zotero-toolbar-tabs-scroll-backwards =
     .title = Geri kaydır
 toolbar-add-attachment =
     .tooltiptext = { add-attachment }
-recently-read = Recently Read
+recently-read = Son Okunanlar
 collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Dermeyi Yeniden Adlandır
-collections-menu-edit-saved-search =
-    .label = Kaydedilen Aramayı Düzenle
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } derme seçildi
+       *[other] { $count } derme seçildi
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Kaydedilen Aramayı Düzenle
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Buraya Taşı
 collections-menu-copy-collection =
     .label = Buraya Kopyala
+collections-menu-export =
+    .label = Dışarı Aktar...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Bir Aşağı Taşı
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Mendeley Desktop alıntılarını yeniden bağlantıla
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name }, { $targetApp } uygulamasına bağlanamadı. Lütfen internet bağlantınızı kontrol edip tekrar deneyin.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Çabuk Arama
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Gelişmiş Arama
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = Bu şekilde görüntüle:
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = ARM64 için yapılmış { -app-name } uygulam
 first-run-guidance-authorMenu = { -app-name }, editörleri ve çevirmenleri belirtmenize de olanak tanır. Bir yazarı, editöre veya çevirmene dönüştürmeyi bu menüden seçebilirsiniz.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Bul
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = ek açıklamalar
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Arama koşulu
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Değer
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Alanlar:
 search-conditions-collection = Derme
 search-conditions-savedSearch = Kaydedilen Arama
 search-conditions-itemTypeID = Eser Türü
 search-conditions-tag = Etiket
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Not
 search-conditions-childNote = Alt Not
 search-conditions-creator = Oluşturan
@@ -715,10 +897,26 @@ search-conditions-dateModified = Son Değiştirme Tarihi
 search-conditions-fulltextContent = Ekin İçeriği
 search-conditions-programmingLanguage = Programlama Dili
 search-conditions-fileTypeID = Ek Dosya Türü
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Ek Açıklama Metni
 search-conditions-annotationComment = Ek Açıklama Yorumu
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Herhangi Bir Alan
+search-conditions-titleCreatorYear = Başlık, Yaratan, Yıl
+search-conditions-submenu-attachment = Ek
+search-conditions-submenu-annotation = Ek Açıklama
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Dosya Türü
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Tür
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Yazar
 find-pdf-files-added =
     { $count ->
         [one] { $count } dosya eklendi
@@ -750,6 +948,9 @@ file-type-video = Video
 file-type-presentation = Sunum
 file-type-document = Doküman
 file-type-ebook = E-kitap
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = Programınızı <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>sürümüne yükselttiniz! Bu sürümdeki <a data-l10n-name="new-features-link">yenilikleri</a>öğrenin.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Yapıştır ve Ara
 mac-word-plugin-install-message = Word eklentisini kurmak için, Zotero'nun Word verilerine erişmesi gerekiyor.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Word Eklentisini Kur
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Kur
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } artık eserlerde değişiklik yaptığınızda ek dosya adlarını otomatik olarak uyumlu tutmaktadır.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = { -app-name } Bağlayıcısı, { -app-name } uygulamasının bu sürümüyle çalışabilmesi için güncellenmelidir.
 userjs-pref-warning = Bazı { -app-name } ayarları desteklenmeyen bir yöntem kullanılarak geçersiz kılındı. { -app-name } bu ayarları geri döndürecek ve kendisini yeniden başlatacak.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Etiketleri Böl
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Ara
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Kaydet
+save-search-name-title = Aramayı Kaydet
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Dermeyi Yeniden Adlandır
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Notu Düzenle
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Eser türünü değiştir
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index 372609864f..8dea44a28d 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 yıl önce
 date.relative.yearsAgo.multiple=%S yıl önce
 
 pane.collections.title=Dermeler
-pane.collections.delete.title=Dermeyi Sil
-pane.collections.delete=Seçili dermeyi silmek istediğinize emin misiniz?
-pane.collections.delete.keepItems=Derme içerisindeki eserler silinmeyecektir.
-pane.collections.deleteWithItems.title=Dermeyi ve Eserleri Sil
-pane.collections.deleteWithItems=Seçili dermeyi silip, içindeki tüm eserleri Çöp Sepetine taşımak istediğinize emin misiniz?
 pane.feed.deleteWithItems.title=Aboneliği İptal Et
 pane.feed.deleteWithItems=Bu beslemeye olan aboneliğinizi iptal etmek istediğinize emin misiniz?
 
-pane.collections.deleteSearch.title=Aramayı Sil
-pane.collections.deleteSearch=Seçili aramayı silmek istediğinize emin misiniz?
 pane.collections.emptyTrash=Çöp Sepetindeki tüm eserleri kalıcı olarak silmek istediğinize emin misiniz?
 pane.collections.newSavedSeach=Yeni Kaydedilen Arama
 pane.collections.savedSearchName=Bu kayıtlı arama için bir isim giriniz:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Yinelenmiş Eserler
 pane.collections.removeLibrary=Kitaplığı Kaldır
 pane.collections.removeLibrary.text=%S'i bu bilgisayardan kalıcı olarak kaldırmak istediğinize emin misiniz?
 
-pane.collections.menu.duplicate.savedSearch=Kaydedilmiş Aramanın Kopyasını Yap
 pane.collections.menu.remove.library=Kitaplığı Kaldır...
-pane.collections.menu.delete.collection=Dermeyi Sil
-pane.collections.menu.delete.collectionAndItems=Dermeyi ve Eserleri Sil
-pane.collections.menu.delete.savedSearch=Kaydedilmiş Aramayı Sil...
-pane.collections.menu.delete.feedAndItems=Beslemeye Olan Aboneliği İptal Et...
-pane.collections.menu.export.collection=Dermeyi Dışarı Aktar...
-pane.collections.menu.export.savedSearch=Kaydedilen Aramayı Dışarı Aktar...
-pane.collections.menu.export.feed=Beslemeyi Dışarı Aktar...
-pane.collections.menu.createBib.collection=Dermeden Kaynakça Yarat...
-pane.collections.menu.createBib.savedSearch=Kaydedilmiş Aramadan Kaynakça Yarat...
-pane.collections.menu.createBib.feed=Beslemeden Kaynakça Yarat...
 pane.collections.showCollectionInLibrary=Dermeyi Kitaplıkta Göster
 
-pane.collections.menu.generateReport.collection=Dermeden Rapor Oluştur...
-pane.collections.menu.generateReport.savedSearch=Kaydedilen Aramadan Rapor Oluştur...
-pane.collections.menu.generateReport.feed=Beslemeden Rapor Oluştur...
-
 pane.collections.menu.refresh.feed=Beslemeyi Yenile
 pane.collections.menu.refresh.allFeeds=Tüm Beslemeleri Yenile
 pane.collections.menu.markAsRead.feed=Beslemeyi Okunmuş İşaretle
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Geriye dönme işlemini tamamlam
 zotero.preferences.sync.reset.fileSyncHistory=Bir sonraki eşitlemede, %1$S, “%2$S” içindeki tüm ek dosyaları depolama hizmetindekilerle kontrol edecektir. Yerelde bulunamayan uzaktaki tüm ek dosyalar indirilecek ve uzakta bulunamayan tüm yerel ek dosyalar yüklenecektir.\n\nBu seçenek normal kullanım sırasında gerekli değildir.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S” için olan dosya eşitleme tarihi temizlendi.
 
-zotero.preferences.search.rebuildIndex=İndeksi Tekrar Oluştur
-zotero.preferences.search.rebuildWarning=Tüm indeksi tekrar oluşturmak istiyor musunuz? Bu işlem zaman alabilir.\n\nYalnızca indekslenmeyen eserleri indekslemek için, %S'yi kullanınız.
-zotero.preferences.search.clearIndex=İndeksi Temizle
-zotero.preferences.search.clearWarning=İndeks temizlendikten sonra, ek içeriği aranabilir olmayacaktır.\n\nWeb bağlantı ekleri sayfa tekrar ziyaret edilmedikçe tekrar indekslenemez. Web bağlantılarını indeksli bırakmak için %S'i seçiniz.
-zotero.preferences.search.clearNonLinkedURLs=Web Bağlantıları Hariç Tümünü Temizle
-zotero.preferences.search.indexUnindexed=İndekslenmemiş Eserleri İndeksle
 zotero.preferences.export.quickCopy.citationStyles=Alıntı Stilleri
 zotero.preferences.export.quickCopy.exportFormats=Dışarı Aktarım Biçimleri
 zotero.preferences.export.quickCopy.instructions=Çabuk Kopyala işlevi, eserleri istediğiniz bir biçimde hızlıca dışarı aktarmanızı sağlar. Seçtiğiniz eserleri panoya kopyalamak için %S tuşuna basabilir ya da eserleri direk olarak başka bir programdaki bir metin kutusuna sürükleyebilirsiniz.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Bu işlemi gerçekleştirmeden önce bir al
 integration.error.mustInsertBibliography=Bu işlemi gerçekleştirmeden önce bir kaynakça koymalısınız.
 integration.error.cannotInsertHere=Zotero alanları buraya konulamaz.
 integration.error.notInCitation=Bir Zotero alıntısını düzeltmek için imleci alıntının içine koymalısınız.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Mevcut kaynakça biçimi bir kaynakçayı belirtmiyor. Eğer bir kaynakça eklemek istiyorsanız, lütfen başka bir biçim seçiniz.
 integration.error.deletePipe=Zotero'nun sözcük işlemcisi ile iletişim kurmasını sağlayan boru ilk kullanıma hazırlanamadı. Zotero'nun bu hatayı düzeltmeye çalışmasını ister misiniz? Şifreniz sorulacaktır.
 integration.error.invalidStyle=Seçtiğiniz stil geçerli gözükmemektedir. Eğer bu stili kendiniz oluşturduysanız, stilinizin http://zotero.org/support/dev/citation_styles adresinde anlatıldığı üzere geçerlilik sınamasını geçtiğinden lütfen emin olunuz. Yoksa, başka bir stil seçmeyi deneyiniz.
diff --git a/chrome/locale/uk-UA/zotero/integration.ftl b/chrome/locale/uk-UA/zotero/integration.ftl
index a1903651e5..7b4e0dbacc 100644
--- a/chrome/locale/uk-UA/zotero/integration.ftl
+++ b/chrome/locale/uk-UA/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Бібліотека
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/uk-UA/zotero/preferences.ftl b/chrome/locale/uk-UA/zotero/preferences.ftl
index 4811990144..ecb9a63c32 100644
--- a/chrome/locale/uk-UA/zotero/preferences.ftl
+++ b/chrome/locale/uk-UA/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Синхронізація
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/uk-UA/zotero/searchbox.dtd b/chrome/locale/uk-UA/zotero/searchbox.dtd
index 56925b0591..df43f0aaa6 100644
--- a/chrome/locale/uk-UA/zotero/searchbox.dtd
+++ b/chrome/locale/uk-UA/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Назва:">
 
-<!ENTITY zotero.search.searchInLibrary "Шукати в бібліотеці:">
-
 <!ENTITY zotero.search.joinMode.prefix "Збігаються з">
 <!ENTITY zotero.search.joinMode.any "будь-яким">
 <!ENTITY zotero.search.joinMode.all "всіма">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "дні">
 <!ENTITY zotero.search.date.units.months "місяці">
 <!ENTITY zotero.search.date.units.years "роки">
-
-<!ENTITY zotero.search.search "Шукати">
-<!ENTITY zotero.search.clear "Очистити">
-<!ENTITY zotero.search.saveSearch "Зберегти пошук">
diff --git a/chrome/locale/uk-UA/zotero/zotero.dtd b/chrome/locale/uk-UA/zotero/zotero.dtd
index 1ffd869aba..86c980cac2 100644
--- a/chrome/locale/uk-UA/zotero/zotero.dtd
+++ b/chrome/locale/uk-UA/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Видалити документ...">
 <!ENTITY zotero.toolbar.newGroup "Нова група...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Нова підколекція...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Новий збережений пошук...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Очистити корзину">
 <!ENTITY zotero.toolbar.tagSelector.label "Показати/сховати панель вибору тегів">
 <!ENTITY zotero.toolbar.actions.label "Дії">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Налаштування...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Підтримка і документація">
 <!ENTITY zotero.toolbar.about.label "Про Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Розширений пошук">
 <!ENTITY zotero.toolbar.openURL.label "Знайти">
 <!ENTITY zotero.toolbar.openURL.tooltip "Знайти через місцеву бібліотеку">
 
diff --git a/chrome/locale/uk-UA/zotero/zotero.ftl b/chrome/locale/uk-UA/zotero/zotero.ftl
index cdd55c6c78..8aabe8cee9 100644
--- a/chrome/locale/uk-UA/zotero/zotero.ftl
+++ b/chrome/locale/uk-UA/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = Роздрукувати
 general-remove = Видалити
 general-add = Додати
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Відмінити
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Покзати в бібліотеці
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Зберегти
 general-clear = Очистити
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Редагувати
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Завантаження
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Стиль цитування:
 language-label = Мова:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Edit Saved Search
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Edit Saved Search
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Експорт...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Перемістити вниз
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Швидкий пошук
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Розширений пошук
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Знайти
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Поля:
 search-conditions-collection = Підбірка
 search-conditions-savedSearch = Збередений пошук
 search-conditions-itemTypeID = Тип документа
 search-conditions-tag = Тег
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Примітка
 search-conditions-childNote = Дочірня примітка
 search-conditions-creator = Автор
@@ -715,10 +897,26 @@ search-conditions-dateModified = Дата зміни
 search-conditions-fulltextContent = Зміст вкладення
 search-conditions-programmingLanguage = Мова програмування
 search-conditions-fileTypeID = Тип вкладеного файлу
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Заголовок, Автор, Рік
+search-conditions-submenu-attachment = Вкладення
+search-conditions-submenu-annotation = Анотація
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Тип файлу
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Тип
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Автор
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Відео
 file-type-presentation = Презентація
 file-type-document = Документ
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Встановити
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Пошук
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Зберегти
+save-search-name-title = Зберегти пошук
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Редагувати примітку
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Змінити тип документу
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/uk-UA/zotero/zotero.properties b/chrome/locale/uk-UA/zotero/zotero.properties
index 5d7b69388f..aa1b5c2f27 100644
--- a/chrome/locale/uk-UA/zotero/zotero.properties
+++ b/chrome/locale/uk-UA/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 рік тому
 date.relative.yearsAgo.multiple=%S рокув тому
 
 pane.collections.title=Collections
-pane.collections.delete.title=Видалити колекцію
-pane.collections.delete=Ви впевнені що бажаєте видалити вибрану колекцію?
-pane.collections.delete.keepItems=Документи всередині цієї колекції не будуть видалені.
-pane.collections.deleteWithItems.title=Видалити колекцію та документи
-pane.collections.deleteWithItems=Ви впевнені, що хочете видалити обрану колекцію і перемістити всі документи в ній до Кошику?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Очистити параметри пошуку
-pane.collections.deleteSearch=Ви впевнені що бажаєте видалити вибраний пошук?
 pane.collections.emptyTrash=Ви впевнені що бажаєте остаточно видалити документи в Кошику?
 pane.collections.newSavedSeach=Новий збережений пошук
 pane.collections.savedSearchName=Введіть назву збереженого пошуку:
@@ -277,24 +270,9 @@ pane.collections.duplicate=Дублікати документів
 pane.collections.removeLibrary=Видалити бібліотеку
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Видалити бібліотеку...
-pane.collections.menu.delete.collection=Видалити колекцію...
-pane.collections.menu.delete.collectionAndItems=Видалити колекцію та документи...
-pane.collections.menu.delete.savedSearch=Очистити параметри пошуку...
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Експортувати  колекцію...
-pane.collections.menu.export.savedSearch=Експортувати збережений пошук...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Create Bibliography from Collection…
-pane.collections.menu.createBib.savedSearch=Create Bibliography from Saved Search…
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Створити звіт з колекції...
-pane.collections.menu.generateReport.savedSearch=Створити звіт зі збереженого пошуку...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Оновити стрічку
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Позначити стрічку як прочитану
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Необхідно переза
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Перебудувати індекс
-zotero.preferences.search.rebuildWarning=Ви бажаєте перебудувати весь індекс? Це може зайняти деякий час.\n\nЩоб переіндексувати тільки непроіндексовні документи, використайте %S.
-zotero.preferences.search.clearIndex=Очистити індекс
-zotero.preferences.search.clearWarning=Після очищення індексу буде неможливо виконувати пошук у вкладеннях.\n\nПрикріпені веб-посилання не можуть бути переіндексовані без перегляду сторінки. Щоб залишити веб-посилання проіндексованими, виберіть %S.
-zotero.preferences.search.clearNonLinkedURLs=Очистити все окрім посилань
-zotero.preferences.search.indexUnindexed=Проіндексувати непроіндексовані документи
 zotero.preferences.export.quickCopy.citationStyles=Стилі цитування
 zotero.preferences.export.quickCopy.exportFormats=Формат експорту
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=Ви повинні вставити хоч
 integration.error.mustInsertBibliography=Ви повинні вставити список літератури перед виконанням цієї операції.
 integration.error.cannotInsertHere=Сюди не можна вставити поле Zotero.
 integration.error.notInCitation=Ви повинні помістити курсор всередину цитати Zotero, щоб редагувати її.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=Поточний стиль цитування не визначає список літератури. Якщо ви бажаєте додати список літератури, будь ласка, виберіть інший стиль.
 integration.error.deletePipe=Не вдалось ініціювати конвеєр, який Zotero використовує для взаємодії з текстовим процесором. Ви бажаєте, щоб Zotero спробував виправити цю помилку? Для цього вам буде необхідно ввести пароль.
 integration.error.invalidStyle=Вибраний стиль не є допустимим. Якщо ви самі створили цей стиль, будь ласка, переконайтесь, що він проходить перевірку, яка описана в https://github.com/citation-style-language/styles/wiki/Validation. Або ж спробуйте вибрати інший стиль.
diff --git a/chrome/locale/vi-VN/zotero/integration.ftl b/chrome/locale/vi-VN/zotero/integration.ftl
index a035cc6afe..ce34153740 100644
--- a/chrome/locale/vi-VN/zotero/integration.ftl
+++ b/chrome/locale/vi-VN/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = Omit Author
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = Preview
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = Thư viện
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/vi-VN/zotero/preferences.ftl b/chrome/locale/vi-VN/zotero/preferences.ftl
index c25241ecd9..4d73d3a681 100644
--- a/chrome/locale/vi-VN/zotero/preferences.ftl
+++ b/chrome/locale/vi-VN/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = Language and Region
 preferences-advanced-enable-bidi-ui =
     .label = Enable bidirectional text editing utilities
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = Đồng bộ
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/vi-VN/zotero/searchbox.dtd b/chrome/locale/vi-VN/zotero/searchbox.dtd
index 31bed25cbc..6055db1b1e 100644
--- a/chrome/locale/vi-VN/zotero/searchbox.dtd
+++ b/chrome/locale/vi-VN/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "Tên:">
 
-<!ENTITY zotero.search.searchInLibrary "Tìm trong thư viện:">
-
 <!ENTITY zotero.search.joinMode.prefix "Tìm các biểu ghi thỏa mãn">
 <!ENTITY zotero.search.joinMode.any "một trong">
 <!ENTITY zotero.search.joinMode.all "tất cả">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "ngày">
 <!ENTITY zotero.search.date.units.months "tháng">
 <!ENTITY zotero.search.date.units.years "năm">
-
-<!ENTITY zotero.search.search "Thực hiện Tìm kiếm">
-<!ENTITY zotero.search.clear "Xóa">
-<!ENTITY zotero.search.saveSearch "Ghi nhớ Tìm kiếm Định sẵn">
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index 23a8e5db8c..6db4f0c12e 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "Xóa mục...">
 <!ENTITY zotero.toolbar.newGroup "Nhóm mới...">
 <!ENTITY zotero.toolbar.newSubcollection.label "Bô sưu tập con mới...">
-<!ENTITY zotero.toolbar.newSavedSearch.label "Tìm kiếm mới...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Dọn thùng rác">
 <!ENTITY zotero.toolbar.tagSelector.label "Hiện/Dấu bộ lọc tag">
 <!ENTITY zotero.toolbar.actions.label "Hành động">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "Tùy chọn...">
 <!ENTITY zotero.toolbar.supportAndDocumentation "Hộ trợ và Tài liệu">
 <!ENTITY zotero.toolbar.about.label "Giới thiệu về Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "Tìm kiếm Nâng cao">
 <!ENTITY zotero.toolbar.openURL.label "Định vị">
 <!ENTITY zotero.toolbar.openURL.tooltip "Tìm trong thư viện cục bộ của bạn">
 
diff --git a/chrome/locale/vi-VN/zotero/zotero.ftl b/chrome/locale/vi-VN/zotero/zotero.ftl
index bf3aee5cca..28f864ba52 100644
--- a/chrome/locale/vi-VN/zotero/zotero.ftl
+++ b/chrome/locale/vi-VN/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = In
 general-remove = Bỏ
 general-add = Thêm
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = View Troubleshooting Instructions
 general-go-back = Go Back
 general-accept = Accept
 general-cancel = Hủy
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = Hiển thị trong Thư viện
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = Restart in Troubleshooting Mode
 general-save = Save
 general-clear = Xóa
+clear-button =
+    .label = { general-clear }
 general-update = Update
 general-back = Back
 general-edit = Chỉnh sửa
@@ -76,6 +86,8 @@ general-maroon = Maroon
 general-gray = Gray
 general-black = Black
 general-loading = Đang nạp...
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = Văn phong của Trích dẫn
 language-label = Ngôn ngữ:
 menu-custom-group-submenu =
@@ -162,14 +174,110 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = Rename Collection
-collections-menu-edit-saved-search =
-    .label = Soạn thảo Tìm kiếm Định sẵn
+items-section-collections-selected =
+    { $count ->
+        [one] { $count } collection selected
+       *[other] { $count } collections selected
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = Soạn thảo Tìm kiếm Định sẵn
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = Move To
 collections-menu-copy-collection =
     .label = Copy To
+collections-menu-export =
+    .label = Xuất khẩu...
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = Move Down
 item-creator-moveToTop =
@@ -282,6 +390,7 @@ import-online-relink-only =
     .label = Relink Mendeley Desktop citations
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } could not connect to { $targetApp }. Please check your internet connection and try again.
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -621,6 +730,18 @@ quicksearch-input =
     .aria-label = Tìm kiếm nhanh
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = Tìm kiếm Nâng cao
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = View As
 item-pane-header-none =
@@ -680,9 +801,64 @@ architecture-x64-on-arm64-action = Download { -app-name } for ARM64
 first-run-guidance-authorMenu = { -app-name } lets you specify editors and translators too. You can turn an author into an editor or translator by selecting from this menu.
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = Find
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = annotations
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = Search condition
     .label = { $label }
@@ -692,11 +868,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = Value
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = Trường:
 search-conditions-collection = Bộ sưu tập
 search-conditions-savedSearch = Saved Search
 search-conditions-itemTypeID = Loại tham khảo
 search-conditions-tag = Thẻ
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = Ghi chép
 search-conditions-childNote = Ghi chép con
 search-conditions-creator = Người tạo lập
@@ -715,10 +897,26 @@ search-conditions-dateModified = Ngày thay đổi
 search-conditions-fulltextContent = Nội dung Phần đính kèm
 search-conditions-programmingLanguage = Ngôn ngữ lập trình
 search-conditions-fileTypeID = Kiểu của Tập tin Đính kèm
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = Annotation Text
 search-conditions-annotationComment = Annotation Comment
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = Any Field
+search-conditions-titleCreatorYear = Title, Creator, Year
+search-conditions-submenu-attachment = Phần đính kèm
+search-conditions-submenu-annotation = Ghi chú
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = Kiểu Tập tin
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = Kiểu
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = Tác giả
 find-pdf-files-added =
     { $count ->
         [one] { $count } file added
@@ -750,6 +948,9 @@ file-type-video = Ghi hình
 file-type-presentation = Trình bày
 file-type-document = Tài liệu
 file-type-ebook = Ebook
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -758,18 +959,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = Paste and Search
 mac-word-plugin-install-message = Zotero needs access to Word data to install the Word plugin.
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = Install Word plugin
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = Cài đặt
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -788,3 +994,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = Tìm
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = Save
+save-search-name-title = Ghi nhớ Tìm kiếm Định sẵn
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = Rename Collection
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = Soạn thảo Ghi chép
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = Đổi Kiểu cho Biểu ghi
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index 6dc356ef21..b8b12f51c9 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 year ago
 date.relative.yearsAgo.multiple=%S years ago
 
 pane.collections.title=Collections
-pane.collections.delete.title=Delete Collection
-pane.collections.delete=Bạn có chắc bạn muốn xóa bộ sưu tập đã chọn?
-pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
 pane.feed.deleteWithItems.title=Unsubscribe
 pane.feed.deleteWithItems=Are you sure you want to unsubscribe from this feed?
 
-pane.collections.deleteSearch.title=Delete Search
-pane.collections.deleteSearch=Bạn có chắc bạn muốn xóa tìm kiếm đã chọn?
 pane.collections.emptyTrash=Are you sure you want to permanently remove items in the Trash?
 pane.collections.newSavedSeach=Tìm kiếm Định sẵn Mới
 pane.collections.savedSearchName=Hãy đặt tên cho tìm kiếm định sẵn này
@@ -277,24 +270,9 @@ pane.collections.duplicate=Duplicate Items
 pane.collections.removeLibrary=Remove Library
 pane.collections.removeLibrary.text=Are you sure you want to permanently remove “%S” from this computer?
 
-pane.collections.menu.duplicate.savedSearch=Duplicate Saved Search
 pane.collections.menu.remove.library=Remove Library…
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
-pane.collections.menu.delete.feedAndItems=Unsubscribe from Feed…
-pane.collections.menu.export.collection=Xuất khẩu Bộ sưu tập...
-pane.collections.menu.export.savedSearch=Xuất khẩu Tìm kiếm Định sẵn...
-pane.collections.menu.export.feed=Export Feed…
-pane.collections.menu.createBib.collection=Tạo danh mục tham khảo từ bộ sưu tập đã chọn…
-pane.collections.menu.createBib.savedSearch=Tạo danh mục tham khảo từ kết quả tìm kiếm …
-pane.collections.menu.createBib.feed=Create Bibliography from Feed…
 pane.collections.showCollectionInLibrary=Show Collection in Library
 
-pane.collections.menu.generateReport.collection=Lập Báo cáo cho Bộ sưu tập...
-pane.collections.menu.generateReport.savedSearch=Lập Báo cáo từ kết quả của Tìm kiếm Định sẵn...
-pane.collections.menu.generateReport.feed=Generate Report from Feed…
-
 pane.collections.menu.refresh.feed=Refresh Feed
 pane.collections.menu.refresh.allFeeds=Refresh All Feeds
 pane.collections.menu.markAsRead.feed=Đánh dấu là đã đọc
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox must be restarted to com
 zotero.preferences.sync.reset.fileSyncHistory=On the next sync, %1$S will check all attachment files in “%2$S” against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 zotero.preferences.sync.reset.fileSyncHistory.cleared=The file sync history for “%S” has been cleared.
 
-zotero.preferences.search.rebuildIndex=Tái tạo Chỉ mục
-zotero.preferences.search.rebuildWarning=Bạn có muốn tái tạo toàn bộ chỉ mục không? Việc này có thể mất khá nhiều thời gian.\n\nNếu bạn chỉ muốn tạo chỉ mục cho các biểu ghi hiện chưa có chỉ mục, hãy ấn vào %S.
-zotero.preferences.search.clearIndex=Xóa Chỉ mục
-zotero.preferences.search.clearWarning=Sau khi xóa chỉ mục, bạn sẽ không còn khả năng tìm kiếm trong nội dung của các phần đính kèm nữa.\n\nZotero cũng không thể tái tạo chỉ mục cho các đường dẫn Web đính kèm nếu bạn không đến duyệt lại các trang Web đó. Để giữ nguyên chỉ mục của các đường dẫn Web, chọn %S.
-zotero.preferences.search.clearNonLinkedURLs=Xóa tất cả, ngoại trừ các đường dẫn Web
-zotero.preferences.search.indexUnindexed=Tạo Chỉ mục cho các Biểu ghi chưa có Chỉ mục
 zotero.preferences.export.quickCopy.citationStyles=Citation Styles
 zotero.preferences.export.quickCopy.exportFormats=Các Định dạng Xuất khẩu
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=You must insert a citation before performin
 integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
 integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
 integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
 integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
 integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
diff --git a/chrome/locale/zh-CN/zotero/integration.ftl b/chrome/locale/zh-CN/zotero/integration.ftl
index f6a767a24f..9c67a1ffa4 100644
--- a/chrome/locale/zh-CN/zotero/integration.ftl
+++ b/chrome/locale/zh-CN/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = 后缀
 integration-citationDialog-details-prefix = 前缀
 integration-citationDialog-details-suppressAuthor = 省略作者
+integration-citationDialog-details-locator-info = 提示：您还可以直接在主字段中键入页码和其他定位符。 <a data-l10n-name="docs-link">了解更多</a>
 integration-citationDialog-details-includeComments = 包含评论
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] 没有已选中或已打开的带注释条目
     }
 integration-citationDialog-settings-keepSorted = 保持文献自动排序
+integration-citationDialog-preview-empty = 预览
+integration-citationDialog-preview-error = 预览不可用
+integration-citationDialog-btn-displayPreview =
+    .title = 显示引注预览
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = 文献库
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = 按 Tab 键选择要添加到此引注中的条目。按 Esc 键放弃修改并关闭对话框。
+integration-citationDialog-just-added-input-placeholder = 键入“10-15”以引用页面或搜索条目
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = 您已修改文
 integration-warning-discard-changes = 放弃修改
 integration-warning-command-is-running = 文字处理器集成命令已在运行。
 first-run-guidance-citationDialog =
-    键入标题、作者和/或年份以搜索参考文献。
-    
-    完成选择后点击气泡或使用键盘选中它，然后按下↓/空格键显示引用选项，如页码、前缀和后缀等。
+    点击气泡或使用 ← 和↓按键可查看引注详情并自定义选项，如页码、前缀和后缀等。
     
     您还可以通过以下两种方式添加页码或其他定位符 ① 将其与搜索词（例如："history { $locator }"）一并输入；② 在气泡框后直接输入并按 { return-or-enter }。
diff --git a/chrome/locale/zh-CN/zotero/preferences.ftl b/chrome/locale/zh-CN/zotero/preferences.ftl
index 59deb76d34..aaae56a380 100644
--- a/chrome/locale/zh-CN/zotero/preferences.ftl
+++ b/chrome/locale/zh-CN/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = 语言和区域
 preferences-advanced-enable-bidi-ui =
     .label = 启用双向文本编辑工具
+preferences-advanced-data-dir =
+    .value = 数据目录：
 preferences-advanced-reset-data-dir =
     .label = 恢复到默认位置...
 preferences-advanced-custom-data-dir =
@@ -77,18 +79,18 @@ preferences-advanced-custom-data-dir =
 preferences-advanced-default-data-dir =
     .value = (默认： { $directory })
     .aria-label = 默认位置
-preferences-pane-account = Account
+preferences-pane-account = 账户
 -preferences-sync-data-syncing = 数据同步
 preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = 登录你的 { -app-name } 账户以跨设备同步你的数据、与他人协作等。
-preferences-sync-settings-heading = Sync
-preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
-preferences-sync-reset-heading = Sync Reset
+preferences-sync-settings-heading = 同步
+preferences-sync-settings-intro = { -app-name } 可以跨设备同步文库数据和文件。<label data-l10n-name="sync-link">了解更多</label>
+preferences-sync-reset-heading = 同步重置
 preferences-sync-fileSyncing-groups =
-    .label = Sync attachment files in group libraries using { -app-name } Storage
-preferences-sync-fileSyncing-tos = By using { -app-name } Storage, you agree to become bound by its <label data-l10n-name="terms-link">terms and conditions</label>.
+    .label = 使用 { -app-name } 存储同步群组文库中的附件
+preferences-sync-fileSyncing-tos = 使用 { -app-name } 存储即代表您接受其 <label data-l10n-name="terms-link">条款和条件</label>.
 preferences-account-log-out =
     .label = 退出登录…
 preferences-sync-reset-restore-to-server-body = { -app-name } 将用此计算机中的数据替换 { $domain } 中 “{ $libraryName }” 中的数据。
@@ -124,3 +126,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = 切换到其他账户将删除此计算机中所有的 { -app-name } 数据。在继续之前，请确保您想要保留的所有数据和文件都已与 “{ $username }” 账户同步，或者您已经备份 { -app-name } 数据目录。
 preferences-account-switch-confirmation-text = 删除本地数据
 preferences-account-switch-accept = 删除数据并重新启动
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/zh-CN/zotero/reader.ftl b/chrome/locale/zh-CN/zotero/reader.ftl
index e6c060cdee..2327b6a490 100644
--- a/chrome/locale/zh-CN/zotero/reader.ftl
+++ b/chrome/locale/zh-CN/zotero/reader.ftl
@@ -219,8 +219,8 @@ reader-read-aloud-quota-exceeded-message =
        *[local] 本地语音
     } 朗读。
 reader-read-aloud-error = { general-error }
-reader-read-aloud-error-unknown = An unknown error occurred.
-reader-read-aloud-error-network = Unable to connect to the Read Aloud service. Please check your internet connection.
+reader-read-aloud-error-unknown = 发生一个未知错误。
+reader-read-aloud-error-network = 无法连接到朗读服务。请检查你的网络连接。
 reader-read-aloud-error-daily-limit-exceeded = 你已经超出 { -app-name } 语音的每日限额。
 reader-read-aloud-retry = 重试
 reader-read-aloud-first-run-title = 选择你喜欢的朗读声音：
diff --git a/chrome/locale/zh-CN/zotero/searchbox.dtd b/chrome/locale/zh-CN/zotero/searchbox.dtd
index 1dbe037ccc..c5852271b8 100644
--- a/chrome/locale/zh-CN/zotero/searchbox.dtd
+++ b/chrome/locale/zh-CN/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "名称:">
 
-<!ENTITY zotero.search.searchInLibrary "在文献库中搜索：">
-
 <!ENTITY zotero.search.joinMode.prefix "匹配">
 <!ENTITY zotero.search.joinMode.any "任意">
 <!ENTITY zotero.search.joinMode.all "全部">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "天">
 <!ENTITY zotero.search.date.units.months "月">
 <!ENTITY zotero.search.date.units.years "年">
-
-<!ENTITY zotero.search.search "搜索">
-<!ENTITY zotero.search.clear "清空">
-<!ENTITY zotero.search.saveSearch "保存搜索结果">
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index 6908f26e6d..df07c981c2 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "移除条目…">
 <!ENTITY zotero.toolbar.newGroup "新建群组…">
 <!ENTITY zotero.toolbar.newSubcollection.label "新建子分类…">
-<!ENTITY zotero.toolbar.newSavedSearch.label "新建搜索…">
 <!ENTITY zotero.toolbar.emptyTrash.label "清空回收站">
 <!ENTITY zotero.toolbar.tagSelector.label "显示/隐藏标签选择器">
 <!ENTITY zotero.toolbar.actions.label "操作">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "首选项…">
 <!ENTITY zotero.toolbar.supportAndDocumentation "支持与文档">
 <!ENTITY zotero.toolbar.about.label "关于 Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "高级搜索">
 <!ENTITY zotero.toolbar.openURL.label "检索">
 <!ENTITY zotero.toolbar.openURL.tooltip "在本地文献库里查找">
 
diff --git a/chrome/locale/zh-CN/zotero/zotero.ftl b/chrome/locale/zh-CN/zotero/zotero.ftl
index 7c9bc12e24..623e44dff3 100644
--- a/chrome/locale/zh-CN/zotero/zotero.ftl
+++ b/chrome/locale/zh-CN/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = 打印
 general-remove = 移除
 general-add = 添加
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = 查看故障排除说明
 general-go-back = 返回
 general-accept = 接受
 general-cancel = 取消
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = 在文献库中显示
 general-restartApp = 重启 { -app-name }
 general-restartInTroubleshootingMode = 以故障排除模式重启
 general-save = 保存
 general-clear = 清空
+clear-button =
+    .label = { general-clear }
 general-update = 更新
 general-back = 后退
 general-edit = 编辑
@@ -76,6 +86,8 @@ general-maroon = 深红色
 general-gray = 灰色
 general-black = 黑色
 general-loading = 加载中…
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = 参考文献样式:
 language-label = 语言：
 menu-custom-group-submenu =
@@ -161,14 +173,94 @@ collections-menu-show-recently-read =
     .label = 显示 { recently-read }
 item-menu-remove-from-recently-read =
     .label = 从 { recently-read } 中移除…
-collections-menu-rename-collection =
-    .label = 重命名分类
-collections-menu-edit-saved-search =
-    .label = 编辑已保存搜索
+items-section-collections-selected =
+    { $count ->
+       *[other] 已选择 { $count } 个分类
+    }
+items-section-searches-selected =
+    { $count ->
+       *[other] 已选择 { $count } 个已保存搜索
+    }
+items-section-sources-selected =
+    { $count ->
+       *[other] 已选择 { $count } 个来源
+    }
+items-section-library-collections =
+    { $count ->
+       *[other] { $library } (已选择 { $count } 个分类)
+    }
+items-section-library-searches =
+    { $count ->
+       *[other] { $library } (已选择 { $count } 个已保存搜索)
+    }
+items-section-library-sources =
+    { $count ->
+       *[other] { $library } (已选择 { $count } 个来源)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = 重命名
+edit-saved-search = 编辑已保存搜索
+collections-menu-edit-search =
+    .label = 编辑搜索
+collections-menu-duplicate-search =
+    .label = 重复搜索
 collections-menu-move-collection =
     .label = 移动到
 collections-menu-copy-collection =
     .label = 复制到
+collections-menu-export =
+    .label = 导出…
+collections-menu-generate-report =
+    .label = 生成报告…
+collections-menu-create-bibliography =
+    .label = 创建参考文献表…
+collections-menu-unsubscribe =
+    .label = 退订…
+collections-menu-delete =
+    .label =
+        { $count ->
+           *[other] 删除分类…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+           *[other] 删除分类和条目…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+           *[other] 删除搜索…
+        }
+collections-delete-title =
+    { $count ->
+       *[other] 删除分类
+    }
+collections-delete-message =
+    { $count ->
+       *[other] 您确定要删除 { $count } 个分类吗？
+    }
+collections-delete-keep-items =
+    { $count ->
+       *[other] 这些分类中的条目不会被删除。
+    }
+collections-delete-with-items-title =
+    { $count ->
+       *[other] 删除分类和条目
+    }
+collections-delete-with-items-message =
+    { $count ->
+       *[other] 您确定要删除 { $count } 个分类并删除其中所有条目吗？
+    }
+collections-delete-search-title =
+    { $count ->
+       *[other] 删除搜索
+    }
+collections-delete-search-message =
+    { $count ->
+       *[other] 您确定要删除 { $count } 个搜索吗？
+    }
 item-creator-moveDown =
     .label = 下移
 item-creator-moveToTop =
@@ -281,6 +373,7 @@ import-online-relink-only =
     .label = 重新链接 Mendeley 桌面程序参考文献
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } 无法连接到 { $targetApp }。请检查您的网络连接并重试。
+tab-title-multiple-collections = 多个
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -614,6 +707,18 @@ quicksearch-input =
     .aria-label = 快速搜索
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = 高级搜索
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = 关闭高级搜索
+advanced-search-expand =
+    .tooltiptext = 展开高级搜索
+advanced-search-collapse =
+    .tooltiptext = 折叠高级搜索
 item-pane-header-view-as =
     .label = 显示为
 item-pane-header-none =
@@ -669,9 +774,64 @@ architecture-x64-on-arm64-action = 下载适配 ARM64 的 { -app-name }
 first-run-guidance-authorMenu = { -app-name } 也允许您指定“编辑”和“译者”。您可以从此菜单中选择，将“作者”更改为“编辑”或“译者”。
 first-run-guidance-readAloud = { -app-name }  现在可以使用自然流畅的语音为你朗读文档。
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = 移除条件
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = 添加条件
+advanced-search-group-btn =
+    .tooltiptext = 添加条件组
+advanced-search-remove-group-btn =
+    .tooltiptext = 删除组
+advanced-search-ungroup-btn =
+    .tooltiptext = 取消条件组合
+advanced-search-result-level-menu =
+    .aria-label = 结果类型
+advanced-search-result-level-prefix-root =
+    .value = 查找
+advanced-search-join-prefix-root =
+    .value = 匹配
+advanced-search-result-level-any =
+    .label = 任意条目
+advanced-search-result-level-item =
+    .label = 顶级条目
+advanced-search-result-level-attachment =
+    .label = 附件
+advanced-search-result-level-note =
+    .label = 笔记
+advanced-search-result-level-annotation =
+    .label = 注释
+advanced-search-binding-menu =
+    .aria-label = 与同一条目匹配
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = 在同一附件中
+advanced-search-binding-same-note =
+    .label = 在同一笔记中
+advanced-search-binding-same-annotation =
+    .label = 在同一注释中
+advanced-search-of-the-following =
+    .value = 以下
+advanced-search-binding-hint-attachment =
+    .value = 这些条件可以匹配不同的附件。
+advanced-search-binding-hint-note =
+    .value = 这些条件可以匹配不同的笔记。
+advanced-search-binding-hint-annotation =
+    .value = 这些条件可以匹配不同的注释。
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = 匹配相同的附件
+advanced-search-bind-same-note =
+    .label = 匹配相同的笔记
+advanced-search-bind-same-annotation =
+    .label = 匹配相同的注释
 advanced-search-conditions-menu =
     .aria-label = 搜索条件
     .label = { $label }
@@ -681,11 +841,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = 值
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = 字段：
 search-conditions-collection = 分类
 search-conditions-savedSearch = 保存的搜索
 search-conditions-itemTypeID = 条目类型
 search-conditions-tag = 标签
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = 笔记
 search-conditions-childNote = 子笔记
 search-conditions-creator = 创建者
@@ -704,10 +870,26 @@ search-conditions-dateModified = 修改日期
 search-conditions-fulltextContent = 附件内容
 search-conditions-programmingLanguage = 编程语言
 search-conditions-fileTypeID = 附件类型
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = 附件最后阅读时间
 search-conditions-annotationText = 文本注释
 search-conditions-annotationComment = 注释评论
+search-conditions-annotationType = 注释类型
+search-conditions-annotationColor = 注释颜色
+search-conditions-annotationAuthor = 注释作者
 search-conditions-anyField = 任何字段
+search-conditions-titleCreatorYear = 标题、创建者、年份
+search-conditions-submenu-attachment = 附件
+search-conditions-submenu-annotation = 注释
+search-conditions-short-fulltextContent = 内容
+search-conditions-short-fileTypeID = 音频文件类型
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = 最后阅读时间
+search-conditions-short-annotationText = 文本
+search-conditions-short-annotationComment = 评论
+search-conditions-short-annotationType = 类型
+search-conditions-short-annotationColor = 颜色
+search-conditions-short-annotationAuthor = 作者
 find-pdf-files-added =
     { $count ->
        *[other] 已添加 { $count } 个文件
@@ -736,6 +918,9 @@ file-type-video = 视频
 file-type-presentation = 演示文档
 file-type-document = 文档
 file-type-ebook = 电子书
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = 你已升级到 <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version } </span>！了解一下<a data-l10n-name="new-features-link">新特性</a>。
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -744,18 +929,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = 粘贴并搜索
 mac-word-plugin-install-message = Zotero 需要访问 Word 数据才能安装 Word 插件。
+mac-word-plugin-install-folder-message = { -app-name }  需要访问 Word 的 startup 文件夹才能安装 Word 插件。
 mac-word-plugin-install-action-button =
     .label = 安装 Word 插件
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = 将插件安装到 Word 的 startup 文件夹中
+mac-word-plugin-install-folder-dialog-button = 安装
+mac-word-plugin-install-wrong-folder-selected = 必须选择建议的文件夹。请重试且不要选择其他文件夹。
 file-renaming-banner-message = { -app-name } 现在支持在您修改条目时自动保持附件文件名同步。
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = { -app-name } Connector 必须更新才能与该版本的 { -app-name } 兼容。
 userjs-pref-warning = 某些 { -app-name } 设置已通过不支持的方法被覆盖。{ -app-name } 将恢复这些设置并重新启动。
 migrate-extra-fields-progress-message = 从其他字段迁移至新字段
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = 拆分标签
 long-tag-fixer-button-dont-split =
@@ -773,4 +963,124 @@ banner-close-button =
     .aria-label = 关闭通知
 plugins-blocked-plugin =
     .message = 此插件已被 { -app-name } 禁用。
-data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+data-dir-unsupported-storage = 如果 { -app-name } 的数据目录位于云存储文件夹（如OneDrive、Dropbox等）或网络共享位置，则可能会出现这种情况。
+login-manager-reset = { -app-name } 无法读取您保存的登录信息，因此已重置。请在 { -app-name } 设置的 { preferences-pane-account } 窗格中重新登录。
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = 搜索
+save-search-new-button =
+    .label = 保存搜索…
+save-search-edit-button =
+    .label = 保存
+save-search-name-title = 保存搜索结果
+save-search-name-message = 为已保存搜索输入一个名称:
+saved-search-close-confirmation-title = 编辑已保存搜索
+saved-search-close-confirmation-body = 是否要保存对此已保存搜索所做的更改？
+item-pane-batch-editing-prompt =
+    .aria-label = 批量编辑
+item-pane-batch-editing-enable =
+    .label = 编辑多个条目…
+item-pane-batch-editing-multiple-values-placeholder = 多个
+item-pane-batch-editing-clear-values = 清除所有值
+item-pane-batch-editing-header =
+    { $count ->
+       *[other] 编辑 { $count } 个条目
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+       *[other] 编辑 { $count } 个条目的元数据
+    }
+undo-action-edit-field =
+    { $count ->
+       *[other] 编辑 { $count } 个条目的 “{ $field }”
+    }
+undo-action-normalize-attachment-titles = 规范附件标题
+undo-action-trash =
+    { $count ->
+       *[other] 删除 { $count } 个条目
+    }
+undo-action-restore-items =
+    { $count ->
+       *[other] 恢复 { $count } 个条目
+    }
+undo-action-trash-collection =
+    { $count ->
+       *[other] 删除 { $count } 个分类
+    }
+undo-action-trash-search =
+    { $count ->
+       *[other] 删除 { $count } 个已保存搜索
+    }
+undo-action-restore-collection =
+    { $count ->
+       *[other] 恢复 { $count } 个分类
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+       *[other] 将 { $count } 个条目添加到分类
+    }
+undo-action-remove-from-collection =
+    { $count ->
+       *[other] 从分类中移除 { $count } 个条目
+    }
+undo-action-move-to-collection =
+    { $count ->
+       *[other] 将 { $count } 个条目移动到分类
+    }
+undo-action-rename-collection = 重命名分类
+undo-action-move-collection = 移动分类
+undo-action-add-tag =
+    { $count ->
+       *[other] 为 { $count } 个条目添加标签
+    }
+undo-action-change-tag = 更改标签
+undo-action-split-tag = 拆分标签
+undo-action-remove-tag =
+    { $count ->
+       *[other] 从 { $count } 个条目删除标签
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+       *[other] 删除 { $count } 个标签
+    }
+undo-action-remove-all-tags = 删除所有标签
+undo-action-edit-note = 编辑笔记
+undo-action-add-creator = 添加创建者
+undo-action-remove-creator = 移除创建者
+undo-action-edit-creator = 编辑创建者
+undo-action-reorder-creator = 重新排序创建者
+undo-action-change-type = 更改条目类型
+undo-action-change-parent-item =
+    { $count ->
+       *[other] 为 { $count } 个条目改变上级条目
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+       *[other] 将 { $count } 个条目转换为独立条目
+    }
+undo-action-add-related = 添加关联
+undo-action-remove-related = 移除关联
+undo-action-merge-items =
+    { $count ->
+       *[other] 合并 { $count } 个条目
+    }
+menu-edit-undo-action = 撤销 { $action }
+menu-edit-redo-action = 重做 { $action }
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index b569e0749c..6f23b9b9b8 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 年前
 date.relative.yearsAgo.multiple=%S 年前
 
 pane.collections.title=分类
-pane.collections.delete.title=删除分类
-pane.collections.delete=您确定要删除选中的分类吗？
-pane.collections.delete.keepItems=将不会删除此分类下的条目。
-pane.collections.deleteWithItems.title=删除分类及条目
-pane.collections.deleteWithItems=您确定要删除选中的分类并将所有的条目移动到回收站中吗？
 pane.feed.deleteWithItems.title=取消订阅
 pane.feed.deleteWithItems=您确定您要退订此订阅吗？
 
-pane.collections.deleteSearch.title=删除搜索
-pane.collections.deleteSearch=您确定要删除选中的搜索结果？
 pane.collections.emptyTrash=您确定要永久删除回收站里的条目吗？
 pane.collections.newSavedSeach=新建搜索
 pane.collections.savedSearchName=输入搜索结果的名称：
@@ -277,24 +270,9 @@ pane.collections.duplicate=重复条目
 pane.collections.removeLibrary=移除文库
 pane.collections.removeLibrary.text=您确定要从电脑中彻底移除“%S”吗？
 
-pane.collections.menu.duplicate.savedSearch=重复保存的搜索
 pane.collections.menu.remove.library=移除文库…
-pane.collections.menu.delete.collection=删除分类…
-pane.collections.menu.delete.collectionAndItems=删除分类及条目…
-pane.collections.menu.delete.savedSearch=删除搜索结果…
-pane.collections.menu.delete.feedAndItems=退订订阅…
-pane.collections.menu.export.collection=导出分类…
-pane.collections.menu.export.savedSearch=导出搜索结果…
-pane.collections.menu.export.feed=导出订阅…
-pane.collections.menu.createBib.collection=用分类创建参考文献表…
-pane.collections.menu.createBib.savedSearch=用已保存的搜索创建参考文献表…
-pane.collections.menu.createBib.feed=用订阅创建参考文献表…
 pane.collections.showCollectionInLibrary=显示库中的分类
 
-pane.collections.menu.generateReport.collection=生成分类报告…
-pane.collections.menu.generateReport.savedSearch=生成搜索结果报告…
-pane.collections.menu.generateReport.feed=生成订阅报告…
-
 pane.collections.menu.refresh.feed=更新订阅
 pane.collections.menu.refresh.allFeeds=更新所有订阅
 pane.collections.menu.markAsRead.feed=标记订阅为已读
@@ -500,11 +478,11 @@ itemFields.tags=标签
 itemFields.attachments=附件
 itemFields.related=相关
 itemFields.url=网址
-itemFields.rights=License
+itemFields.rights=版权
 itemFields.series=系列
 itemFields.volume=卷次
 itemFields.issue=期号
-itemFields.edition=版本
+itemFields.edition=版/版次
 itemFields.place=地点
 itemFields.publisher=出版社
 itemFields.pages=页码
@@ -561,7 +539,7 @@ itemFields.runningTime=时长
 itemFields.network=网络
 itemFields.postType=帖文类型
 itemFields.audioFileType=音频文件类型
-itemFields.versionNumber=版本
+itemFields.versionNumber=版本号
 itemFields.system=系统
 itemFields.company=公司
 itemFields.conferenceName=会议名称
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox需要重启以完成修
 zotero.preferences.sync.reset.fileSyncHistory=在下一次同步时，%1$S 将对照存储服务检查“%2$S”中的所有附件文件。 将下载本地丢失的所有远程附件文件，并上传远程丢失的本地附件文件。\n\n正常使用期间不需要此选项。
 zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S”的文件同步历史记录已清除。
 
-zotero.preferences.search.rebuildIndex=重建索引
-zotero.preferences.search.rebuildWarning=要重建整个索引吗？这可能会花上一些时间。\n\n如果只想索引未索引的条目，请用 %S。
-zotero.preferences.search.clearIndex=清除索引
-zotero.preferences.search.clearWarning=一旦清除索引，附件内容将不可搜索。\n\n网页链接形式的附件不会被重新索引，除非重新访问网页。要保留网页链接的索引，请选择 %S。
-zotero.preferences.search.clearNonLinkedURLs=清除除网页以外的所有链接
-zotero.preferences.search.indexUnindexed=索引尚未索引的条目
 zotero.preferences.export.quickCopy.citationStyles=参考文献样式
 zotero.preferences.export.quickCopy.exportFormats=导出格式
 zotero.preferences.export.quickCopy.instructions=使用“快速复制”可以快速导出条目为特定格式。您可以按 %S 来复制选中的条目到剪切板，或者直接拖拽条目到其他程序中的文本框。
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=执行本操作前您需要插入引注。
 integration.error.mustInsertBibliography=执行本操作前，请先插入参考文献表。
 integration.error.cannotInsertHere=此处无法插入 Zotero 字段。
 integration.error.notInCitation=您需要将光标放在 Zotero 引注上才能进行编辑。
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=当前的参考文献样式并未定义参考文献表。如果您希望插入参考文献表，请选择其他样式。
 integration.error.deletePipe=Zotero 与文字处理程序的通讯管道无法初始化。您希望 Zotero 尝试修复此错误吗？您将按提示输入密码。
 integration.error.invalidStyle=您选择的样式似乎无效。如果您自行创建了此样式，请确保它能通过 https://github.com/citation-style-language/styles/wiki/Validation 中描述的验证。否则，请尝试选择其他样式。
@@ -1005,9 +978,9 @@ sync.error.reportSiteIssuesToForums=如果在特定站点上保存条目时反
 sync.error.invalidDataError=无法下载%S中的某些数据。 可能已使用%S的较新版本保存。
 sync.error.invalidDataError.otherData=其他数据将继续同步。
 
-account.unlinkWarning=Logging out will prevent %S from syncing your data.
+account.unlinkWarning=退出您的账户将使 %S 停止同步您的数据。
 account.unlinkWarning.removeData=从此计算机中移除我的 %S 数据。
-account.unlinkWarning.button=Log Out
+account.unlinkWarning.button=退出账户
 account.warning.emptyLibrary=您将要同步%1$S账户至空数据库。这可能是由于您之前移除了您 %1$S 数据目录中的%2$S 文件，或您更改了数据目录位置。
 account.warning.emptyLibrary.dataWillBeDownloaded=如果继续，‘%1$S’帐号中的数据将被下载到当前计算机。您的在线文献库不受影响。
 account.warning.existingDataElsewhere=如果您的 %S 数据存在于此计算机上的其他位置，请将其移动之当前数据目录；或者在首选项中修改数据目录的位置，使之指向现存的数据。
diff --git a/chrome/locale/zh-TW/zotero/integration.ftl b/chrome/locale/zh-TW/zotero/integration.ftl
index b4119b40e3..0b2b129830 100644
--- a/chrome/locale/zh-TW/zotero/integration.ftl
+++ b/chrome/locale/zh-TW/zotero/integration.ftl
@@ -32,6 +32,7 @@ integration-citationDialog-section-cited =
 integration-citationDialog-details-suffix = Suffix
 integration-citationDialog-details-prefix = Prefix
 integration-citationDialog-details-suppressAuthor = 省略作者
+integration-citationDialog-details-locator-info = Tip: You can also type page numbers and other locators directly into the main field. <a data-l10n-name="docs-link">Learn more</a>
 integration-citationDialog-details-includeComments = Include Comments
 integration-citationDialog-details-remove = { general-remove }
 integration-citationDialog-details-done =
@@ -54,6 +55,10 @@ integration-citationDialog-lib-message-annotations =
        *[other] No selected or open items with annotations
     }
 integration-citationDialog-settings-keepSorted = Keep sources sorted
+integration-citationDialog-preview-empty = 預覽
+integration-citationDialog-preview-error = Preview unavailable
+integration-citationDialog-btn-displayPreview =
+    .title = Display citation preview
 integration-citationDialog-btn-settings =
     .title = { general-open-settings }
 integration-citationDialog-mode-library = 文獻庫
@@ -76,6 +81,11 @@ integration-citationDialog-aria-bubble =
 integration-citationDialog-single-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = Press Tab to select items to add to this citation. Press Escape to discard the changes and close the dialog.
+integration-citationDialog-just-added-input-placeholder = Type “10-15” to cite pages, or search for items
+integration-citationDialog-just-added-input-citation =
+    .placeholder = { $placeholder }
+    .title = { $title }
+    .aria-description = { integration-citationDialog-general-instructions }
 integration-citationDialog-input-citation =
     .placeholder = { integration-citationDialog-search-for-items }
     .aria-description = { integration-citationDialog-general-instructions }
@@ -131,8 +141,6 @@ integration-warning-documentPreferences-changes-will-be-lost = You have made cha
 integration-warning-discard-changes = Discard Changes
 integration-warning-command-is-running = A word processor integration command is already running.
 first-run-guidance-citationDialog =
-    Type a title, author, and/or year to search for a reference.
-    
-    After you’ve made your selection, click the bubble or select it via the keyboard and press ↓/Space to show citation options such as page number, prefix, and suffix.
+    Click the bubble or use the ← and ↓ keys to view the citation details and customize options such as page number, prefix, and suffix.
     
     You can also add a page number or other locator by including it with your search terms (e.g., “history { $locator }”) or by typing it after the bubble and pressing { return-or-enter }.
diff --git a/chrome/locale/zh-TW/zotero/preferences.ftl b/chrome/locale/zh-TW/zotero/preferences.ftl
index 67df92e112..f69e176eb3 100644
--- a/chrome/locale/zh-TW/zotero/preferences.ftl
+++ b/chrome/locale/zh-TW/zotero/preferences.ftl
@@ -70,6 +70,8 @@ preferences-advanced-server-enable-and-restart =
 preferences-advanced-language-and-region-title = 語言與區域
 preferences-advanced-enable-bidi-ui =
     .label = 啟用雙向文字編輯應用程式
+preferences-advanced-data-dir =
+    .value = Data Directory:
 preferences-advanced-reset-data-dir =
     .label = Revert to Default Location…
 preferences-advanced-custom-data-dir =
@@ -83,7 +85,7 @@ preferences-sync-data-syncing-groupbox =
     .aria-label = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-heading = { -preferences-sync-data-syncing }
 preferences-sync-data-syncing-description = Log in with your { -app-name } account to sync your data between devices, collaborate with others, and more.
-preferences-sync-settings-heading = Sync
+preferences-sync-settings-heading = 同步
 preferences-sync-settings-intro = { -app-name } can sync your library data and files across devices. <label data-l10n-name="sync-link">Learn more</label>
 preferences-sync-reset-heading = Sync Reset
 preferences-sync-fileSyncing-groups =
@@ -125,3 +127,7 @@ preferences-account-switch-accounts =
 preferences-account-switch-text = Switching to a different account will remove all { -app-name } data on this computer. Before continuing, make sure all data and files you wish to keep have been synced with the “{ $username }” account or you have a backup of your { -app-name } data directory.
 preferences-account-switch-confirmation-text = remove local data
 preferences-account-switch-accept = Remove Data and Restart
+fulltext-index-status-indexing = Indexing { $indexed } of { $total }…
+fulltext-index-status-complete = Search index is up to date
+fulltext-stats-notes-indexed = Notes indexed:
+fulltext-stats-not-available = File or full-text content not available:
diff --git a/chrome/locale/zh-TW/zotero/searchbox.dtd b/chrome/locale/zh-TW/zotero/searchbox.dtd
index 1d0abc47f8..9135fd49f7 100644
--- a/chrome/locale/zh-TW/zotero/searchbox.dtd
+++ b/chrome/locale/zh-TW/zotero/searchbox.dtd
@@ -1,7 +1,5 @@
 <!ENTITY zotero.search.name "名稱：">
 
-<!ENTITY zotero.search.searchInLibrary "於文獻庫搜尋：">
-
 <!ENTITY zotero.search.joinMode.prefix "比對">
 <!ENTITY zotero.search.joinMode.any "任一個">
 <!ENTITY zotero.search.joinMode.all "全部">
@@ -19,7 +17,3 @@
 <!ENTITY zotero.search.date.units.days "日">
 <!ENTITY zotero.search.date.units.months "月">
 <!ENTITY zotero.search.date.units.years "年">
-
-<!ENTITY zotero.search.search "搜尋">
-<!ENTITY zotero.search.clear "清除">
-<!ENTITY zotero.search.saveSearch "儲存搜尋">
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 38d2f7bfae..96724f1a92 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -81,7 +81,6 @@
 <!ENTITY zotero.toolbar.removeItem.label "移除項目……">
 <!ENTITY zotero.toolbar.newGroup "新增群組……">
 <!ENTITY zotero.toolbar.newSubcollection.label "新增子文獻集……">
-<!ENTITY zotero.toolbar.newSavedSearch.label "新增搜尋結果……">
 <!ENTITY zotero.toolbar.emptyTrash.label "清除垃圾筒">
 <!ENTITY zotero.toolbar.tagSelector.label "顯示/隱藏標籤選擇器">
 <!ENTITY zotero.toolbar.actions.label "動作">
@@ -92,7 +91,6 @@
 <!ENTITY zotero.toolbar.preferences.label "偏好設定……">
 <!ENTITY zotero.toolbar.supportAndDocumentation "支援及說明文件">
 <!ENTITY zotero.toolbar.about.label "關於 Zotero">
-<!ENTITY zotero.toolbar.advancedSearch "進階搜尋">
 <!ENTITY zotero.toolbar.openURL.label "查詢">
 <!ENTITY zotero.toolbar.openURL.tooltip "於本機文獻庫尋找">
 
diff --git a/chrome/locale/zh-TW/zotero/zotero.ftl b/chrome/locale/zh-TW/zotero/zotero.ftl
index 2ed5c8b50e..c0d027e08f 100644
--- a/chrome/locale/zh-TW/zotero/zotero.ftl
+++ b/chrome/locale/zh-TW/zotero/zotero.ftl
@@ -24,6 +24,12 @@ delete-or-backspace =
         [macos] Delete
        *[other] Backspace
     }
+-os-name =
+    { PLATFORM() ->
+        [macos] macOS
+        [windows] Windows
+       *[other] Linux
+    }
 general-print = 列印
 general-remove = 移除
 general-add = 新增
@@ -40,11 +46,15 @@ general-view-troubleshooting-instructions = 查看故障排除說明
 general-go-back = 回到上一層
 general-accept = Accept
 general-cancel = 取消
+cancel-button =
+    .label = { general-cancel }
 general-show-in-library = 在文獻庫中顯示
 general-restartApp = Restart { -app-name }
 general-restartInTroubleshootingMode = 以除錯模式重新啟動
 general-save = 儲存
 general-clear = 清除
+clear-button =
+    .label = { general-clear }
 general-update = 更新
 general-back = 後退
 general-edit = 編輯
@@ -76,6 +86,8 @@ general-maroon = 栗色
 general-gray = 灰色
 general-black = 黑色
 general-loading = 載入中……
+db-checking-integrity = Checking database integrity…
+db-repairing = Repairing database…
 citation-style-label = 引用文獻樣式:
 language-label = 語言：
 menu-custom-group-submenu =
@@ -162,14 +174,109 @@ collections-menu-show-recently-read =
     .label = Show { recently-read }
 item-menu-remove-from-recently-read =
     .label = Remove from { recently-read }…
-collections-menu-rename-collection =
-    .label = 重命名文獻集
-collections-menu-edit-saved-search =
-    .label = 編輯儲存的搜尋結果
+items-section-collections-selected =
+    { $count ->
+       *[other] 已選擇 { $count } 個文獻集
+    }
+items-section-searches-selected =
+    { $count ->
+        [one] { $count } saved search selected
+       *[other] { $count } saved searches selected
+    }
+items-section-sources-selected =
+    { $count ->
+        [one] { $count } source selected
+       *[other] { $count } sources selected
+    }
+items-section-library-collections =
+    { $count ->
+        [one] { $library } ({ $count } collection selected)
+       *[other] { $library } ({ $count } collections selected)
+    }
+items-section-library-searches =
+    { $count ->
+        [one] { $library } ({ $count } saved search selected)
+       *[other] { $library } ({ $count } saved searches selected)
+    }
+items-section-library-sources =
+    { $count ->
+        [one] { $library } ({ $count } source selected)
+       *[other] { $library } ({ $count } sources selected)
+    }
+items-section-library-recently-read = { $library } ({ recently-read })
+items-section-library = { $library }
+collections-menu-rename =
+    .label = Rename
+edit-saved-search = 編輯儲存的搜尋結果
+collections-menu-edit-search =
+    .label = Edit Search
+collections-menu-duplicate-search =
+    .label = Duplicate Search
 collections-menu-move-collection =
     .label = 移動到
 collections-menu-copy-collection =
     .label = 複製到
+collections-menu-export =
+    .label = 匯出……
+collections-menu-generate-report =
+    .label = Generate Report…
+collections-menu-create-bibliography =
+    .label = Create Bibliography…
+collections-menu-unsubscribe =
+    .label = Unsubscribe…
+collections-menu-delete =
+    .label =
+        { $count ->
+            [one] Delete Collection…
+           *[other] Delete Collections…
+        }
+collections-menu-delete-with-items =
+    .label =
+        { $count ->
+            [one] Delete Collection and Items…
+           *[other] Delete Collections and Items…
+        }
+collections-menu-delete-search =
+    .label =
+        { $count ->
+            [one] Delete Search…
+           *[other] Delete Searches…
+        }
+collections-delete-title =
+    { $count ->
+        [one] Delete Collection
+       *[other] Delete Collections
+    }
+collections-delete-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection?
+       *[other] Are you sure you want to delete { $count } collections?
+    }
+collections-delete-keep-items =
+    { $count ->
+        [one] Items within this collection will not be deleted.
+       *[other] Items within these collections will not be deleted.
+    }
+collections-delete-with-items-title =
+    { $count ->
+        [one] Delete Collection and Items
+       *[other] Delete Collections and Items
+    }
+collections-delete-with-items-message =
+    { $count ->
+        [one] Are you sure you want to delete this collection and move all items within it to the Trash?
+       *[other] Are you sure you want to delete { $count } collections and move all items within them to the Trash?
+    }
+collections-delete-search-title =
+    { $count ->
+        [one] Delete Search
+       *[other] Delete Searches
+    }
+collections-delete-search-message =
+    { $count ->
+        [one] Are you sure you want to delete this search?
+       *[other] Are you sure you want to delete { $count } searches?
+    }
 item-creator-moveDown =
     .label = 移至尾端
 item-creator-moveToTop =
@@ -282,6 +389,7 @@ import-online-relink-only =
     .label = 重新連結Mendeley桌面應用程式引文
 import-online-relink-kb = { general-more-information }
 import-online-connection-error = { -app-name } 無法連結到 { $targetApp }。請檢查您的網路連線後再試一次。
+tab-title-multiple-collections = Multiple
 items-table-cell-notes =
     .aria-label =
         { $count ->
@@ -615,6 +723,18 @@ quicksearch-input =
     .aria-label = 快速搜尋
     .placeholder = { $placeholder }
     .aria-description = { $placeholder }
+advanced-search = 進階搜尋
+menuitem-advanced-search =
+    .label = { advanced-search }
+quicksearch-advanced-search-button =
+    .tooltiptext = { advanced-search }
+    .aria-label = { advanced-search }
+advanced-search-close =
+    .tooltiptext = Close Advanced Search
+advanced-search-expand =
+    .tooltiptext = Expand Advanced Search
+advanced-search-collapse =
+    .tooltiptext = Collapse Advanced Search
 item-pane-header-view-as =
     .label = 顯示為
 item-pane-header-none =
@@ -670,9 +790,64 @@ architecture-x64-on-arm64-action = 下載 ARM 64位元版本的 { -app-name }
 first-run-guidance-authorMenu = { -app-name } 也允許您指定編輯與譯者。您可以從此選單中選擇，將作者更改為編輯或譯者。
 first-run-guidance-readAloud = { -app-name } can now read your documents to you using natural-sounding voices.
 advanced-search-remove-btn =
-    .tooltiptext = { general-remove }
+    .tooltiptext = Remove Condition
 advanced-search-add-btn =
-    .tooltiptext = { general-add }
+    .tooltiptext = Add Condition
+advanced-search-group-btn =
+    .tooltiptext = Add Condition Group
+advanced-search-remove-group-btn =
+    .tooltiptext = Remove Group
+advanced-search-ungroup-btn =
+    .tooltiptext = Ungroup Conditions
+advanced-search-result-level-menu =
+    .aria-label = Result type
+advanced-search-result-level-prefix-root =
+    .value = 尋找
+advanced-search-join-prefix-root =
+    .value = matching
+advanced-search-result-level-any =
+    .label = any items
+advanced-search-result-level-item =
+    .label = top-level items
+advanced-search-result-level-attachment =
+    .label = attachments
+advanced-search-result-level-note =
+    .label = notes
+advanced-search-result-level-annotation =
+    .label = 標註
+advanced-search-binding-menu =
+    .aria-label = Match against the same item
+advanced-search-binding-separate =
+    .label = separately
+advanced-search-binding-same-attachment =
+    .label = in the same attachment
+advanced-search-binding-same-note =
+    .label = in the same note
+advanced-search-binding-same-annotation =
+    .label = in the same annotation
+advanced-search-of-the-following =
+    .value = of the following
+advanced-search-binding-hint-attachment =
+    .value = These conditions can match separate attachments.
+advanced-search-binding-hint-note =
+    .value = These conditions can match separate notes.
+advanced-search-binding-hint-annotation =
+    .value = These conditions can match separate annotations.
+advanced-search-level-warning-mixed = These conditions cannot all match the same item, so this search will never return results. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-level-warning-unreachable = This search has a condition that cannot apply to the chosen result type. Set the result type to “{ $topLevelItems }” or remove the incompatible condition.
+advanced-search-group-warning-unreachable =
+    A condition here cannot be in the same { $entity ->
+        [attachment] attachment
+        [note] note
+       *[annotation] annotation
+    }. Match these separately or remove the incompatible condition.
+advanced-search-group-warning-mixed = These conditions cannot all match the same item, so this group will never match. Try matching “{ $matchAny }” of them, or set the result type to “{ $topLevelItems }”.
+advanced-search-bind-same-attachment =
+    .label = Match the same attachment
+advanced-search-bind-same-note =
+    .label = Match the same note
+advanced-search-bind-same-annotation =
+    .label = Match the same annotation
 advanced-search-conditions-menu =
     .aria-label = 搜尋條件
     .label = { $label }
@@ -682,11 +857,17 @@ advanced-search-operators-menu =
 advanced-search-condition-input =
     .aria-label = 值
     .label = { $label }
+search-operator-isEmpty = is empty
+search-operator-isNotEmpty = is not empty
 search-conditions-tooltip-fields = 欄位：
 search-conditions-collection = 文獻集
 search-conditions-savedSearch = 儲存的搜尋結果
 search-conditions-itemTypeID = 項目類型
 search-conditions-tag = 標籤
+search-conditions-numTags = # of Tags
+search-conditions-numNotes = # of Notes
+search-conditions-numAttachments = # of Attachments
+search-conditions-numAnnotations = # of Annotations
 search-conditions-note = 筆記
 search-conditions-childNote = 子筆記
 search-conditions-creator = 創作者
@@ -705,10 +886,26 @@ search-conditions-dateModified = 修改日期
 search-conditions-fulltextContent = 附件內容
 search-conditions-programmingLanguage = 程式語言
 search-conditions-fileTypeID = 附件檔案類型
+search-conditions-attachmentStorageType = Attachment Storage Type
 search-conditions-lastRead = Attachment Last Read
 search-conditions-annotationText = 標註文字
 search-conditions-annotationComment = 標註評論
+search-conditions-annotationType = Annotation Type
+search-conditions-annotationColor = Annotation Color
+search-conditions-annotationAuthor = Annotation Author
 search-conditions-anyField = 任何欄位
+search-conditions-titleCreatorYear = 標題，創作者，年
+search-conditions-submenu-attachment = 附件檔
+search-conditions-submenu-annotation = 標註
+search-conditions-short-fulltextContent = Content
+search-conditions-short-fileTypeID = 檔案類型
+search-conditions-short-attachmentStorageType = Storage Type
+search-conditions-short-lastRead = Last Read
+search-conditions-short-annotationText = Text
+search-conditions-short-annotationComment = Comment
+search-conditions-short-annotationType = 類型
+search-conditions-short-annotationColor = Color
+search-conditions-short-annotationAuthor = 作者
 find-pdf-files-added =
     { $count ->
        *[other] 已新增 { $count } 個檔案
@@ -737,6 +934,9 @@ file-type-video = 視訊
 file-type-presentation = 簡報
 file-type-document = 文件
 file-type-ebook = 電子書
+attachment-storage-type-storedFile = Stored File
+attachment-storage-type-linkedFile = Linked File
+attachment-storage-type-webLink = Web Link
 post-upgrade-message = You’ve been upgraded to <span data-l10n-name="post-upgrade-appver">{ -app-name } { $version }</span>! Learn about <a data-l10n-name="new-features-link">what’s new</a>.
 post-upgrade-remind-me-later =
     .label = { general-remind-me-later }
@@ -745,18 +945,23 @@ post-upgrade-done =
 text-action-paste-and-search =
     .label = 貼上並搜尋
 mac-word-plugin-install-message = Zotero 需要存取 Word 資料來安裝 Word 外掛
+mac-word-plugin-install-folder-message = { -app-name } needs access to Word’s startup folder to install the Word plugin.
 mac-word-plugin-install-action-button =
     .label = 安裝 Word 外掛
 mac-word-plugin-install-remind-later-button =
     .label = { general-remind-me-later }
 mac-word-plugin-install-dont-ask-again-button =
     .label = { general-dont-ask-again }
+mac-word-plugin-install-folder-dialog-title = Install the plugin in the Word startup folder
+mac-word-plugin-install-folder-dialog-button = 安裝
+mac-word-plugin-install-wrong-folder-selected = The suggested folder must be selected. Please try again without choosing a different folder.
 file-renaming-banner-message = { -app-name } now automatically keeps attachment filenames in sync as you make changes to items.
 file-renaming-banner-documentation-link = { general-learn-more }
 file-renaming-banner-settings-link = { general-settings }
 connector-version-warning = The { -app-name } Connector must be updated to work with this version of { -app-name }.
 userjs-pref-warning = Some { -app-name } settings have been overridden using an unsupported method. { -app-name } will revert them and restart.
 migrate-extra-fields-progress-message = Migrating new fields from Extra field
+search-normalization-progress-message = Indexing items for search
 long-tag-fixer-window-title =
     .title = Split Tags
 long-tag-fixer-button-dont-split =
@@ -775,3 +980,140 @@ banner-close-button =
 plugins-blocked-plugin =
     .message = This plugin has been disabled by { -app-name }.
 data-dir-unsupported-storage = This can happen if the { -app-name } data directory is in a cloud storage folder (OneDrive, Dropbox, etc.) or on a network share.
+login-manager-reset = { -app-name } was unable to read your saved login information, so it has been reset. Please log in again in the { preferences-pane-account } pane of the { -app-name } settings.
+os-keystore-save-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to securely save your credentials. Make sure your Keychain is accessible and try again.
+        [windows] { -app-name } couldn’t securely save your credentials. Try again or restart { -app-name }.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to securely save your credentials. Make sure a keyring service is running and try again.
+    }
+os-keystore-migrate-failed =
+    { PLATFORM() ->
+        [macos] { -app-name } couldn’t access the { -os-name } Keychain to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure your Keychain is accessible and restart { -app-name }.
+        [windows] { -app-name } couldn’t encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Restart { -app-name } and try again.
+       *[other] { -app-name } couldn’t access your { -os-name } keyring to encrypt your stored credentials. Your credentials remain stored unencrypted on disk. Make sure a keyring service is running and restart { -app-name }.
+    }
+search-button =
+    .label = 搜尋
+save-search-new-button =
+    .label = Save Search…
+save-search-edit-button =
+    .label = 儲存
+save-search-name-title = 儲存搜尋
+save-search-name-message = Enter a name for the saved search:
+saved-search-close-confirmation-title = Editing Saved Search
+saved-search-close-confirmation-body = Do you want to save changes you made to this saved search?
+item-pane-batch-editing-prompt =
+    .aria-label = Batch editing
+item-pane-batch-editing-enable =
+    .label = Edit Multiple Items…
+item-pane-batch-editing-multiple-values-placeholder = Multiple
+item-pane-batch-editing-clear-values = Clear all values
+item-pane-batch-editing-header =
+    { $count ->
+        [one] Editing { $count } item
+       *[other] Editing { $count } items
+    }
+item-pane-batch-editing-done =
+    .label = { general-done }
+undo-action-edit-metadata =
+    { $count ->
+        [one] Edit Metadata
+       *[other] Edit Metadata for { $count } Items
+    }
+undo-action-edit-field =
+    { $count ->
+        [one] Edit of “{ $field }”
+       *[other] Edit of “{ $field }” for { $count } Items
+    }
+undo-action-normalize-attachment-titles = Normalize Attachment Title
+undo-action-trash =
+    { $count ->
+        [one] Trash Item
+       *[other] Trash { $count } Items
+    }
+undo-action-restore-items =
+    { $count ->
+        [one] Restore Item
+       *[other] Restore { $count } Items
+    }
+undo-action-trash-collection =
+    { $count ->
+        [one] Trash Collection
+       *[other] Trash { $count } Collections
+    }
+undo-action-trash-search =
+    { $count ->
+        [one] Trash Saved Search
+       *[other] Trash { $count } Saved Searches
+    }
+undo-action-restore-collection =
+    { $count ->
+        [one] Restore Collection
+       *[other] Restore { $count } Collections
+    }
+undo-action-restore-objects =
+    { $count ->
+        [one] Restore Object
+       *[other] Restore { $count } Objects
+    }
+undo-action-add-to-collection =
+    { $count ->
+        [one] Add to Collection
+       *[other] Add { $count } Items to Collection
+    }
+undo-action-remove-from-collection =
+    { $count ->
+        [one] Remove from Collection
+       *[other] Remove { $count } Items from Collection
+    }
+undo-action-move-to-collection =
+    { $count ->
+        [one] Move to Collection
+       *[other] Move { $count } Items to Collection
+    }
+undo-action-rename-collection = 重命名文獻集
+undo-action-move-collection = Move Collection
+undo-action-add-tag =
+    { $count ->
+        [one] Add Tag
+       *[other] Add Tag to { $count } Items
+    }
+undo-action-change-tag = Change Tag
+undo-action-split-tag = Split Tag
+undo-action-remove-tag =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove Tag from { $count } Items
+    }
+undo-action-remove-tags-from-item =
+    { $count ->
+        [one] Remove Tag
+       *[other] Remove { $count } Tags
+    }
+undo-action-remove-all-tags = Remove All Tags
+undo-action-edit-note = 編輯筆記
+undo-action-add-creator = Add Creator
+undo-action-remove-creator = Remove Creator
+undo-action-edit-creator = Edit Creator
+undo-action-reorder-creator = Reorder Creator
+undo-action-change-type = 改變項目類型
+undo-action-change-parent-item =
+    { $count ->
+        [one] Change Parent Item
+       *[other] Change Parent for { $count } Items
+    }
+undo-action-convert-to-standalone =
+    { $count ->
+        [one] Convert to Standalone
+       *[other] Convert { $count } Items to Standalone
+    }
+undo-action-add-related = Add Related
+undo-action-remove-related = Remove Related
+undo-action-merge-items =
+    { $count ->
+        [one] Merge Item
+       *[other] Merge { $count } Items
+    }
+menu-edit-undo-action = Undo { $action }
+menu-edit-redo-action = Redo { $action }
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index a3ad950618..e405dc48e9 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -250,16 +250,9 @@ date.relative.yearsAgo.one=1 年前
 date.relative.yearsAgo.multiple=%S 年前
 
 pane.collections.title=文獻集
-pane.collections.delete.title=刪除文獻集
-pane.collections.delete=確定要刪除所選文獻集嗎？
-pane.collections.delete.keepItems=此文獻集內的項目不會被刪除。
-pane.collections.deleteWithItems.title=刪除文獻集與其中項目
-pane.collections.deleteWithItems=確定刪除所選文獻集，並將其內所有項目移至垃圾桶？
 pane.feed.deleteWithItems.title=取消訂閱
 pane.feed.deleteWithItems=確定要取消訂閱這個新聞來源嗎？
 
-pane.collections.deleteSearch.title=刪除搜尋
-pane.collections.deleteSearch=確定要刪除所選的搜尋嗎？
 pane.collections.emptyTrash=確定要永遠移除垃圾筒中的項目？
 pane.collections.newSavedSeach=新增搜尋結果
 pane.collections.savedSearchName=給此搜尋結果一個名稱：
@@ -277,24 +270,9 @@ pane.collections.duplicate=重覆的項目
 pane.collections.removeLibrary=刪除文獻庫
 pane.collections.removeLibrary.text=你確定要從這台電腦中永遠移除 %S 嗎？
 
-pane.collections.menu.duplicate.savedSearch=重複儲存的搜尋結果
 pane.collections.menu.remove.library=刪除文獻庫……
-pane.collections.menu.delete.collection=刪除文獻集……
-pane.collections.menu.delete.collectionAndItems=刪除文獻集與其中項目……
-pane.collections.menu.delete.savedSearch=刪除儲存的搜尋結果……
-pane.collections.menu.delete.feedAndItems=取消訂閱新聞來源……
-pane.collections.menu.export.collection=匯出文獻集……
-pane.collections.menu.export.savedSearch=匯出儲存的搜尋結果……
-pane.collections.menu.export.feed=匯入新聞來源……
-pane.collections.menu.createBib.collection=由文獻集來建立參考文獻表……
-pane.collections.menu.createBib.savedSearch=由儲存的搜尋結果來建立參考文獻表……
-pane.collections.menu.createBib.feed=從新聞來源來建立文獻表……
 pane.collections.showCollectionInLibrary=在文獻庫中顯示文獻集
 
-pane.collections.menu.generateReport.collection=由文獻集來建立報告……
-pane.collections.menu.generateReport.savedSearch=由儲存的搜尋結果來建立報告……
-pane.collections.menu.generateReport.feed=從新聞來源來建立報告……
-
 pane.collections.menu.refresh.feed=重新整理新聞來源
 pane.collections.menu.refresh.allFeeds=重新整理所有新聞來源
 pane.collections.menu.markAsRead.feed=將新聞來源標示成已讀
@@ -720,12 +698,6 @@ zotero.preferences.sync.reset.restartToComplete=Firefox 得重新啟動以完成
 zotero.preferences.sync.reset.fileSyncHistory=在下一次同步時，%1$S 將對照儲存空間服務“%2$S”中的所有附件檔案。將下載本機所遺失的所有遠端附件檔案 並上傳遠端遺失的本機附件檔案。\n\n正常使用期間不需要此選項。
 zotero.preferences.sync.reset.fileSyncHistory.cleared=“%S”的檔案同步歷史紀錄已清除。
 
-zotero.preferences.search.rebuildIndex=重建索引
-zotero.preferences.search.rebuildWarning=想重建整個索引嗎？這可能要花一些時間。\n\n如果只要做尚未索引的項目的索引，可按 %S 鍵。
-zotero.preferences.search.clearIndex=清除索引
-zotero.preferences.search.clearWarning=在清除索引後，將無法搜尋附件檔內容。\n\n至於指向附件檔的網頁連結，只有重新造訪網頁，才能重做索引。要維持網頁連結之索引，選 %S。
-zotero.preferences.search.clearNonLinkedURLs=清除除了網頁連結以外的其他所有東西
-zotero.preferences.search.indexUnindexed=做尚未索引項目的索引
 zotero.preferences.export.quickCopy.citationStyles=引用文獻樣式
 zotero.preferences.export.quickCopy.exportFormats=匯出格式
 zotero.preferences.export.quickCopy.instructions=快速複製能讓您以給定格式快速輸出項目。你可以按下 %S 來複製所選的項目到剪貼簿或是直接拖曳項目到另一個程式的文字方塊中。
@@ -893,6 +865,7 @@ integration.error.mustInsertCitation=進行此動作前，必須先插入一個
 integration.error.mustInsertBibliography=進行此動作前，必須先插入一個參考文獻表。
 integration.error.cannotInsertHere=這裡不能插入 Zotero 欄位。
 integration.error.notInCitation=游標必須移到 Zotero 引用文獻上才能編輯它。
+integration.error.inBibliography=To insert a citation, place the cursor in the body of the text. To edit the bibliography directly, use %S.
 integration.error.noBibliography=目前的參考文獻表樣式並沒在定義一個參考文獻表。如果想增加一個參考文獻表，請選擇其他的樣式。
 integration.error.deletePipe=無法初始化 Zotero 用來與文件編輯器溝通的管道。想要 Zotero 試著修正此錯誤？得提供密碼。
 integration.error.invalidStyle=所選的樣式不像是有效的。若之前是自己建立此樣式，請確認它有通過於 https://github.com/citation-style-language/styles/wiki/Validation 所述的驗證。或者改選另一樣式。
diff --git a/chrome/skin/default/zotero/16/universal/group-condition.svg b/chrome/skin/default/zotero/16/universal/group-condition.svg
new file mode 100644
index 0000000000..cbdbb30410
--- /dev/null
+++ b/chrome/skin/default/zotero/16/universal/group-condition.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.91992 1.99902C4.19855 3.20182 3 5.38935 3 8C3 10.6104 4.1988 12.7971 5.91992 14L5.45801 14.8994C3.38948 13.5093 2 10.9408 2 8C2 5.05902 3.38923 2.48965 5.45801 1.09961L5.91992 1.99902ZM10.542 1.09961C12.6108 2.48965 14 5.05902 14 8C14 10.9408 12.6105 13.5093 10.542 14.8994L10.0801 14C11.8012 12.7971 13 10.6104 13 8C13 5.38935 11.8015 3.20182 10.0801 1.99902L10.542 1.09961Z" fill="context-fill"/>
+</svg>
diff --git a/chrome/skin/default/zotero/16/universal/ungroup-condition.svg b/chrome/skin/default/zotero/16/universal/ungroup-condition.svg
new file mode 100644
index 0000000000..8e534cdf65
--- /dev/null
+++ b/chrome/skin/default/zotero/16/universal/ungroup-condition.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 14.293L14.293 15L1 1.70703L1.70703 1L15 14.293ZM3.38965 5.51074C3.13996 6.27733 3 7.11399 3 8C3 10.6104 4.1988 12.7971 5.91992 14L5.45801 14.8994C3.38948 13.5093 2 10.9408 2 8C2 6.83538 2.21872 5.72936 2.61035 4.73145L3.38965 5.51074ZM11.75 13.8711C11.3814 14.2606 10.9774 14.6068 10.542 14.8994L10.0801 14C10.4241 13.7595 10.7451 13.4777 11.042 13.1631L11.75 13.8711ZM10.542 1.09961C12.6108 2.48965 14 5.05902 14 8C14 9.16448 13.7803 10.2699 13.3887 11.2676L12.6094 10.4883C12.859 9.72192 13 8.88583 13 8C13 5.38935 11.8015 3.20182 10.0801 1.99902L10.542 1.09961ZM5.91992 1.99902C5.57568 2.23956 5.25307 2.52016 4.95605 2.83496L4.24805 2.12695C4.61678 1.73721 5.02238 1.39231 5.45801 1.09961L5.91992 1.99902Z" fill="context-fill"/>
+</svg>
diff --git a/chrome/skin/default/zotero/20/universal/dialog-citation-preview.svg b/chrome/skin/default/zotero/20/universal/dialog-citation-preview.svg
new file mode 100644
index 0000000000..5a35d2c913
--- /dev/null
+++ b/chrome/skin/default/zotero/20/universal/dialog-citation-preview.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0005 4C14.1006 4.0002 17.6223 6.4688 19.1655 10C17.6223 13.5312 14.1006 15.9998 10.0005 16C5.90005 16 2.37673 13.5315 0.833496 10C2.37673 6.46847 5.90005 4 10.0005 4ZM10.0005 5.25C6.6116 5.25 3.67094 7.17741 2.21729 10C3.67094 12.8226 6.6116 14.75 10.0005 14.75C13.3886 14.7498 16.3271 12.8223 17.7808 10C16.3752 7.27113 13.5816 5.37828 10.3354 5.25586L10.0005 5.25ZM10.0005 6.75C11.7952 6.75026 13.2505 8.20524 13.2505 10C13.2505 11.7948 11.7952 13.2497 10.0005 13.25C8.20556 13.25 6.75049 11.7949 6.75049 10C6.75049 8.20507 8.20556 6.75 10.0005 6.75ZM10.0005 8C8.89592 8 8.00049 8.89543 8.00049 10C8.00049 11.1046 8.89592 12 10.0005 12C11.1048 11.9997 12.0005 11.1044 12.0005 10C12.0005 8.89559 11.1048 8.00026 10.0005 8Z" fill="context-fill"/>
+</svg>
diff --git a/chrome/skin/default/zotero/20/universal/maximize.svg b/chrome/skin/default/zotero/20/universal/maximize.svg
new file mode 100644
index 0000000000..ea46e4bfd4
--- /dev/null
+++ b/chrome/skin/default/zotero/20/universal/maximize.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.75 7H18V2H13V3.25L15.8661 3.25L11 8.11612L11.8839 9L16.75 4.13389V7ZM4.13389 16.75L9 11.8839L8.11612 11L3.25 15.8661V13H2V17.375V18H2.625H7V16.75H4.13389Z" fill="context-fill"/>
+</svg>
diff --git a/chrome/skin/default/zotero/20/universal/minimize.svg b/chrome/skin/default/zotero/20/universal/minimize.svg
new file mode 100644
index 0000000000..e4b6fa2700
--- /dev/null
+++ b/chrome/skin/default/zotero/20/universal/minimize.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.1339 7.75L18 2.88388L17.1161 2L12.25 6.86612V4H11V8.375V9H11.625H16V7.75H13.1339ZM7.75 13.1339L7.75 16H9L9 11H4L4 12.25H6.86612L2 17.1161L2.88388 18L7.75 13.1339Z" fill="context-fill"/>
+</svg>
diff --git a/chrome/skin/default/zotero/integration.css b/chrome/skin/default/zotero/integration.css
index dba46780c8..17c8f54761 100644
--- a/chrome/skin/default/zotero/integration.css
+++ b/chrome/skin/default/zotero/integration.css
@@ -33,7 +33,7 @@
 	list-style-image: url('chrome://zotero/skin/citation-up.png');
 }
 
-#up[disabled="true"] {
+#up[disabled] {
 	list-style-image: url('chrome://zotero/skin/citation-up-gray.png');
 }
 
@@ -41,7 +41,7 @@
 	list-style-image: url('chrome://zotero/skin/citation-down.png');
 }
 
-#down[disabled="true"] {
+#down[disabled] {
 	list-style-image: url('chrome://zotero/skin/citation-down-gray.png');
 }
 
@@ -50,7 +50,7 @@
 	list-style-image: url('chrome://zotero/skin/citation-add.png');
 }
 
-#add[disabled="true"] {
+#add[disabled] {
 	list-style-image: url('chrome://zotero/skin/citation-add-gray.png');
 }
 
@@ -58,7 +58,7 @@
 	list-style-image: url('chrome://zotero/skin/citation-delete.png');
 }
 
-#remove[disabled="true"] {
+#remove[disabled] {
 	list-style-image: url('chrome://zotero/skin/citation-delete-gray.png');
 }
 
@@ -161,7 +161,7 @@ span.zotero-bubble-input {
 	border-color: #6d95e0;
 }
 
-.citation-dialog.bubble[selected="true"] {
+.citation-dialog.bubble[selected] {
 	border-radius: 8px !important;
 	background-color: #598bec;
 	color: #fff;
@@ -265,7 +265,7 @@ span.zotero-bubble-input {
 	color: var(--fill-secondary);
 }
 
-richlistitem[selected="true"] {
+richlistitem[selected] {
 	background: Highlight !important;
 	color: HighlightText !important;
 }
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 5ceb25685a..f2b15f8619 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -17,6 +17,11 @@
 	text-align: left;
 }
 
+/* Single-paragraph status messages stay centered when they wrap */
+.items-tree-message > p:only-child {
+	text-align: center;
+}
+
 .items-tree-message div.publications p {
 	font-size: 1.2em;
 }
@@ -37,7 +42,7 @@
 /* 
 	Fix to odd fx115 behavior that gives an un-collapsed pane the initial width of min-width + last width
 */
-#zotero-collections-pane[collapsed=true] {
+#zotero-collections-pane[collapsed] {
 	min-width: 0px !important;
 	width: 0px !important;
 }
@@ -181,3 +186,31 @@
 	background-color: Highlight;
 	color: HighlightText;
 }
+
+.autocomplete-richlistitem[type="options-ac-value"],
+.autocomplete-richlistitem[type="options-ac-no-value"] {
+	height: auto;
+	min-height: auto;
+}
+
+.autocomplete-richlistitem[type="options-ac-value"] > .ac-title,
+.autocomplete-richlistitem[type="options-ac-no-value"] > .ac-title {
+	height: 2em;
+	min-height: 2em;
+	padding-inline: 8px;
+}
+
+.autocomplete-richlistitem[type="options-ac-value"] > .ac-title > .ac-text-overflow-container,
+.autocomplete-richlistitem[type="options-ac-no-value"] > .ac-title > .ac-text-overflow-container {
+	max-width: 100%;
+	overflow: hidden;
+}
+
+.autocomplete-richlistitem[type="options-ac-no-value"] {
+	color: var(--fill-secondary);
+}
+
+.autocomplete-richlistitem[type="options-ac-value"]:not([selected]):hover,
+.autocomplete-richlistitem[type="options-ac-no-value"]:not([selected]):hover {
+	background-color: var(--fill-quinary);
+}
diff --git a/chrome/skin/default/zotero/query-textbox.css b/chrome/skin/default/zotero/query-textbox.css
new file mode 100644
index 0000000000..cb0581a8e4
--- /dev/null
+++ b/chrome/skin/default/zotero/query-textbox.css
@@ -0,0 +1,49 @@
+/* The colored copy of a search query, drawn behind the input (see
+   queryTextbox.js). The input's own text is transparent while a condition is
+   recognized, so what's read on screen is this layer. */
+
+:host {
+	position: relative;
+}
+
+.query-highlight {
+	position: absolute;
+	overflow: hidden;
+	pointer-events: none;
+	box-sizing: border-box;
+	color: FieldText;
+	/* An input centers its line in its content box, so the layer has to too */
+	display: flex;
+	align-items: center;
+	white-space: pre;
+}
+
+:host([highlighted]) input {
+	color: transparent;
+	caret-color: FieldText;
+}
+
+/* A translucent selection lets the layer show through, since the text painted
+   over it is transparent */
+:host([highlighted]) input::selection {
+	background-color: color-mix(in srgb, Highlight 35%, transparent);
+	color: transparent;
+}
+
+.query-token-field {
+	color: var(--accent-blue, #2ea8e5);
+}
+
+.query-token-operator {
+	color: var(--fill-secondary, #6b6b6b);
+}
+
+.query-token-value {
+	color: var(--accent-green, #5fb236);
+}
+
+.query-token-join,
+.query-token-paren {
+	color: var(--fill-secondary, #6b6b6b);
+	font-weight: 600;
+}
diff --git a/chrome/skin/default/zotero/search-textbox.css b/chrome/skin/default/zotero/search-textbox.css
new file mode 100644
index 0000000000..fe71b9b759
--- /dev/null
+++ b/chrome/skin/default/zotero/search-textbox.css
@@ -0,0 +1,116 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+:host {
+  appearance: auto;
+  -moz-default-appearance: textfield;
+  cursor: text;
+  margin: 2px 4px; /* matches <input> global.css margin */
+  padding: 2px 2px 3px;
+  padding-inline-start: 4px;
+  background-color: Field;
+  color: FieldText;
+  min-width: 0;
+}
+
+@media (-moz-platform: macos) {
+  :host {
+    -moz-default-appearance: searchfield;
+    /* TODO: These are a bit dubious, see bug 1815264 */
+    font-size: 12px;
+    margin: 4px; /* matches <input> global.css margin */
+    padding: 1px;
+  }
+}
+
+input {
+  border: none;
+  padding: 0 1px;
+  background-color: transparent;
+  outline: none;
+  color: inherit;
+  font: inherit;
+  text-shadow: inherit;
+  box-sizing: border-box;
+  flex: 1;
+  text-align: inherit;
+  min-width: 0;
+}
+
+:host([readonly="true"]) {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
+:host([disabled]) {
+  cursor: default;
+  background-color: -moz-Dialog;
+  color: GrayText;
+}
+
+:host(:focus-within) {
+  outline: auto;
+}
+
+.textbox-search-icons {
+  align-items: center;
+  justify-items: center;
+}
+
+.textbox-search-icon,
+.textbox-search-sign,
+.textbox-search-clear {
+  /* Search icon is 12px, but we expand to the clear button size so they
+   * overlap. That doesn't make the icon noticeably less crisp */
+  width: 14px;
+}
+
+.textbox-search-sign,
+.textbox-search-icon {
+  list-style-image: url(chrome://global/skin/icons/search-textbox.svg);
+}
+
+.textbox-search-sign:-moz-locale-dir(rtl),
+.textbox-search-icon:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.textbox-search-sign {
+  margin-inline-end: 5px;
+}
+
+.textbox-search-clear {
+  list-style-image: url(resource://content-accessible/close-12.svg);
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+.textbox-search-icon:not([disabled]) {
+  cursor: pointer;
+}
+
+.textbox-search-clear:not([disabled]) {
+  cursor: default;
+}
+
+/* searchbutton disables the icon to the left.
+ * Otherwise we don't show the search icon, only the clear icon, see
+ * bug 1385902 */
+:host([searchbutton]) .textbox-search-sign,
+:host(:not([searchbutton])) .textbox-search-icons:not([selectedIndex="1"]) {
+  display: none;
+}
+
+/* On macOS -moz-default-appearance: searchbox provides the search icon too, so
+ * disable those there unconditionally */
+@media (-moz-platform: macos) {
+  .textbox-search-sign,
+  .textbox-search-icons:not([selectedIndex="1"]) {
+    display: none;
+  }
+
+  .textbox-search-clear {
+    margin-bottom: 1px;
+  }
+}
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 054b7bfd43..c51de7cda2 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -4,6 +4,7 @@
 // http://www.zotero.org/documentation/hidden_prefs
 
 pref("extensions.zotero.firstRun2", true);
+pref("extensions.zotero.undoHistory.steps", 100);
 
 pref("extensions.zotero.saveRelativeAttachmentPath", false);
 pref("extensions.zotero.baseAttachmentPath", "");
@@ -134,7 +135,6 @@ pref("extensions.zotero.export.bibliographySettings", "save-as-rtf");
 pref("extensions.zotero.export.displayCharsetOption", true);
 pref("extensions.zotero.export.citePaperJournalArticleURL", false);
 pref("extensions.zotero.cite.automaticJournalAbbreviations", true);
-pref("extensions.zotero.cite.useCiteprocRs", false);
 pref("extensions.zotero.import.createNewCollection.fromFileOpenHandler", true);
 pref("extensions.zotero.rtfScan.lastInputFile", "");
 pref("extensions.zotero.rtfScan.lastOutputFile", "");
@@ -152,7 +152,9 @@ pref("extensions.zotero.integration.keepAddCitationDialogRaised", false);
 pref("extensions.zotero.integration.upgradeTemplateDelayedOn", 0);
 pref("extensions.zotero.integration.dontPromptMendeleyImport", false);
 pref("extensions.zotero.integration.citationDialogMode", "last-used");
+pref("extensions.zotero.integration.citationDialogShowLocatorTip", true);
 pref("extensions.zotero.integration.annotationDialogIncludeComments", true);
+pref("extensions.zotero.integration.citationPreviewShown", true);
 
 // Connector settings
 pref("extensions.zotero.httpServer.enabled", true);
@@ -246,9 +248,22 @@ pref("extensions.zotero.reader.autoDisableTool.note", true);
 pref("extensions.zotero.reader.autoDisableTool.text", true);
 pref("extensions.zotero.reader.autoDisableTool.image", true);
 pref("extensions.zotero.reader.lastSidebarTab", "annotations");
+pref("extensions.zotero.reader.popupPositions", "{}");
+pref("extensions.zotero.reader.readAloud.highlightGranularity", "sentence");
 
 // Set color scheme to auto by default
 pref("browser.theme.toolbar-theme", 2);
 
 // Need to enable -moz-context-properties for SVG context properties to work
 pref("svg.context-properties.content.enabled", true);
+
+// Firefox applies a baseline "script-src chrome: resource: moz-src:" CSP to every chrome:
+// document, which blocks inline <script>s and inline event handlers
+pref("security.chrome_baseline_csp.enabled", false);
+
+// Allow chrome: DTDs to be loaded, which we still use for localized strings in XUL markup
+pref("dom.fetch.allow_force_allowed_dtd", true);
+
+// Translators are evaluated in the parent process with the system principal
+pref("security.allow_eval_with_system_principal", true);
+pref("security.allow_eval_in_parent_process", true);
diff --git a/document-worker b/document-worker
index fd642b3828..8fb70af400 160000
--- a/document-worker
+++ b/document-worker
@@ -1 +1 @@
-Subproject commit fd642b38287f1e59aaf8e02c3132da6d3daa39c1
+Subproject commit 8fb70af4000873561c82b2f4eb88be190efb9979
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 956c4bce34..443e4975e2 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -99,7 +99,6 @@ export default [
 			"chrome/content/zotero/xpcom/translation/tlds.js",
 			"resource/bluebird/*",
 			"resource/classnames.js",
-			"resource/citeproc_rs*",
 			"resource/jspath.js",
 			"resource/loader.mjs",
 			"resource/pako.js",
diff --git a/js-build/build.js b/js-build/build.js
index a2e074d371..580b97d2b4 100644
--- a/js-build/build.js
+++ b/js-build/build.js
@@ -53,4 +53,4 @@ if (require.main === module) {
 			onError(err);
 		}
 	})();
-}
\ No newline at end of file
+}
diff --git a/js-build/config.js b/js-build/config.js
index bff9dde52a..5c73ace653 100644
--- a/js-build/config.js
+++ b/js-build/config.js
@@ -49,7 +49,6 @@ const symlinkFiles = [
 	// Feed *.idl files are for documentation only
 	'!resource/feeds/*.idl',
 	'!chrome/skin/default/zotero/**/*.scss',
-	'!resource/citeproc_rs_wasm.js',
 	'resource/vs/**/*',
 	// Patched in babel-worker.js
 	'!resource/vs/language/typescript/tsWorker.js',
@@ -104,7 +103,6 @@ const jsFiles = [
 	// Special handling for react-virtualized and others -- see note above
 	'resource/react-virtualized.js',
 	'resource/SingleFile/lib/single-file.js',
-	'resource/citeproc_rs_wasm.js',
 	'resource/vs/language/typescript/tsWorker.js',
 	'resource/monacopilot.mjs',
 	'resource/monacopilot-core.mjs',
diff --git a/js-build/document-worker.js b/js-build/document-worker.js
index 3bdc7c3e50..52f81d2d83 100644
--- a/js-build/document-worker.js
+++ b/js-build/document-worker.js
@@ -7,16 +7,21 @@ const exec = util.promisify(require('child_process').exec);
 const { getSignatures, writeSignatures, onSuccess, onError } = require('./utils');
 const { buildsURL } = require('./config');
 
+const sharedAssetDirs = ['cmaps', 'standard_fonts'];
+const requiredFiles = ['worker.js', 'metadata.json', 'structured-document-text.js'];
+
 async function getDocumentWorker(signatures) {
 	const t1 = Date.now();
 
 	const modulePath = path.join(__dirname, '..', 'document-worker');
+	const targetDir = path.join(__dirname, '..', 'build', 'resource', 'document-worker');
 
 	const { stdout } = await exec('git rev-parse HEAD', { cwd: modulePath });
 	const hash = stdout.trim();
 
-	if (!('document-worker' in signatures) || signatures['document-worker'].hash !== hash) {
-		const targetDir = path.join(__dirname, '..', 'build', 'chrome', 'content', 'zotero', 'xpcom', 'pdfWorker');
+	if (!('document-worker' in signatures)
+			|| signatures['document-worker'].hash !== hash
+			|| !(await isBuildReady(targetDir))) {
 		try {
 			const filename = hash + '.zip';
 			const tmpDir = path.join(__dirname, '..', 'tmp', 'builds', 'document-worker');
@@ -26,21 +31,35 @@ async function getDocumentWorker(signatures) {
 			await fs.ensureDir(targetDir);
 			await fs.ensureDir(tmpDir);
 
+			// Skip the shared asset directories, which are served from the
+			// reader build instead (see the cleanup loop below)
 			await exec(
 				`cd ${tmpDir}`
 				+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
-				+ ` && unzip -o ${filename} worker.js -d ${targetDir}`
+				+ ` && unzip -o ${filename} -d ${targetDir} -x ${sharedAssetDirs.map(dir => `'${dir}/*'`).join(' ')}`
 			);
+			let missingFiles = await getMissingFiles(targetDir);
+			if (missingFiles.length) {
+				throw new Error(`Downloaded document-worker build is missing ${missingFiles.join(', ')}`);
+			}
 		}
 		catch (e) {
 			console.error(e);
 			await exec('npm ci', { cwd: modulePath });
 			await exec('npm run build', { cwd: modulePath });
-			await fs.copy(path.join(modulePath, 'build', 'worker.js'), path.join(targetDir, 'worker.js'));
+			await fs.copy(path.join(modulePath, 'build'), targetDir);
+			let missingFiles = await getMissingFiles(targetDir);
+			if (missingFiles.length) {
+				throw new Error(`Local document-worker build is missing ${missingFiles.join(', ')}`);
+			}
 		}
 		signatures['document-worker'] = { hash };
 	}
 
+	for (let dir of sharedAssetDirs) {
+		await fs.remove(path.join(targetDir, dir));
+	}
+
 	const t2 = Date.now();
 
 	return {
@@ -51,6 +70,20 @@ async function getDocumentWorker(signatures) {
 	};
 }
 
+async function isBuildReady(targetDir) {
+	return !(await getMissingFiles(targetDir)).length;
+}
+
+async function getMissingFiles(targetDir) {
+	let missingFiles = [];
+	for (let file of requiredFiles) {
+		if (!(await fs.pathExists(path.join(targetDir, file)))) {
+			missingFiles.push(file);
+		}
+	}
+	return missingFiles;
+}
+
 module.exports = getDocumentWorker;
 
 if (require.main === module) {
diff --git a/js-build/note-editor.js b/js-build/note-editor.js
index 1435730342..581f85cee8 100644
--- a/js-build/note-editor.js
+++ b/js-build/note-editor.js
@@ -30,9 +30,13 @@ async function getZoteroNoteEditor(signatures) {
 				`cd ${tmpDir}`
 				+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
 				+ ` && unzip ${filename} zotero/* -d ${targetDir}`
-				+ ` && mv ${path.join(targetDir, 'zotero', '*')} ${targetDir}`
 			);
 
+			// Move the contents of zotero/ up a level (not in the shell, whose glob
+			// handling breaks on Windows paths)
+			for (let entry of await fs.readdir(path.join(targetDir, 'zotero'))) {
+				await fs.move(path.join(targetDir, 'zotero', entry), path.join(targetDir, entry));
+			}
 			await fs.remove(path.join(targetDir, 'zotero'));
 		}
 		catch (e) {
diff --git a/js-build/reader.js b/js-build/reader.js
index 12b5df6a92..6f5f631e33 100644
--- a/js-build/reader.js
+++ b/js-build/reader.js
@@ -30,9 +30,13 @@ async function getReader(signatures) {
 				`cd ${tmpDir}`
 				+ ` && (test -f ${filename} || curl -f ${url} -o ${filename})`
 				+ ` && unzip ${filename} zotero/* -d ${targetDir}`
-				+ ` && mv ${path.join(targetDir, 'zotero', '*')} ${targetDir}`
 			);
 
+			// Move the contents of zotero/ up a level (not in the shell, whose glob
+			// handling breaks on Windows paths)
+			for (let entry of await fs.readdir(path.join(targetDir, 'zotero'))) {
+				await fs.move(path.join(targetDir, 'zotero', entry), path.join(targetDir, entry));
+			}
 			await fs.remove(path.join(targetDir, 'zotero'));
 		}
 		catch (e) {
diff --git a/note-editor b/note-editor
index 107ab75c32..acec74d09b 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 107ab75c3247c6584bda2303ecbddf4b317fdd2d
+Subproject commit acec74d09b910cfb67e6fa05135faca06f525c11
diff --git a/package-lock.json b/package-lock.json
index b96c3f150a..65b61fb9aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,6 @@
       "name": "zotero",
       "version": "7.0.0",
       "dependencies": {
-        "@citeproc-rs/wasm": "^0.2.0",
         "ace-builds": "^1.4.12",
         "classnames": "^2.2.6",
         "csl-validator-wasm": "^1.0.0",
@@ -284,7 +283,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
       "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.0",
@@ -716,11 +714,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@citeproc-rs/wasm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@citeproc-rs/wasm/-/wasm-0.2.0.tgz",
-      "integrity": "sha512-y6c9l2C7PvmoTOm8ljKWItodolRFtqfTZB83Ud8HW8H9atgpLcj50T+5XObog33GpWSMNkZTMjzNDP4qxHj9NA=="
-    },
     "node_modules/@emotion/cache": {
       "version": "10.0.29",
       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
@@ -1281,7 +1274,6 @@
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2267,7 +2259,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "peer": true,
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -3375,7 +3366,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
       "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -6126,8 +6116,7 @@
     "node_modules/monaco-editor": {
       "version": "0.47.0",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.47.0.tgz",
-      "integrity": "sha512-VabVvHvQ9QmMwXu4du008ZDuyLnHs9j7ThVFsiJoXSOQk18+LF89N4ADzPbFenm0W4V2bGHnFBztIRQTgBfxzw==",
-      "peer": true
+      "integrity": "sha512-VabVvHvQ9QmMwXu4du008ZDuyLnHs9j7ThVFsiJoXSOQk18+LF89N4ADzPbFenm0W4V2bGHnFBztIRQTgBfxzw=="
     },
     "node_modules/monacopilot": {
       "version": "1.1.15",
@@ -6806,7 +6795,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -6833,7 +6821,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -8970,7 +8957,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
       "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.26.0",
@@ -9279,11 +9265,6 @@
         "@babel/helper-validator-identifier": "^7.25.9"
       }
     },
-    "@citeproc-rs/wasm": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@citeproc-rs/wasm/-/wasm-0.2.0.tgz",
-      "integrity": "sha512-y6c9l2C7PvmoTOm8ljKWItodolRFtqfTZB83Ud8HW8H9atgpLcj50T+5XObog33GpWSMNkZTMjzNDP4qxHj9NA=="
-    },
     "@emotion/cache": {
       "version": "10.0.29",
       "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
@@ -9742,8 +9723,7 @@
       "version": "8.14.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "acorn-jsx": {
       "version": "5.3.2",
@@ -10582,7 +10562,6 @@
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
       "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "dev": true,
-      "peer": true,
       "requires": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -11487,7 +11466,6 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
       "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
-      "peer": true,
       "requires": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -13526,8 +13504,7 @@
     "monaco-editor": {
       "version": "0.47.0",
       "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.47.0.tgz",
-      "integrity": "sha512-VabVvHvQ9QmMwXu4du008ZDuyLnHs9j7ThVFsiJoXSOQk18+LF89N4ADzPbFenm0W4V2bGHnFBztIRQTgBfxzw==",
-      "peer": true
+      "integrity": "sha512-VabVvHvQ9QmMwXu4du008ZDuyLnHs9j7ThVFsiJoXSOQk18+LF89N4ADzPbFenm0W4V2bGHnFBztIRQTgBfxzw=="
     },
     "monacopilot": {
       "version": "1.1.15",
@@ -14064,7 +14041,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0"
       }
@@ -14085,7 +14061,6 @@
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "peer": true,
       "requires": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
diff --git a/package.json b/package.json
index ebe5119042..90fc295271 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
   },
   "license": "",
   "dependencies": {
-    "@citeproc-rs/wasm": "^0.2.0",
     "ace-builds": "^1.4.12",
     "classnames": "^2.2.6",
     "csl-validator-wasm": "^1.0.0",
diff --git a/reader b/reader
index 46d009be88..df215c6033 160000
--- a/reader
+++ b/reader
@@ -1 +1 @@
-Subproject commit 46d009be885cf7cf2543d4bfae50483d85a9c01b
+Subproject commit df215c60334d2d0c7b1fbc9f3959b66afc1ced83
diff --git a/resource/citeproc_rs_wasm.js b/resource/citeproc_rs_wasm.js
deleted file mode 120000
index 5dbc4f3d75..0000000000
--- a/resource/citeproc_rs_wasm.js
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/@citeproc-rs/wasm/_zotero/citeproc_rs_wasm.js
\ No newline at end of file
diff --git a/resource/citeproc_rs_wasm_bg.wasm b/resource/citeproc_rs_wasm_bg.wasm
deleted file mode 120000
index a67fadde7c..0000000000
--- a/resource/citeproc_rs_wasm_bg.wasm
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/@citeproc-rs/wasm/_zotero/citeproc_rs_wasm_bg.wasm
\ No newline at end of file
diff --git a/resource/citeproc_rs_wasm_include.js b/resource/citeproc_rs_wasm_include.js
deleted file mode 120000
index 424bbd86fc..0000000000
--- a/resource/citeproc_rs_wasm_include.js
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/@citeproc-rs/wasm/_zotero/citeproc_rs_wasm_include.js
\ No newline at end of file
diff --git a/resource/loader.sys.mjs b/resource/loader.sys.mjs
index c85821a36c..2ff9f627ff 100644
--- a/resource/loader.sys.mjs
+++ b/resource/loader.sys.mjs
@@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter(
     lazy,
     "resProto",
     "@mozilla.org/network/protocol;1?name=resource",
-    "nsIResProtocolHandler"
+    Ci.nsIResProtocolHandler
 );
 
 ChromeUtils.defineESModuleGetters(
diff --git a/resource/require.js b/resource/require.js
index 343d5fe98e..d512cc3550 100644
--- a/resource/require.js
+++ b/resource/require.js
@@ -131,6 +131,7 @@ function ZoteroLoader({
 		clearInterval: win.clearInterval,
 		requestAnimationFrame: win.requestAnimationFrame,
 		cancelAnimationFrame: win.requestAnimationFrame,
+		ResizeObserver: win.ResizeObserver,
 	};
 	for (const name in injectedGlobals) {
 		this.loader.globals[name] = injectedGlobals[name];
diff --git a/resource/schema/abbreviations.json b/resource/schema/abbreviations.json
index a767a11504..3cec39c5dc 100644
--- a/resource/schema/abbreviations.json
+++ b/resource/schema/abbreviations.json
@@ -40856,7 +40856,10 @@
 			"del": "",
 			"di": "",
 			"do": "",
-			"fur": ""
+			"fur": "",
+			"für": "",
+			"über": "",
+			"à": ""
 		}
 	}
 }
diff --git a/resource/schema/global b/resource/schema/global
index 62e983a2e5..b86c79b564 160000
--- a/resource/schema/global
+++ b/resource/schema/global
@@ -1 +1 @@
-Subproject commit 62e983a2e575fe9b9a3677ad7c9772080b67a1e4
+Subproject commit b86c79b56479cadac3288e1f122cf34ef04e8809
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
index 41c61bb8cb..5ec653b989 100644
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@@ -1 +1 @@
-2026-04-02 19:48:48
+2026-07-15 16:52:40
diff --git a/resource/schema/userdata.sql b/resource/schema/userdata.sql
index 78ff6d3566..86645bc2fa 100644
--- a/resource/schema/userdata.sql
+++ b/resource/schema/userdata.sql
@@ -1,4 +1,4 @@
--- 125
+-- 129
 
 -- Copyright (c) 2009 Center for History and New Media
 --                    George Mason University, Fairfax, Virginia, USA
@@ -164,6 +164,7 @@ CREATE TABLE items (
     libraryID INT NOT NULL,
     key TEXT NOT NULL,
     version INT NOT NULL DEFAULT 0,
+    clientVersion INT NOT NULL DEFAULT 0,
     synced INT NOT NULL DEFAULT 0,
     UNIQUE (libraryID, key),
     FOREIGN KEY (libraryID) REFERENCES libraries(libraryID) ON DELETE CASCADE
@@ -172,7 +173,8 @@ CREATE INDEX items_synced ON items(synced);
 
 CREATE TABLE itemDataValues (
     valueID INTEGER PRIMARY KEY,
-    value UNIQUE
+    value UNIQUE,
+    valueNormalized TEXT
 );
 
 -- Type-specific data for individual items
@@ -229,7 +231,9 @@ CREATE TABLE itemAnnotations (
     type INTEGER NOT NULL,
     authorName TEXT,
     text TEXT,
+    textNormalized TEXT,
     comment TEXT,
+    commentNormalized TEXT,
     color TEXT,
     pageLabel TEXT,
     sortIndex TEXT NOT NULL,
@@ -242,7 +246,8 @@ CREATE INDEX itemAnnotations_parentItemID ON itemAnnotations(parentItemID);
 
 CREATE TABLE tags (
     tagID INTEGER PRIMARY KEY,
-    name TEXT NOT NULL UNIQUE
+    name TEXT NOT NULL UNIQUE,
+    nameNormalized TEXT
 );
 
 CREATE TABLE itemRelations (
@@ -271,6 +276,8 @@ CREATE TABLE creators (
     firstName TEXT,
     lastName TEXT,
     fieldMode INT,
+    firstNameNormalized TEXT,
+    lastNameNormalized TEXT,
     UNIQUE (lastName, firstName, fieldMode)
 );
 
@@ -295,6 +302,7 @@ CREATE TABLE collections (
     libraryID INT NOT NULL,
     key TEXT NOT NULL,
     version INT NOT NULL DEFAULT 0,
+    clientVersion INT NOT NULL DEFAULT 0,
     synced INT NOT NULL DEFAULT 0,
     UNIQUE (libraryID, key),
     FOREIGN KEY (libraryID) REFERENCES libraries(libraryID) ON DELETE CASCADE,
@@ -351,6 +359,7 @@ CREATE TABLE savedSearches (
     libraryID INT NOT NULL,
     key TEXT NOT NULL,
     version INT NOT NULL DEFAULT 0,
+    clientVersion INT NOT NULL DEFAULT 0,
     synced INT NOT NULL DEFAULT 0,
     UNIQUE (libraryID, key),
     FOREIGN KEY (libraryID) REFERENCES libraries(libraryID) ON DELETE CASCADE
@@ -363,7 +372,6 @@ CREATE TABLE savedSearchConditions (
     condition TEXT NOT NULL,
     operator TEXT,
     value TEXT,
-    required NONE,
     PRIMARY KEY (savedSearchID, searchConditionID),
     FOREIGN KEY (savedSearchID) REFERENCES savedSearches(savedSearchID) ON DELETE CASCADE
 );
@@ -395,6 +403,7 @@ CREATE TABLE libraries (
     editable INT NOT NULL,
     filesEditable INT NOT NULL,
     version INT NOT NULL DEFAULT 0,
+    clientVersion INT NOT NULL DEFAULT 0,
     storageVersion INT NOT NULL DEFAULT 0,
     lastSync INT NOT NULL DEFAULT 0,
     archived INT NOT NULL DEFAULT 0,
@@ -448,20 +457,6 @@ CREATE TABLE fulltextItems (
 CREATE INDEX fulltextItems_synced ON fulltextItems(synced);
 CREATE INDEX fulltextItems_version ON fulltextItems(version);
 
-CREATE TABLE fulltextWords (
-    wordID INTEGER PRIMARY KEY,
-    word TEXT UNIQUE
-);
-
-CREATE TABLE fulltextItemWords (
-    wordID INT,
-    itemID INT,
-    PRIMARY KEY (wordID, itemID),
-    FOREIGN KEY (wordID) REFERENCES fulltextWords(wordID),
-    FOREIGN KEY (itemID) REFERENCES items(itemID) ON DELETE CASCADE
-);
-CREATE INDEX fulltextItemWords_itemID ON fulltextItemWords(itemID);
-
 CREATE TABLE syncCache (
     libraryID INT NOT NULL,
     key TEXT NOT NULL,
diff --git a/scripts/locale/run b/scripts/locale/run
index ac9a6acfd2..028f5b5d21 100755
--- a/scripts/locale/run
+++ b/scripts/locale/run
@@ -16,18 +16,16 @@ cp -R $LOCALES_DIR/en-US/zotero/* en-US-new
 cp -R $LOCALES_DIR/ locales/
 rm -rf locales/en-US
 # Correct various errors
-find locales -name '*.dtd' -exec perl -pi -e "s/&amp;([^\s])/&\$1/g" {} \;
-find locales -name '*.properties' -exec rpl 'S%' '%S' {} \;
-find locales -name '*.properties' -exec rpl '/n' '\\n' {} \;
-find locales -name '*.properties' -exec rpl '\\\\' '\\' {} \;
-find locales -name '*.properties' -exec rpl '\\n\\n\\(?!n)' '\\n\\n' {} \;
+find locales -name '*.dtd' -exec perl -pi -e "s/&amp;([^\s])/&\$1/g" {} +
+find locales -name '*.properties' -exec rpl --encoding=UTF-8 'S%' '%S' {} +
+find locales -name '*.properties' -exec rpl --encoding=UTF-8 '/n' '\\n' {} +
+find locales -name '*.properties' -exec rpl --encoding=UTF-8 '\\\\' '\\' {} +
+find locales -name '*.properties' -exec rpl --encoding=UTF-8 '\\n\\n\\(?!n)' '\\n\\n' {} +
 
 # Run merge script
 $SCRIPT_DIR/localizer
 rsync -a --progress --verbose $WORK_DIR/output/locale/ $LOCALES_DIR/
 
-rpl -R ⏎ '\n' "$LOCALES_DIR"
-
 rm -rf en-US-new locales content-locales output
 
 $SCRIPT_DIR/filter_connector_json "$LOCALES_DIR"
diff --git a/scss/_zotero.scss b/scss/_zotero.scss
index e027b26b82..c3f572158f 100644
--- a/scss/_zotero.scss
+++ b/scss/_zotero.scss
@@ -21,7 +21,6 @@
 // Components
 // --------------------------------------------------
 
-@import "components/advancedSearch";
 @import "components/annotation";
 @import "components/autosuggest";
 @import "components/banners";
@@ -79,6 +78,7 @@
 // Elements
 // --------------------------------------------------
 
+@import "elements/advancedSearchPane";
 @import "elements/attachmentBox";
 @import "elements/attachmentPreview";
 @import "elements/attachmentPreviewBox";
diff --git a/scss/abstracts/_svgicon.scss b/scss/abstracts/_svgicon.scss
index 288da5fe50..e582be0ab9 100644
--- a/scss/abstracts/_svgicon.scss
+++ b/scss/abstracts/_svgicon.scss
@@ -24,7 +24,9 @@
 
 @mixin svgicon-menu($icon, $color, $size: "16", $prefix: false, $has2x: false, $light-dark: false) {
     // Disable 2x because list-style-image doesn't support image-set
+    // list-style-image is used by native macOS menus, --menuitem-icon by in-content menus
     list-style-image: -make-icon-background($icon, $color, $size, $prefix, false);
+    --menuitem-icon: #{-make-icon-background($icon, $color, $size, $prefix, false)};
     @if ($color == 'universal') {
         @if ($light-dark) {
             @include light-dark(fill, nth($light-dark, 1), nth($light-dark, 2));
diff --git a/scss/components/_advancedSearch.scss b/scss/components/_advancedSearch.scss
deleted file mode 100644
index 8efd0026d5..0000000000
--- a/scss/components/_advancedSearch.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-#zotero-advanced-search-dialog {
-	@include macOS-normalize-controls;
-	
-	min-height: 500px;
-	min-width: 700px;
-	
-	#zotero-search-box-container {
-		max-height: 100vh;
-	}
-	
-	#zotero-search-box-controls {
-		padding: 3px;
-	}
-	
-	#recursiveCheckbox, #noChildrenCheckbox, #includeParentsAndChildrenCheckbox {
-		margin: 3px 6px;
-	}
-	
-	#zotero-search-buttons {
-		margin: 3px 0;
-
-		button {
-			margin-inline-start: 6px;
-		}
-	}
-}
diff --git a/scss/components/_banners.scss b/scss/components/_banners.scss
index 229738120c..75dee92ca4 100644
--- a/scss/components/_banners.scss
+++ b/scss/components/_banners.scss
@@ -68,7 +68,7 @@
 // Add drop shadow after banner that's followed by another
 //
 // We set a z-index in ZoteroPane.setBannerZIndexes() to make this work
-.banner-container:has(~ .banner-container:not([collapsed="true"])) {
+.banner-container:has(~ .banner-container:not([collapsed])) {
 	box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.25);
 }
 
diff --git a/scss/components/_citationDialog.scss b/scss/components/_citationDialog.scss
index df915ef9f3..9abef5df43 100644
--- a/scss/components/_citationDialog.scss
+++ b/scss/components/_citationDialog.scss
@@ -110,6 +110,11 @@
 	.divider {
 		border-bottom: 1px solid var(--color-panedivider);
 		margin: 0;
+
+		&.subtle {
+			border-bottom-color: var(--fill-quinary);
+			margin: 0 8px;
+		}
 	}
 
 	.add-all {
@@ -451,7 +456,10 @@
 					&.selected {
 						background-color: var(--selected-item-background);
 						border-radius: 0;
-						
+					}
+					// selected background wins over the hover effect
+					&.selected:not([disabled]):hover {
+						background-color: var(--selected-item-background);
 					}
 					&.selected-first {
 						border-top-left-radius: 5px;
@@ -541,14 +549,53 @@
 			}
 		}
 		&.empty {
+			// the bottom area's divider immediately follows, so hide this
+			// layout's divider to avoid a doubled line
+			> .divider {
+				display: none;
+			}
 			#list-layout-wrapper {
 				padding: 0;
 			}
 		}
 	}
 
+	#citation-preview {
+		padding-top: 6px;
+
+		// While the preview is being toggled on, lay it out off-flow so the window can grow to
+		// fit it before it's revealed: absolute keeps a real, measurable height without pushing
+		// the list around, and visibility:hidden keeps it invisible until there's room for it.
+		// inset-inline: 0 matches the in-flow width (body is the flow parent), so the measured
+		// height is accurate.
+		&.measuring {
+			position: absolute;
+			inset-inline: 0;
+			visibility: hidden;
+		}
+
+		#citation-preview-wrapper {
+			padding: 2px 12px 8px 12px;
+			min-height: 20px;
+			max-height: 160px;
+			overflow-y: auto;
+			-moz-window-dragging: no-drag;
+			font-family: "Times New Roman";
+
+			#citation-preview-content {
+				color: var(--fill-primary);
+				font-size: 1.1rem;
+			}
+
+			#citation-preview-error {
+				padding-top: 2px;
+				color: var(--fill-secondary);
+				font-family: $font-family-base;
+			}
+		}
+	}
+
 	#bottom-area-wrapper {
-		border-top: var(--material-panedivider);
 		padding: 4px 8px;
 
 		.segmented-switch {
@@ -647,6 +694,12 @@
 			height: 28px;
 			gap: 8px;
 			-moz-window-dragging: no-drag;
+			#display-preview-button {
+				@include svgicon("dialog-citation-preview", "universal", "20");
+				&[aria-pressed="true"] {
+					background-color: var(--fill-quinary);
+				}
+			}
 			#settings-button {
 				@include svgicon("dialog-options", "universal", "16");
 			}
@@ -741,6 +794,14 @@
 							height: 24px; // same height as input
 						}
 					}
+					.details-locator-info {
+						padding-inline-start: 5px;
+						grid-column: 2;
+						// pull closer to the locator input above
+						margin-top: -4px;
+						color: var(--fill-secondary);
+						font-size: .93rem;
+					}
 				}
 				.buttons {
 					display: flex;
diff --git a/scss/components/_clicky.scss b/scss/components/_clicky.scss
index 7904b455ca..132f7f9a9d 100644
--- a/scss/components/_clicky.scss
+++ b/scss/components/_clicky.scss
@@ -2,7 +2,7 @@
 	border-radius: 6px;
 	padding: 2px;
 
-	&:not([disabled=true]) {
+	&:not([disabled]) {
 		&:hover {
 			background: var(--fill-quinary) !important;
 		}
@@ -81,6 +81,6 @@
 	border: 0px !important;
 }
 
-.zotero-clicky-minus[disabled=true], .zotero-clicky-plus[disabled=true] {
+.zotero-clicky-minus[disabled], .zotero-clicky-plus[disabled] {
 	opacity: .5;
 }
diff --git a/scss/components/_collection-tree.scss b/scss/components/_collection-tree.scss
index 46b4afe395..6836afdeec 100644
--- a/scss/components/_collection-tree.scss
+++ b/scss/components/_collection-tree.scss
@@ -99,6 +99,20 @@ $universal-icons: (
 					}
 				}
 			}
+			
+			&.selected {
+				border-radius: 0;
+
+				&.first-selected {
+					border-top-left-radius: 5px;
+					border-top-right-radius: 5px;
+				}
+
+				&.last-selected {
+					border-bottom-left-radius: 5px;
+					border-bottom-right-radius: 5px;
+				}
+			}
 		}
 
 		.row.flashing:not(.drop) {
diff --git a/scss/components/_contextPane.scss b/scss/components/_contextPane.scss
index e5a80849c8..9eebae59a1 100644
--- a/scss/components/_contextPane.scss
+++ b/scss/components/_contextPane.scss
@@ -54,7 +54,7 @@
 	background: var(--material-sidepane);
 	flex-direction: column;
 	
-	&[collapsed=true] {
+	&[collapsed] {
 		height: 0 !important;
 	}
 }
@@ -113,9 +113,9 @@
 	height: 28px;
 }
 
-#zotero-context-pane[collapsed=true] .notes-list-container,
-#zotero-context-pane-inner[collapsed=true] .notes-list-container,
-#zotero-context-pane[collapsed=true] .zotero-view-item > tabpanel > *,
-#zotero-context-pane-inner[collapsed=true] .zotero-view-item > tabpanel > * {
+#zotero-context-pane[collapsed] .notes-list-container,
+#zotero-context-pane-inner[collapsed] .notes-list-container,
+#zotero-context-pane[collapsed] .zotero-view-item > tabpanel > *,
+#zotero-context-pane-inner[collapsed] .zotero-view-item > tabpanel > * {
 	overflow: unset !important;
 }
diff --git a/scss/components/_exportOptions.scss b/scss/components/_exportOptions.scss
index 8b1da82f78..e00a08a9e8 100644
--- a/scss/components/_exportOptions.scss
+++ b/scss/components/_exportOptions.scss
@@ -4,13 +4,13 @@
 		margin-left: 17px;
 	}
 	
-	checkbox[disabled=true] label {
+	checkbox[disabled] label {
 		opacity: .5;
 	}
 
 	/* Override rules from Mozilla checkbox.css that make text almost unreadable when disabled
 	   when combined with our opacity: .5 */
-	checkbox[native][disabled="true"] {
+	checkbox[native][disabled] {
 		color: unset;
 	}
 }
diff --git a/scss/components/_import-wizard.scss b/scss/components/_import-wizard.scss
index 88e3c89571..f18ccf2241 100644
--- a/scss/components/_import-wizard.scss
+++ b/scss/components/_import-wizard.scss
@@ -44,7 +44,7 @@
 		margin: 0;
 	}
 
-	[disabled="true"] .checkbox-label {
+	[disabled] .checkbox-label {
 		opacity: .5;
 	}
 
diff --git a/scss/components/_item-tree.scss b/scss/components/_item-tree.scss
index e432c1df5a..b6e5b28601 100644
--- a/scss/components/_item-tree.scss
+++ b/scss/components/_item-tree.scss
@@ -17,6 +17,16 @@
 		padding: 4px 8px 8px;
 	}
 
+	// With sticky section headers, the body can't have top padding: overflow clips at the
+	// padding box, so rows would scroll up into the padding and show above the pinned header
+	// (which sticks to the content-box top). Drop the top padding so rows clip exactly where the
+	// header pins, and keep the gap below the column header as a margin -- outside the scroll
+	// area, where rows can't reach it.
+	.virtualized-table-body.has-sticky-section-headers {
+		padding-top: 0;
+		margin-top: 4px;
+	}
+
 	.virtualized-table-body {
 		scrollbar-color: var(--color-scrollbar) var(--color-scrollbar-background);
 	}
@@ -25,6 +35,14 @@
 		padding-inline-start: 8px;
 		padding-inline-end: calc(8px + var(--scrollbar-width, 0px));
 		box-sizing: border-box;
+		// A clear divider below the column headers (the default faint border is lost
+		// against the white section-header/spacer rows below it). The header already
+		// carries a second 1px line via ::after, so drop that one to avoid doubling.
+		border-bottom: var(--material-panedivider);
+
+		&::after {
+			border-bottom: none;
+		}
 
 		.cell.hasAttachment,
 		.cell.numNotes {
@@ -75,7 +93,8 @@
 	
 	.virtualized-table, .drag-image-container {
 		.row {
-			&.odd:not(.selected) {
+			// Header and spacer rows are always the pane background, never striped
+			&.odd:not(.selected):not(.library-header-row):not(.spacer-row) {
 				background-color: var(--material-stripe);
 			}
 
@@ -109,7 +128,9 @@
 			.icon-item-type + .tag-swatch,
 			.icon-item-type + .colored-tag-swatches,
 			.annotation-icon + .tag-swatch,
-			.annotation-icon + .colored-tag-swatches {
+			.annotation-icon + .colored-tag-swatches,
+			.retracted + .tag-swatch,
+			.retracted + .colored-tag-swatches {
 				margin-inline-end: 4px;
 			}
 
@@ -197,6 +218,7 @@
 			.retracted {
 				width: 12px;
 				margin-inline-start: 3px;
+				margin-inline-end: 4px;
 			}
 		}
 		
@@ -215,6 +237,51 @@
 			}
 		}
 
+		// Section header above each library's items in a cross-library selection. These
+		// rows are pinned to the top while their section is scrolled (see the sticky
+		// section header support in virtualized-table), so they're a uniform height with
+		// top-aligned content. The background matches the pane so the items below stripe
+		// against it; square corners keep the on-scroll hairline from curving at the edges.
+		.library-header-row {
+			background-color: var(--material-background);
+			border-radius: 0;
+
+			.cell.library-header {
+				display: flex;
+				align-items: center;
+				padding-bottom: 3px;
+				font-weight: 600;
+				color: var(--fill-secondary);
+
+				.icon-item-type {
+					margin-inline-end: 4px;
+					opacity: 0.8;
+				}
+
+				// Stands in for a missing icon (single-library summary header) so the
+				// label still aligns with the item titles below it
+				.library-header-icon-spacer {
+					width: 16px;
+					margin-inline-end: 4px;
+					flex-shrink: 0;
+				}
+			}
+		}
+
+		// The divider under a section header shows only while its section is scrolled
+		// under the pinned copy (see the "stuck" state in virtualized-table). Drawn as a
+		// box-shadow rather than a border so toggling it doesn't shift the row's content.
+		.virtualized-table-sticky-section-header.stuck .library-header-row {
+			box-shadow: inset 0 -1px 0 var(--color-panedivider);
+		}
+
+		// Blank whitespace row above each library header (except the first); matches the
+		// pane background so it reads as empty space rather than a striped row
+		.spacer-row {
+			background-color: var(--material-background);
+			pointer-events: none;
+		}
+
 		.annotation-row {
 			.cell {
 				font-size: $font-size-small;
diff --git a/scss/components/_mainWindow.scss b/scss/components/_mainWindow.scss
index 1398e24fb4..bcbc0090de 100644
--- a/scss/components/_mainWindow.scss
+++ b/scss/components/_mainWindow.scss
@@ -41,12 +41,22 @@
 	background: var(--color-sidepane);
 	border-radius: 5px;
 	border: var(--color-panedivider);
-	height: 30px;
+	min-height: 30px;
 	width: 300px;
 }
 
 #zotero-pane-progressmeter-container {
 	padding: 10px;
+	justify-content: center;
+}
+
+#zotero-pane-progress-label {
+	margin: 0;
+}
+
+#zotero-pane-progressmeter {
+	width: 100%;
+	margin-top: 4px;
 }
 
 #zotero-layout-switcher {
diff --git a/scss/components/_menu.scss b/scss/components/_menu.scss
index 2771d641ac..6173a0d834 100644
--- a/scss/components/_menu.scss
+++ b/scss/components/_menu.scss
@@ -27,7 +27,6 @@ $menu-icons: (
 	library-lookup: "library-lookup",
 	new-feed: "feed",
 	note: "note",
-	new-saved-search: "saved-search",
 	show-duplicates: "duplicate",
 	show-unfiled: "unfiled",
 	show-retracted: "retracted",
@@ -90,7 +89,7 @@ $menu-icons: (
 	@include macOS-hide-menu-icons;
 }
 
-menupopup image {
+menupopup :is(image, .menu-icon) {
 	-moz-context-properties: fill, fill-opacity;
 	fill: var(--fill-secondary);
 	
@@ -104,9 +103,11 @@ menu {
 	&.zotero-custom-menu-item {
 		@media (prefers-color-scheme: light) {
 			list-style-image: var(--custom-menu-icon-light, none);
+			--menuitem-icon: var(--custom-menu-icon-light, none);
 		}
 		@media (prefers-color-scheme: dark) {
 			list-style-image: var(--custom-menu-icon-dark, none);
+			--menuitem-icon: var(--custom-menu-icon-dark, none);
 		}
 	}
 }
diff --git a/scss/components/_richlistbox.scss b/scss/components/_richlistbox.scss
index b6a807b4ca..5c7baf2b8a 100644
--- a/scss/components/_richlistbox.scss
+++ b/scss/components/_richlistbox.scss
@@ -1,3 +1,10 @@
+// An autocomplete popup keeps focus in the field it completes, so its selected
+// row is the active one, rather than the platform's unfocused selection
+panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem[selected] {
+	background-color: var(--color-accent);
+	color: var(--color-accent-text);
+}
+
 richlistbox {
 	background: var(--material-background);
 	border: var(--material-panedivider);
@@ -27,7 +34,7 @@ richlistbox {
 		}
 
 		// Selected but not focused
-		&[selected="true"] {
+		&[selected] {
 			background-color: var(--color-quarternary-on-sidepane);
 			color: var(--color-accent-text);
 		}
@@ -36,7 +43,7 @@ richlistbox {
 	&:focus {
 		& > richlistitem {
 			// Selected and focused
-			&[selected="true"] {
+			&[selected] {
 				background-color: var(--color-accent);
 				color: var(--color-accent-text);
 			}
@@ -44,7 +51,7 @@ richlistbox {
 
 		// Add focus ring to richlistbox if the richlistbox is multi-select
 		&[seltype="multiple"] > richlistitem {
-			&[selected="true"][current="true"] {
+			&[selected][current] {
 				outline: var(--default-focusring);
 				outline-color: currentColor;
 				outline-offset: calc(-1 * var(--default-focusring-width));
diff --git a/scss/components/_search.scss b/scss/components/_search.scss
index a0533d0d95..4cdc3c18b6 100644
--- a/scss/components/_search.scss
+++ b/scss/components/_search.scss
@@ -22,6 +22,11 @@
 		@media not (-moz-platform: windows) {
 			@include focus-ring;
 		}
+
+		// We draw our own clear button below
+		&::-moz-search-clear-button {
+			display: none;
+		}
 	}
 
 	.search-cancel-button {
@@ -40,7 +45,96 @@
 	}
 }
 
-search-textbox {
+// Firefox gives the native clear button a hover background that runs into the field's focus ring,
+// and we don't use hover effects on comparable buttons
+input::-moz-search-clear-button {
+	&:hover,
+	&:active {
+		background-color: transparent;
+	}
+}
+
+// The list of completions for what's being typed in a query (see
+// queryTextbox.js)
+.query-completions {
+	--panel-padding: 4px 0;
+
+	richlistbox {
+		appearance: none;
+		background: transparent;
+		border: none;
+		margin: 0;
+		padding: 0;
+		min-width: 16em;
+		// Long lists scroll rather than being cut off
+		max-height: 20em;
+	}
+
+	richlistitem {
+		// A row is the name and, at the far end, what it searches, each as wide
+		// as its text, so the popup is as wide as its widest row
+		display: grid;
+		grid-template-columns: auto auto;
+		justify-content: space-between;
+		gap: 24px;
+		padding: 3px 8px;
+
+		> * {
+			overflow: visible;
+			text-overflow: clip;
+			white-space: nowrap;
+			width: auto;
+		}
+
+		&:hover {
+			background-color: var(--fill-quinary);
+		}
+
+		// Focus stays in the search field while the list is open, so the
+		// selected row is the active one
+		&[selected] {
+			background-color: var(--color-accent);
+			color: var(--color-accent-text);
+
+			.completion-description {
+				color: inherit;
+				opacity: 0.8;
+			}
+
+			// A ring in the text color, so the swatch reads on the accent
+			// background whatever colors the two are
+			.completion-swatch {
+				box-shadow: 0 0 0 1px var(--color-accent-text);
+			}
+		}
+	}
+
+	.completion-label {
+		display: flex;
+		align-items: center;
+		gap: 6px;
+
+		// Colored values read as they do in the tag selector
+		&.colored {
+			font-weight: 600;
+		}
+	}
+
+	.completion-swatch {
+		flex: 0 0 auto;
+		width: 10px;
+		height: 10px;
+		border-radius: 50%;
+		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.15);
+	}
+
+	.completion-description {
+		color: var(--fill-secondary);
+	}
+}
+
+search-textbox,
+query-textbox {
 	appearance: none;
 	background: var(--material-background);
 	border-radius: 5px;
@@ -48,6 +142,10 @@ search-textbox {
 	color: var(--fill-primary);
 	padding: 0;
 	padding-inline-end: 6px;
+	text-shadow: none;
+	// Allow text selection in the field instead of dragging the window when the
+	// field is in a draggable toolbar
+	-moz-window-dragging: no-drag;
 
 	&::placeholder {
 		color: var(--fill-tertiary);
@@ -59,8 +157,8 @@ search-textbox {
 	}
 }
 
-:is(search-textbox)::part(search-sign),
-:is(search-textbox)::part(search-icon) {
+:is(search-textbox, query-textbox)::part(search-sign),
+:is(search-textbox, query-textbox)::part(search-icon) {
 	@include svgicon-menu("magnifier", "universal", "16");
 	color: var(--fill-secondary);
 	// right: 2px padding + 8px dropmarker width + 4px padding + 6px padding
@@ -71,7 +169,7 @@ search-textbox {
 	display: block; // override fx115 display:none on macOS
 }
 
-:is(search-textbox):-moz-locale-dir(rtl)::part(search-sign),
-:is(search-textbox):-moz-locale-dir(rtl)::part(search-icon) {
+:is(search-textbox, query-textbox):-moz-locale-dir(rtl)::part(search-sign),
+:is(search-textbox, query-textbox):-moz-locale-dir(rtl)::part(search-icon) {
 	transform: scaleX(-1);
 }
diff --git a/scss/components/_tagSelector.scss b/scss/components/_tagSelector.scss
index f1d3555452..2c6b6d4563 100644
--- a/scss/components/_tagSelector.scss
+++ b/scss/components/_tagSelector.scss
@@ -6,7 +6,7 @@
 	min-height: 100px;
 }
 
-#zotero-tag-selector-container[collapsed=true] {
+#zotero-tag-selector-container[collapsed] {
 	visibility: collapse;
 }
 
diff --git a/scss/components/_toolbar.scss b/scss/components/_toolbar.scss
index 81b36a20a2..0c367a059d 100644
--- a/scss/components/_toolbar.scss
+++ b/scss/components/_toolbar.scss
@@ -1,8 +1,10 @@
+$toolbar-padding-inline: 8px;
+
 .toolbar {
 	height: $height-toolbar !important; /* Hard-code this to fix toolbar icon compression on Linux */
 	min-height: $height-toolbar; /* Needed to prevent squashing by stretched tag selector */
 	margin: 0;
-	padding: 0px 8px 0px 8px;
+	padding: 0 $toolbar-padding-inline;
 	min-width: 1px;
 }
 
@@ -79,12 +81,12 @@
 }
 
 /* Hide collection search on pane collapse, otherwise it still shows when focused */
-#zotero-collections-pane[collapsed=true] #zotero-collections-search.visible {
+#zotero-collections-pane[collapsed] #zotero-collections-search.visible {
 	display: none;
 }
 
 /* Hide the add button on pane collapse. Otherwise, it may show on top of 'New Item' */
-#zotero-collections-pane[collapsed=true] #zotero-tb-collection-add {
+#zotero-collections-pane[collapsed] #zotero-tb-collection-add {
 	visibility: hidden;
 }
 
diff --git a/scss/components/_toolbarbutton.scss b/scss/components/_toolbarbutton.scss
index 13a136a2ba..11ba0d1dff 100644
--- a/scss/components/_toolbarbutton.scss
+++ b/scss/components/_toolbarbutton.scss
@@ -10,14 +10,6 @@ toolbarbutton {
 	background-color: transparent;
 
 
-	.toolbarbutton-menu-dropmarker {
-		-moz-default-appearance: none;
-		@include svgicon-menu("chevron-8", "universal", "8");
-		color: var(--fill-secondary);
-		width: 8px;
-		height: 8px;
-	}
-
 	&:hover {
 		background-color: var(--fill-quinary);
 	}
@@ -29,7 +21,7 @@ toolbarbutton {
 	@include focus-ring;
 	
 	&:disabled,
-	&[disabled="true"] {
+	&[disabled] {
 		background-color: transparent;
 		color: var(--fill-tertiary);
 
@@ -43,6 +35,15 @@ toolbarbutton {
 	}
 }
 
+// Also hosted by plain <button>s, e.g., in the feed settings dialog
+.toolbarbutton-menu-dropmarker {
+	-moz-default-appearance: none;
+	@include svgicon("chevron-6", "universal", "8");
+	color: var(--fill-secondary);
+	width: 8px;
+	height: 8px;
+}
+
 @keyframes rotating {
 	from {
 		transform: rotate(0deg);
diff --git a/scss/components/_virtualized-table.scss b/scss/components/_virtualized-table.scss
index 215a751ad5..c7d8521533 100644
--- a/scss/components/_virtualized-table.scss
+++ b/scss/components/_virtualized-table.scss
@@ -287,8 +287,9 @@
 	}
 
 	.cell:first-child > :first-child {
-		// offset header's column label/icon to align with the text in the first column, without introducing padding to the cell itself to avoid flexbox issues
-		padding-inline-start: var(--first-column-extra-width, 0px);
+		// offset header's column label/icon to align with the text in the first column, without introducing padding to the cell itself to avoid flexbox issues.
+		// The extra 8px (COLUMN_PADDING / 2) makes up for the inline-start padding that the first cell omits.
+		padding-inline-start: calc(var(--first-column-extra-width, 0px) + 8px);
 	}
 
 	.cell {
@@ -358,12 +359,54 @@
 	}
 }
 
+// Pinned copy of the current section's header row. It's the first child of the scrolling
+// body and pins itself with position: sticky, so its width comes from the body's content box
+// for free and it lines up with the real rows without any JS geometry. It has zero height --
+// so it takes no space in the flow, doesn't shift the rows down, and pins flush with the top
+// of the rows -- and its content overflows downward over the rows. (The body's scrollbar is
+// kept clear of it by the reserved scrollbar gutter, not by paint order; see below.)
+.virtualized-table-sticky-section-header {
+	position: sticky;
+	top: 0;
+	height: 0;
+	// Above the rows scrolling under it, including a focused row (z-index: 10000), so they
+	// pass underneath the pinned header rather than over it
+	z-index: 10001;
+	// The zero-height outer box never overlaps anything, so it takes no pointer events;
+	// the opaque content below sets pointer-events: auto so it absorbs them
+	pointer-events: none;
+
+	.virtualized-table-sticky-section-header-content {
+		box-sizing: border-box;
+		// Opaque so the pinned header occludes the rows (and the real header row) beneath it,
+		// and opaque to pointer events too, so clicks, drags, and drops land on the pinned
+		// header rather than passing through to the occluded row underneath
+		background-color: var(--material-background);
+		pointer-events: auto;
+
+		.row {
+			position: static;
+		}
+	}
+}
+
 .virtualized-table-body, .drag-image-container {
 	flex: 1 0;
 	max-width: 100%;
 	overflow: auto;
 	padding: 4px 8px 8px;
 
+	// With sticky section headers, reserve the scrollbar's track so it doesn't float over the
+	// content. The pinned header is opaque and must paint above the rows to occlude them, which
+	// in Gecko also paints it above the scrollbar; keeping the scrollbar out of the content box
+	// is what stops it from covering the scrollbar's edge (see the sticky header rules above).
+	// The body must also have no top padding so rows can't scroll up into it and show above the
+	// pinned header; that's handled per-consumer (e.g. #zotero-items-tree) where the padding is
+	// set with higher specificity.
+	&.has-sticky-section-headers {
+		scrollbar-gutter: stable;
+	}
+
 	.cell {
 		// NOTE: Do not add padding here. See #5198
 		text-overflow: ellipsis;
@@ -375,6 +418,10 @@
 .virtualized-table.multi-select:focus {
 	.row.focused:not(.selected) {
 		outline: var(--default-focusring-width) dotted var(--color-accent);
+		// Inset the ring so it draws inside the row box rather than outside it, where the
+		// scroll container's overflow clip would cut off the top edge on the first row (the
+		// body has no top padding with sticky section headers)
+		outline-offset: calc(-1 * var(--default-focusring-width));
 		z-index: 10000;
 	}
 }
diff --git a/scss/elements/_advancedSearchPane.scss b/scss/elements/_advancedSearchPane.scss
new file mode 100644
index 0000000000..88401a949e
--- /dev/null
+++ b/scss/elements/_advancedSearchPane.scss
@@ -0,0 +1,63 @@
+advanced-search-deck {
+	flex-direction: column;
+	border-bottom: 1px solid var(--color-panedivider);
+
+	// Panes are children of the inner <deck>, so hide the non-selected one
+	// entirely -- otherwise it still occupies the deck's grid cell and forces
+	// the area to the height of the taller pane
+	advanced-search-pane:not(.deck-selected) {
+		display: none;
+	}
+}
+
+advanced-search-pane {
+	@include inactive-opacity;
+
+	flex-direction: column;
+	padding-block: 8px;
+	// Shared inline inset for every row in the pane. zoterosearch re-creates this inside its
+	// own overflow: auto box (cancelling it with a negative margin) so its edge focus rings
+	// aren't clipped; the other rows just inherit it.
+	padding-inline: 10px;
+	gap: 8px;
+	background: var(--material-toolbar);
+
+	.saved-search-name-row {
+		align-items: center;
+	}
+
+	.advanced-search-buttons {
+		gap: 8px;
+
+		button {
+			min-width: 100px;
+			// Patch out the native button margins (5px 6px 3px on macOS) so the
+			// row's gap and the pane's padding control the spacing
+			margin: 0;
+		}
+	}
+	
+	&[type="temporary"] {
+		.saved-search-name-row {
+			display: none;
+		}
+		
+		.advanced-search-buttons {
+			.cancel-button {
+				display: none;
+			}
+		}
+	}
+	
+	&[type="saved"] {
+		.advanced-search-buttons {
+			.search-button {
+				display: none;
+			}
+			
+			.clear-button {
+				display: none;
+			}
+		}
+	}
+}
diff --git a/scss/elements/_attachmentBox.scss b/scss/elements/_attachmentBox.scss
index ec2f645b34..853fd3f986 100644
--- a/scss/elements/_attachmentBox.scss
+++ b/scss/elements/_attachmentBox.scss
@@ -39,7 +39,7 @@ attachment-box {
 			padding: 4px;
 			margin-left: 4px;
 			@include svgicon-menu("sync", "universal", "16");
-			&:not([disabled='true']) {
+			&:not([disabled]) {
 				color: var(--fill-secondary);
 			}
 		}
@@ -50,7 +50,7 @@ attachment-box {
 			padding: 4px;
 			margin-left: 4px;
 			@include svgicon-menu("rename-from-parent", "universal", "16");
-			&:not([disabled='true']) {
+			&:not([disabled]) {
 				color: var(--fill-secondary);
 			}
 		}
diff --git a/scss/elements/_attachmentPreview.scss b/scss/elements/_attachmentPreview.scss
index 2c42886c6c..5290e5af58 100644
--- a/scss/elements/_attachmentPreview.scss
+++ b/scss/elements/_attachmentPreview.scss
@@ -90,7 +90,7 @@ attachment-preview {
 			}
 
 			&:disabled,
-			&[disabled="true"] {
+			&[disabled] {
 				opacity: 0.4;
 			}
 		}
diff --git a/scss/elements/_bubbleInput.scss b/scss/elements/_bubbleInput.scss
index 2a72c9c675..905dc08706 100644
--- a/scss/elements/_bubbleInput.scss
+++ b/scss/elements/_bubbleInput.scss
@@ -52,7 +52,7 @@ bubble-input {
 		// inputs initially occupy no width so they don't misalign bubbles at the
 		// start of each line. On focus, set their width for the cursor to appear
 		// and offset it by negative margin to avoid bubbles shifting
-		&.empty:not(.full-width):focus {
+		&.empty:not(.full-width):not(.just-added-placeholder):focus {
 			min-width: 1px;
 			margin-inline-start: -1px;
 		}
diff --git a/scss/elements/_colorPicker.scss b/scss/elements/_colorPicker.scss
index e29319f244..fea9c2a233 100644
--- a/scss/elements/_colorPicker.scss
+++ b/scss/elements/_colorPicker.scss
@@ -34,11 +34,11 @@ color-picker {
 		padding: 0;
 	}
 
-	.grid-tile[selected="true"] {
+	.grid-tile[selected] {
 		border: 1px outset #C0C0C0;
 	}
 
-	.grid-tile:hover:not([selected="true"]) {
+	.grid-tile:hover:not([selected]) {
 		border: 1px dotted #A7A7A7;
 	}
 }
diff --git a/scss/elements/_duplicatesMergePane.scss b/scss/elements/_duplicatesMergePane.scss
index 167c49ef34..722cea37ab 100644
--- a/scss/elements/_duplicatesMergePane.scss
+++ b/scss/elements/_duplicatesMergePane.scss
@@ -41,7 +41,7 @@ duplicates-merge-pane {
 
 	/* Show duplicates date list item as selected even when not focused
 	(default behavior on other platforms) */
-	#zotero-duplicates-merge-original-date:not(:focus) > richlistitem[selected="true"] {
+	#zotero-duplicates-merge-original-date:not(:focus) > richlistitem[selected] {
 		background-color: -moz-cellhighlight;
 		color: -moz-cellhighlighttext;
 	}
diff --git a/scss/elements/_editableText.scss b/scss/elements/_editableText.scss
index c8eaae0cbb..19df8d0a60 100644
--- a/scss/elements/_editableText.scss
+++ b/scss/elements/_editableText.scss
@@ -1,7 +1,7 @@
 @include comfortable {
 	--editable-text-padding-inline: 4px;
 	--editable-text-padding-block: 4px;
-	
+
 	--editable-text-tight-padding-inline: 4px;
 	--editable-text-tight-padding-block: 2px;
 }
@@ -9,7 +9,7 @@
 @include compact {
 	--editable-text-padding-inline: 4px;
 	--editable-text-padding-block: 1px;
-	
+
 	--editable-text-tight-padding-inline: 3px;
 	--editable-text-tight-padding-block: 1px;
 }
@@ -26,10 +26,10 @@ editable-text {
 
 	// Fun auto-sizing approach from CSSTricks:
 	// https://css-tricks.com/the-cleanest-trick-for-autogrowing-textareas/
-	
+
 	display: grid;
 	scrollbar-color: var(--color-scrollbar) var(--color-scrollbar-background);
-	
+
 	&:not([nowrap])::after {
 		content: attr(value) ' ';
 		visibility: hidden;
@@ -39,7 +39,7 @@ editable-text {
 		line-height: inherit;
 		overflow: hidden;
 	}
-	
+
 	&:not([nowrap])::after, &:not([nowrap]) .input {
 		grid-area: 1 / 1 / 2 / 2;
 		overflow-wrap: anywhere;
@@ -56,10 +56,10 @@ editable-text {
 			scrollbar-gutter: stable;
 		}
 	}
-	
+
 	.input {
 		border-radius: 5px;
-		
+
 		// No focus ring for read-only fields
 		&:read-only {
 			--width-focus-border: 0px;
@@ -80,7 +80,7 @@ editable-text {
 		}
 		// Necessary for consistent padding, even if it's actually an <input>
 		-moz-default-appearance: textarea;
-		
+
 		min-height: calc(var(--line-height) * var(--min-visible-lines));
 		margin: 0;
 		border: 1px solid transparent;
@@ -89,13 +89,13 @@ editable-text {
 		line-height: inherit;
 		color: inherit;
 		padding: var(--editable-text-padding-block) var(--editable-text-padding-inline);
-	
+
 		&:read-only, &:not(:focus) {
 			appearance: none;
 			background: transparent;
 			text-align: inherit;
 		}
-		
+
 		&:hover:not(:read-only, :focus) {
 			background: var(--fill-quinary);
 			box-shadow: 0 0 0 1px var(--fill-quinary);
@@ -104,7 +104,7 @@ editable-text {
 		&:focus:not(:read-only) {
 			background: var(--material-background);
 		}
-		
+
 		::placeholder {
 			color: var(--fill-tertiary);
 		}
@@ -120,11 +120,12 @@ editable-text {
 	&[hidden] {
 		display: none;
 	}
+
 	textarea {
 		// Per https://stackoverflow.com/a/22700700, somehow this removes an extra half-line
 		// at the bottom of textarea on all platforms with non-overlay scrollbars
 		overflow-x: hidden;
-		
+
 		// Match the gutters we apply to ::after
 		overflow-y: scroll;
 	}
diff --git a/scss/elements/_fileRenamingSettings.scss b/scss/elements/_fileRenamingSettings.scss
index 2f3574a3ed..d6fbe6b431 100644
--- a/scss/elements/_fileRenamingSettings.scss
+++ b/scss/elements/_fileRenamingSettings.scss
@@ -15,10 +15,19 @@ file-renaming-settings {
 		padding: 0.4em;
 	}
 
-	#file-rename-settings-section-instructions {
+	#file-rename-settings-section-instructions,
+	#file-renaming-template-invalid {
 		margin-top: .5em;
 	}
 
+	#file-renaming-template-invalid {
+		color: var(--color-invalid);
+		font-size: 0.9em;
+		padding: 8px 10px;
+		background: var(--color-invalid-background);
+		border-radius: 6px;
+	}
+
 	#file-renaming-format-template-label h2 {
 		margin-top: 0;
 	}
@@ -26,4 +35,8 @@ file-renaming-settings {
 	.indented-pref {
 		margin-inline-start: 2em;
 	}
+
+	.is-hidden {
+		display: none;
+	}
 }
diff --git a/scss/elements/_itemPane.scss b/scss/elements/_itemPane.scss
index 2dd29f22ef..2aa4612aa6 100644
--- a/scss/elements/_itemPane.scss
+++ b/scss/elements/_itemPane.scss
@@ -4,7 +4,7 @@ item-pane {
 	min-width: var(--width-available-item-pane, $min-width-item-pane + $width-sidenav);
 	min-height: $min-width-item-pane + $width-sidenav;
 
-	&[collapsed="true"] {
+	&[collapsed] {
 		min-width: $width-sidenav;
 		min-height: $width-sidenav;
 		max-width: $width-sidenav;
@@ -29,4 +29,8 @@ item-pane {
 			width: 100%;
 		}
 	}
+	
+	#batch-edit-prompt-message {
+		padding: 3px 8px;
+	}
 }
diff --git a/scss/elements/_itemPaneHeader.scss b/scss/elements/_itemPaneHeader.scss
index 153b632a84..eace7ae2c8 100644
--- a/scss/elements/_itemPaneHeader.scss
+++ b/scss/elements/_itemPaneHeader.scss
@@ -78,4 +78,35 @@ item-pane-header {
 		border: none;
 		height: 24px;
 	}
+
+	&.batch-edit {
+		background: var(--accent-blue10);
+
+		&.has-custom-head .custom-head {
+			background: transparent;
+			// Match the 4px icon-title gap of the collapsible sections below
+			gap: 4px;
+
+			.batch-edit-head-icon {
+				width: 16px;
+				height: 16px;
+				@include svgicon("edit", "universal", "16");
+				fill: var(--accent-blue);
+			}
+
+			description {
+				flex: 1;
+				font-weight: 600;
+				line-height: 1.333;
+				margin: 0;
+			}
+
+			button {
+				flex-grow: 0;
+				height: 24px;
+				min-width: 0;
+				padding-inline: 12px;
+			}
+		}
+	}
 }
diff --git a/scss/elements/_itemPaneSidenav.scss b/scss/elements/_itemPaneSidenav.scss
index 45234e0d7e..f98d0453bf 100644
--- a/scss/elements/_itemPaneSidenav.scss
+++ b/scss/elements/_itemPaneSidenav.scss
@@ -80,7 +80,7 @@ item-pane-sidenav {
 		box-sizing: border-box;
 
 		&:disabled,
-		&[disabled="true"] {
+		&[disabled] {
 			opacity: 60%;
 			pointer-events: none;
 		}
diff --git a/scss/elements/_quickSearchTextbox.scss b/scss/elements/_quickSearchTextbox.scss
index b4e3dc07cc..7d27be970f 100644
--- a/scss/elements/_quickSearchTextbox.scss
+++ b/scss/elements/_quickSearchTextbox.scss
@@ -8,12 +8,51 @@ quick-search-textbox {
 	max-width: 300px;
 	flex-grow: 1;
 
+	// Let the wrapper shrink below its content width when the items pane is squeezed (e.g., by a
+	// wide item pane). Otherwise it keeps its intrinsic width and overflows to the right, pushing
+	// the trailing Advanced Search button out under the item pane where it's clipped.
+	#search-wrapper {
+		min-width: 0;
+	}
+
+	// While the Advanced Search indicator is shown, size this element to the indicator's content
+	// (full label + buttons) rather than the 146px quick-search width, and allow shrinking below
+	// it (min-width: 0) only when the toolbar overflows -- so the label stays full on a normal
+	// window and crops just enough on a narrow one, keeping the buttons to its right (collapse/
+	// close and the stacked item-pane toggle) unclipped. The normal search box keeps its default
+	// size (it isn't shown then).
+	&[advanced-search-open] {
+		width: auto;
+		min-width: 0;
+		// Take only the indicator's width (don't grow toward max-width), so the buttons sit right
+		// after the label and the toggle isn't pushed out; the toolbar's spacer absorbs the slack
+		flex-grow: 0;
+
+		// A XUL <deck> sizes to its largest panel and doesn't clamp the panel to the deck's
+		// width, so the indicator keeps its full width and overflows. Since only the indicator
+		// is shown while advanced search is open, lay the deck out as flex and let the indicator
+		// (and its label) shrink, hiding the inactive quick-search panel.
+		#search-deck {
+			min-width: 0;
+			display: flex;
+		}
+
+		#search-wrapper {
+			display: none;
+		}
+
+		#advanced-search-indicator {
+			flex: 1;
+			min-width: 0;
+		}
+	}
+
 	*[zoteroFontSize=small] {
 		font-size: 11px;
 	}
 
-	:is(search-textbox)::part(search-sign),
-	:is(search-textbox)::part(search-icon) {
+	:is(search-textbox, query-textbox)::part(search-sign),
+	:is(search-textbox, query-textbox)::part(search-icon) {
 		@include svgicon-menu("magnifier", "universal", "16");
 		color: var(--fill-secondary);
 		// right: 4px gap + 2px padding + 8px dropmarker width + 4px padding
@@ -23,11 +62,15 @@ quick-search-textbox {
 		margin: 0;
 	}
 
-	:is(search-textbox)::part(search-input) {
+	:is(search-textbox, query-textbox)::part(search-input) {
 		padding: 0;
 	}
 }
 
+#zotero-tb-search {
+	height: 100%;
+}
+
 #zotero-tb-search-dropmarker {
 	position: relative;
 	// 6px padding + 16px icon width + 2px padding + 8px dropmarker width + 4px padding
@@ -70,6 +113,54 @@ quick-search-textbox {
 	height: 28px;
 	z-index: 1;
 	width: 100%;
+
+	// Keep input text and the clear icon out from under the Advanced Search button
+	&:has(~ #zotero-tb-search-advanced-button) {
+		padding-inline-end: 30px;
+	}
+}
+
+// Match the specificity of the #zotero-items-toolbar toolbarbutton rules
+#zotero-tb-search #zotero-tb-search-advanced-button {
+	position: relative;
+	width: 28px;
+	height: 28px;
+	min-width: 0;
+	margin: 0;
+	margin-inline-start: -28px;
+	margin-inline-end: 2px;
+	padding: 0;
+	z-index: 2;
+	@include svgicon-menu("filter", "universal", "16");
+	color: var(--fill-secondary);
+
+	@include focus-ring;
+
+	// Show the hover effect on a chip around the icon, inset within the field,
+	// rather than on the whole button
+	&:hover, &:active {
+		background-color: transparent;
+	}
+
+	.toolbarbutton-icon {
+		width: 24px;
+		height: 24px;
+		// The glyph is weighted slightly to the right within the SVG, so shift it
+		// a pixel left to optically center it (physical sides -- doesn't flip in RTL)
+		padding: 5px 6px 5px 4px;
+		border-radius: 4px;
+		// The button is 4px wider than the chip and left-aligns it, which puts the
+		// focus ring off-center; shift the chip 2px to center it within the button
+		margin-inline-start: 2px;
+	}
+
+	&:hover .toolbarbutton-icon {
+		background-color: var(--fill-quinary);
+	}
+
+	&:active .toolbarbutton-icon {
+		background-color: var(--fill-quarternary);
+	}
 }
 
 #zotero-tb-search-spinner {
@@ -79,6 +170,66 @@ quick-search-textbox {
 	visibility: hidden;
 }
 
-#search-wrapper {
+#search-deck {
 	width: 100%;
-}
\ No newline at end of file
+}
+
+#search-wrapper {
+	align-items: center;
+}
+
+#advanced-search-indicator {
+	gap: 8px;
+	align-items: center;
+	
+	// Cover the inline-end toolbar padding and the existing bottom border
+	margin-inline-end: -$toolbar-padding-inline;
+	padding-inline: $toolbar-padding-inline;
+	margin-bottom: -1px;
+	
+	background: var(--material-toolbar);
+	border-inline-start: var(--material-border);
+
+	// Prevent text from shifting when border shows after panel is collapsed
+	border-block: var(--material-border-transparent);
+	
+	// This is styled like it's part of the Advanced Search panel, which can't drag the window,
+	// so match that behavior
+	-moz-window-dragging: no-drag;
+
+	& > label {
+		flex: 1;
+		// Let the label shrink and crop on a narrow window so the collapse/close buttons to its
+		// right stay visible
+		min-width: 0;
+		padding-inline: 4px;
+		font-weight: 700;
+	}
+
+	.zotero-clicky {
+		width: 28px;
+		height: 28px;
+		margin: 0;
+		padding: 4px;
+	}
+	
+	.advanced-collapse-button {
+		@include svgicon-menu("minimize", "universal", "20");
+	}
+	
+	.advanced-close-button {
+		@include svgicon-menu("x", "universal", "20");
+		// Inset to match the filter button's chip in the closed state (it sits 2px
+		// in from the field edge), so the edge doesn't shift when toggling between
+		// the search field and this header
+		margin-inline-end: 2px;
+	}
+
+	&[data-collapsed="true"] {
+		border-bottom: var(--material-border);
+		
+		.advanced-collapse-button {
+			@include svgicon-menu("maximize", "universal", "20");
+		}
+	}
+}
diff --git a/scss/elements/_richlistCheckbox.scss b/scss/elements/_richlistCheckbox.scss
index 18064b6f1b..f059a11d56 100644
--- a/scss/elements/_richlistCheckbox.scss
+++ b/scss/elements/_richlistCheckbox.scss
@@ -12,29 +12,29 @@ richlistcheckbox {
 	}
 }
  
-richlistcheckbox[selected="true"] {
+richlistcheckbox[selected] {
 	background-color: var(--color-accent);
 	color: var(--fill-primary);
 }
 
-richlistbox:where(:focus) > richlistcheckbox[selected="true"] {
+richlistbox:where(:focus) > richlistcheckbox[selected] {
 	background-color: var(--color-accent);
 	color: var(--color-accent-text);
 }
 
-richlistbox[seltype="multiple"]:focus > richlistcheckbox[current="true"],
-richlistbox:focus > richlistcheckbox[current="true"] {
+richlistbox[seltype="multiple"]:focus > richlistcheckbox[current],
+richlistbox:focus > richlistcheckbox[current] {
 	outline: var(--default-focusring);
 	outline-color: var(--color-accent);
 	outline-offset: calc(-1 * var(--default-focusring-width));
 }
 
-richlistbox[seltype="multiple"]:focus > richlistcheckbox[current="true"][selected="true"],
-richlistbox:focus > richlistcheckbox[current="true"][selected="true"] {
+richlistbox[seltype="multiple"]:focus > richlistcheckbox[current][selected],
+richlistbox:focus > richlistcheckbox[current][selected] {
 	outline-color: #F3D982; /* TODO: find a suitable system color */
 }
 
-richlistbox:not(:focus) > richlistcheckbox[selected="true"] {
+richlistbox:not(:focus) > richlistcheckbox[selected] {
 	background-color: -moz-cellhighlight;
 	color: -moz-cellhighlighttext;
 }
@@ -48,7 +48,7 @@ richlistbox > richlistcheckbox > label {
 	white-space: nowrap;
 }
 
-richlistcheckbox[selected=true] {
+richlistcheckbox[selected] {
 	background-color: -moz-cellhighlight;
 	color: -moz-cellhighlighttext;	
 }
diff --git a/scss/elements/_styleConfigurator.scss b/scss/elements/_styleConfigurator.scss
index 1b296a0614..1bbff30a94 100644
--- a/scss/elements/_styleConfigurator.scss
+++ b/scss/elements/_styleConfigurator.scss
@@ -52,7 +52,7 @@ style-configurator {
 		}
 		
 		@media (-moz-platform: macos) {
-			&:not(:focus) richlistitem[selected="true"] {
+			&:not(:focus) richlistitem[selected] {
 				background-color: -moz-mac-secondaryhighlight;
 			}
 		}
diff --git a/scss/elements/_zoteroSearch.scss b/scss/elements/_zoteroSearch.scss
index 9085b3ed6e..14291627d5 100644
--- a/scss/elements/_zoteroSearch.scss
+++ b/scss/elements/_zoteroSearch.scss
@@ -1,21 +1,239 @@
 zoterosearch {
-	#search-box > hbox, #search-box > groupbox {
-		margin: 0 6px;
+	flex-direction: column;
+	// The pane sets a shared inline inset (its padding-inline); re-create it inside this scroll
+	// container and cancel the pane's with a negative margin, so edge focus rings -- e.g. the
+	// value field, or the caption's join-mode menulist -- aren't clipped by overflow: auto. The
+	// block padding works the same way vertically. The negative margins keep the surrounding
+	// spacing unchanged (the pane's padding and the column gap control it).
+	padding-inline: 10px;
+	margin-inline: -10px;
+	padding-block: 8px;
+	margin-block: -8px;
+	gap: 8px;
+	overflow: auto;
+	max-height: 33vh;
+	// Keep the whole builder a comfortable width on a wide window (left-aligned) rather
+	// than stretching the rows across the full width. The value field flexes within this.
+	max-width: 64em;
+	@include macOS-normalize-controls;
+
+	// Use the full pane width
+	search-condition-group {
+		display: flex;
+		flex-direction: column;
 	}
 
-	groupbox {
-		margin-top: 0;
-		padding-top: 0;
+	.search-condition-group {
+		gap: 8px;
+		// Zero the toolkit groupbox margin/padding
+		margin: 0;
+		padding: 0;
+		// The XUL groupbox shrink-wraps to content by default; fill its parent so the
+		// conditions box (and the value field) can use the available width
+		width: -moz-available;
 
-		& > #conditions {
-			-moz-appearance: groupbox;
-			padding: 6px;
+		.conditions {
+			min-width: fit-content; // Grow with content, don't overflow
+			// Rows abut, separated by full-width dividers (below)
+			gap: 0;
+		}
+
+		// A nested group has no box of its own. Each nesting level sets an indent that the
+		// rows and headers below apply to their own content -- not to the container -- so
+		// every row stays full width and its divider spans edge to edge. A group's
+		// conditions hold the level's indent; its header inherits the parent's, so the
+		// header lines up with the condition before it while the conditions step in one
+		// more level. (Custom properties can't accumulate by self-reference, so each level
+		// is set explicitly.)
+		@for $depth from 1 through 6 {
+			$sel: "";
+			@for $i from 1 through $depth {
+				$sel: "#{$sel}.search-condition-group ";
+			}
+			#{$sel}.conditions {
+				--indent: #{$depth * 20}px;
+			}
+		}
+
+		// The caption's remove-group/add-condition buttons, laid out so they line up in
+		// the same columns as a condition row's remove/add buttons. The placeholder
+		// reserves the trailing "( )" wrap-button column that rows have but captions don't.
+		.group-actions {
+			display: flex;
+			align-items: center;
+			gap: 8px;
+		}
+
+		.group-action-placeholder {
+			width: 20px;
+		}
+
+		.remove-group {
+			margin: 0;
+		}
+	}
+
+	// Full-width dividers between rows and groups. They sit on the row/group wrappers,
+	// which run the full width, so the lines span edge to edge regardless of how deeply
+	// the content is indented. The first item in a box has no line above it; a group's
+	// header is divided from its conditions by a line below the caption.
+	.conditions > * {
+		border-top: var(--material-border-quinary);
+	}
+
+	.conditions > *:first-child {
+		border-top: 0;
+	}
+
+	search-condition-group:not([root]) > .search-condition-group {
+		gap: 0;
+
+		> caption {
+			border-bottom: var(--material-border-quinary);
+		}
+	}
+
+	// Only the root group draws the surrounding frame; nested groups are shown by
+	// indentation
+	search-condition-group[root] > .search-condition-group > .conditions {
+		// No vertical padding: the rows' own 6px block padding sets the gap to the frame,
+		// matching the gap to a divider, so the first and last rows are centered in their
+		// bands just like the rows between dividers
+		padding: 0 8px;
+		background: var(--fill-senary);
+		border: var(--material-border-quinary);
+		border-radius: 6px;
+	}
+
+	// The root "Find ... matching ..." line is the top level of all conditions, so it needs no
+	// indent; and with no divider above it, no vertical padding either
+	search-condition-group[root] > .search-condition-group > caption {
+		padding-inline-start: 0 !important;
+		padding-block: 0;
+	}
+
+	// The per-condition "group" button (wraps the condition in a new group)
+	.search-group-button {
+		@include svgicon-menu("group-condition", "universal", "16");
+		width: 20px;
+		margin: 0;
+		border: 0 !important;
+		border-radius: 2px;
+		color: var(--fill-secondary);
+
+		.toolbarbutton-text {
+			display: none;
+		}
+	}
+
+	// The group caption's "ungroup" button sits in the same column as a row's group button and
+	// reuses its styling, but with the bracket-remove icon
+	.ungroup-group {
+		@include svgicon-menu("ungroup-condition", "universal", "16");
+	}
+	
+	.level-warning {
+		// Each group's level warning: a light-red callout below its conditions (the root's at the
+		// bottom, a nested group's inside its box), mirroring the binding hint's light-blue one.
+		color: var(--color-invalid);
+		font-size: 0.9em;
+		// 10px inline is a small visual nudge to bring the text slightly in (it doesn't line up
+		// with anything exactly); 8px block keeps the two-line message from cramping.
+		padding: 8px 10px;
+		background: var(--color-invalid-background);
+		border-radius: 6px;
+		// Fill the pane width but contribute no intrinsic (max-content) width of its own, so
+		// showing/hiding this notice can't widen the search pane and shrink the collections
+		// pane. (Its long text would otherwise push the pane to its max-width.)
+		box-sizing: border-box;
+		width: 0;
+		min-width: 100%;
+
+		description {
+			// Wrap to the available width instead of overflowing the pane; min-width: 0 lets
+			// it shrink within the flex row rather than contributing an intrinsic width
+			flex: 1;
+			min-width: 0;
+			margin: 0;
+			white-space: normal;
+		}
+	}
+
+	// A nested group's warning sits inside the outer box, so leave room below it rather than
+	// letting it butt against the box's bottom edge. (The root's warning is below the box.)
+	search-condition-group:not([root]) .level-warning {
+		margin-block-end: 6px;
+	}
+
+	#search-binding-hint {
+		// A distinct suggestion callout under the conditions (not plain body text): a light
+		// blue, rounded block with slightly smaller text, one "[statement] [button]" line per
+		// bindable level. Fills the pane width but contributes no intrinsic width (like the
+		// warning) so its line can't widen the search pane.
+		display: flex;
+		flex-direction: column;
+		// Each row hugs its content (so the button sits right next to the text) while the
+		// box itself still fills the pane width
+		align-items: flex-start;
+		gap: 8px;
+		padding: 8px;
+		font-size: 0.9em;
+		background: var(--accent-blue10);
+		border-radius: 6px;
+		box-sizing: border-box;
+		width: 0;
+		min-width: 100%;
+
+		> hbox {
+			display: flex;
+			align-items: center;
+			gap: 5px;
+		}
+
+		button {
+			margin: 0;
+		}
+
+		// The explicit `display: flex` above overrides the `hidden` attribute's display:none,
+		// so re-assert it -- otherwise the empty box shows when there's nothing to suggest
+		&[hidden] {
+			display: none;
+		}
+	}
+
+	#search-option-checkboxes {
+		flex-direction: row;
+		flex-wrap: wrap;
+		gap: 8px;
+		
+		checkbox {
+			margin: 0;
 		}
 	}
 
 	caption {
 		font: inherit;
-		padding-left: 0 !important;
+		align-items: center;
+		gap: 4px;
+		margin: 0 !important;
+		// Vertical breathing room around the divider lines
+		padding-block: 6px;
+		// A nested group's header inherits its parent's indent, so it lines up with the
+		// sibling condition above it (the root header is re-indented to the box below).
+		// The extra 5px matches the menulist's internal label inset, so "Match" aligns
+		// with the condition dropdown's label rather than its (slightly wider) box.
+		padding-inline-start: calc(var(--indent, 0px) + 5px) !important;
+
+		label {
+			margin: 0;
+		}
+
+		// Native menulists sit a couple pixels high relative to the inline label text
+		// ("Find ... matching ... of the following:"); baseline/align-self alignment is
+		// locked by the platform, so nudge them down to sit on the text
+		menulist {
+			margin-block-start: 2px;
+		}
 	}
 
 	label:first-child:not(tooltip label), checkbox:first-child {
@@ -23,25 +241,58 @@ zoterosearch {
 		padding-left: 0 !important;
 	}
 
-	checkbox {
-		margin-right: .5em;
-	}
-
 	input {
 		margin-block: 0;
 	}
 
+	// Native menulists carry platform-specific margins (e.g. 5px 2px 3px on
+	// macOS) that macOS-normalize-controls doesn't cover, unlike the inputs and
+	// checkboxes. Zero them and let the containers' gaps control the spacing.
+	menulist {
+		margin: 0;
+	}
+
 	.search-condition {
 		flex: 1;
 		display: flex;
 		align-items: center;
+		// Match the row's 6px block padding
+		gap: 6px;
+		// Vertical breathing room around the divider lines
+		padding-block: 6px;
+		// Indent the row's content by its nesting level (see --indent above) while the
+		// row itself stays full width, so the divider below it spans edge to edge
+		padding-inline-start: var(--indent, 0px);
 
-		.valuefield, .valuemenu, .value-date-age {
+		// The per-row tooltip container shouldn't take a flex slot (and the row's gap
+		// after it), which would push the condition menu right of the "Match" header.
+		// Take it out of flow rather than display:none, which would hide the tooltips.
+		popupset {
+			position: absolute;
+		}
+
+		.valuemenu, .value-date-age {
 			flex: 1;
 		}
+
+		// The text value field grows to use the available row width (the overall cap is on
+		// the builder, not here). It's a flex container itself so the inner stack/input
+		// fills the host.
+		.valuefield {
+			display: flex;
+			flex: 1;
+			min-width: 12em;
+
+			// The `display: flex` above overrides the `hidden` attribute's display:none, so
+			// re-assert it -- otherwise the textbox shows alongside the value menu for
+			// menu-based conditions (Collection, Item Type, Attachment File Type)
+			&[hidden] {
+				display: none;
+			}
+		}
 	}
 
-	#joinModeMenu {
+	.join-mode-menu {
 		min-width: 60px;
 	}
 	
@@ -49,18 +300,26 @@ zoterosearch {
 		width: 15em;
 	}
 	
-	#operatorsmenu, #valuemenu, #valuefield, .search-in-the-last {
+	#operatorsmenu, #valuemenu, .search-in-the-last {
 		width: 12em;
 	}
+
+	// Fill the flexed value field (host -> stack -> input)
+	#search-textbox {
+		flex: 1;
+		width: 100%;
+		// Match the drop-down menus' height and drop the native search input's extra left margin,
+		// so the row doesn't grow or shift (and the gap stays even) when switching between a text
+		// field and a drop-down menu
+		height: 22px;
+		box-sizing: border-box;
+		margin-inline: 0;
+	}
 	
 	#valuemenu::part(icon) {
 		max-height: 16px;
 	}
 	
-	#valuemenu::part(label), #valuemenu menuitem > .menu-iconic-text {
-		white-space: pre;
-	}
-
 	#condition-tooltips hbox > label
 	{
 		font-weight: 600;
diff --git a/scss/linux/_menu.scss b/scss/linux/_menu.scss
index 5e1e521f94..fe6d8abc9c 100644
--- a/scss/linux/_menu.scss
+++ b/scss/linux/_menu.scss
@@ -1,6 +1,6 @@
 menu,
 menuitem {
-	.menu-icon[src] {
+	.menu-icon[srcset] {
 		-moz-default-appearance: none;
 	}
 }
diff --git a/scss/linux/_menupopup.scss b/scss/linux/_menupopup.scss
index 9cc6ea4708..1dbb3031a3 100644
--- a/scss/linux/_menupopup.scss
+++ b/scss/linux/_menupopup.scss
@@ -1,4 +1,6 @@
 menupopup {
+	--menuitem-padding: 4px 9px;
+
 	menu {
 		menupopup {
 			margin-top: -4px;
diff --git a/scss/mac/_helpButton.scss b/scss/mac/_helpButton.scss
index 8d9d0aba23..24104d5ff4 100644
--- a/scss/mac/_helpButton.scss
+++ b/scss/mac/_helpButton.scss
@@ -2,4 +2,9 @@
 	appearance: auto;
 	-moz-default-appearance: -moz-mac-help-button;
 	min-width: 0;
+
+	// The question mark comes from the native appearance, so a visible label would overlap it
+	.button-text {
+		visibility: hidden;
+	}
 }
diff --git a/scss/mac/components/_menupopup.scss b/scss/mac/components/_menupopup.scss
index 18b9da0dd4..5cf35971b3 100644
--- a/scss/mac/components/_menupopup.scss
+++ b/scss/mac/components/_menupopup.scss
@@ -28,7 +28,7 @@ menulist > menupopup {
 			font-weight: bold;
 		}
 
-		&:is([checked="true"], [selected="true"])::before {
+		&:is([checked], [selected])::before {
 			visibility: inherit;
 		}
 	}
diff --git a/scss/merge.scss b/scss/merge.scss
index 937534fa81..3dd6c1edf7 100644
--- a/scss/merge.scss
+++ b/scss/merge.scss
@@ -20,8 +20,8 @@ merge-group {
 			flex: 1;
 		}
 
-		&[selected=true] h2,
-		&[selected=true] attachment-box #title {
+		&[selected] h2,
+		&[selected] attachment-box #title {
 			color: red;
 			font-weight: 600;
 			text-decoration: underline;
@@ -54,10 +54,10 @@ merge-group {
 		}
 	}
 
-	#left-pane:hover:not([selected=true]) h2,
-	#left-pane groupbox:focus:not([selected=true]) h2,
-	#right-pane:hover:not([selected=true]) h2,
-	#right-pane groupbox:focus:not([selected=true]) h2 {
+	#left-pane:hover:not([selected]) h2,
+	#left-pane groupbox:focus:not([selected]) h2,
+	#right-pane:hover:not([selected]) h2,
+	#right-pane groupbox:focus:not([selected]) h2 {
 		text-decoration: underline;
 	}
 
diff --git a/scss/preferences.scss b/scss/preferences.scss
index 9302377293..23e4e9fabc 100644
--- a/scss/preferences.scss
+++ b/scss/preferences.scss
@@ -124,7 +124,7 @@
 		fill: currentColor;
 		@include inactive-opacity;
 
-		&:is([selected="true"], [data-parent-selected="true"]) {
+		&:is([selected], [data-parent-selected="true"]) {
 			@media (-moz-platform: macos) {
 				background-color: color-mix(in srgb, var(--color-accent) 80%, transparent);
 			}
@@ -134,7 +134,7 @@
 			color: #fff;;
 		}
 
-		&:not([selected="true"], [data-parent-selected="true"]):hover {
+		&:not([selected], [data-parent-selected="true"]):hover {
 			background-color: color-mix(in srgb, var(--color-accent) 20%, transparent);
 		}
 	}
@@ -266,11 +266,11 @@ description, label, checkbox {
 	max-width: 630px;
 }
 
-checkbox[disabled="true"] {
+checkbox[disabled] {
 	color: gray !important;
 }
 
-menulist[disabled="true"] {
+menulist[disabled] {
 	opacity: 75%;
 	/* Disable default hover styling */
 	pointer-events: none;
diff --git a/scss/preferences/_advanced.scss b/scss/preferences/_advanced.scss
index 4151fc76cc..e732352d23 100644
--- a/scss/preferences/_advanced.scss
+++ b/scss/preferences/_advanced.scss
@@ -81,12 +81,20 @@
 	margin-top: 0 !important;
 }
 
-#fulltext-stats > .form-grid > label:nth-child(odd)
-{
-	text-align: end;
+#fulltext-stats-grid label + label {
+	margin-inline-start: 0.35em;
 }
 
-#updateButton, #fulltext-clearIndex {
+#fulltext-stats-progress-label {
+	margin-inline-start: 12px;
+}
+
+#fulltext-stats-progress-box,
+#fulltext-stats-complete {
+	margin-bottom: 8px;
+}
+
+#updateButton {
 	margin-inline-start: 6px;
 }
 
diff --git a/scss/preferences/_general.scss b/scss/preferences/_general.scss
index a2d57a85c6..89d2c52250 100644
--- a/scss/preferences/_general.scss
+++ b/scss/preferences/_general.scss
@@ -33,7 +33,7 @@
 // navigation on Windows, but we don't want to display the checkmark in that
 // case. Only show checkmark if "checked=true".
 #zotero-prefpane-general #openurl-menu {
-	menuitem:is([selected="true"]):not([checked="true"])::before {
+	menuitem:is([selected]):not([checked])::before {
 		visibility: hidden;
 	}
 }
diff --git a/scss/scaffold.scss b/scss/scaffold.scss
index 23affca4c3..081b1bf561 100644
--- a/scss/scaffold.scss
+++ b/scss/scaffold.scss
@@ -83,6 +83,11 @@ $scaffold-toolbarbutton-icons: (
 		margin: 0 4px;
 		
 		.toolbarbutton-menu-dropmarker {
+			-moz-default-appearance: none;
+			@include svgicon("chevron-6", "universal", "8");
+			color: var(--fill-secondary);
+			width: 8px;
+			height: 8px;
 			margin-inline-start: 4px;
 		}
 	}
diff --git a/scss/themes/_dark.scss b/scss/themes/_dark.scss
index 6a95c28e8f..3ee559a7e5 100644
--- a/scss/themes/_dark.scss
+++ b/scss/themes/_dark.scss
@@ -28,6 +28,8 @@ $-colors: (
     color-border50: #ffffff17,
     color-button: #404040,
     color-control: #ccc,
+    color-invalid: #ff7078,
+    color-invalid-background: #40191c,
     color-menu: #28282894,
     color-panedivider: #404040,
     color-sidepane: #303030,
diff --git a/scss/themes/_light.scss b/scss/themes/_light.scss
index ce64579b64..daf31c3c52 100644
--- a/scss/themes/_light.scss
+++ b/scss/themes/_light.scss
@@ -28,6 +28,8 @@ $-colors: (
     color-border50: #00000014,
     color-button: #fff,
     color-control: #fff,
+    color-invalid: #b81d29,
+    color-invalid-background: #fce8ea,
     color-menu: #f6f6f6b8,
     color-panedivider: #dadada,
     color-sidepane: #f2f2f2,
diff --git a/scss/win/_titleBar.scss b/scss/win/_titleBar.scss
index 8c07f82682..e49dc58b33 100644
--- a/scss/win/_titleBar.scss
+++ b/scss/win/_titleBar.scss
@@ -138,17 +138,28 @@
 	appearance: none;
 	border: none;
 	margin: 0;
-	padding: 8px 17px;
-	-moz-context-properties: stroke;
-	stroke: currentColor;
+	padding: 8px 18px;
+	color: inherit;
+
+	/* Segoe Fluent Icons is the preferred font for Windows 11, and
+	 * Segoe MDL2 Assets is there for windows 10. Luckily, the relevant glyphs
+	 * are the same, so we can just fall back.
+	 * See: https://learn.microsoft.com/en-us/windows/apps/design/style/segoe-fluent-icons-font */
+	font-family: "Segoe Fluent Icons", "Segoe MDL2 Assets";
+	font-size: round(10px, env(hairline));
+	line-height: 1;
 
 	:root[tabletmode] & {
 	display: none;
 	}
 
 	> .toolbarbutton-icon {
-	width: 12px;
-	height: 12px;
+	display: none;
+	}
+
+	&::before {
+	display: inline-block;
+	content: inherit;
 
 	&:-moz-locale-dir(rtl) {
 		transform: scaleX(-1);
@@ -161,83 +172,33 @@
 	 * for Windows 11's "snap layouts" feature, see
 	 * DealWithWindowsAppearanceHacks */
 	-moz-default-appearance: -moz-window-button-minimize;
-	list-style-image: url(chrome://browser/skin/window-controls/minimize.svg);
+	content: "\e921"; /* ChromeMinimize */
+	@media (prefers-contrast) {
+		content: "\ef2d"; /* ChromeMinimizeContrast */
+	}
 }
 
 .titlebar-max {
 	-moz-default-appearance: -moz-window-button-maximize;
-	list-style-image: url(chrome://browser/skin/window-controls/maximize.svg);
+	content: "\e922"; /* ChromeMaximize */
+	@media (prefers-contrast) {
+		content: "\ef2e"; /* ChromeMaximizeContrast */
+	}
 }
 
 .titlebar-restore {
 	-moz-default-appearance: -moz-window-button-restore;
-	list-style-image: url(chrome://browser/skin/window-controls/restore.svg);
+	content: "\e923"; /* ChromeRestore */
+	@media (prefers-contrast) {
+		content: "\ef2f"; /* ChromeRestoreContrast */
+	}
 }
 
 .titlebar-close {
 	-moz-default-appearance: -moz-window-button-close;
-	list-style-image: url(chrome://browser/skin/window-controls/close.svg);
-}
-
-:root[lwtheme-image] {
-	.titlebar-button {
-	-moz-context-properties: unset;
-	}
-	.titlebar-min {
-	list-style-image: url(chrome://browser/skin/window-controls/minimize-themes.svg);
-	}
-	.titlebar-max {
-	list-style-image: url(chrome://browser/skin/window-controls/maximize-themes.svg);
-	}
-	.titlebar-restore {
-	list-style-image: url(chrome://browser/skin/window-controls/restore-themes.svg);
-	}
-	.titlebar-close {
-	list-style-image: url(chrome://browser/skin/window-controls/close-themes.svg);
-	}
-}
-
-/* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which
- * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */
-@media (1.20dppx <= resolution <= 1.45dppx) {
-	.titlebar-button > .toolbarbutton-icon {
-	width: 11.5px;
-	height: 11.5px;
-	}
-}
-
-/* 175% dpi should result in the same device pixel sizes as 150% dpi. */
-@media (1.70dppx <= resolution <= 1.95dppx) {
-	.titlebar-button {
-	padding-inline: 14.1px;
-
-	> .toolbarbutton-icon {
-		width: 10.8px;
-		height: 10.8px;
-	}
-	}
-}
-
-/* 225% dpi should result in the same device pixel sizes as 200% dpi. */
-@media (2.20dppx <= resolution <= 2.45dppx) {
-	.titlebar-button {
-	padding-inline: 15.3333px;
-
-	> .toolbarbutton-icon {
-		width: 10.8px;
-		height: 10.8px;
-	}
-	}
-}
-
-/* 275% dpi should result in the same device pixel sizes as 250% dpi. */
-@media (2.70dppx <= resolution <= 2.95dppx) {
-	/* NB: todo: this should also change padding on the buttons
-	 * themselves, but without a device to test this on, it's
-	 * impossible to know by how much. */
-	.titlebar-button > .toolbarbutton-icon {
-	width: 10.8px;
-	height: 10.8px;
+	content: "\e8bb"; /* ChromeClose */
+	@media (prefers-contrast) {
+		content: "\ef2c"; /* ChromeCloseContrast */
 	}
 }
 
@@ -252,13 +213,13 @@
 }
 
 .titlebar-close:hover {
-	stroke: white;
+	color: white;
 	background-color: hsl(355,86%,49%);
 }
 .titlebar-close:hover:active {
 	background-color: hsl(355,82%,69%);
 }
 
-.titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
+.titlebar-button:not(:hover):-moz-window-inactive::before {
 	opacity: 0.5;
 }
diff --git a/scss/win/components/_checkbox.scss b/scss/win/components/_checkbox.scss
index ce0eba6aee..a65a561732 100644
--- a/scss/win/components/_checkbox.scss
+++ b/scss/win/components/_checkbox.scss
@@ -3,7 +3,7 @@
 		@include focus-states using ($color) {
 			background-image: url('chrome://zotero/skin/win/#{$color}/checkbox-#{$state}.svg');
 	
-			&[checked=true] {
+			&[checked] {
 				background-image: url('chrome://zotero/skin/win/#{$color}/checkbox-selected-#{$state}.svg');
 			}
 		}
diff --git a/scss/win/components/_input.scss b/scss/win/components/_input.scss
index f29687b43e..5646034100 100644
--- a/scss/win/components/_input.scss
+++ b/scss/win/components/_input.scss
@@ -59,6 +59,7 @@
 	),
 	textbox,
 	search-textbox,
+	query-textbox,
 	textarea
 ):where(:not([no-native])) {
 	appearance: none;
diff --git a/scss/win/components/_menupopup.scss b/scss/win/components/_menupopup.scss
index 86c3fea710..e797528f4e 100644
--- a/scss/win/components/_menupopup.scss
+++ b/scss/win/components/_menupopup.scss
@@ -1,4 +1,6 @@
 menupopup {
+	--menuitem-padding: 4px 9px;
+
 	menu, menuitem {
 		border-radius: 4px;
 		fill: currentColor;
@@ -19,18 +21,18 @@ menupopup {
 	font-size: 11px;
 }
 
-.menu-icon[disabled="true"] {
+.menu-icon[disabled] {
 	opacity: 50%;
 }
 
-menuitem:is([checked="true"]):is([type="radio"]) > .menu-icon {
-	list-style-image: url("chrome://zotero/skin/win/menu-radio.svg");
+menuitem:is([checked]):is([type="radio"]) > .menu-icon {
+	content: url("chrome://zotero/skin/win/menu-radio.svg");
 }
 
 menulist {
 	menupopup {
 		menu:not([icon], .menu-iconic),
-		menuitem:not([checked="true"], [icon], .menuitem-iconic) {
+		menuitem:not([checked], [icon], .menuitem-iconic) {
 			padding-inline-start: 36px;
 
 			.menu-icon {
@@ -38,15 +40,16 @@ menulist {
 			}
 		}
 
-		menuitem[selected="true"] {
+		menuitem[selected] {
 			padding-inline-start: 12px !important;
 	
 			& > .menu-icon {
 				display: revert;
+				visibility: inherit;
 				-moz-context-properties: fill, fill-opacity;
 				fill: currentColor;
-				fill-opacity: var(--menu-icon-opacity);
-				list-style-image: url("chrome://zotero/skin/win/menu-radio.svg");
+				fill-opacity: var(--menu-arrow-opacity);
+				content: url("chrome://zotero/skin/win/menu-radio.svg");
 				width: 16px;
 				margin-inline-end: 8px;
 			}
diff --git a/scss/win/components/_radio.scss b/scss/win/components/_radio.scss
index 6033830669..c2843b113d 100644
--- a/scss/win/components/_radio.scss
+++ b/scss/win/components/_radio.scss
@@ -3,7 +3,7 @@
 		@include focus-states using ($color) {
 			background-image: url('chrome://zotero/skin/win/#{$color}/radio-#{$state}.svg');
 	
-			&[selected=true] {
+			&[selected] {
 				background-image: url('chrome://zotero/skin/win/#{$color}/radio-selected-#{$state}.svg');
 			}
 		}
diff --git a/scss/xulElementPatches/wizard.scss b/scss/xulElementPatches/wizard.scss
index c2be086d1b..50175ab338 100644
--- a/scss/xulElementPatches/wizard.scss
+++ b/scss/xulElementPatches/wizard.scss
@@ -31,11 +31,11 @@
                 margin-bottom: 0;
             }
 
-            button:nth-child(1 of :not([hidden=true])) {
+            button:nth-child(1 of :not([hidden])) {
                 margin-left: 0;
             }
 
-            button:nth-last-child(1 of :not([hidden=true])) {
+            button:nth-last-child(1 of :not([hidden])) {
                 margin-right: 0;
             }
         }
diff --git a/test/content/runtests.js b/test/content/runtests.js
index 702cbe84f2..758eaf1b2b 100644
--- a/test/content/runtests.js
+++ b/test/content/runtests.js
@@ -10,15 +10,20 @@ chai.config.truncateThreshold = 0
 
 function quit(failed) {
 	// Quit with exit status
+	var promise = Promise.resolve();
 	if(!failed) {
-		IOUtils.write(PathUtils.join(FileUtils.getDir("ProfD", []).path, "success"), new Uint8Array(0));
+		// Wait for the write, which the runner uses to detect success, to finish before
+		// quitting -- on Windows, quitting could otherwise beat it
+		promise = IOUtils.write(PathUtils.join(FileUtils.getDir("ProfD", []).path, "success"), new Uint8Array(0));
 	}
 	if(!TestOptions.noquit) {
-		setTimeout(function () {
-			Components.classes['@mozilla.org/toolkit/app-startup;1']
-				.getService(Components.interfaces.nsIAppStartup)
-				.quit(Components.interfaces.nsIAppStartup.eForceQuit);
-		}, 250);
+		promise.then(function () {
+			setTimeout(function () {
+				Components.classes['@mozilla.org/toolkit/app-startup;1']
+					.getService(Components.interfaces.nsIAppStartup)
+					.quit(Components.interfaces.nsIAppStartup.eForceQuit);
+			}, 250);
+		});
 	}
 }
 
@@ -121,7 +126,7 @@ function Reporter(runner) {
 		dump(msg+"\n");
 	});
 
-	runner.on('fail', function(test, err){
+	function cleanErrorStack(err) {
 		// Remove internal code references
 		err.stack = err.stack.replace(/.+(?:zotero-unit\/|\/Task\.jsm|zotero\/bluebird\/).+\n?/g, "");
 		
@@ -136,6 +141,21 @@ function Reporter(runner) {
 		
 		// Make sure there's a blank line after all stack traces
 		err.stack = err.stack.replace(/\s*$/, '\n\n');
+	}
+	
+	runner.on('retry', function (test, err) {
+		cleanErrorStack(err);
+		let indentStr = indent();
+		dump(indentStr
+			// Yellow X for failures that will be retried
+			+ "\x1B[33;40m" + Mocha.reporters.Base.symbols.err + " [FAIL -- retrying]\x1B[0m"
+			+ " " + test.title + "\n"
+			+ indentStr + "  " + err.message + " at\n"
+			+ err.stack.replace(/^/gm, indentStr + "    ").trim() + "\n\n");
+	});
+	
+	runner.on('fail', function(test, err){
+		cleanErrorStack(err);
 		
 		failed++;
 		let indentStr = indent();
@@ -256,6 +276,41 @@ if (run && TestOptions.tests) {
 			dump(`Invalid start file ${startFile}\n`);
 		}
 		testFiles = testFiles.slice(startPos, stopPos + 1);
+
+		// Limit to the given shard of the file list (e.g., "2/4")
+		if (TestOptions.shard) {
+			let matches = TestOptions.shard.match(/^([0-9]+)\/([0-9]+)$/);
+			let shard = matches && parseInt(matches[1]);
+			let numShards = matches && parseInt(matches[2]);
+			if (!matches || shard < 1 || shard > numShards) {
+				dump(`Invalid shard ${TestOptions.shard}\n`);
+				run = false;
+				quit(true);
+			}
+			else {
+				// Split the sorted file list into contiguous chunks of roughly equal total file
+				// size, using size as a stand-in for run time. Contiguous chunks preserve the
+				// alphabetical run order of a full run, and a shard can be reproduced locally by
+				// passing its first and last files to -s and -e.
+				let sizes = new Map();
+				let totalSize = 0;
+				for (let fname of testFiles) {
+					let file = testDirectory.clone();
+					file.append(fname);
+					sizes.set(fname, file.fileSize);
+					totalSize += file.fileSize;
+				}
+				// A file belongs to the shard that the midpoint of its size range falls in
+				let cumSize = 0;
+				testFiles = testFiles.filter((fname) => {
+					let midpoint = cumSize + sizes.get(fname) / 2;
+					cumSize += sizes.get(fname);
+					return Math.min(numShards - 1, Math.floor(midpoint / totalSize * numShards)) == shard - 1;
+				});
+				dump(`Running shard ${shard}/${numShards} with ${testFiles.length} test files:\n`
+					+ testFiles.join(' ') + '\n');
+			}
+		}
 	} else {
 		var specifiedTests = TestOptions.tests.split(",");
 		for (let test of specifiedTests) {
diff --git a/test/content/support.js b/test/content/support.js
index 8b51d7df1c..effe76f80a 100644
--- a/test/content/support.js
+++ b/test/content/support.js
@@ -177,7 +177,7 @@ function waitForWindow(uri, callback) {
 		}
 		
 		Services.ww.unregisterNotification(winobserver);
-		var win = ev.target.ownerGlobal;
+		var win = ev.target.documentGlobal;
 		// Give window code time to run on load
 		win.setTimeout(function () {
 			if (callback) {
@@ -429,7 +429,7 @@ function waitForCallback(cb, interval, timeout) {
 			deferred.resolve(success);
 		} else if(Date.now() - start > timeout*1000) {
 			clearInterval(id);
-			deferred.reject(new Error("Promise timed out"));
+			deferred.reject(new Error("Promise timed out: " + cb.toString()));
 		}
 	}, interval);
 	return deferred.promise;
@@ -650,7 +650,7 @@ var modifyDataObject = function (obj, params = {}, saveOptions) {
 	default:
 		obj.name = params.name !== undefined ? params.name : Zotero.Utilities.randomString();
 	}
-	return obj.saveTx(saveOptions);
+	return obj.save({ tx: true, ...saveOptions });
 };
 
 /**
@@ -666,6 +666,33 @@ async function getPromiseError(promise) {
 	return false;
 }
 
+/**
+ * Run the given function within a DB transaction that is rolled back at the end,
+ * for testing rollback handling
+ *
+ * The function runs within the transaction, so it must use save() rather than saveTx().
+ *
+ * @param {Function} fn
+ * @param {Object} [options] - Options to pass to Zotero.DB.executeTransaction()
+ * @return {Promise} - Return value of the passed function
+ */
+async function executeTransactionWithForcedRollback(fn, options) {
+	var result;
+	var forcedError = new Error("Forced rollback");
+	try {
+		await Zotero.DB.executeTransaction(async function () {
+			result = await fn();
+			throw forcedError;
+		}, options);
+	}
+	catch (e) {
+		if (e !== forcedError) {
+			throw e;
+		}
+	}
+	return result;
+}
+
 /**
  * Returns the nsIFile corresponding to the test data directory
  * (i.e., test/tests/data)
@@ -721,10 +748,18 @@ var removeDir = async function (dir) {
  *
  * @param {Object} [options] - Initialization options, as passed to Zotero.init(), overriding
  *                             any that were set at startup
+ * @param {Object} [options.prefs] - Prefs to set for the reinitialization, overriding the
+ *     test-runner defaults. Cleared by the global afterEach().
  */
 async function resetDB(options = {}) {
 	resetPrefs();
 	
+	if (options.prefs) {
+		for (let key in options.prefs) {
+			Zotero.Prefs.set(key, options.prefs[key]);
+		}
+	}
+	
 	if (options.thisArg) {
 		options.thisArg.timeout(60000);
 	}
diff --git a/test/runtests.sh b/test/runtests.sh
index fbd1758170..70e0ef4709 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -46,6 +46,7 @@ Options
  -f                  stop after first test failure
  -g                  only run tests matching the given pattern (grep)
  -h                  display this help
+ -p SHARD/TOTAL      run only the given shard of the default test set (e.g., 2/4)
  -r RETRIES          retry failed tests the given number of times (default: 0)
  -s TEST             start at the given test
  -t                  generate test data and quit
@@ -58,7 +59,7 @@ DONE
 DEBUG=false
 DEBUG_LEVEL=5
 RETRIES=0
-while getopts "bcd:e:fg:hr:s:tx:" opt; do
+while getopts "bcd:e:fg:hp:r:s:tx:" opt; do
 	case $opt in
         b)
         	Z_ARGS="$Z_ARGS -ZoteroSkipBundledFiles"
@@ -85,6 +86,12 @@ while getopts "bcd:e:fg:hr:s:tx:" opt; do
 		h)
 			usage
 			;;
+		p)
+			if [[ ! "$OPTARG" =~ ^[1-9][0-9]*/[1-9][0-9]*$ ]]; then
+				usage
+			fi
+			Z_ARGS="$Z_ARGS -shard $OPTARG"
+			;;
 		r)
 			RETRIES="$OPTARG"
 			;;
@@ -164,6 +171,13 @@ else
 	Z_ARGS="$Z_ARGS -jsconsole"
 fi
 
+# On Windows, zotero.exe is the Mozilla launcher process, which spawns the browser process
+# and exits, so tell it to wait -- the success check and profile cleanup below otherwise
+# run while the app is still starting
+if [ ! -z $IS_CYGWIN ]; then
+	Z_ARGS="$Z_ARGS --wait-for-browser"
+fi
+
 # Clean up on exit
 trap "{ rm -rf \"$TEMPDIR\"; }" EXIT
 
@@ -173,11 +187,11 @@ if [[ -z "$CI" ]] && ! ps | grep js-build/build.js | grep -v grep > /dev/null; t
 	echo
 	echo "Running JS build process"
 	cd "$ROOT_DIR"
-	NODE_OPTIONS=--openssl-legacy-provider npm run build || exit $?
+	NODE_OPTIONS=--openssl-legacy-provider node js-build/build.js || exit $?
 	echo
 fi
 
-ZOTERO_TEST=1 "$ROOT_DIR/app/scripts/dir_build" -q
+ZOTERO_TEST=1 "$ROOT_DIR/app/scripts/dir_build"
 
 makePath FX_PROFILE "$PROFILE"
 MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$Z_EXECUTABLE" -profile "$FX_PROFILE" \
diff --git a/test/tests/HiddenBrowserTest.js b/test/tests/HiddenBrowserTest.js
index 58b5240716..4b21d0ee8a 100644
--- a/test/tests/HiddenBrowserTest.js
+++ b/test/tests/HiddenBrowserTest.js
@@ -151,6 +151,84 @@ describe("HiddenBrowser", function() {
 			assert.equal(characterSet, 'GBK');
 			assert.equal(bodyText, '这是一个测试文件。');
 		});
+
+		it("shouldn't execute JavaScript with allowJavaScript: false", async function () {
+			// A blob: URL created from chrome gets the system principal, which can run scripts
+			// even when JavaScript is disabled
+			var html = '<html><head><meta charset="utf-8"></head><body>'
+				+ '<p>Static content</p><p id="target"></p>'
+				+ '<script>document.getElementById("target").textContent = "This is a test.";</script>'
+				+ '</body></html>';
+			var blobURL = URL.createObjectURL(new Blob([html], { type: 'text/html' }));
+			var browser = new HiddenBrowser({ allowJavaScript: false });
+			await browser.load(blobURL);
+			var { bodyText } = await browser.getPageData(['bodyText']);
+			URL.revokeObjectURL(blobURL);
+			browser.destroy();
+			assert.include(bodyText, 'Static content');
+			assert.notInclude(bodyText, 'This is a test.');
+		});
+
+		it("shouldn't execute JavaScript in a local file with allowJavaScript: false", async function () {
+			// A file: URL loads in a separate content process, so this also checks that the
+			// sandboxing survives the content-process switch that happens during the load
+			var path = OS.Path.join(getTestDataDirectory().path, 'test-js.html');
+			var browser = new HiddenBrowser({ allowJavaScript: false });
+			await browser.load(path);
+			var { bodyText } = await browser.getPageData(['bodyText']);
+			browser.destroy();
+			assert.include(bodyText, 'Static content');
+			assert.notInclude(bodyText, 'This is a test.');
+		});
+	});
+
+	describe("#getPageData() timeout", function () {
+		var httpd;
+		var port = 16216;
+		var heldResponses = [];
+
+		before(function () {
+			httpd = new HttpServer();
+			httpd.start(port);
+			// Same-origin page whose parser-blocking script never finishes loading, so the
+			// document never reaches 'interactive'
+			httpd.registerPathHandler('/hangpage', {
+				handle(request, response) {
+					response.setHeader('Content-Type', 'text/html', false);
+					response.setStatusLine(null, 200, 'OK');
+					response.write('<html><head><script src="/hang.js"></script></head>'
+						+ '<body>x</body></html>');
+				}
+			});
+			httpd.registerPathHandler('/hang.js', {
+				handle(request, response) {
+					response.processAsync();
+					response.setStatusLine(null, 200, 'OK');
+					response.setHeader('Content-Type', 'text/javascript', false);
+					heldResponses.push(response);
+				}
+			});
+		});
+
+		after(async function () {
+			for (let r of heldResponses) {
+				try { r.finish(); } catch (e) {}
+			}
+			await new Promise(resolve => httpd.stop(resolve));
+		});
+
+		it("getPageData should reject instead of hanging on a never-ready document", async function () {
+			this.timeout(20000);
+			let browser = new HiddenBrowser();
+			await browser.load(`http://127.0.0.1:${port}/hangpage`);
+			let start = Date.now();
+			let e = await getPromiseError(browser.getPageData(['bodyText'], { timeout: 2000 }));
+			let elapsed = Date.now() - start;
+			browser.destroy();
+			assert.ok(e, 'getPageData rejected');
+			assert.include(e.message, 'Timed out');
+			assert.isBelow(elapsed, 10000, 'rejected around the timeout, not after a long hang');
+		});
 	});
 
 	describe("#getDocument()", function () {
diff --git a/test/tests/advancedSearchTest.js b/test/tests/advancedSearchTest.js
index 455409d4a1..1b0989a83b 100644
--- a/test/tests/advancedSearchTest.js
+++ b/test/tests/advancedSearchTest.js
@@ -1,7 +1,7 @@
 "use strict";
 
 describe("Advanced Search", function () {
-	var win, zp;
+	var win, zp, deck;
 	
 	before(function* () {
 		yield resetDB({
@@ -10,60 +10,1337 @@ describe("Advanced Search", function () {
 		});
 		win = yield loadZoteroPane();
 		zp = win.ZoteroPane;
+		deck = win.document.getElementById('zotero-advanced-search-pane-deck');
 	});
 	
 	after(function () {
 		win.close();
 	});
 	
-	it("should perform a search", function* () {
-		var item = yield createDataObject('item', { setTitle: true });
+	it("should perform a search", async function () {
+		var item = await createDataObject('item', { setTitle: true });
+		var otherItem = await createDataObject('item', { setTitle: true });
+		
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+		
+		// Opening the pane shouldn't filter the items list
+		await zp.itemsView.waitForLoad();
+		assert.equal(zp.itemsView.rowCount, 2);
 		
-		var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml');
-		zp.openAdvancedSearchWindow();
-		var searchWin = yield promise;
-		yield searchWin.ZoteroAdvancedSearch._loadedDeferred.promise;
 		// Add condition
-		var searchBox = searchWin.document.getElementById('zotero-search-box');
-		
 		var s = new Zotero.Search();
-		s.addCondition('title', 'is', item.getField('title'))
-		searchBox.search = s;
+		s.libraryID = item.libraryID;
+		s.addCondition('title', 'is', item.getField('title'));
+		pane.search = s;
 		
 		// Run search and wait for results
-		var o = searchWin.ZoteroAdvancedSearch;
-		var iv = o.itemsView;
-		yield iv.waitForLoad();
-		yield o.search();
-		yield iv.waitForLoad();
+		var iv = zp.itemsView;
+		await pane.submit();
+		await iv.waitForLoad();
 		
 		// Check results
 		assert.equal(iv.rowCount, 1);
 		var index = iv.getRowIndexByID(item.id);
 		assert.isNumber(index);
 		
-		searchWin.close();
+		// Closing should restore the unfiltered view
+		await zp.setAdvancedSearchState('closed');
+		assert.equal(iv.rowCount, 2);
 		
-		yield item.eraseTx();
+		await item.eraseTx();
+		await otherItem.eraseTx();
 	});
 	
+	it("shouldn't invalidate the collection tree row when clearing an unset advanced search", async function () {
+		// setAdvancedSearch() returns whether the row's filter changed, which
+		// setFilter() uses to decide whether to refresh the items list
+		let row = zp.getCollectionTreeRows()[0];
+		// Nothing to clear
+		assert.isFalse(row.setAdvancedSearch(null));
+		
+		let s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('title', 'is', 'foo');
+		// Applying and clearing a search are changes; clearing again isn't
+		assert.isTrue(row.setAdvancedSearch(s));
+		assert.isTrue(row.setAdvancedSearch(null));
+		assert.isFalse(row.setAdvancedSearch(null));
+	});
+	
+	it("should seed conditions written in the quick search query", async function () {
+		var match = await createDataObject('item', { title: "alpha beta" });
+		match.addTag('zztag');
+		await match.saveTx();
+		var wrongTag = await createDataObject('item', { title: "alpha beta" });
+		await wrongTag.saveTx();
+
+		await zp.openAdvancedSearchFromQuickSearch('tag:zztag alpha', 'fields');
+		var iv = zp.itemsView;
+		await iv.waitForLoad();
+
+		var conditions = Object.values(deck.pane.search.getConditions());
+		var tag = conditions.find(c => c.condition === 'tag');
+		assert.isDefined(tag);
+		assert.equal(tag.value, 'zztag');
+		assert.equal(tag.operator, 'is');
+		// The rest of the query is still words to match
+		assert.sameMembers(
+			conditions.filter(c => c.condition === 'anyField').map(c => c.value),
+			['alpha']
+		);
+
+		assert.equal(iv.rowCount, 1);
+		assert.isNumber(iv.getRowIndexByID(match.id));
+
+		await zp.setAdvancedSearchState('closed');
+		await iv.waitForLoad();
+		await Zotero.Items.erase([match.id, wrongTag.id]);
+	});
+
+	it("should seed from the quick search text and reset on close", async function () {
+		var match = await createDataObject('item', { title: "alpha beta" });
+		var partial = await createDataObject('item', { title: "alpha gamma" });
+		var neither = await createDataObject('item', { title: "delta" });
+
+		var searchBox = win.document.getElementById('zotero-tb-search');
+		searchBox.value = 'alpha beta';
+		await zp.itemsView.setFilter('search', 'alpha beta');
+
+		await zp.openAdvancedSearchFromQuickSearch('alpha beta', 'fields');
+		var iv = zp.itemsView;
+		await iv.waitForLoad();
+
+		// One "Any Field" condition per word, joined with "all"
+		var conditions = Object.values(deck.pane.search.getConditions())
+			.filter(c => c.condition === 'anyField');
+		assert.lengthOf(conditions, 2);
+		assert.sameMembers(conditions.map(c => c.value), ['alpha', 'beta']);
+
+		// Only the item matching both words, and the quick search field is cleared
+		assert.equal(iv.rowCount, 1);
+		assert.isNumber(iv.getRowIndexByID(match.id));
+		assert.equal(searchBox.value, '');
+
+		// Closing resets to an unfiltered view (doesn't restore the quick search)
+		await zp.setAdvancedSearchState('closed');
+		await iv.waitForLoad();
+		assert.equal(iv.rowCount, 3);
+
+		await Zotero.Items.erase([match.id, partial.id, neither.id]);
+	});
+	
+	it("should seed an \"Everything\" quick search as full-text groups", async function () {
+		await zp.openAdvancedSearchFromQuickSearch('alpha beta', 'everything');
+		await zp.itemsView.waitForLoad();
+
+		// Each word -> an "any" group of [Any Field, Full Text Content]
+		var conds = Object.values(deck.pane.search.getConditions());
+		assert.lengthOf(conds.filter(c => c.condition === 'groupStart'), 2);
+		assert.lengthOf(conds.filter(c => c.condition === 'anyField'), 2);
+		assert.sameMembers(
+			conds.filter(c => c.condition === 'fulltextContent').map(c => c.value),
+			['alpha', 'beta']
+		);
+
+		await zp.setAdvancedSearchState('closed');
+	});
+	it("should prefill a Title/Creator/Year quick search, restricted to top-level items", async function () {
+		// A top-level item whose title matches both words, and an item whose only match is a
+		// child attachment's title (which shouldn't broaden a top-level-only search)
+		var topMatch = await createDataObject('item', { title: "alpha beta" });
+		var childOnly = await createDataObject('item', { title: "zzznomatch" });
+		var attachment = await importPDFAttachment(childOnly);
+		attachment.setField('title', 'alpha beta');
+		await attachment.saveTx();
+
+		await zp.openAdvancedSearchFromQuickSearch('alpha beta', 'titleCreatorYear');
+		var iv = zp.itemsView;
+		await iv.waitForLoad();
+
+		// One "Title, Creator, Year" condition per word, plus a result level of item
+		var conds = Object.values(deck.pane.search.getConditions());
+		var tcy = conds.filter(c => c.condition === 'titleCreatorYear');
+		assert.lengthOf(tcy, 2);
+		assert.sameMembers(tcy.map(c => c.value), ['alpha', 'beta']);
+		assert.isTrue(conds.some(c => c.condition === 'resultLevel' && c.operator === 'item'));
+
+		// The top-level title matches; the child attachment's matching title doesn't broaden it
+		assert.equal(iv.rowCount, 1);
+		assert.isNumber(iv.getRowIndexByID(topMatch.id));
+
+		await zp.setAdvancedSearchState('closed');
+		await topMatch.eraseTx();
+		await childOnly.eraseTx();
+	});
+
+	it("should run a cross-level search across a multi-collection selection", async function () {
+		var word = 'zmc' + Zotero.Utilities.randomString();
+		var makeMatch = async function (collection) {
+			var item = await createDataObject('item', { collections: [collection.id] });
+			var attachment = await importPDFAttachment(item);
+			await createAnnotation('highlight', attachment, { comment: 'foo ' + word + ' bar' });
+			return item;
+		};
+		var c1 = await createDataObject('collection');
+		var c2 = await createDataObject('collection');
+		var c3 = await createDataObject('collection');
+		var itemA = await makeMatch(c1);
+		var itemB = await makeMatch(c2);
+		var itemC = await makeMatch(c3); // in an unselected collection
+		
+		// Select c1 and c2, leaving c3 out
+		var cv = zp.collectionsView;
+		await cv.selectByID("C" + c1.id);
+		await waitForItemsLoad(win);
+		cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+		await zp.onCollectionSelected();
+		await zp.itemsView.waitForLoad();
+		
+		// Top-level items with a descendant annotation matching the comment
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('resultLevel', 'item');
+		s.addCondition('annotationComment', 'contains', word);
+		
+		var iv = zp.itemsView;
+		await iv.setFilter('advanced-search', s);
+		await iv.waitForLoad();
+		
+		// The view merges getItems() across the selected rows (collectionViewItemTree),
+		// so the cross-level search runs scoped to each collection and the results union:
+		// both selected collections' matching items, but not the unselected one's
+		var rows = zp.getCollectionTreeRows();
+		var ids = new Set();
+		for (let arr of await Promise.all(rows.map(row => row.getItems()))) {
+			for (let item of arr) ids.add(item.id);
+		}
+		assert.sameMembers([...ids], [itemA.id, itemB.id]);
+		
+		await iv.setFilter('advanced-search', null);
+		await selectLibrary(win);
+		await Zotero.Items.erase([itemA.id, itemB.id, itemC.id]);
+		await Zotero.Collections.erase([c1.id, c2.id, c3.id]);
+	});
+	
+
+	it("shouldn't match an image embedded in a note", async function () {
+		var item = await createDataObject('item');
+		item.addTag('a');
+		await item.saveTx();
+		var note = new Zotero.Item('note');
+		note.setNote('foo');
+		note.parentItemID = item.id;
+		note.addTag('a');
+		await note.saveTx();
+		await createEmbeddedImage(note);
+		
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+		
+		var s = new Zotero.Search();
+		s.libraryID = item.libraryID;
+		s.addCondition('numTags', 'is', '0');
+		pane.search = s;
+		
+		var iv = zp.itemsView;
+		await pane.submit();
+		await iv.waitForLoad();
+		
+		// The item and its note are tagged, so the only untagged row under the item is
+		// the embedded image, which is hidden and shouldn't pull the item into the results
+		assert.isFalse(iv.getRowIndexByID(item.id));
+		
+		await zp.setAdvancedSearchState('closed');
+	});
+	
+	it("shouldn't show trashed items outside the trash", async function () {
+		var item = await createDataObject('item', { setTitle: true });
+		item.deleted = true;
+		await item.saveTx();
+
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+
+		var s = new Zotero.Search();
+		s.libraryID = item.libraryID;
+		s.addCondition('title', 'is', item.getField('title'));
+		pane.search = s;
+
+		var iv = zp.itemsView;
+		await pane.submit();
+		await iv.waitForLoad();
+
+		assert.isFalse(iv.getRowIndexByID(item.id));
+
+		await zp.setAdvancedSearchState('closed');
+
+		await item.eraseTx();
+	});
+
+	it("should remove a trashed result and not show it again on re-run", async function () {
+		var item = await createDataObject('item', { setTitle: true });
+
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+
+		var s = new Zotero.Search();
+		s.libraryID = item.libraryID;
+		s.addCondition('title', 'is', item.getField('title'));
+		pane.search = s;
+
+		var iv = zp.itemsView;
+		await pane.submit();
+		await iv.waitForLoad();
+		assert.isNumber(iv.getRowIndexByID(item.id));
+
+		// Trashing the item should remove it from the results
+		await Zotero.Items.trashTx(item.id);
+		assert.isFalse(iv.getRowIndexByID(item.id));
+
+		// Re-running the search shouldn't bring it back
+		await pane.submit();
+		await iv.waitForLoad();
+		assert.isFalse(iv.getRowIndexByID(item.id));
+
+		await zp.setAdvancedSearchState('closed');
+
+		await item.eraseTx();
+	});
+
+	it("should show trashed items when in the trash", async function () {
+		var item = await createDataObject('item', { setTitle: true });
+		item.deleted = true;
+		await item.saveTx();
+
+		await selectTrash(win, item.libraryID);
+
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+
+		var s = new Zotero.Search();
+		s.libraryID = item.libraryID;
+		s.addCondition('title', 'is', item.getField('title'));
+		pane.search = s;
+
+		var iv = zp.itemsView;
+		await pane.submit();
+		await iv.waitForLoad();
+
+		assert.isNumber(iv.getRowIndexByID(item.id));
+
+		await zp.setAdvancedSearchState('closed');
+		await selectLibrary(win, item.libraryID);
+
+		await item.eraseTx();
+	});
+	
+	it("shouldn't reapply previous search when reopened while closing", async function () {
+		var item = await createDataObject('item', { setTitle: true });
+		
+		await zp.toggleAdvancedSearchState('open');
+		var s = new Zotero.Search();
+		s.libraryID = item.libraryID;
+		s.addCondition('title', 'is', 'nomatch');
+		deck.pane.search = s;
+		await deck.pane.submit();
+		await zp.itemsView.waitForLoad();
+		assert.equal(zp.itemsView.rowCount, 0);
+		
+		// Close and immediately reopen, without waiting, as with UI clicks
+		zp.toggleAdvancedSearchState('closed');
+		await zp.toggleAdvancedSearchState('open');
+		await zp.itemsView.waitForLoad();
+		
+		// The previous search shouldn't have been reapplied
+		assert.isNumber(zp.itemsView.getRowIndexByID(item.id));
+		
+		await zp.setAdvancedSearchState('closed');
+		await item.eraseTx();
+	});
+	
+	it("should scope results to the selected saved search", async function () {
+		var inBoth = await createDataObject('item', { title: "foo bar" });
+		var inSavedOnly = await createDataObject('item', { title: "foo baz" });
+		var inAdvancedOnly = await createDataObject('item', { title: "bar qux" });
+		
+		var saved = new Zotero.Search();
+		saved.libraryID = Zotero.Libraries.userLibraryID;
+		saved.name = "Scope Test";
+		saved.addCondition('title', 'contains', 'foo');
+		await saved.saveTx();
+		await select(win, saved);
+		
+		await zp.toggleAdvancedSearchState('open');
+		var s = new Zotero.Search();
+		s.libraryID = saved.libraryID;
+		s.addCondition('title', 'contains', 'bar');
+		deck.pane.search = s;
+		
+		var iv = zp.itemsView;
+		await deck.pane.submit();
+		await iv.waitForLoad();
+		
+		// Only the item matching both the saved search and the advanced search
+		assert.equal(iv.rowCount, 1);
+		assert.isNumber(iv.getRowIndexByID(inBoth.id));
+		
+		// The saved search itself shouldn't have been modified
+		assert.lengthOf(Object.keys(saved.getConditions()), 1);
+		
+		await zp.setAdvancedSearchState('closed');
+		
+		await Zotero.Items.erase([inBoth.id, inSavedOnly.id, inAdvancedOnly.id]);
+		await saved.eraseTx();
+	});
+	
+	it("should scope results to multiple selected collections", async function () {
+		var collection1 = await createDataObject('collection');
+		var collection2 = await createDataObject('collection');
+		var inFirst = await createDataObject('item', { title: "foo bar", collections: [collection1.id] });
+		var inSecond = await createDataObject('item', { title: "foo baz", collections: [collection2.id] });
+		var noMatch = await createDataObject('item', { title: "qux", collections: [collection2.id] });
+		var notInCollections = await createDataObject('item', { title: "foo qux" });
+		
+		var cv = zp.collectionsView;
+		await cv.selectByID("C" + collection1.id);
+		await waitForItemsLoad(win);
+		cv.selection.toggleSelect(cv.getRowIndexByID("C" + collection2.id));
+		await zp.onCollectionSelected();
+		await zp.itemsView.waitForLoad();
+		
+		await zp.toggleAdvancedSearchState('open');
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('title', 'contains', 'foo');
+		deck.pane.search = s;
+		
+		var iv = zp.itemsView;
+		await deck.pane.submit();
+		await iv.waitForLoad();
+		
+		// Matching items from both collections, but not the non-matching item or the
+		// matching item outside the selected collections (the row count also includes the
+		// "2 collections selected" section header)
+		assert.isNumber(iv.getRowIndexByID(inFirst.id));
+		assert.isNumber(iv.getRowIndexByID(inSecond.id));
+		assert.isFalse(iv.getRowIndexByID(noMatch.id));
+		assert.isFalse(iv.getRowIndexByID(notInCollections.id));
+		
+		await zp.setAdvancedSearchState('closed');
+		await selectLibrary(win);
+		
+		await Zotero.Items.erase([inFirst.id, inSecond.id, noMatch.id, notInCollections.id]);
+		await Zotero.Collections.erase([collection1.id, collection2.id]);
+	});
+	
+	it("should search across feeds in Feeds view", async function () {
+		let feed = await createFeed();
+		let feedItem = await createDataObject('feedItem', { libraryID: feed.libraryID, setTitle: true }, { skipSelect: true });
+		let otherFeedItem = await createDataObject('feedItem', { libraryID: feed.libraryID, setTitle: true }, { skipSelect: true });
+		
+		await zp.collectionsView.selectFeeds();
+		await waitForItemsLoad(win);
+		
+		await zp.toggleAdvancedSearchState('open');
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('title', 'is', feedItem.getField('title'));
+		deck.pane.search = s;
+		
+		var iv = zp.itemsView;
+		await deck.pane.submit();
+		await iv.waitForLoad();
+		
+		assert.equal(iv.rowCount, 1);
+		assert.isNumber(iv.getRowIndexByID(feedItem.id));
+		
+		await zp.setAdvancedSearchState('closed');
+		await selectLibrary(win);
+		
+		await feed.eraseTx();
+	});
+	
+	// Run the 'zotero' autocomplete provider directly with given params
+	function autocomplete(searchString, params) {
+		return new Promise((resolve) => {
+			let search = Cc["@mozilla.org/autocomplete/search;1?name=zotero"]
+				.createInstance(Ci.nsIAutoCompleteSearch);
+			let listener = {
+				onSearchResult(_search, result) {
+					// Ignore intermediate (ongoing) updates
+					if (result.searchResult == Ci.nsIAutoCompleteResult.RESULT_SUCCESS_ONGOING) {
+						return;
+					}
+					let values = [];
+					for (let i = 0; i < result.matchCount; i++) {
+						values.push(result.getValueAt(i));
+					}
+					resolve(values);
+				}
+			};
+			search.startSearch(searchString, JSON.stringify(params), null, listener);
+		});
+	}
+	
+	it("should scope value autocomplete to the given libraries", async function () {
+		var group = await getGroup();
+		var groupLibraryID = group.libraryID;
+		// Autocomplete matches a value prefix, so both values start with the token
+		var token = Zotero.Utilities.randomString() + ' ';
+		var userPublisher = token + 'User';
+		var groupPublisher = token + 'Group';
+		var userItem = await createDataObject('item', { itemType: 'book' });
+		userItem.setField('publisher', userPublisher);
+		await userItem.saveTx();
+		var groupItem = await createDataObject('item', { itemType: 'book', libraryID: groupLibraryID });
+		groupItem.setField('publisher', groupPublisher);
+		await groupItem.saveTx();
+		
+		// Scoped to the user library: only its value
+		var userOnly = await autocomplete(token, { fieldName: 'publisher', libraryIDs: [Zotero.Libraries.userLibraryID] });
+		assert.deepEqual(userOnly, [userPublisher]);
+		
+		// Scoped to both libraries: both values
+		var both = await autocomplete(token, {
+			fieldName: 'publisher',
+			libraryIDs: [Zotero.Libraries.userLibraryID, groupLibraryID]
+		});
+		assert.includeMembers(both, [userPublisher, groupPublisher]);
+		
+		await Zotero.Items.erase([userItem.id, groupItem.id]);
+	});
+	
+	it("should not autocomplete a two-field creator without a first name as a leading space", async function () {
+		var item = createUnsavedDataObject('item');
+		item.setCreators([{ firstName: '', lastName: 'Solodova', creatorType: 'author' }]);
+		await item.saveTx();
+		
+		var values = await autocomplete('solodova', { fieldName: 'creator', fieldMode: 2 });
+		assert.deepEqual(values, ['Solodova']);
+		
+		await item.eraseTx();
+	});
+	
+	it("should save a search in an editable group library root but not the trash", async function () {
+		var group = await getGroup();
+		var groupLibraryID = group.libraryID;
+		
+		await selectLibrary(win, groupLibraryID);
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+		
+		// Saving should be enabled at an editable group library root
+		assert.isFalse(pane._saveButton.disabled);
+		
+		var s = new Zotero.Search();
+		s.libraryID = groupLibraryID;
+		s.addCondition('title', 'contains', 'foo');
+		pane.search = s;
+		// Saving prompts for a name
+		var promptService = Services.prompt;
+		Services.prompt = {
+			prompt: (parent, title, message, nameObj) => {
+				nameObj.value = 'Group Search';
+				return true;
+			}
+		};
+		try {
+			await pane.save();
+		}
+		finally {
+			Services.prompt = promptService;
+		}
+		
+		// The search should have been saved to the group library
+		var searches = await Zotero.Searches.getAll(groupLibraryID);
+		assert.lengthOf(searches, 1);
+		var conditions = Object.values(searches[0].getConditions());
+		assert.lengthOf(conditions, 1);
+		assert.equal(conditions[0].condition, 'title');
+		assert.equal(conditions[0].value, 'foo');
+		
+		// Saving should be disabled in the trash, which can't be scoped to
+		await selectTrash(win, groupLibraryID);
+		await zp.toggleAdvancedSearchState('open');
+		assert.isTrue(deck.pane._saveButton.disabled);
+		
+		await zp.setAdvancedSearchState('closed');
+		await Zotero.Searches.erase(searches.map(s => s.id));
+		await selectLibrary(win);
+	});
+	
+	it("should scope a saved search to the selected collection", async function () {
+		var collection = await createDataObject('collection');
+		var inCollection = await createDataObject('item', { title: "scoped foo", collections: [collection.id] });
+		var noMatch = await createDataObject('item', { title: "bar", collections: [collection.id] });
+		var outsideCollection = await createDataObject('item', { title: "scoped foo" });
+		
+		await selectCollection(win, collection.id);
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+		assert.isFalse(pane._saveButton.disabled);
+		
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('title', 'contains', 'scoped');
+		pane.search = s;
+		
+		var promptService = Services.prompt;
+		Services.prompt = {
+			prompt: (parent, title, message, nameObj) => {
+				nameObj.value = 'Collection Scoped';
+				return true;
+			}
+		};
+		try {
+			await pane.save();
+		}
+		finally {
+			Services.prompt = promptService;
+		}
+		
+		var saved = (await Zotero.Searches.getAll(Zotero.Libraries.userLibraryID))
+			.find(x => x.name == 'Collection Scoped');
+		assert.ok(saved);
+		// The collection scope is a top-level condition above the existing one
+		var conditions = Object.values(saved.getConditions());
+		assert.equal(conditions[0].condition, 'collection');
+		assert.equal(conditions[0].value, collection.key);
+		// Only the matching item within the collection
+		var ids = await saved.search();
+		assert.sameMembers(ids, [inCollection.id]);
+		
+		await saved.eraseTx();
+		await Zotero.Items.erase([inCollection.id, noMatch.id, outsideCollection.id]);
+		await collection.eraseTx();
+		await selectLibrary(win);
+	});
+	
+	it("should group the scope and the existing conditions when saving an 'any' search with a collection and a saved search selected", async function () {
+		var scopeSearch = new Zotero.Search();
+		scopeSearch.libraryID = Zotero.Libraries.userLibraryID;
+		scopeSearch.name = "Scope Search";
+		scopeSearch.addCondition('title', 'contains', 'blue');
+		await scopeSearch.saveTx();
+		var collection = await createDataObject('collection');
+		// Matches a condition and is in the collection
+		var inCollection = await createDataObject('item', { title: "red apple", collections: [collection.id] });
+		// Matches a condition and the scope search
+		var inScopeSearch = await createDataObject('item', { title: "blue sky" });
+		// Matches a condition but is in neither scope
+		var outsideScopes = await createDataObject('item', { title: "red car" });
+		// In the collection but matches no condition
+		var noMatch = await createDataObject('item', { title: "green grass", collections: [collection.id] });
+		
+		var cv = zp.collectionsView;
+		await cv.selectByID("C" + collection.id);
+		await waitForItemsLoad(win);
+		cv.selection.toggleSelect(cv.getRowIndexByID("S" + scopeSearch.id));
+		await zp.onCollectionSelected();
+		await zp.itemsView.waitForLoad();
+		
+		await zp.toggleAdvancedSearchState('open');
+		var pane = deck.pane;
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('joinMode', 'any');
+		s.addCondition('title', 'contains', 'red');
+		s.addCondition('title', 'contains', 'sky');
+		pane.search = s;
+		
+		var promptService = Services.prompt;
+		Services.prompt = {
+			prompt: (parent, title, message, nameObj) => {
+				nameObj.value = 'Scoped Any Search';
+				return true;
+			}
+		};
+		try {
+			await pane.save();
+		}
+		finally {
+			Services.prompt = promptService;
+		}
+		
+		var saved = (await Zotero.Searches.getAll(Zotero.Libraries.userLibraryID))
+			.find(x => x.name == 'Scoped Any Search');
+		assert.ok(saved);
+		// An 'any' group of the two scopes ANDed with an 'any' group of the conditions
+		var conditions = Object.values(saved.getConditions());
+		assert.lengthOf(conditions.filter(c => c.condition == 'groupStart'), 2);
+		assert.isTrue(conditions.some(c => c.condition == 'collection' && c.value == collection.key));
+		assert.isTrue(conditions.some(c => c.condition == 'savedSearch' && c.value == scopeSearch.key));
+		var ids = await saved.search();
+		assert.sameMembers(ids, [inCollection.id, inScopeSearch.id]);
+		
+		await saved.eraseTx();
+		await Zotero.Items.erase([inCollection.id, inScopeSearch.id, outsideScopes.id, noMatch.id]);
+		await collection.eraseTx();
+		await scopeSearch.eraseTx();
+		await selectLibrary(win);
+	});
+	
+	it("should close the saved-search editor when the edited search is deleted", async function () {
+		var saved = await createDataObject('search', { name: "DeleteWhileEditing" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+		assert.equal(deck.state, 'open');
+		assert.equal(deck.selectedSearchType, 'saved');
+
+		// Deleting the search being edited should close the editor without a
+		// save-changes prompt (which would otherwise block here)
+		await saved.eraseTx();
+		for (let i = 0; i < 60 && deck.state !== 'closed'; i++) {
+			await Zotero.Promise.delay(50);
+		}
+		assert.equal(deck.state, 'closed');
+
+		await selectLibrary(win);
+	});
+
+	it("should close the saved-search editor without prompting when the edited search is trashed", async function () {
+		var saved = await createDataObject('search', { name: "TrashWhileEditing" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+		assert.equal(deck.state, 'open');
+		assert.equal(deck.selectedSearchType, 'saved');
+
+		// Trashing the search being edited should close the editor without a
+		// save-changes prompt, as when it's deleted outright
+		let stub = sinon.stub().returns(1);
+		let promptService = win.Services.prompt;
+		win.Services.prompt = { confirmEx: stub };
+		try {
+			saved.deleted = true;
+			await saved.saveTx();
+			for (let i = 0; i < 60 && deck.state !== 'closed'; i++) {
+				await Zotero.Promise.delay(50);
+			}
+			assert.equal(deck.state, 'closed');
+			assert.equal(stub.callCount, 0);
+		}
+		finally {
+			win.Services.prompt = promptService;
+		}
+
+		await saved.eraseTx();
+		await selectLibrary(win);
+	});
+
+	it("should close the saved-search editor without prompting when nothing was changed", async function () {
+		var saved = await createDataObject('search', { name: "UnchangedEditing" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+		assert.equal(deck.selectedSearchType, 'saved');
+
+		let stub = sinon.stub().returns(1); // Cancel
+		let promptService = win.Services.prompt;
+		win.Services.prompt = { confirmEx: stub };
+		try {
+			await selectLibrary(win);
+			assert.equal(stub.callCount, 0);
+			assert.equal(deck.state, 'closed');
+		}
+		finally {
+			win.Services.prompt = promptService;
+		}
+
+		await saved.eraseTx();
+	});
+
+	it("should prompt when only the saved search's name was changed", async function () {
+		var saved = await createDataObject('search', { name: "RenameWhileEditing" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+
+		deck.pane.querySelector('#saved-search-name').value = "RenameWhileEditing 2";
+
+		let stub = sinon.stub().returns(0); // Save
+		let promptService = win.Services.prompt;
+		win.Services.prompt = { confirmEx: stub };
+		try {
+			await selectLibrary(win);
+			assert.equal(stub.callCount, 1);
+			assert.equal(saved.name, "RenameWhileEditing 2");
+		}
+		finally {
+			win.Services.prompt = promptService;
+		}
+
+		await saved.eraseTx();
+	});
+
+	it("should revert to the edited search without re-prompting when canceling", async function () {
+		var search1 = await createDataObject('search', { name: "CancelEditing1" });
+		var search2 = await createDataObject('search', { name: "CancelEditing2" });
+		let cv = zp.collectionsView;
+
+		await select(win, search1);
+		await zp.setSavedSearchEditorState('open');
+		assert.equal(deck.selectedSearchType, 'saved');
+
+		// Edit the editor's working copy, so that closing it prompts
+		var searchBox = deck.pane.querySelector('zoterosearch');
+		searchBox.querySelector('.conditions').firstChild.querySelector('#valuefield').value = 'edited';
+		searchBox.updateSearch();
+
+		// zoteroPane.js uses the pane window's Services, so stub there. Set it before
+		// touching the selection so no prompt can reach the real (modal) service.
+		let stub = sinon.stub().returns(1); // Cancel
+		let promptService = win.Services.prompt;
+		win.Services.prompt = { confirmEx: stub };
+		try {
+			// Form a [search1, search2] multi-selection without firing a selection change
+			cv.selection.selectEventsSuppressed = true;
+			cv.selection.select(cv.getRowIndexByID("S" + search1.id));
+			cv.selection.toggleSelect(cv.getRowIndexByID("S" + search2.id));
+			cv.selection.selectEventsSuppressed = false;
+
+			await zp.onCollectionSelected();
+			// Prompted once (no loop) and reverted to just the edited search
+			assert.equal(stub.callCount, 1);
+			assert.deepEqual(cv.getSelectedRows().map(r => r.id), ["S" + search1.id]);
+		}
+		finally {
+			win.Services.prompt = promptService;
+		}
+
+		await zp.setSavedSearchEditorState('closed');
+		await Zotero.Searches.erase([search1.id, search2.id]);
+		await selectLibrary(win);
+	});
+
+	it("should run a focused button's action on Enter instead of the pane default", async function () {
+		var saved = await createDataObject('search', { name: "EnterOnCancel" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+		assert.equal(deck.selectedSearchType, 'saved');
+		
+		var savedPane = deck.pane;
+		var save = sinon.stub(savedPane, 'save');
+		var cancel = sinon.stub(savedPane, 'cancel');
+		try {
+			var cancelButton = savedPane.querySelector('.cancel-button');
+			cancelButton.focus();
+			cancelButton.dispatchEvent(
+				new win.KeyboardEvent('keydown', { key: 'Enter', bubbles: true, cancelable: true })
+			);
+			// Enter on the focused Cancel button cancels -- it mustn't save
+			assert.isTrue(save.notCalled);
+			assert.isTrue(cancel.called);
+		}
+		finally {
+			save.restore();
+			cancel.restore();
+		}
+		
+		await zp.setSavedSearchEditorState('closed');
+		await saved.eraseTx();
+		await selectLibrary(win);
+	});
+
+	it("should prompt before replacing the saved-search editor with a new advanced search", async function () {
+		var saved = await createDataObject('search', { name: "ToggleWhileEditing" });
+		await select(win, saved);
+		await zp.setSavedSearchEditorState('open');
+		
+		// Edit the editor's working copy
+		var searchBox = deck.pane.querySelector('zoterosearch');
+		searchBox.querySelector('.conditions').firstChild.querySelector('#valuefield').value = 'edited';
+		searchBox.updateSearch();
+		
+		let stub = sinon.stub().returns(1); // Cancel
+		let promptService = win.Services.prompt;
+		win.Services.prompt = { confirmEx: stub };
+		try {
+			// Cmd-Shift-F opens a new temporary search over the editor
+			await zp.toggleAdvancedSearchState('open');
+			
+			// Cancel keeps the editor open with the edits intact
+			assert.equal(stub.callCount, 1);
+			assert.equal(deck.selectedSearchType, 'saved');
+			assert.equal(deck.state, 'open');
+			assert.include(
+				Object.values(deck.pane.search.getConditions()).map(c => c.value), 'edited');
+			
+			// Save saves the edits and continues to the temporary pane
+			stub.returns(0);
+			await zp.toggleAdvancedSearchState('open');
+			assert.equal(stub.callCount, 2);
+			assert.equal(deck.selectedSearchType, 'temporary');
+			assert.equal(deck.state, 'open');
+			assert.include(Object.values(saved.getConditions()).map(c => c.value), 'edited');
+		}
+		finally {
+			win.Services.prompt = promptService;
+		}
+		
+		await zp.setAdvancedSearchState('closed');
+		await saved.eraseTx();
+		await selectLibrary(win);
+	});
+
+	it("should prompt for a name when saving a new search", async function () {
+		await selectLibrary(win);
+		await zp.toggleAdvancedSearchState('open');
+		var s = new Zotero.Search();
+		s.libraryID = Zotero.Libraries.userLibraryID;
+		s.addCondition('title', 'contains', 'foo');
+		deck.pane.search = s;
+
+		var promptService = Services.prompt;
+		try {
+			// Cancelling the name prompt leaves the pane open and saves nothing
+			Services.prompt = { prompt: () => false };
+			await deck.pane.save();
+			assert.equal(deck.state, 'open');
+
+			// Accepting saves with the entered name and closes the pane
+			Services.prompt = {
+				prompt: (parent, title, message, nameObj) => {
+					nameObj.value = 'My Named Search';
+					return true;
+				}
+			};
+			await deck.pane.save();
+		}
+		finally {
+			Services.prompt = promptService;
+		}
+
+		var searches = await Zotero.Searches.getAll(Zotero.Libraries.userLibraryID);
+		var saved = searches.find(x => x.name === 'My Named Search');
+		assert.ok(saved);
+		assert.equal(deck.state, 'closed');
+
+		await saved.eraseTx();
+	});
+
 	describe("Conditions", function () {
-		var searchWin, searchBox, conditions;
+		var pane, searchBox, conditions;
 		
-		before(function* () {
-			var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml');
-			zp.openAdvancedSearchWindow();
-			searchWin = yield promise;
-			searchBox = searchWin.document.getElementById('zotero-search-box');
-			conditions = searchBox.querySelector('#conditions');
+		before(async function () {
+			await zp.toggleAdvancedSearchState('open');
+			pane = deck.pane;
+			searchBox = pane.querySelector('zoterosearch');
+			conditions = searchBox.querySelector('.conditions');
 		});
 		
-		after(function () {
-			searchWin.close();
+		after(async function () {
+			await zp.setAdvancedSearchState('closed');
+		});
+
+		it("should reset to a single empty condition when the last populated condition is removed", async function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'contains', 'foo');
+			pane.search = s;
+
+			assert.lengthOf(conditions.childNodes, 1);
+			var row = conditions.firstChild;
+
+			// With a value entered, the last condition can be removed
+			assert.isFalse(row.querySelector('#remove').hasAttribute('disabled'));
+
+			row.onRemoveClicked();
+
+			// It's replaced by a single empty default condition with the remove button disabled
+			assert.lengthOf(conditions.childNodes, 1);
+			var newRow = conditions.firstChild;
+			assert.equal(newRow.selectedCondition, 'title');
+			assert.equal(newRow.querySelector('#valuefield').value, '');
+			assert.isTrue(newRow.querySelector('#remove').hasAttribute('disabled'));
+
+			// Focus moves to the new condition's drop-down
+			assert.equal(win.document.activeElement, newRow.querySelector('#conditionsmenu'));
+		});
+		it("should hide the value textbox for a menu-based condition", async function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'is', '');
+			pane.search = s;
+			
+			var row = conditions.firstChild;
+			row.onConditionSelected('fileTypeID');
+			
+			// File Type uses a value menu, so the textbox must actually be hidden, not just
+			// sitting alongside the menu
+			var valuefield = row.querySelector('#valuefield');
+			assert.isTrue(valuefield.hidden);
+			assert.equal(win.getComputedStyle(valuefield).display, 'none');
+			assert.isFalse(row.querySelector('#valuemenu').hidden);
 		});
 		
+		it("should blank the value field for an isEmpty condition", async function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('place', 'isEmpty', '');
+			pane.search = s;
+			
+			// The value field keeps its space in the row but must not be visible, and the
+			// other value controls are hidden
+			var row = conditions.firstChild;
+			var valuefield = row.querySelector('#valuefield');
+			assert.isFalse(valuefield.hidden);
+			assert.equal(win.getComputedStyle(valuefield).visibility, 'hidden');
+			assert.isTrue(row.querySelector('#valuemenu').hidden);
+			assert.isTrue(row.querySelector('#value-date-age').hidden);
+			
+			// The row serializes with no value
+			var data = row.getConditionData();
+			assert.equal(data.condition, 'place');
+			assert.equal(data.operator, 'isEmpty');
+			assert.equal(data.value, '');
+		});
+		
+		it("should keep a loaded annotationAuthor value while its author menu is populating", async function () {
+			var deferred = Zotero.Promise.defer();
+			var stub = sinon.stub(Zotero.Annotations, 'getAllAuthors').returns(deferred.promise);
+			try {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('annotationAuthor', 'is', '12345');
+				pane.search = s;
+				
+				// Serializing while the author list is still loading shouldn't drop the value
+				var row = conditions.firstChild;
+				assert.equal(row.getConditionData().value, '12345');
+				
+				deferred.resolve([{ name: "Some User", userID: 12345 }]);
+				// Let onConditionSelected() finish populating the menu
+				await Zotero.Promise.delay(0);
+				assert.isFalse(row.querySelector('#valuemenu').hidden);
+				assert.equal(row.getConditionData().value, '12345');
+			}
+			finally {
+				stub.restore();
+			}
+		});
+
+		it("should place attachment and annotation conditions in their submenus", function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'is', '');
+			pane.search = s;
+
+			var row = conditions.firstChild;
+			var attachmentMenu = row.querySelector('#attachment-conditions-menu');
+			var annotationMenu = row.querySelector('#annotation-conditions-menu');
+
+			// An attachment-level condition is in the Attachment submenu rather than at
+			// the top level of the conditions menu
+			assert.isFalse(row.isPrimaryCondition('fileTypeID'));
+			assert.ok(attachmentMenu.querySelector('menuitem[value="fileTypeID"]'));
+
+			// An annotation-level condition is in the Annotation submenu
+			assert.isFalse(row.isPrimaryCondition('annotationColor'));
+			assert.ok(annotationMenu.querySelector('menuitem[value="annotationColor"]'));
+
+			// Selecting one shows its full name as the closed-menu label
+			row.onConditionSelected('annotationColor');
+			assert.equal(row.selectedCondition, 'annotationColor');
+			assert.equal(
+				row.querySelector('#conditionsmenu').getAttribute('label'),
+				Zotero.SearchConditions.getLocalizedName('annotationColor')
+			);
+		});
+
+		it("should sort the submenus alphabetically among the top-level conditions", function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'is', '');
+			pane.search = s;
+
+			var row = conditions.firstChild;
+			var popup = row.querySelector('#conditionsmenu > menupopup');
+
+			// Top-level entries (including the Attachment/Annotation submenus) are in
+			// alphabetical order, with the catch-all "More" submenu kept last
+			var labels = [...popup.children]
+				.filter(node => node.id != 'more-conditions-menu')
+				.map(node => node.getAttribute('label'));
+			var collation = Zotero.getLocaleCollation();
+			var sorted = [...labels].sort((a, b) => collation.compareString(1, a, b));
+			assert.deepEqual(labels, sorted);
+			assert.equal(popup.lastElementChild.id, 'more-conditions-menu');
+		});
+
+		it("should keep an edited value when switching to another text condition", async function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'contains', '');
+			pane.search = s;
+
+			var row = conditions.firstChild;
+			// Simulate the user typing into the value field after the row was loaded
+			row.querySelector('#valuefield').value = 'foo';
+
+			row.onConditionSelected('publicationTitle');
+
+			// The typed value carries over rather than reverting to the stale loaded value
+			assert.equal(row.querySelector('#valuefield').value, 'foo');
+			assert.equal(row.getConditionData().value, 'foo');
+		});
+
+
+		describe("Find-as-you-type", function () {
+			function typeInMenu(menu, str) {
+				for (let ch of str) {
+					menu.dispatchEvent(new win.KeyboardEvent('keydown', {
+						key: ch,
+						bubbles: true,
+						cancelable: true
+					}));
+				}
+			}
+
+			it("should select a condition from the More submenu by typing its name", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+
+				// "Language" lives in the More submenu, so it's only reachable via type-ahead
+				assert.isFalse(searchCondition.isPrimaryCondition('language'));
+				typeInMenu(conditionsMenu, 'lang');
+				assert.equal(searchCondition.selectedCondition, 'language');
+			});
+
+			it("should select an attachment condition by its full name", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+
+				// The Attachment submenu shows a short label, but the menulist shows the
+				// full name, which is what gets typed
+				let menuitem = conditionsMenu.querySelector('menuitem[value="fileTypeID"]');
+				assert.notEqual(
+					menuitem.label,
+					Zotero.SearchConditions.getLocalizedName('fileTypeID')
+				);
+				// The spaces in the name would otherwise open the menu (see customElements.js)
+				typeInMenu(conditionsMenu, 'attachment file t');
+				assert.equal(searchCondition.selectedCondition, 'fileTypeID');
+			});
+
+			it("should cycle through matches when the same letter is typed repeatedly", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+
+				typeInMenu(conditionsMenu, 'd');
+				var first = searchCondition.selectedCondition;
+				typeInMenu(conditionsMenu, 'd');
+				var second = searchCondition.selectedCondition;
+
+				assert.notEqual(first, second);
+				assert.match(Zotero.SearchConditions.getLocalizedName(first), /^d/i);
+				assert.match(Zotero.SearchConditions.getLocalizedName(second), /^d/i);
+			});
+		});
+
+		describe("Keyboard", function () {
+			// Focus is deferred to after the originating key event is handled
+			function nextTick() {
+				return new Promise(resolve => win.setTimeout(resolve));
+			}
+
+			it("should focus the new row's condition drop-down when adding via the + button", async function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var before = conditions.childNodes.length;
+				// Native keyboard activation of the button dispatches a click with detail 0
+				conditions.firstChild.querySelector('#add').dispatchEvent(
+					new win.MouseEvent('click', { detail: 0, bubbles: true, cancelable: true })
+				);
+
+				assert.equal(conditions.childNodes.length, before + 1);
+				await nextTick();
+				assert.equal(
+					win.document.activeElement,
+					conditions.lastChild.querySelector('#conditionsmenu')
+				);
+			});
+
+			it("shouldn't move focus when adding via the + button with the mouse", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var before = conditions.childNodes.length;
+				var addButton = conditions.firstChild.querySelector('#add');
+				addButton.focus();
+				// A mouse click has detail >= 1
+				addButton.dispatchEvent(
+					new win.MouseEvent('click', { detail: 1, bubbles: true, cancelable: true })
+				);
+
+				assert.equal(conditions.childNodes.length, before + 1);
+				assert.equal(win.document.activeElement, addButton);
+			});
+
+			it("should add a condition and focus its drop-down on Shift-Enter", async function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var before = conditions.childNodes.length;
+				conditions.firstChild.querySelector('#conditionsmenu').dispatchEvent(
+					new win.KeyboardEvent('keypress', {
+						key: 'Enter',
+						keyCode: 13,
+						shiftKey: true,
+						bubbles: true,
+						cancelable: true
+					})
+				);
+
+				assert.equal(conditions.childNodes.length, before + 1);
+				await nextTick();
+				assert.equal(
+					win.document.activeElement,
+					conditions.lastChild.querySelector('#conditionsmenu')
+				);
+			});
+
+			it("shouldn't run the search on Shift-Enter", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				function pressEnter(shiftKey) {
+					conditions.firstChild.querySelector('#conditionsmenu').dispatchEvent(
+						new win.KeyboardEvent('keydown', {
+							key: 'Enter',
+							shiftKey,
+							bubbles: true,
+							cancelable: true
+						})
+					);
+				}
+
+				var submit = sinon.stub(pane, 'submit');
+				try {
+					// Plain Enter runs the search
+					pressEnter(false);
+					assert.isTrue(submit.calledOnce);
+					// Shift-Enter does not
+					pressEnter(true);
+					assert.isTrue(submit.calledOnce);
+				}
+				finally {
+					submit.restore();
+				}
+			});
+
+			// Native keyboard activation of a button dispatches a click with detail 0
+			function clickFromKeyboard(button) {
+				button.dispatchEvent(
+					new win.MouseEvent('click', { detail: 0, bubbles: true, cancelable: true })
+				);
+			}
+
+			function threeConditionSearch() {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('title', 'contains', 'b');
+				s.addCondition('title', 'contains', 'c');
+				pane.search = s;
+			}
+
+			it("should focus the next row's remove button when removing via the keyboard", async function () {
+				threeConditionSearch();
+				assert.equal(conditions.childNodes.length, 3);
+
+				// Remove the first row
+				clickFromKeyboard(conditions.childNodes[0].querySelector('#remove'));
+
+				assert.equal(conditions.childNodes.length, 2);
+				await nextTick();
+				// Focus moves to the row that took its place
+				assert.equal(
+					win.document.activeElement,
+					conditions.childNodes[0].querySelector('#remove')
+				);
+			});
+
+			it("should focus the previous row's remove button when removing the last row", async function () {
+				threeConditionSearch();
+
+				// Remove the last row
+				clickFromKeyboard(conditions.childNodes[2].querySelector('#remove'));
+
+				assert.equal(conditions.childNodes.length, 2);
+				await nextTick();
+				// Focus moves up to the new last row
+				assert.equal(
+					win.document.activeElement,
+					conditions.childNodes[1].querySelector('#remove')
+				);
+			});
+			
+			it("should focus the row that took a pruned group's place when removing via the keyboard", async function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('tag', 'is', 'x');
+				s.addCondition('groupEnd', 'true', '');
+				s.addCondition('title', 'contains', 'b');
+				pane.search = s;
+				
+				// Removing the group's only condition prunes the group itself
+				var group = conditions.querySelector('search-condition-group');
+				clickFromKeyboard(group.conditionsContainer.firstChild.querySelector('#remove'));
+				
+				assert.notOk(conditions.querySelector('search-condition-group'));
+				assert.lengthOf(conditions.children, 2);
+				await nextTick();
+				// Focus lands on the row that took the group's place ('b'), not the first row
+				assert.equal(
+					win.document.activeElement,
+					conditions.children[1].querySelector('#remove')
+				);
+			});
+		});
+
+		it("should insert a condition right after the row whose + is clicked", function () {
+			var s = new Zotero.Search();
+			s.libraryID = Zotero.Libraries.userLibraryID;
+			s.addCondition('title', 'contains', 'a');
+			s.addCondition('title', 'contains', 'b');
+			pane.search = s;
+			assert.lengthOf(conditions.children, 2);
+
+			conditions.children[0].onAddClicked({ preventDefault() {} });
+
+			// New (empty) condition lands between the two, not at the end
+			var values = [...conditions.children]
+				.map(row => row.querySelector('#valuefield').value);
+			assert.deepEqual(values, ['a', '', 'b']);
+		});
+
 		describe("Collection", function () {
-			it("should show collections and saved searches", async function () {
+			it("should show only collections, with subcollections in submenus", async function () {
 				var col1 = await createDataObject('collection', { name: "A" });
 				var col2 = await createDataObject('collection', { name: "C", parentID: col1.id });
 				var col3 = await createDataObject('collection', { name: "D", parentID: col2.id });
@@ -73,8 +1350,9 @@ describe("Advanced Search", function () {
 				
 				// Add condition
 				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
 				s.addCondition('title', 'is', '');
-				searchBox.search = s;
+				pane.search = s;
 				
 				var searchCondition = conditions.firstChild;
 				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
@@ -91,49 +1369,47 @@ describe("Advanced Search", function () {
 				}
 				
 				assert.isFalse(valueMenu.hidden);
-				assert.equal(valueMenu.itemCount, 6);
-				var valueMenuItem = valueMenu.getItemAtIndex(1);
-				assert.equal(valueMenuItem.getAttribute('label'), "- " + col2.name);
-				assert.equal(valueMenuItem.getAttribute('value'), "C" + col2.key);
-				valueMenuItem = valueMenu.getItemAtIndex(2);
-				assert.equal(valueMenuItem.getAttribute('label'), "    - " + col3.name);
-				assert.equal(valueMenuItem.getAttribute('value'), "C" + col3.key);
-				valueMenuItem = valueMenu.getItemAtIndex(4);
-				assert.equal(valueMenuItem.getAttribute('label'), search1.name);
-				assert.equal(valueMenuItem.getAttribute('value'), "S" + search1.key);
-				valueMenuItem = valueMenu.getItemAtIndex(5);
-				assert.equal(valueMenuItem.getAttribute('label'), search2.name);
-				assert.equal(valueMenuItem.getAttribute('value'), "S" + search2.key);
+				// Only the two top-level collections
+				assert.equal(valueMenu.itemCount, 2);
+				var col1Menu = valueMenu.getItemAtIndex(0);
+				assert.equal(col1Menu.getAttribute('label'), col1.name);
+				assert.equal(valueMenu.getItemAtIndex(1).getAttribute('label'), col4.name);
+				
+				// Subcollections are nested below their parents
+				var col2Menu = col1Menu.menupopup.querySelector(`menu[value="${col2.treeViewID}"]`);
+				assert.equal(col2Menu.getAttribute('label'), col2.name);
+				var col3Item = col2Menu.menupopup
+					.querySelector(`menuitem[value="${col3.treeViewID}"]`);
+				assert.equal(col3Item.getAttribute('label'), col3.name);
+				
+				var values = [...valueMenu.querySelectorAll('menu, menuitem')]
+					.map(node => node.getAttribute('value'));
+				assert.notInclude(values, "S" + search1.key);
+				assert.notInclude(values, "S" + search2.key);
+				
+				// Selecting a subcollection shows it on the menulist and stores its key
+				col3Item.doCommand();
+				assert.equal(valueMenu.label, col3.name);
+				// The path is out of the way in a tooltip, since the menulist rarely has room
+				assert.equal(
+					valueMenu.getAttribute('tooltiptext'),
+					`${col1.name} \u203A ${col2.name} \u203A ${col3.name}`
+				);
+				assert.isTrue(col3Item.hasAttribute('checked'));
+				assert.equal(searchCondition.getConditionData().value, col3.key);
 				
 				await Zotero.Collections.erase([col1.id, col2.id, col3.id, col4.id]);
 				await Zotero.Searches.erase([search1.id, search2.id]);
 			});
 			
-			it("should be selected for 'savedSearch' condition", async function () {
-				var search = await createDataObject('search', { name: "A" });
-				
-				var s = new Zotero.Search();
-				s.addCondition('savedSearch', 'is', search.key);
-				searchBox.search = s;
-				
-				var searchCondition = conditions.firstChild;
-				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
-				var valueMenu = searchCondition.querySelector('#valuemenu');
-				
-				assert.equal(conditionsMenu.selectedItem.value, 'collection');
-				assert.isFalse(valueMenu.hidden);
-				assert.equal(valueMenu.selectedItem.value, "S" + search.key);
-				
-				await search.eraseTx();
-			});
-			
-			it("should set 'savedSearch' condition when a search is selected", async function () {
-				var collection = await createDataObject('collection', { name: "A" });
-				var search = await createDataObject('search', { name: "B" });
+			it("should select a subcollection in a submenu by typing its name", async function () {
+				var col1 = await createDataObject('collection', { name: "A" });
+				var col2 = await createDataObject('collection', { name: "Deep", parentID: col1.id });
 				
 				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
 				s.addCondition('title', 'is', '');
-				searchBox.search = s;
+				pane.search = s;
 				
 				var searchCondition = conditions.firstChild;
 				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
@@ -147,6 +1423,219 @@ describe("Advanced Search", function () {
 						break;
 					}
 				}
+				assert.equal(valueMenu.label, col1.name);
+				
+				// "Deep" is in a submenu, so the menulist's own find-as-you-type can't reach it
+				valueMenu.dispatchEvent(new win.KeyboardEvent('keydown', {
+					key: 'd',
+					bubbles: true,
+					cancelable: true
+				}));
+				assert.equal(valueMenu.label, col2.name);
+				assert.equal(searchCondition.getConditionData().value, col2.key);
+				
+				await Zotero.Collections.erase([col1.id, col2.id]);
+			});
+			
+			it("should keep matching by name after the menu is rebuilt", async function () {
+				var col1 = await createDataObject('collection', { name: "Apple" });
+				var col2 = await createDataObject('collection', { name: "Banana" });
+				
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('collection', 'is', col1.key);
+				pane.search = s;
+				
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+				var valueMenu = searchCondition.querySelector('#valuemenu');
+				
+				// Switching to another condition and back replaces the menu
+				conditionsMenu.querySelector('menuitem[value="title"]').doCommand();
+				conditionsMenu.querySelector('menuitem[value="collection"]').doCommand();
+				
+				for (let ch of 'banana') {
+					valueMenu.dispatchEvent(new win.KeyboardEvent('keydown', {
+						key: ch,
+						bubbles: true,
+						cancelable: true
+					}));
+				}
+				assert.equal(valueMenu.label, col2.name);
+				assert.equal(searchCondition.getConditionData().value, col2.key);
+				
+				await Zotero.Collections.erase([col1.id, col2.id]);
+			});
+			
+			it("should update when the library is changed", async function () {
+				var group = await getGroup();
+				var groupLibraryID = group.libraryID;
+				
+				var collection1 = await createDataObject('collection', { name: "A" });
+				var collection2 = await createDataObject('collection', { name: "C", libraryID: groupLibraryID });
+				
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+				
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+				var valueMenu = searchCondition.querySelector('#valuemenu');
+				
+				// Select 'Collection' condition
+				for (let i = 0; i < conditionsMenu.itemCount; i++) {
+					let menuitem = conditionsMenu.getItemAtIndex(i);
+					if (menuitem.value == 'collection') {
+						menuitem.click();
+						break;
+					}
+				}
+				valueMenu.querySelector(`menuitem[value="${collection1.treeViewID}"]`).doCommand();
+				assert.equal(valueMenu.label, collection1.name);
+				assert.equal(searchCondition.getConditionData().value, collection1.key);
+				
+				// Switch to the group library in the collection tree, which changes
+				// the search library and re-renders the conditions
+				await selectLibrary(win, groupLibraryID);
+				
+				var values = [];
+				searchCondition = conditions.firstChild;
+				valueMenu = searchCondition.querySelector('#valuemenu');
+				assert.equal(valueMenu.label, collection2.name);
+				assert.equal(searchCondition.getConditionData().value, collection2.key);
+				for (let i = 0; i < valueMenu.itemCount; i++) {
+					let menuitem = valueMenu.getItemAtIndex(i);
+					values.push(menuitem.getAttribute('value'));
+				}
+				assert.notInclude(values, collection1.treeViewID);
+				assert.include(values, collection2.treeViewID);
+				
+				await selectLibrary(win);
+
+				await Zotero.Collections.erase([collection1.id, collection2.id]);
+			});
+			
+			it("shouldn't appear in a cross-library scope", async function () {
+				var group = await getGroup();
+				var groupLibraryID = group.libraryID;
+				
+				// Simulate the cross-library scope that advancedSearchPane.refresh() sets
+				// from a multi-library collection selection
+				searchBox.scopeLibraryIDs = [Zotero.Libraries.userLibraryID, groupLibraryID];
+				try {
+					var s = new Zotero.Search();
+					s.libraryID = Zotero.Libraries.userLibraryID;
+					s.addCondition('title', 'is', '');
+					pane.search = s;
+					
+					var searchCondition = conditions.firstChild;
+					var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+					
+					// Neither Collection nor Saved Search can resolve across libraries
+					for (let i = 0; i < conditionsMenu.itemCount; i++) {
+						assert.notEqual(conditionsMenu.getItemAtIndex(i).value, 'collection');
+						assert.notEqual(conditionsMenu.getItemAtIndex(i).value, 'savedSearch');
+					}
+				}
+				finally {
+					searchBox.scopeLibraryIDs = null;
+				}
+			});
+		});
+		
+		describe("Saved Search", function () {
+			it("should appear as a condition", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+
+				var values = [];
+				for (let i = 0; i < conditionsMenu.itemCount; i++) {
+					values.push(conditionsMenu.getItemAtIndex(i).value);
+				}
+				assert.include(values, 'savedSearch');
+			});
+			
+			it("should show only saved searches", async function () {
+				var collection = await createDataObject('collection', { name: "A" });
+				var search1 = await createDataObject('search', { name: "A" });
+				var search2 = await createDataObject('search', { name: "B" });
+				
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+				
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+				var valueMenu = searchCondition.querySelector('#valuemenu');
+				
+				assert.isTrue(valueMenu.hidden);
+				// Select 'Saved Search' condition
+				for (let i = 0; i < conditionsMenu.itemCount; i++) {
+					let menuitem = conditionsMenu.getItemAtIndex(i);
+					if (menuitem.value == 'savedSearch') {
+						menuitem.click();
+						break;
+					}
+				}
+				
+				assert.isFalse(valueMenu.hidden);
+				var values = [];
+				for (let i = 0; i < valueMenu.itemCount; i++) {
+					values.push(valueMenu.getItemAtIndex(i).getAttribute('value'));
+				}
+				assert.sameMembers(values, ["S" + search1.key, "S" + search2.key]);
+				assert.notInclude(values, "C" + collection.key);
+				
+				await collection.eraseTx();
+				await Zotero.Searches.erase([search1.id, search2.id]);
+			});
+			
+			it("should be selected for a 'savedSearch' condition", async function () {
+				var search = await createDataObject('search', { name: "A" });
+				
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('savedSearch', 'is', search.key);
+				pane.search = s;
+				
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+				var valueMenu = searchCondition.querySelector('#valuemenu');
+				
+				assert.equal(conditionsMenu.selectedItem.value, 'savedSearch');
+				assert.isFalse(valueMenu.hidden);
+				assert.equal(valueMenu.selectedItem.value, "S" + search.key);
+				
+				await search.eraseTx();
+			});
+			
+			it("should set a 'savedSearch' condition when a search is selected", async function () {
+				var search = await createDataObject('search', { name: "B" });
+				
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'is', '');
+				pane.search = s;
+				
+				var searchCondition = conditions.firstChild;
+				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+				var valueMenu = searchCondition.querySelector('#valuemenu');
+				
+				// Select 'Saved Search' condition
+				for (let i = 0; i < conditionsMenu.itemCount; i++) {
+					let menuitem = conditionsMenu.getItemAtIndex(i);
+					if (menuitem.value == 'savedSearch') {
+						menuitem.click();
+						break;
+					}
+				}
 				for (let i = 0; i < valueMenu.itemCount; i++) {
 					let menuitem = valueMenu.getItemAtIndex(i);
 					if (menuitem.getAttribute('value') == "S" + search.key) {
@@ -160,28 +1649,25 @@ describe("Advanced Search", function () {
 				assert.equal(condition.condition, 'savedSearch');
 				assert.equal(condition.value, search.key);
 				
-				await collection.eraseTx();
 				await search.eraseTx();
 			});
-			
-			it("should update when the library is changed", async function () {
-				var group = await getGroup();
-				var groupLibraryID = group.libraryID;
-				
-				var collection1 = await createDataObject('collection', { name: "A" });
-				var search1 = await createDataObject('search', { name: "B" });
-				var collection2 = await createDataObject('collection', { name: "C", libraryID: groupLibraryID });
-				var search2 = await createDataObject('search', { name: "D", libraryID: groupLibraryID });
+		});
+		
+		describe("Search subcollections", function () {
+			it("should appear only when there's a Collection condition", async function () {
+				var collection = await createDataObject('collection');
 				
 				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
 				s.addCondition('title', 'is', '');
-				searchBox.search = s;
+				pane.search = s;
 				
-				var searchCondition = conditions.firstChild;
-				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
-				var valueMenu = searchCondition.querySelector('#valuemenu');
+				var options = searchBox.querySelector('#search-option-checkboxes');
+				// Hidden while the search has no Collection condition to recurse into
+				assert.isTrue(options.hidden);
 				
-				// Select 'Collection' condition
+				// Switch the row to a Collection condition
+				var conditionsMenu = conditions.firstChild.querySelector('#conditionsmenu');
 				for (let i = 0; i < conditionsMenu.itemCount; i++) {
 					let menuitem = conditionsMenu.getItemAtIndex(i);
 					if (menuitem.value == 'collection') {
@@ -189,54 +1675,565 @@ describe("Advanced Search", function () {
 						break;
 					}
 				}
-				for (let i = 0; i < valueMenu.itemCount; i++) {
-					let menuitem = valueMenu.getItemAtIndex(i);
-					if (menuitem.getAttribute('value') == "S" + search1.key) {
-						menuitem.click();
-						break;
-					}
-				}
-				assert.equal(valueMenu.value, "S" + search1.key);
 				
-				var libraryMenu = searchWin.document.getElementById('libraryMenu');
-				for (let i = 0; i < libraryMenu.itemCount; i++) {
-					let menuitem = libraryMenu.getItemAtIndex(i);
-					// Switch to group library
-					if (menuitem.value == groupLibraryID) {
-						menuitem.click();
-						break;
-					}
-				}
+				assert.isFalse(options.hidden);
 				
-				var values = [];
-				valueMenu = searchCondition.querySelector('#valuemenu')
-				assert.equal(valueMenu.value, "C" + collection2.key);
-				for (let i = 0; i < valueMenu.itemCount; i++) {
-					let menuitem = valueMenu.getItemAtIndex(i);
-					values.push(menuitem.getAttribute('value'));
-				}
-				assert.notInclude(values, "C" + collection1.key);
-				assert.notInclude(values, "S" + search1.key);
-				assert.include(values, "C" + collection2.key);
-				assert.include(values, "S" + search2.key);
-				
-				await Zotero.Collections.erase([collection1.id, collection2.id]);
-				await Zotero.Searches.erase([search1.id, search2.id]);
+				await collection.eraseTx();
 			});
 		});
 		
-		describe("Saved Search", function () {
-			it("shouldn't appear", async function () {
-				var searchCondition = conditions.firstChild;
-				var conditionsMenu = searchCondition.querySelector('#conditionsmenu');
+		describe("Groups", function () {
+			function groupedSearch() {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'foo');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('joinMode', 'any');
+				s.addCondition('tag', 'is', 'x');
+				s.addCondition('tag', 'is', 'y');
+				s.addCondition('groupEnd', 'true', '');
+				return s;
+			}
+
+			it("should render a nested group from group markers", function () {
+				pane.search = groupedSearch();
+
+				// Root holds the title row plus one nested group
+				assert.lengthOf(conditions.children, 2);
+				var group = conditions.querySelector('search-condition-group');
+				assert.equal(group.joinMode, 'any');
+				assert.lengthOf(group.conditionsContainer.children, 2);
+				assert.equal(group.conditionsContainer.firstChild.selectedCondition, 'tag');
+			});
+
+			it("should serialize a nested group back to markers", function () {
+				pane.search = groupedSearch();
+				searchBox.updateSearch();
+
+				var sequence = Object.values(searchBox.search.getConditions())
+					.map(c => c.condition);
+				assert.deepEqual(sequence,
+					['title', 'groupStart', 'joinMode', 'tag', 'tag', 'groupEnd']);
+			});
+
+			it("should keep a binding that scopes a condition matching at any level", async function () {
+				// An item whose attachment has the tag, and one where the tag is on a
+				// note instead
+				var hit = await createDataObject('item');
+				var attachment = await importFileAttachment('test.png', { parentID: hit.id });
+				attachment.setTags([{ tag: 'zbound' }]);
+				await attachment.saveTx();
+				var miss = await createDataObject('item');
+				var note = new Zotero.Item('note');
+				note.parentID = miss.id;
+				note.setNote('note');
+				note.setTags([{ tag: 'zbound' }]);
+				await note.saveTx();
+
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'attachment');
+				s.addCondition('tag', 'is', 'zbound');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+				searchBox.updateSearch();
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.equal(group.resultLevel, 'attachment');
+				// The tag has to be on the attachment, not anywhere in the item
+				var ids = await searchBox.search.search();
+				assert.include(ids, hit.id);
+				assert.notInclude(ids, miss.id);
+			});
+
+			it("should drop a binding that the result level makes meaningless", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'attachment');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'attachment');
+				s.addCondition('tag', 'is', 'zbound');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+				searchBox.updateSearch();
+
+				// Results are attachments, so binding the group to the attachment says
+				// nothing the result level doesn't
+				var group = conditions.querySelector('search-condition-group');
+				assert.equal(group.resultLevel, 'any');
+				assert.deepEqual(
+					Object.values(searchBox.search.getConditions()).map(c => c.condition),
+					['resultLevel', 'groupStart', 'tag', 'groupEnd']
+				);
+			});
+
+			it("should wrap a condition in a new group in its place", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'foo');
+				pane.search = s;
+
+				conditions.firstChild.onGroupClicked({ preventDefault() {} });
+
+				// The condition is now the sole member of a group in its old place,
+				// keeping its value
+				assert.lengthOf(conditions.children, 1);
+				var group = conditions.querySelector('search-condition-group');
+				assert.lengthOf(group.conditionsContainer.children, 1);
+				var row = group.conditionsContainer.firstChild;
+				assert.equal(row.selectedCondition, 'title');
+				assert.equal(row.querySelector('#valuefield').value, 'foo');
+			});
+
+			it("should ungroup a group back into its parent", function () {
+				pane.search = groupedSearch();
+
+				var group = conditions.querySelector('search-condition-group');
+				group.onUngroupClicked();
+
+				// The group is gone and its two tag conditions now sit alongside the title row
+				assert.notOk(conditions.querySelector('search-condition-group'));
+				searchBox.updateSearch();
+				var sequence = Object.values(searchBox.search.getConditions())
+					.map(c => c.condition);
+				assert.deepEqual(sequence, ['title', 'tag', 'tag']);
+			});
+
+			it("should remove a group when its last condition is removed", function () {
+				pane.search = groupedSearch();
+
+				var group = conditions.querySelector('search-condition-group');
+				group.conditionsContainer.firstChild.onRemoveClicked();
+				// Removing the group's first tag leaves it with the second
+				assert.ok(conditions.querySelector('search-condition-group'));
+				group.conditionsContainer.firstChild.onRemoveClicked();
+
+				// With no conditions left, the group itself is gone
+				assert.notOk(conditions.querySelector('search-condition-group'));
+				// The root's title condition remains
+				assert.lengthOf(conditions.children, 1);
+				assert.equal(conditions.firstChild.selectedCondition, 'title');
+			});
+
+			it("should reset the root to an empty condition when its last group empties", function () {
+				// A search whose only content is a single group with a single condition
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('tag', 'is', 'x');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				group.conditionsContainer.firstChild.onRemoveClicked();
+
+				// The emptied group is gone and the root falls back to one empty condition
+				assert.notOk(conditions.querySelector('search-condition-group'));
+				assert.lengthOf(conditions.children, 1);
+				assert.equal(conditions.firstChild.selectedCondition, 'title');
+				assert.equal(conditions.firstChild.querySelector('#valuefield').value, '');
+			});
+
+			it("should default a fresh search to the top-level item result level", function () {
+				// Opening a new (unseeded) advanced search defaults the result level to
+				// top-level items, so child conditions map up without grouping
+				pane.search = null;
+				assert.equal(searchBox.rootGroup.resultLevel, 'item');
+			});
+
+			it("should render and serialize the root result level", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				pane.search = s;
+
+				assert.equal(searchBox.rootGroup.resultLevel, 'annotation');
+
+				searchBox.updateSearch();
+				var sequence = Object.values(searchBox.search.getConditions())
+					.map(c => c.condition);
+				assert.deepEqual(sequence, ['resultLevel', 'annotationText']);
+				var scopeCond = Object.values(searchBox.search.getConditions())
+					.find(c => c.condition == 'resultLevel');
+				assert.equal(scopeCond.operator, 'annotation');
+			});
+
+			it("should render and serialize a nested group result level", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('creator', 'contains', 'Smith');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.equal(group.resultLevel, 'annotation');
+
+				searchBox.updateSearch();
+				var sequence = Object.values(searchBox.search.getConditions())
+					.map(c => c.condition);
+				assert.deepEqual(sequence,
+					['creator', 'groupStart', 'resultLevel', 'annotationText', 'groupEnd']);
+			});
+
+			it("should show a binding menu for a group of same-level descendant conditions", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item'); // result level
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.isFalse(group.bindingMenu.hidden);
+				var values = [...group.bindingMenu.querySelectorAll('menuitem')].map(i => i.value);
+				assert.includeMembers(values, ['any', 'annotation']);
+				// No attachment conditions, so it isn't offered
+				assert.notInclude(values, 'attachment');
+
+				// Bind to the same annotation and confirm it serializes
+				group.resultLevel = 'annotation';
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.deepEqual(seq,
+					['resultLevel', 'groupStart', 'resultLevel', 'annotationText', 'annotationComment', 'groupEnd']);
+				var groupScope = Object.values(searchBox.search.getConditions())
+					.filter(c => c.condition == 'resultLevel')[1];
+				assert.equal(groupScope.operator, 'annotation');
+			});
+
+			it("should not show a binding menu for a group of item-level conditions", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('title', 'contains', 'b');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.isTrue(group.bindingMenu.hidden);
+			});
+
+			it("should render a stored group binding into the menu", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.isFalse(group.bindingMenu.hidden);
+				assert.equal(group.resultLevel, 'annotation');
+				assert.equal(group.bindingMenu.value, 'annotation');
+			});
+			
+			it("should keep showing a group binding when a condition switches level", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
 				
-				// Make sure "Saved Search" isn't present
-				for (let i = 0; i < conditionsMenu.itemCount; i++) {
-					let menuitem = conditionsMenu.getItemAtIndex(i);
-					if (menuitem.value == 'savedSearch') {
-						assert.fail();
-					}
-				}
+				var group = conditions.querySelector('search-condition-group');
+				assert.isFalse(group.bindingMenu.hidden);
+				
+				// The binding stays visible (and clearable) rather than silently
+				// constraining the group from a hidden menu
+				group.conditionsContainer.firstChild.onConditionSelected('title');
+				searchBox.updateSearch();
+				
+				assert.isFalse(group.bindingMenu.hidden);
+				assert.equal(group.bindingMenu.value, 'annotation');
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.deepEqual(seq,
+					['resultLevel', 'groupStart', 'resultLevel', 'title', 'annotationComment', 'groupEnd']);
+			});
+			
+			it("should keep showing a group binding for a lone condition at the bound level", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+				
+				var group = conditions.querySelector('search-condition-group');
+				assert.isFalse(group.bindingMenu.hidden);
+				assert.equal(group.bindingMenu.value, 'annotation');
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.deepEqual(seq,
+					['resultLevel', 'groupStart', 'resultLevel', 'annotationText', 'groupEnd']);
+			});
+			
+			it("should drop a group binding when no condition at its level remains", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+				
+				var group = conditions.querySelector('search-condition-group');
+				group.conditionsContainer.firstChild.onConditionSelected('title');
+				group.conditionsContainer.lastChild.onConditionSelected('title');
+				searchBox.updateSearch();
+				
+				assert.isTrue(group.bindingMenu.hidden);
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.deepEqual(seq,
+					['resultLevel', 'groupStart', 'title', 'title', 'groupEnd']);
+			});
+
+			it("should offer a binding hint for ungrouped sibling descendant conditions", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				pane.search = s;
+
+				var hint = searchBox.querySelector('#search-binding-hint');
+				assert.isFalse(hint.hidden);
+				// One bindable level (annotation), so one suggestion line with one button
+				assert.lengthOf([...hint.querySelectorAll('button')], 1);
+			});
+
+			it("should not offer a binding hint for item-level sibling conditions", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('title', 'contains', 'b');
+				pane.search = s;
+
+				assert.isTrue(searchBox.querySelector('#search-binding-hint').hidden);
+			});
+
+			it("should offer a binding hint for descendant conditions with no values", function () {
+				// Two descendant conditions suggest binding as soon as they're selected, with no
+				// values needed
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('annotationText', 'contains', '');
+				s.addCondition('annotationComment', 'contains', '');
+				pane.search = s;
+
+				assert.isFalse(searchBox.querySelector('#search-binding-hint').hidden);
+			});
+
+			it("should not offer a binding hint for a freshly added condition until it's changed", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('annotationText', 'contains', 'foo');
+				pane.search = s;
+
+				// "+" seeds a second annotation condition, but it shouldn't suggest binding until
+				// the user engages with it
+				conditions.firstChild.onAddClicked({ preventDefault() {}, detail: 1 });
+				assert.isTrue(searchBox.querySelector('#search-binding-hint').hidden);
+
+				// Engaging with the new row (here, typing in it) lets it count
+				conditions.lastChild.querySelector('#search-textbox')
+					.dispatchEvent(new win.Event('input', { bubbles: true }));
+				assert.isFalse(searchBox.querySelector('#search-binding-hint').hidden);
+			});
+
+			it("should wrap conditions into a bound group when the hint is taken", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('annotationText', 'contains', 'foo');
+				s.addCondition('annotationComment', 'contains', 'bar');
+				pane.search = s;
+
+				searchBox.rootGroup.bindSameEntity('annotation');
+
+				// The two conditions are now one group bound to annotation
+				var group = conditions.querySelector('search-condition-group');
+				assert.ok(group);
+				assert.equal(group.resultLevel, 'annotation');
+				assert.lengthOf(
+					[...group.conditionsContainer.children].filter(c => c.localName == 'zoterosearchcondition'),
+					2);
+
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.deepEqual(seq,
+					['resultLevel', 'groupStart', 'resultLevel', 'annotationText', 'annotationComment', 'groupEnd']);
+
+				// Conditions are no longer ungrouped siblings, so the hint is gone
+				assert.isTrue(searchBox.querySelector('#search-binding-hint').hidden);
+			});
+
+			it("should fold a legacy noChildren into the result level", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('noChildren', 'true');
+				s.addCondition('title', 'contains', 'foo');
+				pane.search = s;
+
+				// Shown as result level = top-level items, no separate checkbox
+				assert.equal(searchBox.rootGroup.resultLevel, 'item');
+
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.notInclude(seq, 'noChildren');
+				assert.deepEqual(seq, ['resultLevel', 'title']);
+			});
+
+
+			it("should warn when ALL conditions can't match the same item at a mixed result level", function () {
+				// No result type (mixed), so an item-level and an annotation-level condition
+				// can't both be true of one row
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('annotationText', 'contains', 'b');
+				pane.search = s;
+
+				assert.isFalse(searchBox.querySelector('.level-warning').hidden);
+			});
+
+			it("should not warn when a result type lets the conditions combine", function () {
+				// Result type item: the annotation condition maps up, so it's satisfiable
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('title', 'contains', 'a');
+				s.addCondition('annotationText', 'contains', 'b');
+				pane.search = s;
+
+				assert.isTrue(searchBox.querySelector('.level-warning').hidden);
+			});
+
+			it("should warn when a condition can't reach the result type", function () {
+				// A note can never be (or be under) an attachment
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'attachment');
+				s.addCondition('note', 'contains', 'a');
+				pane.search = s;
+
+				assert.isFalse(searchBox.querySelector('.level-warning').hidden);
+			});
+
+			it("should warn on the group when a condition can't reach its binding", function () {
+				// A group bound to "same annotation" with a note condition: the conflict is the
+				// group's binding, so the warning belongs on the group, not at the root.
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('resultLevel', 'annotation');
+				s.addCondition('annotationComment', 'contains', 'a');
+				s.addCondition('note', 'contains', 'b');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				var group = conditions.querySelector('search-condition-group');
+				assert.isFalse(group.levelWarning.hidden);
+				assert.isTrue(searchBox.rootGroup.levelWarning.hidden);
+			});
+
+			it("should not warn for a \"separately\" group whose conditions roll up", function () {
+				// "Separately" inherits the result level (item), so annotations and a note all
+				// roll up independently -- satisfiable, no warning (so "match separately" really
+				// does clear the bound-group warning)
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('resultLevel', 'item');
+				s.addCondition('groupStart', 'true', '');
+				s.addCondition('annotationComment', 'contains', 'a');
+				s.addCondition('annotationComment', 'contains', 'b');
+				s.addCondition('note', 'contains', 'c');
+				s.addCondition('groupEnd', 'true', '');
+				pane.search = s;
+
+				assert.isTrue(conditions.querySelector('search-condition-group').levelWarning.hidden);
+			});
+
+			it("should not warn for an ordinary search", function () {
+				pane.search = null;
+				assert.isTrue(searchBox.querySelector('.level-warning').hidden);
+			});
+
+			it("should keep a legacy includeParentsAndChildren editable and round-tripping", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'foo');
+				s.addCondition('includeParentsAndChildren', 'true');
+				pane.search = s;
+
+				assert.isFalse(searchBox.querySelector('#search-legacy-options').hidden);
+				assert.isTrue(searchBox.querySelector('#includeParentsAndChildrenCheckbox').checked);
+
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.include(seq, 'includeParentsAndChildren');
+			});
+
+			it("should drop includeParentsAndChildren when its legacy checkbox is unchecked", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'foo');
+				s.addCondition('includeParentsAndChildren', 'true');
+				pane.search = s;
+
+				searchBox.querySelector('#includeParentsAndChildrenCheckbox').checked = false;
+				searchBox.updateSearch();
+				var seq = Object.values(searchBox.search.getConditions()).map(c => c.condition);
+				assert.notInclude(seq, 'includeParentsAndChildren');
+			});
+
+			it("should add a sibling condition outside the group from the group's +", function () {
+				var s = new Zotero.Search();
+				s.libraryID = Zotero.Libraries.userLibraryID;
+				s.addCondition('title', 'contains', 'foo');
+				pane.search = s;
+
+				// The root has no parent, so its caption "+" stays hidden
+				assert.isTrue(searchBox.rootGroup.addConditionButton.hidden);
+
+				// Wrap the only root condition, so the root now holds just the group
+				conditions.firstChild.onGroupClicked({ preventDefault() {} });
+				assert.lengthOf(conditions.children, 1);
+				var group = conditions.querySelector('search-condition-group');
+
+				// The group's "+" adds a sibling in the parent (root), not inside the group
+				group.onAddSiblingClicked();
+
+				assert.lengthOf(conditions.children, 2);
+				var rows = [...conditions.children]
+					.filter(c => c.localName === 'zoterosearchcondition');
+				assert.lengthOf(rows, 1);
+				assert.equal(rows[0].selectedCondition, 'title');
+				// Nothing was added inside the group
+				assert.lengthOf(group.conditionsContainer.children, 1);
 			});
 		});
 	});
diff --git a/test/tests/attachmentReadObserverTest.js b/test/tests/attachmentReadObserverTest.js
index 0c90160ed1..c3908537ee 100644
--- a/test/tests/attachmentReadObserverTest.js
+++ b/test/tests/attachmentReadObserverTest.js
@@ -42,6 +42,13 @@ describe("Zotero.AttachmentReadObserver", function () {
 			stub.restore();
 		});
 
+		it("should not update an attachment's attachmentLastRead when it is revealed in the filesystem", async function () {
+			let attachment = await importPDFAttachment(null);
+
+			await Zotero.Notifier.trigger('reveal', 'file', [attachment.id]);
+			assert.isNull(attachment.attachmentLastRead);
+		});
+
 		it("should not mark a group attachment as unsynced when opened", async function () {
 			let group = await createGroup();
 			let item = await createDataObject('item', { libraryID: group.libraryID });
diff --git a/test/tests/attachmentsTest.js b/test/tests/attachmentsTest.js
index b4237d178f..d6c52c7cb0 100644
--- a/test/tests/attachmentsTest.js
+++ b/test/tests/attachmentsTest.js
@@ -304,7 +304,7 @@ describe("Zotero.Attachments", function () {
 			assert.propertyVal(matches[0], 'id', attachment.id);
 		});
 		
-		it("should index JavaScript-created text in an HTML file", async function () {
+		it("shouldn't execute JavaScript when indexing an HTML file", async function () {
 			var item = await createDataObject('item');
 			var file = getTestDataDirectory();
 			file.append('test-js.html');
@@ -318,9 +318,14 @@ describe("Zotero.Attachments", function () {
 			
 			assert.equal(attachment.attachmentCharset, 'utf-8');
 			
-			var matches = await Zotero.Fulltext.findTextInItems([attachment.id], 'test');
+			// Static content should be indexed
+			var matches = await Zotero.Fulltext.findTextInItems([attachment.id], 'static');
 			assert.lengthOf(matches, 1);
 			assert.propertyVal(matches[0], 'id', attachment.id);
+			
+			// JavaScript-created content shouldn't be
+			matches = await Zotero.Fulltext.findTextInItems([attachment.id], 'test');
+			assert.lengthOf(matches, 0);
 		});
 	});
 	
@@ -1031,6 +1036,48 @@ describe("Zotero.Attachments", function () {
 			assert.equal(await OS.File.stat(attachment.getFilePath()).size, pdfSize);
 		});
 
+		it("should include a PubMed Central resolver from a PMCID", async function () {
+			var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
+			item.setField('title', 'Test');
+			item.setField('PMCID', 'PMC9262588');
+			await item.saveTx();
+
+			var resolvers = Zotero.Attachments.getFileResolvers(item, ['oa']);
+
+			assert.deepEqual(resolvers, [
+				{
+					pageURL: 'https://pmc.ncbi.nlm.nih.gov/articles/PMC9262588/',
+					accessMethod: 'oa'
+				}
+			]);
+		});
+
+		it("should include a PubMed Central resolver after DOI OA resolvers", async function () {
+			var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
+			item.setField('title', 'Test');
+			item.setField('DOI', '10.1093/nar/gkac173');
+			item.setField('PMCID', 'PMC9262588');
+			await item.saveTx();
+
+			var resolvers = Zotero.Attachments.getFileResolvers(item, ['oa']);
+
+			assert.lengthOf(resolvers, 2);
+			assert.isFunction(resolvers[0]);
+			assert.deepEqual(resolvers[1], {
+				pageURL: 'https://pmc.ncbi.nlm.nih.gov/articles/PMC9262588/',
+				accessMethod: 'oa'
+			});
+		});
+
+		it("should allow finding files for an item with a PMCID", async function () {
+			var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
+			item.setField('title', 'Test');
+			item.setField('PMCID', 'PMC9262588');
+			await item.saveTx();
+
+			assert.isTrue(Zotero.Attachments.canFindFileForItem(item));
+		});
+
 		it("should add a PDF from a URL", async function () {
 			var url = pageURL1;
 			var item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
@@ -2022,6 +2069,53 @@ describe("Zotero.Attachments", function () {
 			var str = Zotero.Attachments.getFileBaseNameFromItem(item);
 			assert.equal(str, Zotero.getString('general.andJoiner', ['Foo', 'Bar']) + ' - ');
 		});
+
+		it("should fall back to the default template when the synced template is invalid", async function () {
+			const { DEFAULT_ATTACHMENT_RENAME_TEMPLATE } = ChromeUtils.importESModule("chrome://zotero/content/renameFiles.mjs");
+			let libraryID = Zotero.Libraries.userLibraryID;
+			let expected = Zotero.Attachments.getFileBaseNameFromItem(item, { formatString: DEFAULT_ATTACHMENT_RENAME_TEMPLATE });
+			await Zotero.SyncedSettings.set(libraryID, 'attachmentRenameTemplate', '{{ title');
+			try {
+				assert.equal(Zotero.Attachments.getFileBaseNameFromItem(item), expected);
+			}
+			finally {
+				await Zotero.SyncedSettings.clear(libraryID, 'attachmentRenameTemplate');
+			}
+		});
+
+		it("should fall back to the default template when the synced template is empty", async function () {
+			const { DEFAULT_ATTACHMENT_RENAME_TEMPLATE } = ChromeUtils.importESModule("chrome://zotero/content/renameFiles.mjs");
+			let libraryID = Zotero.Libraries.userLibraryID;
+			let expected = Zotero.Attachments.getFileBaseNameFromItem(item, { formatString: DEFAULT_ATTACHMENT_RENAME_TEMPLATE });
+			for (let empty of ['', '   ', '\n\t']) {
+				await Zotero.SyncedSettings.set(libraryID, 'attachmentRenameTemplate', empty);
+				try {
+					assert.equal(
+						Zotero.Attachments.getAttachmentRenameTemplate(libraryID),
+						DEFAULT_ATTACHMENT_RENAME_TEMPLATE,
+						`empty synced template ${JSON.stringify(empty)} must resolve to the default`
+					);
+					// A non-empty basename proves the empty template never reached the engine
+					assert.equal(Zotero.Attachments.getFileBaseNameFromItem(item), expected);
+				}
+				finally {
+					await Zotero.SyncedSettings.clear(libraryID, 'attachmentRenameTemplate');
+				}
+			}
+		});
+
+		it("should validate the synced template as the engine renders it, ignoring newlines inside a tag", async function () {
+			// The engine strips newlines before rendering, so a newline inside a tag (here splitting
+			// `endif`) must be validated against the stripped form and not force the default template
+			let libraryID = Zotero.Libraries.userLibraryID;
+			await Zotero.SyncedSettings.set(libraryID, 'attachmentRenameTemplate', '{{if title}}a{{end\nif}}');
+			try {
+				assert.equal(Zotero.Attachments.getFileBaseNameFromItem(item), 'a');
+			}
+			finally {
+				await Zotero.SyncedSettings.clear(libraryID, 'attachmentRenameTemplate');
+			}
+		});
 	});
 	
 	describe("#getBaseDirectoryRelativePath()", function () {
@@ -2475,6 +2569,31 @@ describe("Zotero.Attachments", function () {
 			await item.eraseTx();
 		});
 
+		it("should validate the rename template only once for the whole batch", async function () {
+			let item1 = createUnsavedDataObject('item');
+			item1.setField('title', 'Lorem');
+			await item1.saveTx();
+			let attachment1 = await importFileAttachment('test.pdf', { parentItemID: item1.id });
+
+			let item2 = createUnsavedDataObject('item');
+			item2.setField('title', 'Ipsum');
+			await item2.saveTx();
+			let attachment2 = await importFileAttachment('test.pdf', { parentItemID: item2.id });
+
+			let spy = sinon.spy(Zotero.Attachments, 'getAttachmentRenameTemplate');
+			try {
+				await renameFilesFromParent({ pretend: true });
+				assert.isAtMost(spy.callCount, 1, 'template should be resolved and validated once for the batch, not per item');
+			}
+			finally {
+				spy.restore();
+				await attachment1.eraseTx();
+				await attachment2.eraseTx();
+				await item1.eraseTx();
+				await item2.eraseTx();
+			}
+		});
+
 		it('should restore missing extension when renaming a primary attachment with a file present locally', async function () {
 			let item = createUnsavedDataObject('item');
 			item.setField('title', 'Lorem');
@@ -2610,5 +2729,71 @@ describe("Zotero.Attachments", function () {
 			await attachment1.eraseTx();
 			await item.eraseTx();
 		});
+
+		it("should auto-rename a file when parent item type changes", async function () {
+			let libraryID = Zotero.Libraries.userLibraryID;
+			// Use a template that depends on the item type so that changing the
+			// type alone is enough to change the derived file name
+			await Zotero.SyncedSettings.set(
+				libraryID, 'attachmentRenameTemplate', '{{ itemType suffix=" - " }}{{ title truncate="100" }}'
+			);
+			let item, attachment1;
+			try {
+				item = createUnsavedDataObject('item', { itemType: 'book' });
+				item.setField('title', 'Lorem');
+				await item.saveTx();
+				attachment1 = await importFileAttachment('test.pdf', { parentItemID: item.id });
+				await renameFilesFromParent();
+				assert.equal(attachment1.attachmentFilename, 'book - Lorem.pdf');
+
+				item.setType(Zotero.ItemTypes.getID('journalArticle'));
+				item.saveTx();
+				assert.include(await waitForItemEvent("modify"), item.id);
+				// Renaming the attachment fires a second `modify` event
+				await waitNoLongerThan(waitForItemEvent("modify"), 1000);
+
+				assert.equal(attachment1.attachmentFilename, 'journalArticle - Lorem.pdf');
+			}
+			finally {
+				await Zotero.SyncedSettings.clear(libraryID, 'attachmentRenameTemplate');
+				if (attachment1) {
+					await attachment1.eraseTx();
+				}
+				if (item) {
+					await item.eraseTx();
+				}
+			}
+		});
+
+		it("should auto-rename a file when parent item type and a type-mapped field change together", async function () {
+			let item, attachment1;
+			try {
+				item = createUnsavedDataObject('item', { itemType: 'email' });
+				item.setField('title', 'Lorem');
+				await item.saveTx();
+				attachment1 = await importFileAttachment('test.pdf', { parentItemID: item.id });
+				await renameFilesFromParent();
+				assert.equal(attachment1.attachmentFilename, 'Lorem.pdf');
+
+				// Use the type-specific field name ('caseName'), as the item box
+				// does, so the changed key matches a field of the new type
+				item.setType(Zotero.ItemTypes.getID('case'));
+				item.setField('caseName', 'Ipsum');
+				item.saveTx();
+				assert.include(await waitForItemEvent("modify"), item.id);
+				// Renaming the attachment fires a second `modify` event
+				await waitNoLongerThan(waitForItemEvent("modify"), 1000);
+
+				assert.equal(attachment1.attachmentFilename, 'Ipsum.pdf');
+			}
+			finally {
+				if (attachment1) {
+					await attachment1.eraseTx();
+				}
+				if (item) {
+					await item.eraseTx();
+				}
+			}
+		});
 	});
 })
diff --git a/test/tests/citationDialogTest.js b/test/tests/citationDialogTest.js
index 2c8c809fe0..e7ae2f6f94 100644
--- a/test/tests/citationDialogTest.js
+++ b/test/tests/citationDialogTest.js
@@ -13,11 +13,14 @@ describe("Citation Dialog", function () {
 		getItems() {
 			return [];
 		},
+		preview: () => {},
 		allCitedDataLoadedPromise: Promise.resolve(),
 	};
 	let dialog, win, doc, IOManager, CitationDataManager, SearchHandler;
 
 	before(async function () {
+		// Zotero.Cite.getLocatorString() requires styles to be initialized
+		await Zotero.Styles.init();
 		// one of helper functions of searchHandler uses zotero pane
 		win = await loadZoteroPane();
 		let dialogPromise = waitForWindow("chrome://zotero/content/integration/citationDialog.xhtml");
@@ -373,11 +376,8 @@ describe("Citation Dialog", function () {
 			let itemTwo = await createDataObject('item');
 			await IOManager.addItemsToCitation([itemOne, itemTwo]);
 
-			// Both items should be counted as just-added
-			assert.sameMembers(CitationDataManager.items.map(i => i.dialogReferenceID), IOManager._justAddedBubbles.map(b => b.dialogReferenceID));
-
-			// Clear just-added bubbles, as if the user did it themselves
-			IOManager._clearJustAddedBubbles();
+			// A multi-item add does not record just-added bubbles
+			assert.notOk(IOManager._justAddedBubbles);
 
 			// Type a locator and press Enter
 			let currentInput = dialog.document.getElementById("bubble-input").getCurrentInput();
@@ -448,6 +448,24 @@ describe("Citation Dialog", function () {
 			assert.isTrue(dialog.document.getElementById("list-layout").hidden);
 		});
 
+		it("should show the citation preview only when the citation has items", async function () {
+			let prefWas = Zotero.Prefs.get("integration.citationPreviewShown");
+			Zotero.Prefs.set("integration.citationPreviewShown", true);
+			try {
+				IOManager.updateBubbleInput();
+				assert.isTrue(dialog.document.getElementById("citation-preview").hidden);
+				assert.isTrue(dialog.document.getElementById("display-preview-button").hidden);
+
+				let item = await createDataObject('item');
+				await IOManager.addItemsToCitation([item]);
+				assert.isFalse(dialog.document.getElementById("citation-preview").hidden);
+				assert.isFalse(dialog.document.getElementById("display-preview-button").hidden);
+			}
+			finally {
+				Zotero.Prefs.set("integration.citationPreviewShown", prefWas);
+			}
+		});
+
 		it("should highlight bubbles whose items are selected", async function () {
 			let itemOne = await createDataObject('item');
 			let itemTwo = await createDataObject('item');
@@ -481,6 +499,113 @@ describe("Citation Dialog", function () {
 			let rowNode = dialog.document.getElementById(rowID);
 			assert.isTrue(rowNode.classList.contains("highlighted"));
 		});
+
+		it("should add all selected items when clicking + on a selected row", async function () {
+			let collection = await createDataObject('collection');
+			let itemOne = await createDataObject('item', { collections: [collection.id] });
+			let itemTwo = await createDataObject('item', { collections: [collection.id] });
+
+			await IOManager.toggleDialogMode("library");
+			let cv = dialog.libraryLayout.collectionsView;
+			let itemsView = dialog.libraryLayout.itemsView;
+			await cv.selectByID("C" + collection.id);
+			await itemsView.waitForLoad();
+
+			await itemsView.selectItems([itemOne.id, itemTwo.id]);
+			IOManager.focusItemTree();
+			dialog.libraryLayout._handleItemsViewIconClick(itemsView.getRowIndexByID(itemOne.id));
+			// the add is done once focus returns to the input
+			while (!dialog.document.activeElement.closest("bubble-input")) {
+				await Zotero.Promise.delay(10);
+			}
+
+			assert.sameMembers(CitationDataManager.items.map(item => item.id), [itemOne.id, itemTwo.id]);
+
+			// a number typed after a multi-item add is not applied as a page locator
+			let input = dialog.document.querySelector("bubble-input").refocusInput();
+			input.value = "123";
+			IOManager._handleInputEnter(input);
+			assert.isTrue(CitationDataManager.items.every(item => !item.locator));
+			input.value = "";
+
+			await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+			await itemsView.waitForLoad();
+		});
+
+		it("should add only the clicked item when clicking + on an unselected row", async function () {
+			let collection = await createDataObject('collection');
+			let itemOne = await createDataObject('item', { collections: [collection.id] });
+			let itemTwo = await createDataObject('item', { collections: [collection.id] });
+
+			await IOManager.toggleDialogMode("library");
+			let cv = dialog.libraryLayout.collectionsView;
+			let itemsView = dialog.libraryLayout.itemsView;
+			await cv.selectByID("C" + collection.id);
+			await itemsView.waitForLoad();
+
+			await itemsView.selectItem(itemTwo.id);
+			IOManager.focusItemTree();
+			dialog.libraryLayout._handleItemsViewIconClick(itemsView.getRowIndexByID(itemOne.id));
+			// the add is done once focus returns to the input
+			while (!dialog.document.activeElement.closest("bubble-input")) {
+				await Zotero.Promise.delay(10);
+			}
+
+			assert.sameMembers(CitationDataManager.items.map(item => item.id), [itemOne.id]);
+
+			await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+			await itemsView.waitForLoad();
+		});
+
+		it("should focus the input after adding an item with Enter in the items list", async function () {
+			let collection = await createDataObject('collection');
+			let item = await createDataObject('item', { collections: [collection.id] });
+
+			await IOManager.toggleDialogMode("library");
+			let cv = dialog.libraryLayout.collectionsView;
+			let itemsView = dialog.libraryLayout.itemsView;
+			await cv.selectByID("C" + collection.id);
+			await itemsView.waitForLoad();
+
+			await itemsView.selectItem(item.id);
+			IOManager.focusItemTree();
+			let treeElem = dialog.document.querySelector("#zotero-items-tree [tabindex]");
+			treeElem.dispatchEvent(new KeyboardEvent("keydown", { key: "Enter", bubbles: true }));
+			// the post-add handling returns focus to the input
+			while (!dialog.document.activeElement.closest("bubble-input")) {
+				await Zotero.Promise.delay(10);
+			}
+
+			await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+			await itemsView.waitForLoad();
+		});
+
+		it("should show the union of items from multiple selected collections", async function () {
+			let collectionOne = await createDataObject('collection');
+			let collectionTwo = await createDataObject('collection');
+			let itemOne = await createDataObject('item', { collections: [collectionOne.id] });
+			let itemTwo = await createDataObject('item', { collections: [collectionTwo.id] });
+
+			await IOManager.toggleDialogMode("library");
+			let cv = dialog.libraryLayout.collectionsView;
+			let itemsView = dialog.libraryLayout.itemsView;
+
+			// Select both collections
+			await cv.selectByID("C" + collectionOne.id);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + collectionTwo.id));
+			await dialog.libraryLayout._onCollectionSelection();
+			await itemsView.waitForLoad();
+
+			assert.isNumber(itemsView.getRowIndexByID(itemOne.id),
+				"Item from first selected collection should be shown");
+			assert.isNumber(itemsView.getRowIndexByID(itemTwo.id),
+				"Item from second selected collection should be shown");
+
+			// Restore the default single-row selection so later tests that rely on the
+			// library root being selected aren't affected by the leftover multi-selection
+			await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+			await itemsView.waitForLoad();
+		});
 	});
 
 	describe("Search", function () {
@@ -522,12 +647,12 @@ describe("Citation Dialog", function () {
 			SearchHandler.citedItems = [citedOne, citedAndOpenOne];
 			// Search for "one"
 			await dialog.currentLayout.search("one", { skipDebounce: true });
-			// Selected items should have both "one_selected" and "one_selected_open"
+			// Selected items should have "one_selected" but not "one_selected_open", since it is open
 			let selectedIDs = SearchHandler.results.selected.map(item => item.id);
-			assert.sameMembers(selectedIDs, [selectedOne.id, selectedAndOpenOne.id]);
-			// Open items should have "one_open" and "one_open_cited" but not "one_selected_open", since it is selected
+			assert.sameMembers(selectedIDs, [selectedOne.id]);
+			// Open items should have "one_open", "one_selected_open", and "one_open_cited"
 			let openIDs = SearchHandler.results.open.map(item => item.id);
-			assert.sameMembers(openIDs, [openOne.id, citedAndOpenOne.id]);
+			assert.sameMembers(openIDs, [openOne.id, selectedAndOpenOne.id, citedAndOpenOne.id]);
 			// Cited items should have "one_cited"
 			let citedIDs = SearchHandler.results.cited.map(item => item.id);
 			assert.sameMembers(citedIDs, [citedOne.id]);
@@ -558,12 +683,12 @@ describe("Citation Dialog", function () {
 			SearchHandler.citedItems = [citedOne, citedAndOpenOne];
 			// Search for "one"
 			await dialog.currentLayout.search("one", { skipDebounce: true });
-			// Selected items should have both "one_selected" and "one_selected_open"
+			// Selected items should have "one_selected" but not "one_selected_open", since it is open
 			let selectedIDs = SearchHandler.results.selected.map(item => item.id);
-			assert.sameMembers(selectedIDs, [selectedOne.id, selectedAndOpenOne.id]);
-			// Open items should have "one_open" and "one_open_cited" but not "one_selected_open", since it is selected
+			assert.sameMembers(selectedIDs, [selectedOne.id]);
+			// Open items should have "one_open", "one_selected_open", and "one_open_cited"
 			let openIDs = SearchHandler.results.open.map(item => item.id);
-			assert.sameMembers(openIDs, [openOne.id, citedAndOpenOne.id]);
+			assert.sameMembers(openIDs, [openOne.id, selectedAndOpenOne.id, citedAndOpenOne.id]);
 			// Cited items should have "one_cited"
 			let citedIDs = SearchHandler.results.cited.map(item => item.id);
 			assert.sameMembers(citedIDs, [citedOne.id]);
@@ -661,6 +786,7 @@ describe("Citation Dialog", function () {
 				getItems() {
 					return new Zotero.Promise(() => {});
 				},
+				preview: () => {},
 				allCitedDataLoadedPromise: new Zotero.Promise(() => {}),
 			};
 
@@ -785,6 +911,26 @@ describe("Citation Dialog", function () {
 
 			await parentItem.eraseTx();
 		});
+
+		it("should include notes open in tabs in open items", async function () {
+			await dialog.setDialogType("add-note");
+			while (SearchHandler.searching) {
+				await Zotero.Promise.delay(10);
+			}
+
+			// Open the note in a tab in the main window
+			let win = Zotero.getMainWindow();
+			await Zotero.Notes.open(note.id, undefined, { openInBackground: true });
+			let tabID = win.Zotero_Tabs.getTabIDByItemID(note.id);
+
+			// Re-fetch open items
+			SearchHandler.setSearchValue("");
+			SearchHandler.clearNonLibraryItemsCache();
+			await SearchHandler.refreshSelectedAndOpenItems();
+			win.Zotero_Tabs.close(tabID);
+
+			assert.includeMembers(SearchHandler.results.open, [note]);
+		});
 	});
 
 
@@ -902,7 +1048,7 @@ describe("Citation Dialog", function () {
 			let selectedStub = sinon.stub(SearchHandler, "_getSelectedLibraryItems");
 			let selectedWithAnnotations = SearchHandler.keepItemsWithAnnotations([itemNoAnnotations1, itemWithAnnotations1]);
 			selectedStub.returns(selectedWithAnnotations);
-			let openStub = sinon.stub(SearchHandler, "_getReaderOpenItems");
+			let openStub = sinon.stub(SearchHandler, "_getOpenTabItems");
 			let openWithAnnotations = SearchHandler.keepItemsWithAnnotations([itemNoAnnotations2, itemWithAnnotations2]);
 			openStub.resolves(openWithAnnotations);
 
diff --git a/test/tests/citeTest.js b/test/tests/citeTest.js
index 54b19e0736..c4c9c668db 100644
--- a/test/tests/citeTest.js
+++ b/test/tests/citeTest.js
@@ -25,6 +25,58 @@ describe("Zotero.Cite", function () {
 		});
 	});
 	
+	describe("#getAbbreviation()", function () {
+		it("should drop accented stop-words when auto-abbreviating", function () {
+			var obj = { default: { 'container-title': {} } };
+			Zotero.Cite.getAbbreviation(
+				"default", obj, "default", "container-title", "Jahrbuch für Heimatkunde"
+			);
+			assert.equal(
+				obj.default['container-title']['Jahrbuch für Heimatkunde'],
+				"Jahrb. Heimatkunde"
+			);
+		});
+	});
+	
+	describe("Dates", function () {
+		async function makeBibliography(fields) {
+			let item = new Zotero.Item;
+			item.fromJSON(Object.assign({
+				itemType: "book",
+				title: "Test Book"
+			}, fields));
+			await item.saveTx();
+
+			let style = Zotero.Styles.get('http://www.zotero.org/styles/chicago-notes-bibliography');
+			let cslEngine = style.getCiteProc('en-US');
+			return Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, [item], "text");
+		}
+
+		it("should render a date range", async function () {
+			assert.include(await makeBibliography({ date: '2021/2026' }), '2021–2026');
+		});
+
+		it("should render a BCE date", async function () {
+			assert.match(await makeBibliography({ date: '-429' }), /429\s?BC/);
+		});
+
+		it("should render a spelled-out BCE date", async function () {
+			let output = await makeBibliography({ date: 'January 10, 200 BCE' });
+			assert.match(output, /200\s?BC/);
+			assert.notMatch(output, /\bAD\b/);
+		});
+
+		it("should render an EDTF range in Extra, overriding the Date field", async function () {
+			let output = await makeBibliography({ date: '1999', extra: 'issued: 2021/2026' });
+			assert.include(output, '2021–2026');
+			assert.notInclude(output, '1999');
+		});
+
+		it("should render a quoted date as a literal string", async function () {
+			assert.include(await makeBibliography({ date: '"1637 and 1662"' }), '1637 and 1662');
+		});
+	});
+
 	describe("#retrieveLocale()", function () {
 		it("should handle locale with script code", async function () {
 			var item = new Zotero.Item;
@@ -41,6 +93,22 @@ describe("Zotero.Cite", function () {
 			var output = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, [item], "text");
 			assert.include(output, 'izd');
 		});
+
+		it("should use closest available locale for locale without a CSL locale", async function () {
+			var item = new Zotero.Item;
+			item.fromJSON({
+				itemType: "book",
+				title: "Test Book",
+				edition: "2"
+			});
+			await item.saveTx();
+
+			var style = Zotero.Styles.get('http://www.zotero.org/styles/chicago-notes-bibliography');
+			var cslEngine = style.getCiteProc('sr-RS');
+
+			var output = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, [item], "text");
+			assert.include(output, 'изд');
+		});
 	});
 	
 	describe("#extraToCSL()", function () {
@@ -92,6 +160,75 @@ describe("Zotero.Cite", function () {
 		});
 	});
 	
+	describe("previewCitationCluster()", function () {
+		before(async function () {
+			await Zotero.Styles.init();
+			await Zotero.Styles.install(
+				{ file: OS.Path.join(getTestDataDirectory().path, 'apa.csl') },
+				'http://www.zotero.org/styles/apa',
+				true
+			);
+		});
+		
+		async function makeEngineWithCitation() {
+			let item = new Zotero.Item;
+			item.fromJSON({
+				itemType: "book",
+				title: "Preview Test",
+				creators: [{ creatorType: "author", firstName: "Jane", lastName: "Smith" }],
+				date: "2019"
+			});
+			await item.saveTx();
+			let style = Zotero.Styles.get('http://www.zotero.org/styles/apa');
+			let cslEngine = style.getCiteProc('en-US', 'rtf');
+			cslEngine.processCitationCluster(
+				{
+					citationID: "CITATION-1",
+					citationItems: [{ id: item.id }],
+					properties: { noteIndex: 1 }
+				},
+				[], []
+			);
+			return { cslEngine, item };
+		}
+		
+		function assertStateRestored(cslEngine, item) {
+			assert.equal(cslEngine.opt.mode, 'rtf');
+			assert.lengthOf(cslEngine.registry.citationreg.citationByIndex, 1);
+			// Processor should still render in its native format
+			let text = cslEngine.previewCitationCluster(
+				{ citationItems: [{ id: item.id }], properties: { noteIndex: 2 } },
+				[["CITATION-1", 1]], [], "rtf"
+			);
+			assert.equal(text, "(Smith, 2019)");
+		}
+		
+		it("shouldn't modify processor state if an item can't be retrieved", async function () {
+			let { cslEngine, item } = await makeEngineWithCitation();
+			assert.throws(() => {
+				cslEngine.previewCitationCluster(
+					{ citationItems: [{ id: 999999999 }], properties: { noteIndex: 2 } },
+					[["CITATION-1", 1]], [], "html"
+				);
+			});
+			assertStateRestored(cslEngine, item);
+		});
+		
+		it("shouldn't modify processor state if rendering fails", async function () {
+			let { cslEngine, item } = await makeEngineWithCitation();
+			let stub = sinon.stub(cslEngine, 'process_CitationCluster')
+				.throws(new Error("simulated rendering error"));
+			assert.throws(() => {
+				cslEngine.previewCitationCluster(
+					{ citationItems: [{ id: item.id }], properties: { noteIndex: 2 } },
+					[["CITATION-1", 1]], [], "html"
+				);
+			});
+			stub.restore();
+			assertStateRestored(cslEngine, item);
+		});
+	});
+	
 	it("shouldn't hang during disambiguation (https://github.com/Juris-M/citeproc-js/issues/179)", async function () {
 		var item1 = new Zotero.Item;
 		item1.fromJSON({"key":"WB338HGS","version":0,"itemType":"journalArticle","creators":[{"firstName":"Carl G.","lastName":"de Boer","creatorType":"author"},{"firstName":"John P.","lastName":"Ray","creatorType":"author"},{"firstName":"Nir","lastName":"Hacohen","creatorType":"author"},{"firstName":"Aviv","lastName":"Regev","creatorType":"author"}],"tags":[{"tag":"CRISPR/Cas9","type":1},{"tag":"Enhancers","type":1},{"tag":"Gene regulation","type":1},{"tag":"Transcriptional regulation","type":1},{"tag":"Gene expression","type":1},{"tag":"Pooled screen","type":1},{"tag":"R","type":1}],"date":"June 3, 2020","title":"MAUDE: inferring expression changes in sorting-based CRISPR screens","journalAbbreviation":"Genome Biology","pages":"134","volume":"21","issue":"1","abstractNote":"","ISSN":"1474-760X","url":"https://doi.org/10.1186/s13059-020-02046-8","DOI":"10.1186/s13059-020-02046-8","publicationTitle":"Genome Biology","libraryCatalog":"BioMed Central","accessDate":"2021-02-17T02:40:40Z","shortTitle":"MAUDE"});
diff --git a/test/tests/citeprocRsBridgeTest.js b/test/tests/citeprocRsBridgeTest.js
deleted file mode 100644
index 372f84b5bb..0000000000
--- a/test/tests/citeprocRsBridgeTest.js
+++ /dev/null
@@ -1,171 +0,0 @@
-"use strict";
-
-describe.skip("Zotero.CiteprocRs", function () {
-	var chicagoNoteStyleID = "http://www.zotero.org/styles/chicago-shortened-notes-bibliography";
-	var chicagoAuthorDateStyleID = "http://www.zotero.org/styles/chicago-author-date";
-	var style;
-	function getCiteprocJSEngine(style) {
-		Zotero.Prefs.set('cite.useCiteprocRs', false);
-		return style.getCiteProc('en-US', 'text');
-	}
-	function getCiteprocRSEngine(style) {
-		Zotero.Prefs.set('cite.useCiteprocRs', true);
-		return style.getCiteProc('en-US', 'text');
-	}
-	function createCitationItem(item) {
-		return {
-			id: item.id,
-			uris: Zotero.Utilities.randomString(10),
-			itemData: Zotero.Cite.System.prototype.retrieveItem(item.id)
-		};
-	}
-	function createACitation(items) {
-		if (!Array.isArray(items)) items = [items];
-		return {
-			citationID: Zotero.Utilities.randomString(10),
-			citationItems: items.map(createCitationItem),
-			properties: { noteIndex: noteIndex++ }
-		};
-	}
-	function assertProducedCitationsAreEqual(citation) {
-		citeprocRS.insertCluster(citation);
-		citeprocRS.setClusterOrder([[citation.citationID, citation.properties.noteIndex]]);
-		let updateSummary = citeprocRS.getBatchedUpdates();
-		let CRSCitation = updateSummary.clusters[0][1];
-		let CRSBibl = Zotero.Cite.makeFormattedBibliography(citeprocRS, 'text');
-		
-		// We need to deepcopy before passing to citeproc-js, because it doesn't respect
-		// our objects and just writes stuff all over them.
-		let [_, citationInfo] = citeprocJS.processCitationCluster(citation, [], []);
-		let CJSCitation = citationInfo[0][1];
-		let CJSBibl = Zotero.Cite.makeFormattedBibliography(citeprocJS, 'text');
-		
-		Zotero.debug(`\nciteproc-js: ${CJSCitation}\nciteproc-rs: ${CRSCitation}`, 2);
-		Zotero.debug(`\nciteproc-js: ${CJSBibl}\nciteproc-rs: ${CRSBibl}`, 2);
-		
-		assert.equal(CJSCitation, CRSCitation, 'citations are equal');
-		assert.deepEqual(CJSBibl, CRSBibl, 'bibliographies are equal');
-	}
-	
-	var item1, item2SameLastName, item3;
-	var citeprocRS, citeprocJS;
-	var noteIndex = 1;
-	
-	before(async function () {
-		await Zotero.CiteprocRs.init();
-		await Zotero.Styles.init();
-		item1 = createUnsavedDataObject(
-			'item',
-			{
-				itemType: 'book',
-				title: 'Test book'
-			}
-		);
-		item1.libraryID = Zotero.Libraries.userLibraryID;
-		item1.setField('date', '2021');
-		item1.setCreators([
-			{
-				firstName: "First1",
-				lastName: "Last1",
-				creatorType: "author"
-			}
-		]);
-		
-		item2SameLastName = item1.clone();
-		item2SameLastName.setField('title', 'Test book 2');
-		item2SameLastName.setCreators([
-			{
-				firstName: "DifferentFirst2",
-				lastName: "Last1",
-				creatorType: "author"
-			}
-		]);
-		item3 = item1.clone();
-		item3.setCreators([
-			{
-				firstName: "First3",
-				lastName: "Last3",
-				creatorType: "author"
-			}
-		]);
-		await Promise.all([item1.saveTx(), item2SameLastName.saveTx(), item3.saveTx()]);
-	});
-
-	after(function () {
-		Zotero.Prefs.set('cite.useCiteprocRs', false);
-	});
-	
-	beforeEach(function () {
-		noteIndex = 1;
-		citeprocJS = getCiteprocJSEngine(style);
-		citeprocRS = getCiteprocRSEngine(style);
-	});
-	
-	afterEach(function () {
-		citeprocJS.free();
-		citeprocRS.free();
-	});
-	
-	describe('with chicago-shortened-notes-bibliography.csl', function () {
-		before(function () {
-			style = Zotero.Styles.get(chicagoNoteStyleID);
-		});
-		
-		it("should produce a correct citation", function () {
-			assertProducedCitationsAreEqual(createACitation([item1, item3]));
-		});
-
-		it("should produce a correct citation with a locator", function () {
-			let citation = createACitation(item1);
-			Object.assign(citation.citationItems[0], { locator: 1, label: "page" });
-			assertProducedCitationsAreEqual(citation);
-		});
-
-		it("should produce a correct citation with a prefix", function () {
-			let citation = createACitation(item1);
-			Object.assign(citation.citationItems[0], { prefix: 'hello' });
-			assertProducedCitationsAreEqual(citation);
-		});
-
-		it("should produce a correct citation with a suppressed author", function () {
-			let citation = createACitation(item1);
-			Object.assign(citation.citationItems[0], { 'suppress-author': true });
-			assertProducedCitationsAreEqual(citation);
-		});
-
-		it("should should produce ibid when appropriate", function () {
-			let citation1 = createACitation(item1);
-			let citation2 = createACitation(item1);
-
-			citeprocRS.insertCluster(citation1);
-			citeprocRS.insertCluster(citation2);
-			citeprocRS.setClusterOrder([[citation1.citationID, 1], [citation2.citationID, 2]]);
-			let updateSummary = citeprocRS.getBatchedUpdates();
-
-			let [_, citationInfo] = citeprocJS.processCitationCluster(citation1, [], []);
-			[_, citationInfo] = citeprocJS.processCitationCluster(citation2, [[citation1.citationID, 1]], []);
-
-			for (let i = 0; i < 2; i++) {
-				let CRSCitation = updateSummary.clusters[i][1];
-				let CJSCitation = citationInfo[i][1];
-				Zotero.debug(`\nciteproc-js: ${CJSCitation}\nciteproc-rs: ${CRSCitation}`, 2);
-				assert.equal(CJSCitation, CRSCitation, `citations #${i} are equal`);
-			}
-
-			let CRSBibl = Zotero.Cite.makeFormattedBibliography(citeprocRS, 'text');
-			let CJSBibl = Zotero.Cite.makeFormattedBibliography(citeprocJS, 'text');
-			assert.deepEqual(CJSBibl, CRSBibl, 'bibliographies are equal');
-		});
-	});
-
-	// Chicago note-bibliography does not perform last name disambiguation
-	describe('with chicago-author-date.csl', function () {
-		before(function () {
-			style = Zotero.Styles.get(chicagoAuthorDateStyleID);
-		});
-		
-		it("should perform last name disambiguation", function () {
-			assertProducedCitationsAreEqual(createACitation([item1, item2SameLastName]));
-		});
-	});
-});
diff --git a/test/tests/collectionTreeRowTest.js b/test/tests/collectionTreeRowTest.js
index f7bf4ae284..9c3e078f54 100644
--- a/test/tests/collectionTreeRowTest.js
+++ b/test/tests/collectionTreeRowTest.js
@@ -28,7 +28,7 @@ describe("CollectionTreeRow", function () {
 		}
 
 		beforeEach(function () {
-			collectionTreeRow = zp.getCollectionTreeRow();
+			collectionTreeRow = zp.getCollectionTreeRows()[0];
 			collectionTreeRow.clearCache();
 		});
 
diff --git a/test/tests/collectionTreeTest.js b/test/tests/collectionTreeTest.js
index 6a31e182e9..0b009d5ec8 100644
--- a/test/tests/collectionTreeTest.js
+++ b/test/tests/collectionTreeTest.js
@@ -99,6 +99,80 @@ describe("Zotero.CollectionTree", function () {
 			assert.equal(cv.selection.focused, row);
 			assert.ok(cv.isContainerOpen(row));
 		})
+
+		it("should expand/collapse selected containers when focus is on a multi-selection", async function () {
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection');
+			await createDataObject('collection', { parentID: collection1.id });
+			await createDataObject('collection', { parentID: collection2.id });
+			let collection1Row = cv.getRowIndexByID(collection1.treeViewID);
+			let collection2Row = cv.getRowIndexByID(collection2.treeViewID);
+			if (cv.isContainerOpen(collection1Row)) {
+				await cv.toggleOpenState(collection1Row);
+			}
+			collection2Row = cv.getRowIndexByID(collection2.treeViewID);
+			if (cv.isContainerOpen(collection2Row)) {
+				await cv.toggleOpenState(collection2Row);
+			}
+
+			cv.selection.select(cv.getRowIndexByID(collection1.treeViewID));
+			cv.selection.toggleSelect(cv.getRowIndexByID(collection2.treeViewID));
+			assert.equal(cv.selection.count, 2);
+			assert.isTrue(cv.selection.isSelected(cv.selection.focused));
+			let selectEventCount = 0;
+			let selectListener = () => selectEventCount++;
+			cv.onSelect.addListener(selectListener);
+			cv.tree._onKeyDown({
+				key: Zotero.arrowNextKey,
+				preventDefault: () => {},
+				stopPropagation: () => {}
+			});
+			await waitForCallback(() => selectEventCount
+				&& cv.isContainerOpen(cv.getRowIndexByID(collection1.treeViewID))
+				&& cv.isContainerOpen(cv.getRowIndexByID(collection2.treeViewID)));
+			assert.sameMembers(cv.getSelectedRows().map(row => row.id), [collection1.treeViewID, collection2.treeViewID]);
+
+			selectEventCount = 0;
+			cv.tree._onKeyDown({
+				key: Zotero.arrowPreviousKey,
+				preventDefault: () => {},
+				stopPropagation: () => {}
+			});
+			await waitForCallback(() => selectEventCount
+				&& !cv.isContainerOpen(cv.getRowIndexByID(collection1.treeViewID))
+				&& !cv.isContainerOpen(cv.getRowIndexByID(collection2.treeViewID)));
+			assert.sameMembers(cv.getSelectedRows().map(row => row.id), [collection1.treeViewID, collection2.treeViewID]);
+			cv.onSelect.removeListener(selectListener);
+		})
+
+		it("should preserve selection when focus is on a collapsed/expanded row", async function () {
+			let group = await createGroup();
+			let collection = await createDataObject('collection', { libraryID: group.libraryID });
+			let feed = await createFeed();
+			let groupRow = cv.getRowIndexByID(group.treeViewID);
+			if (!cv.isContainerOpen(groupRow)) {
+				await cv.toggleOpenState(groupRow);
+			}
+			await cv.selectByID(feed.treeViewID);
+			cv.selection.focused = groupRow;
+			cv.selection.pivot = groupRow;
+
+			await cv.toggleOpenState(groupRow);
+			assert.equal(cv.getSelectedRows()[0].id, feed.treeViewID);
+
+			groupRow = cv.getRowIndexByID(group.treeViewID);
+			cv.selection.focused = groupRow;
+			cv.selection.pivot = groupRow;
+			await cv.toggleOpenState(groupRow);
+			assert.equal(cv.getSelectedRows()[0].id, feed.treeViewID);
+
+			await cv.selectByID(collection.treeViewID);
+			groupRow = cv.getRowIndexByID(group.treeViewID);
+			cv.selection.focused = groupRow;
+			cv.selection.pivot = groupRow;
+			await cv.toggleOpenState(groupRow);
+			assert.equal(cv.getSelectedRows()[0].id, group.treeViewID);
+		})
 	})
 	
 	describe("#expandLibrary()", function () {
@@ -319,7 +393,7 @@ describe("Zotero.CollectionTree", function () {
 			var id = await collection.saveTx();
 			
 			// New collection should be selected
-			var selected = cv.getSelectedCollection(true);
+			var selected = cv.getSelectedCollections(true)[0];
 			assert.equal(selected, id);
 		});
 		
@@ -332,7 +406,7 @@ describe("Zotero.CollectionTree", function () {
 			});
 			
 			// Library should still be selected
-			assert.equal(cv.getSelectedLibraryID(), userLibraryID);
+			assert.equal(cv.getSelectedLibraryIDs()[0], userLibraryID);
 		});
 		
 		it("shouldn't select a new collection if skipSelect is passed", async function () {
@@ -344,7 +418,7 @@ describe("Zotero.CollectionTree", function () {
 			});
 			
 			// Library should still be selected
-			assert.equal(cv.getSelectedLibraryID(), userLibraryID);
+			assert.equal(cv.getSelectedLibraryIDs()[0], userLibraryID);
 		});
 		
 		it("shouldn't select a modified collection", async function () {
@@ -359,7 +433,7 @@ describe("Zotero.CollectionTree", function () {
 			await collection.saveTx();
 			
 			// Modified collection should not be selected
-			assert.equal(cv.getSelectedLibraryID(), userLibraryID);
+			assert.equal(cv.getSelectedLibraryIDs()[0], userLibraryID);
 		});
 		
 		it("should maintain selection on a selected modified collection", async function () {
@@ -368,14 +442,14 @@ describe("Zotero.CollectionTree", function () {
 			collection.name = "Reselect on modify";
 			var id = await collection.saveTx();
 			
-			var selected = cv.getSelectedCollection(true);
+			var selected = cv.getSelectedCollections(true)[0];
 			assert.equal(selected, id);
 			
 			collection.name = "Reselect on modify 2";
 			await collection.saveTx();
 			
 			// Modified collection should still be selected
-			selected = cv.getSelectedCollection(true);
+			selected = cv.getSelectedCollections(true)[0];
 			assert.equal(selected, id);
 		});
 		
@@ -392,7 +466,7 @@ describe("Zotero.CollectionTree", function () {
 					o2.deleted = true;
 					await o2.saveTx();
 					
-					assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
+					assert.equal(zp.getCollectionTreeRows()[0].ref.id, o3.id);
 				});
 				
 				it(`should maintain selection on ${objectType} when row above is moved to trash`, async function () {
@@ -402,28 +476,45 @@ describe("Zotero.CollectionTree", function () {
 					var o3 = await createDataObject(objectType, { name: ran + "CCC" });
 					
 					await cv.selectByID(o3.treeViewID);
-					assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
+					assert.equal(zp.getCollectionTreeRows()[0].ref.id, o3.id);
 					
 					o1.deleted = true;
 					await o1.saveTx();
 					
-					assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
+					assert.equal(zp.getCollectionTreeRows()[0].ref.id, o3.id);
 				});
 				
 				it(`should maintain selection on trash when ${objectType} is restored`, async function () {
 					var o = await createDataObject(objectType, { deleted: true });
-					
+
 					await cv.selectByID("T1");
-					
+
 					o.deleted = false;
 					await o.saveTx();
-					
-					assert.isTrue(zp.getCollectionTreeRow().isTrash());
-					
+
+					assert.isTrue(zp.getCollectionTreeRows()[0].isTrash());
+
 					// Row should have been added back
 					assert.isAbove(cv.getRowIndexByID(o.treeViewID), 0);
 				});
 			}
+
+			it("should drop a collection from a multi-selection when it's moved to trash", async function () {
+				var ran = Zotero.Utilities.randomString();
+				var o1 = await createDataObject('collection', { name: ran + "AAA" });
+				var o2 = await createDataObject('collection', { name: ran + "BBB" });
+				var o3 = await createDataObject('collection', { name: ran + "CCC" });
+
+				await cv.selectByID(o1.treeViewID);
+				cv.selection.toggleSelect(cv.getRowIndexByID(o3.treeViewID));
+				cv.selection.focused = cv.getRowIndexByID(o1.treeViewID);
+				cv.selection.pivot = cv.selection.focused;
+
+				o3.deleted = true;
+				await o3.saveTx();
+
+				assert.sameMembers(cv.getSelectedRows().map(row => row.id), [o1.treeViewID]);
+			});
 		});
 		
 		for (let objectType of ['collection', 'search']) {
@@ -437,7 +528,7 @@ describe("Zotero.CollectionTree", function () {
 				
 				await o2.eraseTx();
 				
-				assert.equal(zp.getCollectionTreeRow().ref.id, o3.id);
+				assert.equal(zp.getCollectionTreeRows()[0].ref.id, o3.id);
 			});
 		}
 		
@@ -449,15 +540,15 @@ describe("Zotero.CollectionTree", function () {
 			await cv.selectLibrary(group.libraryID);
 			await waitForItemsLoad(win);
 			
-			assert.isFalse(zp.getCollectionTreeRow().editable);
+			assert.isFalse(zp.getCollectionTreeRows()[0].editable);
 			var cmd = win.document.getElementById('cmd_zotero_newStandaloneNote');
-			assert.isTrue(cmd.getAttribute('disabled') == 'true');
+			assert.isTrue(cmd.hasAttribute('disabled'));
 			
 			group.editable = true;
 			await group.saveTx();
 			
-			assert.isTrue(zp.getCollectionTreeRow().editable);
-			assert.isFalse(cmd.getAttribute('disabled') == 'true');
+			assert.isTrue(zp.getCollectionTreeRows()[0].editable);
+			assert.isFalse(cmd.hasAttribute('disabled'));
 		});
 		
 		it("should re-sort a modified collection", async function () {
@@ -586,7 +677,7 @@ describe("Zotero.CollectionTree", function () {
 		it("shouldn't select a new group", async function () {
 			var group = await createGroup();
 			// Library should still be selected
-			assert.equal(cv.getSelectedLibraryID(), userLibraryID);
+			assert.equal(cv.getSelectedLibraryIDs()[0], userLibraryID);
 		})
 		
 		it("should remove a group and all children", async function () {
@@ -627,7 +718,7 @@ describe("Zotero.CollectionTree", function () {
 		it("should select a new feed", async function () {
 			var feed = await createFeed();
 			// Feed should be selected
-			assert.equal(cv.getSelectedLibraryID(), feed.id);
+			assert.equal(cv.getSelectedLibraryIDs()[0], feed.id);
 		});
 		
 		it("shouldn't select a new feed with skipSelect: true", async function () {
@@ -637,7 +728,7 @@ describe("Zotero.CollectionTree", function () {
 				}
 			});
 			// Library should still be selected
-			assert.equal(cv.getSelectedLibraryID(), userLibraryID);
+			assert.equal(cv.getSelectedLibraryIDs()[0], userLibraryID);
 		});
 		
 		it("should remove deleted feed", async function () {
@@ -673,7 +764,6 @@ describe("Zotero.CollectionTree", function () {
 		it("should switch to library root if item isn't in collection", async function () {
 			var item = await createDataObject('item');
 			var collection = await createDataObject('collection');
-			Zotero.debug(zp.itemsView._rows);
 			await cv.selectItem(item.id);
 			await waitForItemsLoad(win);
 			assert.equal(cv.selection.focused, 0);
@@ -696,7 +786,7 @@ describe("Zotero.CollectionTree", function () {
 			var item = await createDataObject('item', { deleted: true });
 			await cv.selectItems([item.id]);
 			await waitForItemsLoad(win);
-			assert.isTrue(zp.getCollectionTreeRow().isTrash());
+			assert.isTrue(zp.getCollectionTreeRows()[0].isTrash());
 			assert.sameMembers(zp.itemsView.getSelectedItems(true), [item.id]);
 		});
 		
@@ -705,11 +795,185 @@ describe("Zotero.CollectionTree", function () {
 			var note = await createDataObject('item', { itemType: 'note', parentItemID: item.id });
 			await cv.selectItems([note.id]);
 			await waitForItemsLoad(win);
-			assert.isTrue(zp.getCollectionTreeRow().isTrash());
+			assert.isTrue(zp.getCollectionTreeRows()[0].isTrash());
 			assert.sameMembers(zp.itemsView.getSelectedItems(true), [note.id]);
 		});
 	});
 	
+	describe("#handleActivate()", function () {
+		it("shouldn't start editing when multiple collections are selected", async function () {
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection');
+			await cv.selectByID("C" + c1.id);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			assert.equal(cv.selection.count, 2);
+
+			cv.handleActivate(new Event('keydown'), [cv.selection.focused]);
+
+			assert.notOk(cv._editing);
+		});
+	});
+
+	describe("selection", function () {
+		// Toggle a row the way a Cmd-click/Space does (through the table's selection handler)
+		function toggleRow(index) {
+			cv.tree._onSelection(index, false, true);
+		}
+
+		it("should return each selected library once, in tree order", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection');
+			let groupCollection = await createDataObject(
+				'collection', { libraryID: group.libraryID }
+			);
+
+			await cv.expandLibrary(group.libraryID);
+			await cv.selectByID("C" + collection1.id);
+			// Toggle in reverse tree order, to show the result isn't in click order
+			toggleRow(cv.getRowIndexByID("C" + groupCollection.id));
+			toggleRow(cv.getRowIndexByID("C" + collection2.id));
+
+			assert.sameOrderedMembers(
+				cv.getSelectedLibraryIDs(),
+				[Zotero.Libraries.userLibraryID, group.libraryID]
+			);
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should keep a selection when the last selected row is toggled off", async function () {
+			let c = await createDataObject('collection');
+			await cv.selectByID("C" + c.id);
+			let row = cv.getRowIndexByID("C" + c.id);
+			assert.equal(cv.selection.count, 1);
+
+			// Toggling off the only selected row would empty the selection
+			toggleRow(row);
+
+			assert.equal(cv.selection.count, 1);
+			assert.isTrue(cv.selection.isSelected(row));
+		});
+
+		it("should allow toggling off a row when others remain selected", async function () {
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection');
+			await cv.selectByID("C" + c1.id);
+			let r2 = cv.getRowIndexByID("C" + c2.id);
+			toggleRow(r2);
+			assert.equal(cv.selection.count, 2);
+
+			// Toggling one off leaves the other
+			toggleRow(r2);
+			assert.equal(cv.selection.count, 1);
+			assert.isTrue(cv.selection.isSelected(cv.getRowIndexByID("C" + c1.id)));
+		});
+
+		it("should mark the focused-but-unselected row for the focus ring", async function () {
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection');
+			await cv.selectByID("C" + c1.id);
+			let r2 = cv.getRowIndexByID("C" + c2.id);
+
+			// Move focus to c2 without selecting it (macOS Cmd-arrow style)
+			cv.tree._onSelection(r2, false, false, true);
+			assert.equal(cv.selection.focused, r2);
+			assert.isFalse(cv.selection.isSelected(r2));
+
+			// The focused (unselected) row gets the 'focused' class that drives the
+			// dotted focus ring (rendering is async, so wait for it)
+			await waitForCallback(() => {
+				let n = win.document.getElementById(`${cv.id}-row-${r2}`);
+				return n && n.classList.contains('focused');
+			}, 50, 20);
+			let node = win.document.getElementById(`${cv.id}-row-${r2}`);
+			assert.isTrue(node.classList.contains('focused'));
+			assert.isFalse(node.classList.contains('selected'));
+		});
+
+		it("should not leave a stale multi-selection after filtering", async function () {
+			let cA = await createDataObject('collection', { name: 'filterAAA' });
+			let cB = await createDataObject('collection', { name: 'filterBBB' });
+			let cC = await createDataObject('collection', { name: 'filterCCC' });
+
+			// Select all three, focusing the one that will still match the filter
+			await cv.selectByID("C" + cB.id);
+			toggleRow(cv.getRowIndexByID("C" + cC.id));
+			toggleRow(cv.getRowIndexByID("C" + cA.id));
+			assert.equal(cv.selection.count, 3);
+
+			await cv.setFilter("filterAAA");
+
+			// Only the still-matching focused row is selected -- no stale indices
+			assert.deepEqual(cv.getSelectedRows().map(r => r.id), ["C" + cA.id]);
+
+			await cv.setFilter("");
+		});
+	});
+
+	describe("#_handleSelectAll()", function () {
+		beforeEach(async function () {
+			await clearFeeds();
+		});
+		after(async function () {
+			await clearFeeds();
+		});
+
+		it("should select all library roots without pulling in feeds", async function () {
+			var group = await createGroup();
+			await createFeed();
+
+			// Expand the Feeds container so its feed rows are in the tree, which is the
+			// state that triggered the bug
+			var feedsRow = cv._rows.findIndex(row => row.isFeeds());
+			assert.isAbove(feedsRow, -1);
+			if (!cv.isContainerOpen(feedsRow)) {
+				await cv.toggleOpenState(feedsRow);
+			}
+			assert.isTrue(cv._rows.some(row => row.isFeed()));
+
+			// Select My Library and do Cmd/Ctrl-A
+			await cv.selectByID("L" + userLibraryID);
+			await cv._handleSelectAll();
+			await zp.onCollectionSelected();
+
+			var selectedRows = cv.getSelectedRows();
+			// My Library and the group are both selected...
+			assert.isTrue(selectedRows.some(row => row.id == "L" + userLibraryID));
+			assert.isTrue(selectedRows.some(row => row.id == group.treeViewID));
+			// ...and no feeds were pulled in, so the selection wasn't collapsed to a
+			// single row for not being shown together
+			assert.isFalse(selectedRows.some(row => row.isFeed()));
+			assert.isAbove(cv.selection.count, 1);
+		});
+	});
+
+	describe("#deleteSelectedCollection()", function () {
+		it("shouldn't delete a mixed-type selection", async function () {
+			let collection = await createDataObject('collection');
+			let search = await createDataObject('search');
+			await cv.selectByID("C" + collection.id);
+			cv.selection.toggleSelect(cv.getRowIndexByID("S" + search.id));
+			await zp.onCollectionSelected();
+			assert.equal(cv.selection.count, 2);
+
+			let stub = sinon.stub().returns(0);
+			let promptService = win.Services.prompt;
+			win.Services.prompt = { confirmEx: stub };
+			try {
+				await zp.deleteSelectedCollection(false);
+			}
+			finally {
+				win.Services.prompt = promptService;
+			}
+
+			assert.isFalse(stub.called, "Mixed selection shouldn't prompt or delete");
+			assert.isFalse(collection.deleted);
+			assert.isFalse(search.deleted);
+		});
+	});
+
 	describe("#onDrop()", function () {
 		/**
 		 * Simulate a drag and drop
@@ -731,7 +995,7 @@ describe("Zotero.CollectionTree", function () {
 			}
 			
 			Zotero.DragDrop.currentDragSource = objectType == "item"
-				? zp.itemsView.collectionTreeRow
+				? zp.itemsView.collectionTreeRows[0]
 				: null;
 			
 			if (!promise) {
@@ -763,7 +1027,7 @@ describe("Zotero.CollectionTree", function () {
 			var row = cv.getRowIndexByID(targetRowID);
 			
 			Zotero.DragDrop.currentDragSource = objectType == "item"
-				? zp.itemsView.collectionTreeRow
+				? zp.itemsView.collectionTreeRows[0]
 				: null;
 			var dt = {
 				dropEffect: 'copy',
@@ -783,6 +1047,47 @@ describe("Zotero.CollectionTree", function () {
 			return canDrop;
 		};
 		
+		// Simulate a drag over a row and return the resulting dropEffect ('copy', 'move', or
+		// 'none'). Pass { move: true } to simulate the platform's move modifier being held.
+		var dragOver = function (objectType, targetRowID, ids, { move = false, effectAllowed = 'copyMove' } = {}) {
+			var index = cv.getRowIndexByID(targetRowID);
+			
+			Zotero.DragDrop.currentDragSource = objectType == "item"
+				? zp.itemsView.collectionTreeRows[0]
+				: null;
+			
+			// Drop directly onto the middle of the row (orient 0)
+			var rowEl = {
+				classList: { contains: () => true },
+				getBoundingClientRect: () => ({ y: 0, height: 100 })
+			};
+			var dataTransfer = {
+				dropEffect: 'copy',
+				effectAllowed,
+				types: [`zotero/${objectType}`],
+				getData: function (type) {
+					if (type == `zotero/${objectType}`) {
+						return ids.join(",");
+					}
+					return "";
+				},
+				setDragImage: () => {}
+			};
+			cv.onDragOver({
+				preventDefault: () => {},
+				stopPropagation: () => {},
+				currentTarget: rowEl,
+				target: rowEl,
+				clientY: 50,
+				metaKey: move && Zotero.isMac,
+				shiftKey: move && !Zotero.isMac,
+				dataTransfer
+			}, index);
+			Zotero.DragDrop.currentDragSource = null;
+			Zotero.DragDrop.currentDropEffect = null;
+			return dataTransfer.dropEffect;
+		};
+		
 		describe("with items", function () {
 			it("should add an item to a collection", async function () {
 				var collection = await createDataObject('collection');
@@ -813,6 +1118,56 @@ describe("Zotero.CollectionTree", function () {
 				assert.equal(treeRow.ref.id, item.id);
 			})
 			
+			it("should move an item when the drag only allows copying", async function () {
+				var collection1 = await createDataObject('collection');
+				await select(win, collection1);
+				var collection2 = await createDataObject('collection');
+				var item = await createDataObject('item', { collections: [collection1.id] });
+				
+				var index = cv.getRowIndexByID('C' + collection2.id);
+				var rowEl = {
+					classList: { contains: () => true },
+					getBoundingClientRect: () => ({ y: 0, height: 100 })
+				};
+				var dataTransfer = {
+					dropEffect: 'copy',
+					effectAllowed: 'copy',
+					types: ['zotero/item'],
+					getData: function (type) {
+						if (type == 'zotero/item') {
+							return item.id + "";
+						}
+						return "";
+					},
+					setDragImage: () => {}
+				};
+				Zotero.DragDrop.currentDragSource = zp.itemsView.collectionTreeRows[0];
+				cv.onDragOver({
+					preventDefault: () => {},
+					stopPropagation: () => {},
+					currentTarget: rowEl,
+					target: rowEl,
+					clientY: 50,
+					metaKey: Zotero.isMac,
+					shiftKey: !Zotero.isMac,
+					dataTransfer
+				}, index);
+				// A file attachment drag allows only copying, so the requested move has to be
+				// sent as a copy for the drop to happen
+				assert.equal(dataTransfer.dropEffect, 'copy');
+				
+				var promise = waitForNotifierEvent('add', 'collection-item');
+				await cv.onDrop({
+					persist: () => 0,
+					target: { ownerDocument: { defaultView: win } },
+					dataTransfer
+				}, index);
+				await promise;
+				Zotero.DragDrop.currentDragSource = null;
+				
+				assert.sameMembers(item.getCollections(), [collection2.id]);
+			});
+			
 			it("should move an item from one collection to another", async function () {
 				var collection1 = await createDataObject('collection');
 				await select(win, collection1);
@@ -842,13 +1197,126 @@ describe("Zotero.CollectionTree", function () {
 				assert.equal(zp.itemsView.rowCount, 0);
 				
 				await select(win, collection2);
-				
+
 				// Target collection should have item
 				assert.equal(zp.itemsView.rowCount, 1);
 				var treeRow = zp.itemsView.getRow(0);
 				assert.equal(treeRow.ref.id, item.id);
 			});
+
+			it("should add a multiple-library item selection to a collection, copying out-of-library items", async function () {
+				await Zotero.Users.setCurrentUserID(1);
+				await Zotero.Users.setName(1, 'Name');
+				
+				var collection = await createDataObject('collection');
+				var libraryItem = await createDataObject('item', false, { skipSelect: true });
+				
+				var group = await createGroup();
+				var groupItem = await createDataObject('item', { libraryID: group.libraryID });
+				
+				// Drop one item from the personal library and one from the group onto a
+				// personal-library collection
+				await onDrop('item', 'C' + collection.id, [libraryItem.id, groupItem.id]);
+				await collection.loadDataType('childItems');
+				
+				// The collection now contains the same-library item plus a copy of the group item
+				var childItemIDs = collection.getChildItems(true);
+				assert.lengthOf(childItemIDs, 2);
+				assert.include(childItemIDs, libraryItem.id);
+				
+				// The group item was copied into the personal library, and the copy links back to it
+				var copiedItem = Zotero.Items.get(childItemIDs.find(id => id != libraryItem.id));
+				assert.equal(copiedItem.libraryID, collection.libraryID);
+				assert.equal((await copiedItem.getLinkedItem(group.libraryID)).id, groupItem.id);
+				
+				await group.eraseTx();
+			});
 			
+			it("should disallow moving a multiple-library item selection", async function () {
+				var sourceCollection = await createDataObject('collection');
+				var targetCollection = await createDataObject('collection');
+				var libraryItem = await createDataObject('item', { collections: [sourceCollection.id] });
+
+				var group = await createGroup();
+				var groupItem = await createDataObject('item', { libraryID: group.libraryID });
+
+				// Source collection has to be selected so it's used as the drag source
+				await select(win, sourceCollection);
+				await waitForItemsLoad(win);
+
+				var ids = [libraryItem.id, groupItem.id];
+				// A plain drag copies the selection
+				assert.equal(dragOver('item', 'C' + targetCollection.id, ids), 'copy');
+				// A move is disallowed, since the out-of-library item can't be moved
+				assert.equal(dragOver('item', 'C' + targetCollection.id, ids, { move: true }), 'none');
+
+				await group.eraseTx();
+			});
+
+			it("should copy out-of-library items from a multiple-library selection dropped on a library root", async function () {
+				await Zotero.Users.setCurrentUserID(1);
+				await Zotero.Users.setName(1, 'Name');
+
+				var libraryItem = await createDataObject('item', false, { skipSelect: true });
+
+				var group = await createGroup();
+				var groupItem = await createDataObject('item', { libraryID: group.libraryID });
+
+				// Drop a personal-library item and a group item onto the personal library root: the
+				// item already in the library is a no-op, and the group item is copied in
+				var ids = (await onDrop('item', 'L' + userLibraryID, [libraryItem.id, groupItem.id])).ids;
+				assert.lengthOf(ids, 1);
+
+				var copiedItem = Zotero.Items.get(ids[0]);
+				assert.equal(copiedItem.libraryID, userLibraryID);
+				assert.equal((await copiedItem.getLinkedItem(group.libraryID)).id, groupItem.id);
+
+				await group.eraseTx();
+			});
+
+			it("should refuse a single-library selection dropped on its own library root", async function () {
+				var item1 = await createDataObject('item', false, { skipSelect: true });
+				var item2 = await createDataObject('item', false, { skipSelect: true });
+
+				// With no out-of-library items to copy, the drag is refused
+				assert.isFalse(await canDrop('item', 'L' + userLibraryID, [item1.id, item2.id]));
+			});
+
+			it("should record an undo step when adding an item to a collection", async function () {
+				var collection = await createDataObject('collection');
+				var item = await createDataObject('item', false, { skipSelect: true });
+				Zotero.UndoHistory.clear();
+
+				// Add observer to wait for collection add
+				var deferred = Zotero.Promise.defer();
+				var observerID = Zotero.Notifier.registerObserver({
+					notify: function (event, type, ids, extraData) {
+						if (type == 'collection-item' && event == 'add'
+								&& ids[0] == collection.id + "-" + item.id) {
+							setTimeout(function () {
+								deferred.resolve();
+							});
+						}
+					}
+				}, 'collection-item', 'test');
+
+				await onDrop('item', 'C' + collection.id, [item.id], deferred.promise);
+
+				Zotero.Notifier.unregisterObserver(observerID);
+
+				assert.include(item.getCollections(), collection.id);
+				assert.isTrue(Zotero.UndoHistory.canUndo());
+				var action = Zotero.UndoHistory.getUndoAction();
+				assert.equal(action.action, 'undo-action-add-to-collection');
+				assert.equal(action.actionArgs.count, 1);
+
+				await Zotero.UndoHistory.undo();
+				assert.notInclude(item.getCollections(), collection.id);
+
+				await Zotero.UndoHistory.redo();
+				assert.include(item.getCollections(), collection.id);
+			});
+
 			describe("My Publications", function () {
 				function getItemModifyPromise(item) {
 					// Add observer to wait for item modification
@@ -866,7 +1334,7 @@ describe("Zotero.CollectionTree", function () {
 				
 				function acceptItemsWithoutFiles(win) {
 					var doc = win.document;
-					doc.getElementById('confirm-authorship-checkbox').checked = true;
+					doc.getElementById('confirm-authorship-checkbox').click();
 					var wizard = doc.getElementById('publications-dialog-wizard');
 					if (!doc.getElementById('include-files').disabled) {
 						throw new Error("Include Files checkbox isn't disabled");
@@ -876,8 +1344,8 @@ describe("Zotero.CollectionTree", function () {
 				
 				function acceptItemsWithFiles(win) {
 					var doc = win.document;
-					doc.getElementById('include-files').checked = true;
-					doc.getElementById('confirm-authorship-checkbox').checked = true;
+					doc.getElementById('include-files').click();
+					doc.getElementById('confirm-authorship-checkbox').click();
 					var wizard = doc.getElementById('publications-dialog-wizard');
 					if (doc.getElementById('include-files').disabled) {
 						throw new Error("Include Files checkbox shouldn't be disabled");
@@ -1452,7 +1920,7 @@ describe("Zotero.CollectionTree", function () {
 
 				await select(win, collection);
 				// TEMP: Some extra asserts to debug flakiness in CI
-				var selectedTreeRow = win.ZoteroPane.getCollectionTreeRow();
+				var selectedTreeRow = win.ZoteroPane.getCollectionTreeRows()[0];
 				assert.ok(selectedTreeRow, 'a collection tree row should be selected');
 				assert.isTrue(selectedTreeRow.isCollection(),
 					'selected tree row should be a collection');
@@ -1593,6 +2061,15 @@ describe("Zotero.CollectionTree", function () {
 			});
 		}
 
+		it('should match an accented collection name from an unaccented filter', async function () {
+			var collection = await createDataObject('collection', { name: "zdiacrésumé", libraryID: userLibraryID });
+			await cv.setFilter("zdiacresume");
+			let displayedNames = cv._rows.filter(row => row.type == "collection").map(row => row.ref.name);
+			assert.include(displayedNames, "zdiacrésumé");
+			await cv.setFilter("");
+			await collection.eraseTx();
+		});
+
 		it('should show non-passing entries whose children pass the filter', async function () {
 			await cv.setFilter("three");
 			let displayedRowNames = cv._rows.filter(row => row.type == "collection").map(row => row.ref.name);
@@ -1684,7 +2161,7 @@ describe("Zotero.CollectionTree", function () {
 			win.document.getElementById("zotero-collections-search").value = "_2";
 			await cv.setFilter("_2");
 			win.document.getElementById("zotero-collections-search").dispatchEvent(keyboardClick("Enter"));
-			assert.equal(cv.getSelectedCollection(true), collection3.id);
+			assert.equal(cv.getSelectedCollections(true)[0], collection3.id);
 			assert.equal(win.document.activeElement.id, 'collection-tree');
 		});
 
@@ -1696,7 +2173,7 @@ describe("Zotero.CollectionTree", function () {
 			win.document.getElementById("zotero-collections-search").dispatchEvent(keyboardClick("Enter"));
 			// Wait for the selection to go through
 			await Zotero.Promise.delay(100);
-			assert.equal(cv.getSelectedCollection(true), collection3.id);
+			assert.equal(cv.getSelectedCollections(true)[0], collection3.id);
 			assert.equal(win.document.activeElement.id, 'collection-tree');
 		});
 
@@ -1715,12 +2192,12 @@ describe("Zotero.CollectionTree", function () {
 			await cv.focusFirstMatchingRow();
 			// Skip collection6 that does not match on the way up and down
 			for (let col of [collection3, collection7, collection8]) {
-				assert.equal(cv.getSelectedCollection(true), col.id);
+				assert.equal(cv.getSelectedCollections(true)[0], col.id);
 				await cv.focusNextMatchingRow(cv.selection.focused);
 			}
 			await cv.selectByID(`C${collection8.id}`);
 			for (let col of [collection8, collection7, collection3]) {
-				assert.equal(cv.getSelectedCollection(true), col.id);
+				assert.equal(cv.getSelectedCollections(true)[0], col.id);
 				await cv.focusNextMatchingRow(cv.selection.focused, true);
 			}
 		});
@@ -1732,7 +2209,7 @@ describe("Zotero.CollectionTree", function () {
 			cv.focusFirstMatchingRow();
 			colTree.dispatchEvent(keyboardClick("Escape"));
 			assert.equal(cv._filter, "");
-			assert.equal(cv.getSelectedCollection(true), collection2.id);
+			assert.equal(cv.getSelectedCollections(true)[0], collection2.id);
 		});
 	});
 
@@ -1747,4 +2224,53 @@ describe("Zotero.CollectionTree", function () {
 			invalidateSpy.restore();
 		});
 	})
+
+	describe("removed single-selection methods", function () {
+		var buildFlags = ['isBetaBuild', 'isDevBuild', 'isSourceBuild'];
+		var savedBuildFlags;
+		
+		beforeEach(function () {
+			savedBuildFlags = buildFlags.map(flag => Zotero[flag]);
+			// Tests run in a source build, where these methods always throw
+			buildFlags.forEach(flag => Zotero[flag] = false);
+		});
+		
+		afterEach(function () {
+			buildFlags.forEach((flag, i) => Zotero[flag] = savedBuildFlags[i]);
+		});
+		
+		it("should return the selected row when focus is on a different row", async function () {
+			var collection1 = await createDataObject('collection');
+			var collection2 = await createDataObject('collection');
+			var index1 = cv.getRowIndexByID(collection1.treeViewID);
+			var index2 = cv.getRowIndexByID(collection2.treeViewID);
+			
+			cv.selection.select(index1);
+			// Ctrl/Cmd-arrow moves focus without changing the selection
+			cv.selection.focused = index2;
+			
+			assert.equal(cv.getSelectedCollection(), collection1);
+			assert.equal(zp.getSelectedCollection(), collection1);
+			assert.equal(zp.getCollectionTreeRow().ref, collection1);
+		});
+		
+		it("should throw when multiple rows are selected", async function () {
+			var collection1 = await createDataObject('collection');
+			var collection2 = await createDataObject('collection');
+			cv.selection.select(cv.getRowIndexByID(collection1.treeViewID));
+			cv.selection.toggleSelect(cv.getRowIndexByID(collection2.treeViewID));
+			
+			assert.throws(() => cv.getSelectedCollection());
+			assert.throws(() => zp.getSelectedLibraryID());
+		});
+		
+		it("should throw in pre-release builds with a single row selected", async function () {
+			Zotero.isBetaBuild = true;
+			var collection = await createDataObject('collection');
+			cv.selection.select(cv.getRowIndexByID(collection.treeViewID));
+			
+			assert.throws(() => cv.getSelectedCollection());
+			assert.throws(() => zp.getSelectedCollection());
+		});
+	});
 })
diff --git a/test/tests/collectionViewItemTreeTest.js b/test/tests/collectionViewItemTreeTest.js
index f3b9182314..301b975de8 100644
--- a/test/tests/collectionViewItemTreeTest.js
+++ b/test/tests/collectionViewItemTreeTest.js
@@ -165,6 +165,26 @@ describe("CollectionViewItemTree", function () {
 			});
 		});
 		
+		it("should re-run the search when the quick-search mode changes", async function () {
+			// Term appears only in a field excluded by "Title, Creator, Year" mode
+			let item = createUnsavedDataObject('item', { itemType: 'journalArticle', title: 'Untitled' });
+			item.setField('abstractNote', 'zqsmodeterm');
+			await item.saveTx();
+
+			Zotero.Prefs.set('search.quicksearch-mode', 'titleCreatorYear');
+			quicksearch.value = 'zqsmodeterm';
+			await zp.search();
+			assert.isFalse(itemsView.getRowIndexByID(item.id));
+
+			// Changing only the mode, with the same search text, should re-run the search
+			Zotero.Prefs.set('search.quicksearch-mode', 'fields');
+			await zp.search();
+			assert.isNumber(itemsView.getRowIndexByID(item.id));
+
+			Zotero.Prefs.clear('search.quicksearch-mode');
+			await item.eraseTx();
+		});
+
 		it("should not clear quick search after deleting item from collection", async function () {
 			let col = await createDataObject('collection');
 			let item = await createDataObject('item', { title: "test", collections: [col.id] });
@@ -240,6 +260,37 @@ describe("CollectionViewItemTree", function () {
 			assert.isFalse(itemsView.getRowIndexByID(highlightOne.id));
 			assert.isFalse(itemsView.getRowIndexByID(highlightTwo.id));
 		});
+
+		it("should keep attachments expandable and show all annotations for non-annotation searches when hideContextAnnotationRows=true", async function () {
+			Zotero.Prefs.set("hideContextAnnotationRows", true);
+
+			let item = await createDataObject('item', { title: "uniqueParentTitle" });
+			let attachment = await importFileAttachment('test.pdf', { title: 'PDF', parentItemID: item.id });
+			let highlight = await createAnnotation('highlight', attachment, { comment: "comment one" });
+			let underline = await createAnnotation('underline', attachment, { comment: "comment two" });
+
+			// Search matches the parent item's title, not any annotation
+			await zp.itemsView.setFilter('search', "uniqueParentTitle");
+
+			// Expand the matched parent to reveal its attachment
+			let itemRow = itemsView.getRowIndexByID(item.id);
+			assert.isNumber(itemRow);
+			if (!itemsView.isContainerOpen(itemRow)) {
+				await itemsView.toggleOpenState(itemRow);
+			}
+
+			// The attachment should still be expandable even though no annotation matched
+			let attachmentRow = itemsView.getRowIndexByID(attachment.id);
+			assert.isNumber(attachmentRow);
+			assert.isFalse(itemsView.isContainerEmpty(attachmentRow));
+
+			// Expanding it should reveal all of its annotations rather than hiding them
+			if (!itemsView.isContainerOpen(attachmentRow)) {
+				await itemsView.toggleOpenState(attachmentRow);
+			}
+			assert.isNumber(itemsView.getRowIndexByID(highlight.id));
+			assert.isNumber(itemsView.getRowIndexByID(underline.id));
+		});
 	});
 	
 	describe("#selectItem()", function () {
@@ -276,7 +327,7 @@ describe("CollectionViewItemTree", function () {
 			await zp.itemsView.selectItem(itemTwo.id);
 
 			// tag selector should be cleared and itemTwo - selected
-			assert.equal(zp.getCollectionTreeRow().tags.size, 0);
+			assert.equal(zp.getCollectionTreeRows()[0].tags.size, 0);
 			assert.equal(zp.tagSelector.selectedTags.size, 0);
 			assert.equal(zp.itemsView.getSelectedItems()[0].id, itemTwo.id);
 		});
@@ -513,6 +564,138 @@ describe("CollectionViewItemTree", function () {
 	});
 	
 	describe("#toggleOpenState()", function () {
+		it("should preserve selection and detached focus when toggling another container", async function () {
+			var collection = await createDataObject('collection');
+			await select(win, collection);
+			itemsView = zp.itemsView;
+			
+			var parentItem = await createDataObject('item', { collections: [collection.id] });
+			var attachment = await importFileAttachment('test.png', { parentItemID: parentItem.id });
+			var item1 = await createDataObject('item', { collections: [collection.id] });
+			var item2 = await createDataObject('item', { collections: [collection.id] });
+			await waitForItemsLoad(win);
+
+			var parentRow = itemsView.getRowIndexByID(parentItem.id);
+			if (itemsView.isContainerOpen(parentRow)) {
+				await itemsView.toggleOpenState(parentRow);
+				await itemsView.waitForLoad();
+			}
+			await itemsView.selectItem(item1.id);
+			itemsView.selection.toggleSelect(itemsView.getRowIndexByID(item2.id));
+			itemsView.selection.focused = parentRow;
+			itemsView.selection.pivot = parentRow;
+
+			itemsView.tree._onKeyDown({
+				key: Zotero.arrowNextKey,
+				preventDefault: () => {},
+				stopPropagation: () => {}
+			});
+			await itemsView.waitForLoad();
+			assert.isTrue(itemsView.isContainerOpen(itemsView.getRowIndexByID(parentItem.id)));
+			assert.sameMembers(itemsView.getSelectedItems(true), [item1.id, item2.id]);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(parentItem.id));
+
+			itemsView.tree._onKeyDown({
+				key: Zotero.arrowPreviousKey,
+				preventDefault: () => {},
+				stopPropagation: () => {}
+			});
+			await itemsView.waitForLoad();
+			assert.isFalse(itemsView.isContainerOpen(itemsView.getRowIndexByID(parentItem.id)));
+			assert.sameMembers(itemsView.getSelectedItems(true), [item1.id, item2.id]);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(parentItem.id));
+		})
+
+		it("should select the parent when collapsing a selected child", async function () {
+			var collection = await createDataObject('collection');
+			await select(win, collection);
+			itemsView = zp.itemsView;
+			
+			var parentItem = await createDataObject('item', { collections: [collection.id] });
+			var attachment = await importFileAttachment('test.png', { parentItemID: parentItem.id });
+			await waitForItemsLoad(win);
+
+			var parentRow = itemsView.getRowIndexByID(parentItem.id);
+			if (!itemsView.isContainerOpen(parentRow)) {
+				await itemsView.toggleOpenState(parentRow);
+				await itemsView.waitForLoad();
+			}
+			await itemsView.selectItem(attachment.id);
+			parentRow = itemsView.getRowIndexByID(parentItem.id);
+			itemsView.selection.focused = parentRow;
+			itemsView.selection.pivot = parentRow;
+			// The selection changes to the parent, so a select event has to fire
+			var selectPromise = itemsView.waitForSelect();
+			await itemsView.toggleOpenState(parentRow);
+			await itemsView.waitForLoad();
+			await selectPromise;
+			assert.sameMembers(itemsView.getSelectedItems(true), [parentItem.id]);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(parentItem.id));
+		})
+
+		it("should keep detached focus when collapsing a selected child alongside another selected item", async function () {
+			var collection = await createDataObject('collection');
+			await select(win, collection);
+			itemsView = zp.itemsView;
+
+			var parentItem = await createDataObject('item', { collections: [collection.id] });
+			var attachment = await importFileAttachment('test.png', { parentItemID: parentItem.id });
+			var item1 = await createDataObject('item', { collections: [collection.id] });
+			await waitForItemsLoad(win);
+
+			var parentRow = itemsView.getRowIndexByID(parentItem.id);
+			if (!itemsView.isContainerOpen(parentRow)) {
+				await itemsView.toggleOpenState(parentRow);
+				await itemsView.waitForLoad();
+			}
+			await itemsView.selectItem(item1.id);
+			itemsView.selection.toggleSelect(itemsView.getRowIndexByID(attachment.id));
+			parentRow = itemsView.getRowIndexByID(parentItem.id);
+			itemsView.selection.focused = parentRow;
+			itemsView.selection.pivot = parentRow;
+
+			var selectPromise = itemsView.waitForSelect();
+			await itemsView.toggleOpenState(parentRow);
+			await itemsView.waitForLoad();
+			await selectPromise;
+			assert.sameMembers(itemsView.getSelectedItems(true), [item1.id, parentItem.id]);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(parentItem.id));
+		})
+
+		it("should adjust focus with an empty selection when toggling a container above it", async function () {
+			var collection = await createDataObject('collection');
+			await select(win, collection);
+			itemsView = zp.itemsView;
+
+			var ran = Zotero.Utilities.randomString();
+			var parentItem = await createDataObject('item', { title: ran + " AAA", collections: [collection.id] });
+			var attachment = await importFileAttachment('test.png', { parentItemID: parentItem.id });
+			var item1 = await createDataObject('item', { title: ran + " ZZZ", collections: [collection.id] });
+			await waitForItemsLoad(win);
+
+			var parentRow = itemsView.getRowIndexByID(parentItem.id);
+			if (!itemsView.isContainerOpen(parentRow)) {
+				await itemsView.toggleOpenState(parentRow);
+				await itemsView.waitForLoad();
+			}
+			var item1Row = itemsView.getRowIndexByID(item1.id);
+			assert.isAbove(item1Row, itemsView.getRowIndexByID(attachment.id));
+			// Empty the selection, leaving focus on the item
+			await itemsView.selectItem(item1.id);
+			itemsView.selection.toggleSelect(item1Row);
+			assert.equal(itemsView.selection.count, 0);
+
+			await itemsView.toggleOpenState(itemsView.getRowIndexByID(parentItem.id));
+			await itemsView.waitForLoad();
+			assert.equal(itemsView.selection.count, 0);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(item1.id));
+
+			await itemsView.toggleOpenState(itemsView.getRowIndexByID(parentItem.id));
+			await itemsView.waitForLoad();
+			assert.equal(itemsView.selection.count, 0);
+			assert.equal(itemsView.selection.focused, itemsView.getRowIndexByID(item1.id));
+		})
+
 		it("shouldn't scroll back to selected row when opening another container", async function () {
 			var collection = await createDataObject('collection');
 			await select(win, collection);
@@ -1140,7 +1323,7 @@ describe("CollectionViewItemTree", function () {
 			var item = await createDataObject('item', { title: "Unfiled Item" });
 			var attachment = await importFileAttachment('test.png', { parentItemID: item.id });
 			await zp.setVirtual(userLibraryID, 'unfiled', true, true);
-			assert.equal(zp.getCollectionTreeRow().id, 'U' + userLibraryID);
+			assert.equal(zp.getCollectionTreeRows()[0].id, 'U' + userLibraryID);
 			await waitForItemsLoad(win);
 			let rowIndex = zp.itemsView.getRowIndexByID(item.id);
 			assert.isNumber(rowIndex);
@@ -1182,6 +1365,33 @@ describe("CollectionViewItemTree", function () {
 			assert.equal(quickSearch.value, "item");
 		});
 
+		it("should add an item to a collection when a saved search is also selected", async function () {
+			Zotero.Prefs.set('recursiveCollections', true);
+			let logError = sinon.spy(Zotero, 'logError');
+			try {
+				let collection = await createDataObject('collection');
+				let subcollection = await createDataObject('collection', { parentID: collection.id });
+				let search = await createDataObject('search');
+
+				await cv.selectByID("C" + collection.id);
+				await waitForItemsLoad(win);
+				cv.selection.toggleSelect(cv.getRowIndexByID("S" + search.id));
+				await zp.onCollectionSelected();
+				await zp.itemsView.waitForLoad();
+
+				// With recursiveCollections, an item added to a subcollection shows in
+				// the parent collection's view
+				let item = await createDataObject('item', { collections: [subcollection.id] });
+				assert.isNumber(zp.itemsView.getRowIndexByID(item.id));
+				assert.deepEqual(logError.getCalls().map(call => String(call.args[0])), []);
+			}
+			finally {
+				logError.restore();
+				Zotero.Prefs.clear('recursiveCollections');
+				await selectLibrary(win);
+			}
+		});
+
 		describe("Change parent item", function () {
 			let item1, item2, attachment1, highlight1;
 			
@@ -1335,7 +1545,7 @@ describe("CollectionViewItemTree", function () {
 				await attachment2.saveTx();
 
 				await zp.setVirtual(userLibraryID, 'recentlyRead', true, true);
-				assert.equal(zp.getCollectionTreeRow().id, 'Y' + userLibraryID);
+				assert.equal(zp.getCollectionTreeRows()[0].id, 'Y' + userLibraryID);
 				await waitForItemsLoad(win);
 				assert.isAbove(zp.itemsView.getRowIndexByID(item1.id), zp.itemsView.getRowIndexByID(item2.id));
 
@@ -1365,7 +1575,7 @@ describe("CollectionViewItemTree", function () {
 				await attachment2.saveTx();
 
 				await zp.setVirtual(groupLibraryID, 'recentlyRead', true, true);
-				assert.equal(zp.getCollectionTreeRow().id, 'Y' + groupLibraryID);
+				assert.equal(zp.getCollectionTreeRows()[0].id, 'Y' + groupLibraryID);
 				await waitForItemsLoad(win);
 				assert.isAbove(zp.itemsView.getRowIndexByID(item1.id), zp.itemsView.getRowIndexByID(item2.id));
 
@@ -1379,6 +1589,74 @@ describe("CollectionViewItemTree", function () {
 				await item2.eraseTx();
 			});
 
+			it("should show read child attachments as matched, not context, rows", async function () {
+				let userLibraryID = Zotero.Libraries.userLibraryID;
+				let item = await createDataObject('item', { libraryID: userLibraryID });
+				let readAttachment = await importPDFAttachment(item);
+				let unreadAttachment = await importPDFAttachment(item);
+				readAttachment.attachmentLastRead = Math.round(Date.now() / 1000);
+				await readAttachment.saveTx();
+
+				await zp.setVirtual(userLibraryID, 'recentlyRead', true, true);
+				await waitForItemsLoad(win);
+
+				let itemsView = zp.itemsView;
+				let parentRow = itemsView.getRowIndexByID(item.id);
+				assert.isNumber(parentRow);
+
+				// Expand the parent to reveal its children
+				await itemsView.toggleOpenState(parentRow);
+
+				let readRow = itemsView.getRowIndexByID(readAttachment.id);
+				let unreadRow = itemsView.getRowIndexByID(unreadAttachment.id);
+				assert.isNumber(readRow);
+				assert.isNumber(unreadRow);
+
+				// The read attachment is matched, shown in black
+				assert.isNotOk(itemsView._getRowData(readRow).contextRow);
+				// The parent is also matched
+				assert.isNotOk(itemsView._getRowData(parentRow).contextRow);
+				// The unread sibling is still a grayed-out context row
+				assert.isTrue(itemsView._getRowData(unreadRow).contextRow);
+
+				await item.eraseTx();
+			});
+
+			it("should not auto-expand parents of read attachments", async function () {
+				let userLibraryID = Zotero.Libraries.userLibraryID;
+				let now = Math.round(Date.now() / 1000);
+
+				let item1 = await createDataObject('item', { libraryID: userLibraryID });
+				let attachment1 = await importPDFAttachment(item1);
+				attachment1.attachmentLastRead = now;
+				await attachment1.saveTx();
+
+				let item2 = await createDataObject('item', { libraryID: userLibraryID });
+				let attachment2 = await importPDFAttachment(item2);
+				attachment2.attachmentLastRead = now - 5;
+				await attachment2.saveTx();
+
+				await zp.setVirtual(userLibraryID, 'recentlyRead', true, true);
+				await waitForItemsLoad(win);
+
+				let itemsView = zp.itemsView;
+				let item1Row = itemsView.getRowIndexByID(item1.id);
+				let item2Row = itemsView.getRowIndexByID(item2.id);
+				assert.isNumber(item1Row);
+				assert.isNumber(item2Row);
+
+				// Parents should remain collapsed - marking read children as matched
+				// must not trigger auto-expansion
+				assert.isFalse(itemsView.isContainerOpen(item1Row));
+				assert.isFalse(itemsView.isContainerOpen(item2Row));
+				// Child attachments are therefore not shown until the parent is expanded
+				assert.isFalse(itemsView.getRowIndexByID(attachment1.id));
+				assert.isFalse(itemsView.getRowIndexByID(attachment2.id));
+
+				await item1.eraseTx();
+				await item2.eraseTx();
+			});
+
 			it("should show empty Recently Read when no items have been read", async function () {
 				let userLibraryID = Zotero.Libraries.userLibraryID;
 				let item = await createDataObject('item', { libraryID: userLibraryID });
@@ -1523,6 +1801,50 @@ describe("CollectionViewItemTree", function () {
 					assert.isNumber(zp.itemsView.getRowIndexByID(matchItem.id));
 					assert.isFalse(zp.itemsView.getRowIndexByID(otherItem.id));
 				});
+
+				it("should show read attachments as matches in every selected library", async function () {
+					let group = await createGroup();
+					let title = 'Cross Library Read QQQ';
+					let userItem = await createDataObject('item', { title });
+					let userAttachment = await importPDFAttachment(userItem);
+					let groupItem = await createDataObject(
+						'item', { libraryID: group.libraryID, title }
+					);
+					let groupAttachment = await importPDFAttachment(groupItem);
+					for (let attachment of [userAttachment, groupAttachment]) {
+						attachment.attachmentLastRead = Math.round(Date.now() / 1000);
+						await attachment.saveTx();
+					}
+
+					await zp.setVirtual(Zotero.Libraries.userLibraryID, 'recentlyRead', true, true);
+					await zp.setVirtual(group.libraryID, 'recentlyRead', true, true);
+					await cv.expandLibrary(group.libraryID);
+					await cv.selectByID("Y" + Zotero.Libraries.userLibraryID);
+					await waitForItemsLoad(win);
+					cv.selection.toggleSelect(cv.getRowIndexByID("Y" + group.libraryID));
+					await zp.onCollectionSelected();
+					await zp.itemsView.waitForLoad();
+
+					quicksearch.value = title;
+					quicksearch.doCommand();
+					await zp.itemsView._refreshPromise;
+
+					// The attachments are what was actually read, so they display as
+					// results rather than grayed-out context rows
+					let view = zp.itemsView;
+					for (let attachment of [userAttachment, groupAttachment]) {
+						await view.expandToItem(attachment.id);
+						let row = view.getRowIndexByID(attachment.id);
+						assert.isNumber(row, `Attachment ${attachment.id} should be shown`);
+						assert.isFalse(
+							view.tree._jsWindow.getElementByIndex(row).classList.contains('context-row'),
+							`Attachment in library ${attachment.libraryID} should be a match`
+						);
+					}
+
+					await selectLibrary(win);
+					await group.eraseTx();
+				});
 			});
 
 			describe("After Remove from Recently Read", function () {
@@ -1667,6 +1989,58 @@ describe("CollectionViewItemTree", function () {
 				assert.equal(itemsView.getRow(searchRowIndex).type, 'search');
 			});
 
+			it("shouldn't show a value in Added By/Modified By for trashed collections and searches", async function () {
+				let collection = await createDataObject('collection', { deleted: true });
+				let search = await createDataObject('search', { deleted: true });
+
+				await selectTrash(win);
+
+				for (let obj of [collection, search]) {
+					let row = itemsView.getRowIndexByID(obj.treeViewID);
+					assert.isNumber(row);
+					assert.strictEqual(itemsView.getCellText(row, 'addedBy'), "");
+					assert.strictEqual(itemsView.getCellText(row, 'lastModifiedBy'), "");
+				}
+			});
+
+			it("shouldn't show trashed collections or searches when an advanced search is active", async function () {
+				let item = await createDataObject('item', { title: "advancedTrashMatch", deleted: true });
+				let collection = await createDataObject('collection', { name: "advancedTrashMatch", deleted: true });
+				let search = await createDataObject('search', { name: "advancedTrashMatch", deleted: true });
+
+				await selectTrash(win);
+
+				let s = new Zotero.Search();
+				s.libraryID = item.libraryID;
+				s.addCondition('title', 'is', "advancedTrashMatch");
+				await itemsView.setFilter('advanced-search', s);
+
+				// The matching item is shown, but the collection and search, which can't
+				// match item-level conditions, are excluded
+				assert.isNumber(itemsView.getRowIndexByID(item.treeViewID));
+				assert.isFalse(itemsView.getRowIndexByID(collection.treeViewID));
+				assert.isFalse(itemsView.getRowIndexByID(search.treeViewID));
+
+				await itemsView.setFilter('advanced-search', null);
+			});
+
+			it("should filter trashed collections and searches by name during a quick search", async function () {
+				let match = await createDataObject('collection', { name: "quickTrashFindme", deleted: true });
+				let other = await createDataObject('collection', { name: "quickTrashOther", deleted: true });
+				let matchSearch = await createDataObject('search', { name: "quickTrashFindme", deleted: true });
+				let otherSearch = await createDataObject('search', { name: "quickTrashOther", deleted: true });
+
+				await selectTrash(win);
+				await itemsView.setFilter('search', "quickTrashFindme");
+
+				assert.isNumber(itemsView.getRowIndexByID(match.treeViewID));
+				assert.isNumber(itemsView.getRowIndexByID(matchSearch.treeViewID));
+				assert.isFalse(itemsView.getRowIndexByID(other.treeViewID));
+				assert.isFalse(itemsView.getRowIndexByID(otherSearch.treeViewID));
+
+				await itemsView.setFilter('search', "");
+			});
+
 			it("should sort by hasAttachment in trash without crashing", async function () {
 				await createDataObject('collection', { deleted: true });
 				await createDataObject('search', { deleted: true });
@@ -1901,6 +2275,51 @@ describe("CollectionViewItemTree", function () {
 			assert.isFalse(itemsView.isContainerEmpty(itemsView.getRowIndexByID(item2.id)));
 		});
 		
+		it("should move a child item when the drag only allows copying", async function () {
+			var collection = await createDataObject('collection');
+			await waitForItemsLoad(win);
+			var item1 = await createDataObject('item', { title: "A", collections: [collection.id] });
+			var item2 = await createDataObject('item', { title: "B", collections: [collection.id] });
+			var attachment = await importFileAttachment('test.pdf', { parentItemID: item1.id });
+			
+			await itemsView.selectItem(attachment.id);
+			
+			var dataTransfer = {
+				dropEffect: 'copy',
+				effectAllowed: 'copy',
+				types: ['zotero/item'],
+				getData: function (type) {
+					if (type == 'zotero/item') {
+						return attachment.id + "";
+					}
+					return "";
+				},
+				mozItemCount: 1
+			};
+			var index = itemsView.getRowIndexByID(item2.id);
+			var rowEl = {
+				classList: { contains: () => false },
+				getBoundingClientRect: () => ({ y: 0, height: 100 })
+			};
+			Zotero.DragDrop.currentDragSource = itemsView.collectionTreeRows[0];
+			itemsView.onDragOver({
+				preventDefault: () => {},
+				stopPropagation: () => {},
+				currentTarget: rowEl,
+				target: rowEl,
+				clientY: 50,
+				dataTransfer
+			}, index);
+			// The requested move has to be sent as an allowed effect for the drop to happen
+			assert.equal(dataTransfer.dropEffect, 'copy');
+			
+			var promise = itemsView.waitForSelect();
+			await drop(index, 0, dataTransfer);
+			await promise;
+			
+			assert.equal(attachment.parentItemID, item2.id);
+		});
+		
 		it("should move a child item from last item in list to another", async function () {
 			var collection = await createDataObject('collection');
 			await waitForItemsLoad(win);
@@ -1962,6 +2381,120 @@ describe("CollectionViewItemTree", function () {
 			);
 		});
 		
+		it("should add a dragged file to all selected collections", async function () {
+			var collection1 = await createDataObject('collection');
+			var collection2 = await createDataObject('collection');
+			
+			// Select both collections
+			await cv.selectByID("C" + collection1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + collection2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			itemsView = zp.itemsView;
+			
+			var file = getTestDataDirectory();
+			file.append('test.png');
+			
+			var idsPromise = waitForItemEvent('add');
+			
+			drop(0, -1, {
+				dropEffect: 'copy',
+				effectAllowed: 'copy',
+				types: ['application/x-moz-file'],
+				mozItemCount: 1,
+				mozGetDataAt: function (type, i) {
+					if (type == 'application/x-moz-file' && i == 0) {
+						return file;
+					}
+				}
+			})
+			
+			var ids = await idsPromise;
+			var item = Zotero.Items.get(ids[0]);
+			assert.isTrue(item.inCollection(collection1.id));
+			assert.isTrue(item.inCollection(collection2.id));
+		});
+		
+		it("should allow a file drop onto a specific item but not blank space for a cross-library selection", async function () {
+			var group = await createGroup();
+			var c1 = await createDataObject('collection');
+			var c2 = await createDataObject('collection', { libraryID: group.libraryID });
+			var userItem = await createDataObject('item', { collections: [c1.id] });
+			var groupItem = await createDataObject('item', { libraryID: group.libraryID, collections: [c2.id] });
+
+			await cv.expandLibrary(group.libraryID);
+			await cv.selectByID("C" + c1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			itemsView = zp.itemsView;
+
+			var file = getTestDataDirectory();
+			file.append('test.png');
+			var fileDataTransfer = {
+				dropEffect: 'copy',
+				effectAllowed: 'copy',
+				types: ['application/x-moz-file'],
+				mozItemCount: 1,
+				mozGetDataAt: function (type, i) {
+					if (type == 'application/x-moz-file' && i == 0) {
+						return file;
+					}
+				}
+			};
+
+			// Directly onto a specific item (which identifies the target library): allowed
+			assert.isTrue(itemsView.canDropCheck(itemsView.getRowIndexByID(userItem.id), 0, fileDataTransfer));
+			// Into blank space (ambiguous across libraries): rejected
+			assert.isFalse(itemsView.canDropCheck(-1, -1, fileDataTransfer));
+
+			// Dropping onto the group item attaches the file in the group library
+			var idsPromise = waitForItemEvent('add');
+			await drop(itemsView.getRowIndexByID(groupItem.id), 0, fileDataTransfer);
+			var ids = await idsPromise;
+			var attachment = Zotero.Items.get(ids[0]);
+			assert.equal(attachment.libraryID, group.libraryID);
+			assert.equal(attachment.parentItemID, groupItem.id);
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should allow a blank-space file drop for a mixed collection and saved-search selection regardless of order", async function () {
+			var collection = await createDataObject('collection');
+			var search = await createDataObject('search');
+
+			var file = getTestDataDirectory();
+			file.append('test.png');
+			var fileDataTransfer = {
+				dropEffect: 'copy',
+				effectAllowed: 'copy',
+				types: ['application/x-moz-file'],
+				mozItemCount: 1,
+				mozGetDataAt: function (type, i) {
+					if (type == 'application/x-moz-file' && i == 0) {
+						return file;
+					}
+				}
+			};
+
+			// Select the saved search first (so it's focused), then add the collection
+			await cv.selectByID("S" + search.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + collection.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			itemsView = zp.itemsView;
+
+			// Allowed even though the focused row is a search, since a selected
+			// collection can receive the file
+			assert.isTrue(itemsView.canDropCheck(-1, -1, fileDataTransfer));
+
+			await selectLibrary(win);
+		});
+
 		it("should create a stored top-level attachment when a file URI is dragged", async function () {
 			var promise = itemsView.waitForSelect();
 			var pdfFile = getTestDataDirectory();
@@ -2449,33 +2982,340 @@ describe("CollectionViewItemTree", function () {
 		});
 	});
 	
-	describe("#setCollectionTreeRow()", function () {
-		it("should no-op when setting the same row", async function () {
+	describe("#setCollectionTreeRows()", function () {
+		it("should no-op when setting the same rows", async function () {
 			let rowProvider = itemsView.rowProvider;
-			let currentRow = rowProvider.collectionTreeRow;
+			let currentRow = rowProvider.collectionTreeRows[0];
 			assert.ok(currentRow);
-			
+
 			let refreshSpy = sinon.spy(rowProvider, 'refresh');
-			
+
 			try {
-				await rowProvider.setCollectionTreeRow(currentRow);
+				await rowProvider.setCollectionTreeRows([currentRow]);
 				assert.equal(refreshSpy.callCount, 0);
 			}
 			finally {
 				refreshSpy.restore();
 			}
 		});
+
+		it("should treat collections, saved searches, and library roots as one kind of view", async function () {
+			let collection = await createDataObject('collection');
+			let search = await createDataObject('search');
+
+			await selectLibrary(win);
+			assert.equal(zp.itemsView.viewMode, 'default');
+
+			await cv.selectByID("C" + collection.id);
+			await waitForItemsLoad(win);
+			assert.equal(zp.itemsView.viewMode, 'default');
+
+			// A collection and a saved search together are still an ordinary view
+			cv.selection.toggleSelect(cv.getRowIndexByID("S" + search.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			assert.equal(zp.itemsView.viewMode, 'default');
+
+			await cv.selectByID("T" + Zotero.Libraries.userLibraryID);
+			await waitForItemsLoad(win);
+			assert.equal(zp.itemsView.viewMode, 'trash');
+
+			await selectLibrary(win);
+		});
+
+		it("should reject rows that don't form a single view", async function () {
+			let collection = await createDataObject('collection');
+			await cv.selectByID("C" + collection.id);
+			await waitForItemsLoad(win);
+
+			let collectionRow = cv.getRow(cv.getRowIndexByID("C" + collection.id));
+			let trashRow = cv.getRow(cv.getRowIndexByID("T" + Zotero.Libraries.userLibraryID));
+
+			let error = await getPromiseError(
+				zp.itemsView.rowProvider.setCollectionTreeRows([collectionRow, trashRow])
+			);
+			assert.match(error.message, /don't form a single view/);
+
+			await selectLibrary(win);
+		});
 	});
-	
+
+	describe("Library grouping", function () {
+		// Fluent wraps interpolated values in bidi isolation marks; strip them for
+		// plain-text comparisons
+		function stripBidi(str) {
+			return str.replace(/[⁦-⁩]/g, '');
+		}
+
+		async function selectMultipleCollections(collections) {
+			await cv.selectByID("C" + collections[0].id);
+			await waitForItemsLoad(win);
+			for (let i = 1; i < collections.length; i++) {
+				cv.selection.toggleSelect(cv.getRowIndexByID("C" + collections[i].id));
+			}
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+		}
+
+		it("should group items by library with headers in collections-list order", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+			// Reverse-alphabetical across the library boundary, so title sorting
+			// alone would put the group item first
+			let item1 = await createDataObject('item', { title: "ZZZ", collections: [collection1.id] });
+			let item2 = await createDataObject(
+				'item',
+				{ libraryID: group.libraryID, title: "AAA", collections: [collection2.id] }
+			);
+
+			await cv.expandLibrary(group.libraryID);
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			let userHeaderRow = view.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			let groupHeaderRow = view.getRowIndexByID("L" + group.libraryID);
+			let item1Row = view.getRowIndexByID(item1.id);
+			let item2Row = view.getRowIndexByID(item2.id);
+
+			assert.isNumber(userHeaderRow, "User library header should be shown");
+			assert.isNumber(groupHeaderRow, "Group library header should be shown");
+			assert.isBelow(userHeaderRow, groupHeaderRow,
+				"User library group should come first");
+			assert.isAbove(item1Row, userHeaderRow);
+			assert.isBelow(item1Row, groupHeaderRow,
+				"User library item should be in the user library group despite sorting after the group item");
+			assert.isAbove(item2Row, groupHeaderRow);
+
+			// Header rows aren't selectable
+			assert.isFalse(view.isSelectable(userHeaderRow));
+
+			// Each cross-library header is the library name plus what's selected in it
+			assert.equal(stripBidi(view.getRow(groupHeaderRow).getDisplayTitle()),
+				Zotero.Libraries.getName(group.libraryID) + " (1 collection selected)");
+
+			// A blank spacer row sits above every header except the first, for whitespace
+			// separating the sections
+			assert.notEqual(view.getRow(userHeaderRow - 1)?.type, 'spacer',
+				"No spacer above the first header");
+			assert.equal(view.getRow(groupHeaderRow - 1).type, 'spacer',
+				"Spacer row above a later header");
+			assert.isFalse(view.isSelectable(groupHeaderRow - 1),
+				"Spacer rows aren't selectable");
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should pin the section header of the library scrolled to the top", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+			await createDataObject('item', { collections: [collection1.id] });
+			// Enough group items below the group header that it can be scrolled to the top
+			await Zotero.DB.executeTransaction(async function () {
+				for (let i = 0; i < 60; i++) {
+					let item = createUnsavedDataObject(
+						'item', { libraryID: group.libraryID, collections: [collection2.id] }
+					);
+					await item.save();
+				}
+			});
+
+			await cv.expandLibrary(group.libraryID);
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			let tree = view.tree;
+			let body = tree._jsWindow.targetElement;
+			let userHeaderRow = view.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			let groupHeaderRow = view.getRowIndexByID("L" + group.libraryID);
+
+			// At the very top, the real header is in place, so nothing is pinned -- a pinned
+			// copy would just double the header
+			body.scrollTop = 0;
+			tree._updateStickySectionHeader();
+			assert.equal(tree._stickyHeader.style.display, 'none');
+
+			// Scrolling the first (user library) header up under the top pins it
+			body.scrollTop = tree._jsWindow._getItemPosition(userHeaderRow) + 5;
+			tree._updateStickySectionHeader();
+			assert.include(tree._stickyHeader.textContent,
+				Zotero.Libraries.getName(Zotero.Libraries.userLibraryID));
+
+			// The pinned header lines up horizontally with the real header row
+			let realIcon = tree._jsWindow.getElementByIndex(userHeaderRow).querySelector('.icon-item-type');
+			let stickyIcon = tree._stickyHeaderContent.querySelector('.icon-item-type');
+			assert.equal(
+				stickyIcon.getBoundingClientRect().left,
+				realIcon.getBoundingClientRect().left,
+				"Pinned header icon should align with the real header icon"
+			);
+
+			// A focused header row renders with the focus class, but the pinned copy must
+			// not carry that focus ring
+			tree.selection.focused = userHeaderRow;
+			assert.isTrue(tree._renderItem(userHeaderRow).classList.contains('focused'),
+				"Setup: a focused header row renders with the focus class");
+			tree._stickyHeaderIndex = null;
+			tree._updateStickySectionHeader();
+			assert.isFalse(tree._stickyHeaderContent.querySelector('.row').classList.contains('focused'),
+				"Pinned header should not show a focus ring");
+
+			// Scrolling the group header up under the top pins the group library header instead
+			body.scrollTop = tree._jsWindow._getItemPosition(groupHeaderRow) + 5;
+			tree._updateStickySectionHeader();
+			assert.include(tree._stickyHeader.textContent, Zotero.Libraries.getName(group.libraryID));
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should restart row striping at each section header", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+			// One user-library item so the group's first item falls on an even absolute index
+			await createDataObject('item', { collections: [collection1.id] });
+			await createDataObject('item', { libraryID: group.libraryID, collections: [collection2.id] });
+
+			await cv.expandLibrary(group.libraryID);
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			let tree = view.tree;
+			let groupHeaderRow = view.getRowIndexByID("L" + group.libraryID);
+			let firstGroupItemRow = groupHeaderRow + 1;
+			// The header is the section's unstriped row, so the item right below it is
+			// striped (odd) -- even though its absolute index is even
+			assert.equal(firstGroupItemRow % 2, 0, "Setup: first group item at an even index");
+			let elem = tree._jsWindow.getElementByIndex(firstGroupItemRow);
+			assert.isTrue(elem.classList.contains('odd'), "First item below a header is striped");
+			assert.isFalse(elem.classList.contains('even'));
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should show one summary header but not group for a single-library multi-selection", async function () {
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection');
+			let item1 = await createDataObject('item', { collections: [collection1.id] });
+			let item2 = await createDataObject('item', { collections: [collection2.id] });
+
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			// One library -> a single summary header, but not grouped into sections
+			assert.isFalse(view.rowProvider._groupedByLibrary);
+			let headerRow = view.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			assert.isNumber(headerRow, "A summary header should be shown");
+			assert.equal(stripBidi(view.getRow(headerRow).getDisplayTitle()), "2 collections selected");
+			assert.isNumber(view.getRowIndexByID(item1.id));
+			assert.isNumber(view.getRowIndexByID(item2.id));
+
+			await selectLibrary(win);
+		});
+
+		it("shouldn't include header and spacer rows in the view's items", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+			let item1 = await createDataObject('item', { collections: [collection1.id] });
+			let item2 = await createDataObject(
+				'item', { libraryID: group.libraryID, collections: [collection2.id] }
+			);
+
+			await cv.expandLibrary(group.libraryID);
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			// Two headers and a spacer sit among the rows
+			assert.equal(view.rowCount, 5);
+
+			let items = view.getSortedItems();
+			assert.sameMembers(items.map(o => o.id), [item1.id, item2.id]);
+			assert.isTrue(items.every(o => o instanceof Zotero.Item));
+			assert.sameMembers(view.getSortedItems(true), [item1.id, item2.id]);
+			assert.equal(view.objectRowCount, 2);
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("should keep headers above their items after a column sort", async function () {
+			let group = await createGroup();
+			let collection1 = await createDataObject('collection');
+			let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+			await createDataObject('item', { title: "AAA", collections: [collection1.id] });
+			await createDataObject('item', { title: "ZZZ", collections: [collection1.id] });
+			await createDataObject(
+				'item', { libraryID: group.libraryID, title: "MMM", collections: [collection2.id] }
+			);
+
+			await cv.expandLibrary(group.libraryID);
+			await selectMultipleCollections([collection1, collection2]);
+
+			let view = zp.itemsView;
+			await view.sort();
+
+			let userHeaderRow = view.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			let groupHeaderRow = view.getRowIndexByID("L" + group.libraryID);
+			assert.equal(userHeaderRow, 0, "First header stays at the top");
+			assert.equal(view.getRow(groupHeaderRow - 1).type, 'spacer',
+				"Spacer stays directly above the later header");
+			// Every item still sits within its own library's section
+			for (let i = 0; i < view.rowCount; i++) {
+				let row = view.getRow(i);
+				if (!row.isObjectRow) continue;
+				if (row.ref.libraryID == group.libraryID) {
+					assert.isAbove(i, groupHeaderRow, `Group item at row ${i}`);
+				}
+				else {
+					assert.isBelow(i, groupHeaderRow - 1, `User library item at row ${i}`);
+				}
+			}
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("shouldn't group feeds by library, even across feed libraries", async function () {
+			let feed1 = await createFeed();
+			let feed2 = await createFeed();
+			let feedItem1 = await createDataObject('feedItem', { libraryID: feed1.libraryID });
+			let feedItem2 = await createDataObject('feedItem', { libraryID: feed2.libraryID });
+
+			// Select both feeds (each is its own feed library)
+			await cv.selectByID(feed1.treeViewID);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID(feed2.treeViewID));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+
+			let view = zp.itemsView;
+			// The selection spans two feed libraries, but feeds are never grouped
+			assert.isFalse(view.rowProvider._groupedByLibrary);
+			assert.isFalse(view.getRowIndexByID("L" + feed1.libraryID),
+				"No library header should be shown for a feeds selection");
+			assert.isNumber(view.getRowIndexByID(feedItem1.id));
+			assert.isNumber(view.getRowIndexByID(feedItem2.id));
+
+			await selectLibrary(win);
+			await clearFeeds();
+		});
+	});
+
 	describe("#setFilter()", function () {
 		it("should refresh when search filter value changes", async function () {
 			let rowProvider = itemsView.rowProvider;
 			let refreshSpy = sinon.spy(rowProvider, 'refresh');
-			let setSearchStub = sinon.stub(rowProvider.collectionTreeRow, 'setSearch').returns(true);
+			let setSearchStub = sinon.stub(rowProvider.collectionTreeRows[0], 'setSearch').returns(true);
 			
 			try {
 				await rowProvider.setFilter('search', 'changed-search');
-				assert.isTrue(setSearchStub.calledOnceWithExactly('changed-search'));
+				assert.isTrue(setSearchStub.calledOnceWithExactly('changed-search',
+					Zotero.Prefs.get('search.quicksearch-mode')));
 				assert.isTrue(refreshSpy.calledOnceWithExactly({ restoreSelection: true }));
 			}
 			finally {
@@ -2487,7 +3327,7 @@ describe("CollectionViewItemTree", function () {
 		it("should not refresh when filter value is unchanged", async function () {
 			let rowProvider = itemsView.rowProvider;
 			let refreshSpy = sinon.spy(rowProvider, 'refresh');
-			let setSearchStub = sinon.stub(rowProvider.collectionTreeRow, 'setSearch').returns(false);
+			let setSearchStub = sinon.stub(rowProvider.collectionTreeRows[0], 'setSearch').returns(false);
 			
 			try {
 				await rowProvider.setFilter('search', 'unchanged-search');
@@ -2783,47 +3623,6 @@ describe("CollectionViewItemTree", function () {
 			assert.include(text, toplevelItemTwo.getDisplayTitle());
 		});
 	});
-	
-	describe('Advanced Search', function () {
-		describe('#notify', function () {
-			it('should resolve the returned promise when an item is selected', async function() {
-				var item = await createDataObject('item', { setTitle: true });
-				var promise = waitForWindow('chrome://zotero/content/advancedSearch.xhtml');
-				zp.openAdvancedSearchWindow();
-				var searchWin = await promise;
-				await searchWin.ZoteroAdvancedSearch._loadedDeferred.promise;
-				// Add condition
-				var searchBox = searchWin.document.getElementById('zotero-search-box');
-				
-				var s = new Zotero.Search();
-				s.addCondition('title', 'is', item.getField('title'))
-				searchBox.search = s;
-				
-				// Run search and wait for results
-				var o = searchWin.ZoteroAdvancedSearch;
-				var iv = o.itemsView;
-				await iv.waitForLoad();
-				await o.search();
-				await iv.waitForLoad();
-				
-				// Check results
-				assert.equal(iv.rowCount, 1);
-				
-				// Make sure an item is selected (otherwise notify resolves fine)
-				await iv.selectItem(item.id);
-				assert.equal(iv.selection.count, 1);
-
-				let notifySpy = sinon.spy(iv, 'notify');
-				await createDataObject('item');
-				assert.isTrue(notifySpy.calledOnce);
-				await notifySpy.returnValues[0];
-				notifySpy.restore();
-
-				searchWin.close();
-				await item.eraseTx();
-			});
-		});
-	});
 
 	describe("Search error handling", function () {
 		var rowProvider;
@@ -2844,7 +3643,7 @@ describe("CollectionViewItemTree", function () {
 		});
 
 		it("should show load error message on search failure", async function () {
-			var stub = stubBrokenSearch(rowProvider.collectionTreeRow);
+			var stub = stubBrokenSearch(rowProvider.collectionTreeRows[0]);
 			var setMessageSpy = sinon.spy(itemsView, 'setItemsPaneMessage');
 			try {
 				await rowProvider.refresh();
@@ -2859,7 +3658,7 @@ describe("CollectionViewItemTree", function () {
 		});
 
 		it("should recover after switching to a working collection", async function () {
-			var stub = stubBrokenSearch(rowProvider.collectionTreeRow);
+			var stub = stubBrokenSearch(rowProvider.collectionTreeRows[0]);
 			await rowProvider.refresh();
 			stub.restore();
 
@@ -2870,7 +3669,7 @@ describe("CollectionViewItemTree", function () {
 		});
 
 		it("should not re-throw SearchError from refresh()", async function () {
-			var stub = stubBrokenSearch(rowProvider.collectionTreeRow);
+			var stub = stubBrokenSearch(rowProvider.collectionTreeRows[0]);
 			try {
 				// refresh() should resolve, not reject
 				await rowProvider.refresh();
diff --git a/test/tests/collectionsTest.js b/test/tests/collectionsTest.js
index c93d8493ed..ac74ffa0c8 100644
--- a/test/tests/collectionsTest.js
+++ b/test/tests/collectionsTest.js
@@ -101,4 +101,62 @@ describe("Zotero.Collections", function () {
 			assert.notInstanceOf(collection, Zotero.Feed);
 		});
 	});
+	
+	describe("#getRecent()", function () {
+		it("should list collections most recently added first", async function () {
+			var col1 = await createDataObject('collection');
+			var col2 = await createDataObject('collection');
+			
+			Zotero.Collections.addToRecent(col1);
+			Zotero.Collections.addToRecent(col2);
+			assert.sameOrderedMembers(Zotero.Collections.getRecent().slice(0, 2), [col2, col1]);
+			
+			// Adding a collection again moves it to the front without duplicating it
+			Zotero.Collections.addToRecent(col1);
+			assert.sameOrderedMembers(Zotero.Collections.getRecent().slice(0, 2), [col1, col2]);
+		});
+		
+		it("should drop the oldest collection past the maximum for each library", async function () {
+			var group = await createGroup();
+			var groupCollection = await createDataObject('collection', { libraryID: group.libraryID });
+			Zotero.Collections.addToRecent(groupCollection);
+			
+			var collections = [];
+			for (let i = 0; i <= Zotero.Collections.MAX_RECENT; i++) {
+				let collection = await createDataObject('collection');
+				collections.push(collection);
+				Zotero.Collections.addToRecent(collection);
+			}
+			
+			var recent = Zotero.Collections.getRecent(Zotero.Libraries.userLibraryID);
+			assert.lengthOf(recent, Zotero.Collections.MAX_RECENT);
+			assert.notInclude(recent, collections[0]);
+			assert.include(recent, collections[1]);
+			// Another library's collections aren't pushed out along with them
+			assert.include(Zotero.Collections.getRecent(group.libraryID), groupCollection);
+		});
+		
+		it("should skip trashed collections and collections in other libraries", async function () {
+			var group = await createGroup();
+			var groupCollection = await createDataObject('collection', { libraryID: group.libraryID });
+			var trashed = await createDataObject('collection');
+			var collection = await createDataObject('collection');
+			
+			Zotero.Collections.addToRecent(groupCollection);
+			Zotero.Collections.addToRecent(trashed);
+			Zotero.Collections.addToRecent(collection);
+			
+			trashed.deleted = true;
+			await trashed.saveTx();
+			
+			var recent = Zotero.Collections.getRecent();
+			assert.include(recent, collection);
+			assert.include(recent, groupCollection);
+			assert.notInclude(recent, trashed);
+			
+			var userRecent = Zotero.Collections.getRecent(Zotero.Libraries.userLibraryID);
+			assert.include(userRecent, collection);
+			assert.notInclude(userRecent, groupCollection);
+		});
+	});
 })
diff --git a/test/tests/data/57173eea-07fc-3382-a3f7-548dff05def8@www.mendeley.com.sqlite b/test/tests/data/57173eea-07fc-3382-a3f7-548dff05def8@www.mendeley.com.sqlite
new file mode 100644
index 0000000000..357403a962
Binary files /dev/null and b/test/tests/data/57173eea-07fc-3382-a3f7-548dff05def8@www.mendeley.com.sqlite differ
diff --git a/test/tests/data/test-js.html b/test/tests/data/test-js.html
index d9bf2b19d8..6550a9d59e 100644
--- a/test/tests/data/test-js.html
+++ b/test/tests/data/test-js.html
@@ -8,6 +8,7 @@
 		};
 	</script>
 	<body>
+		<p>Static content</p>
 		<p id="target"/>
 	</body>
 </html>
diff --git a/test/tests/dataObjectTest.js b/test/tests/dataObjectTest.js
index 9aa9f21b1a..de371967e5 100644
--- a/test/tests/dataObjectTest.js
+++ b/test/tests/dataObjectTest.js
@@ -52,6 +52,85 @@ describe("Zotero.DataObject", function () {
 		})
 	})
 	
+	describe("#clientVersion", function () {
+		it("should be set to library clientVersion after creating object", async function () {
+			for (let type of types) {
+				let obj = await createDataObject(type);
+				assert.equal(obj.clientVersion, obj.library.clientVersion);
+				await obj.eraseTx();
+			}
+		});
+
+		it("should load 0 as a number", async function () {
+			for (let type of types) {
+				let objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(type);
+				let obj = await createDataObject(type);
+				let id = obj.id;
+				await Zotero.DB.queryAsync(
+					`UPDATE ${objectsClass.table} SET clientVersion=0 WHERE ${objectsClass.idColumn}=?`,
+					id
+				);
+				objectsClass.unload(id);
+				obj = await objectsClass.getAsync(id);
+				assert.strictEqual(obj.clientVersion, 0, type + " clientVersion mismatch");
+			}
+		});
+
+		it("should increase after modifying object", async function () {
+			for (let type of types) {
+				let obj = await createDataObject(type);
+				let clientVersion = obj.clientVersion;
+
+				await modifyDataObject(obj);
+				
+				assert.isAbove(obj.clientVersion, clientVersion);
+				assert.equal(obj.clientVersion, obj.library.clientVersion);
+				
+				await obj.eraseTx();
+			}
+		});
+
+		it("should increase once per library per transaction", async function () {
+			for (let type of types) {
+				let obj1 = await createDataObject(type);
+				let obj2 = await createDataObject(type);
+				
+				let group = await getGroup();
+				let obj3 = await createDataObject(type, { libraryID: group.libraryID });
+				
+				assert.isBelow(obj1.clientVersion, obj2.clientVersion);
+				assert.equal(obj2.clientVersion, Zotero.Libraries.userLibrary.clientVersion);
+				
+				await modifyDataObject(obj1);
+				assert.isAbove(obj1.clientVersion, obj2.clientVersion);
+				assert.equal(obj1.clientVersion, Zotero.Libraries.userLibrary.clientVersion);
+				
+				let libraryVersionBefore = Zotero.Libraries.userLibrary.clientVersion;
+				let groupVersionBefore = group.clientVersion;
+				await Zotero.DB.executeTransaction(async () => {
+					await modifyDataObject(obj1, undefined, { tx: false });
+					await modifyDataObject(obj2, undefined, { tx: false });
+					await modifyDataObject(obj3, undefined, { tx: false });
+				});
+				assert.equal(obj1.clientVersion, Zotero.Libraries.userLibrary.clientVersion);
+				assert.equal(obj1.clientVersion, obj2.clientVersion);
+				assert.notEqual(obj1.clientVersion, libraryVersionBefore);
+				
+				assert.equal(obj3.clientVersion, group.clientVersion);
+				assert.notEqual(obj3.clientVersion, groupVersionBefore);
+			}
+		});
+
+		it("should increment library clientVersion when object is deleted", async function () {
+			for (let type of types) {
+				let obj = await createDataObject(type);
+				let libraryVersion = obj.library.clientVersion;
+				await obj.eraseTx();
+				assert.equal(obj.library.clientVersion, libraryVersion + 1);
+			}
+		});
+	});
+	
 	describe("#synced", function () {
 		it("should be set to false after creating object", async function () {
 			for (let type of types) {
diff --git a/test/tests/dataObjectUtilitiesTest.js b/test/tests/dataObjectUtilitiesTest.js
index 62a110ac3e..bb9cd0a938 100644
--- a/test/tests/dataObjectUtilitiesTest.js
+++ b/test/tests/dataObjectUtilitiesTest.js
@@ -345,7 +345,44 @@ describe("Zotero.DataObjectUtilities", function () {
 					Zotero.debug(changes);
 					assert.lengthOf(changes, 0);
 				})
-				
+
+				it("should diff conditions as an ordered unit, not an unordered set", function () {
+					// Condition order and group markers are structural, so the same conditions
+					// with the group wrapping a different one is a real change the diff must catch.
+					var json1 = {
+						conditions: [
+							{ condition: 'title', operator: 'contains', value: 'foo' },
+							{ condition: 'groupStart', operator: 'true', value: '' },
+							{ condition: 'tag', operator: 'is', value: 'x' },
+							{ condition: 'groupEnd', operator: 'true', value: '' }
+						]
+					};
+					var json2 = {
+						conditions: [
+							{ condition: 'groupStart', operator: 'true', value: '' },
+							{ condition: 'title', operator: 'contains', value: 'foo' },
+							{ condition: 'groupEnd', operator: 'true', value: '' },
+							{ condition: 'tag', operator: 'is', value: 'x' }
+						]
+					};
+					var changes = Zotero.DataObjectUtilities.diff(json1, json2);
+					assert.lengthOf(changes, 1);
+					assert.equal(changes[0].field, 'conditions');
+					assert.equal(changes[0].op, 'modify');
+					assert.deepEqual(changes[0].value, json2.conditions);
+				})
+
+				it("should show no change for identical conditions", function () {
+					var json1 = {
+						conditions: [{ condition: 'title', operator: 'is', value: 'A' }]
+					};
+					var json2 = {
+						conditions: [{ condition: 'title', operator: 'is', value: 'A' }]
+					};
+					var changes = Zotero.DataObjectUtilities.diff(json1, json2);
+					assert.lengthOf(changes, 0);
+				})
+
 				/*it("should not show an empty conditions object and a missing one as different", function () {
 					var json1 = {
 						conditions: []
@@ -738,82 +775,25 @@ describe("Zotero.DataObjectUtilities", function () {
 		// Search conditions
 		//
 		describe("conditions", function () {
-			it("should add a condition", function () {
+			// Conditions are applied as a whole ordered array (op: 'modify'), not merged
+			// member-by-member, so group structure (order + marker pairing) is preserved
+			it("should replace conditions with the modified array", function () {
 				var json = {
 					conditions: [
-						{
-							condition: "title",
-							op: "contains",
-							value: "A"
-						}
+						{ condition: "title", operator: "contains", value: "A" }
 					]
 				};
+				var newConditions = [
+					{ condition: "title", operator: "contains", value: "A" },
+					{ condition: "groupStart", operator: "true", value: "" },
+					{ condition: "tag", operator: "is", value: "x" },
+					{ condition: "groupEnd", operator: "true", value: "" }
+				];
 				var changes = [
-					{
-						field: "conditions",
-						op: "member-add",
-						value: {
-							condition: "title",
-							op: "contains",
-							value: "B"
-						}
-					}
+					{ field: "conditions", op: "modify", value: newConditions }
 				];
 				Zotero.DataObjectUtilities.applyChanges(json, changes);
-				assert.sameDeepMembers(
-					json.conditions,
-					[
-						{
-							condition: "title",
-							op: "contains",
-							value: "A"
-						},
-						{
-							condition: "title",
-							op: "contains",
-							value: "B"
-						}
-					]
-				);
-			})
-			
-			it("should remove a condition", function () {
-				var json = {
-					conditions: [
-						{
-							condition: "title",
-							op: "contains",
-							value: "A"
-						},
-						{
-							condition: "title",
-							op: "contains",
-							value: "B"
-						}
-					]
-				};
-				var changes = [
-					{
-						field: "conditions",
-						op: "member-remove",
-						value: {
-							condition: "title",
-							op: "contains",
-							value: "B"
-						}
-					}
-				];
-				Zotero.DataObjectUtilities.applyChanges(json, changes);
-				assert.sameDeepMembers(
-					json.conditions,
-					[
-						{
-							condition: "title",
-							op: "contains",
-							value: "A"
-						}
-					]
-				);
+				assert.deepEqual(json.conditions, newConditions);
 			})
 		})
 	})
diff --git a/test/tests/dataObjectsTest.js b/test/tests/dataObjectsTest.js
index 96b778f2dd..1cc11266cf 100644
--- a/test/tests/dataObjectsTest.js
+++ b/test/tests/dataObjectsTest.js
@@ -41,16 +41,10 @@ describe("Zotero.DataObjects", function () {
 			for (let type of types) {
 				let objectsClass = Zotero.DataObjectUtilities.getObjectsClassForObjectType(type);
 				var obj;
-				try {
-					await Zotero.DB.executeTransaction(async function () {
-						obj = createUnsavedDataObject(type);
-						await obj.save();
-						throw 'Aborting transaction -- ignore';
-					});
-				}
-				catch (e) {
-					if (typeof e != 'string' || !e.startsWith('Aborting transaction')) throw e;
-				}
+				await executeTransactionWithForcedRollback(async function () {
+					obj = createUnsavedDataObject(type);
+					await obj.save();
+				});
 				
 				// The registered identifiers should be reset in a rollback handler
 				var libraryKey = objectsClass.getLibraryAndKeyFromID(obj.id);
diff --git a/test/tests/dbTest.js b/test/tests/dbTest.js
index d30a4a7b31..b65ea206c8 100644
--- a/test/tests/dbTest.js
+++ b/test/tests/dbTest.js
@@ -268,15 +268,9 @@ describe("Zotero.DB", function () {
 		
 		it("should roll back on error", async function () {
 			await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (1)");
-			try {
-				await Zotero.DB.executeTransaction(async function () {
-					await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (2)");
-					throw 'Aborting transaction -- ignore';
-				});
-			}
-			catch (e) {
-				if (typeof e != 'string' || !e.startsWith('Aborting transaction')) throw e;
-			}
+			await executeTransactionWithForcedRollback(async function () {
+				await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (2)");
+			});
 			var count = await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM " + tmpTable + "");
 			assert.equal(count, 1);
 			
@@ -288,27 +282,56 @@ describe("Zotero.DB", function () {
 		
 		it("should run onRollback callbacks", async function () {
 			var callbackRan = false;
-			try {
-				await Zotero.DB.executeTransaction(
-					async function () {
-						await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (1)");
-						throw 'Aborting transaction -- ignore';
-					},
-					{
-						onRollback: function () {
-							callbackRan = true;
-						}
+			await executeTransactionWithForcedRollback(
+				async function () {
+					await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (1)");
+				},
+				{
+					onRollback: function () {
+						callbackRan = true;
 					}
-				);
-			}
-			catch (e) {
-				if (typeof e != 'string' || !e.startsWith('Aborting transaction')) throw e;
-			}
+				}
+			);
 			assert.ok(callbackRan);
 			
 			await Zotero.DB.queryAsync("DROP TABLE " + tmpTable);
 		});
 		
+		it("shouldn't reject or roll back on an error in a commit callback", async function () {
+			var laterCallbackRan = false;
+			await Zotero.DB.executeTransaction(async function () {
+				await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (1)");
+				Zotero.DB.addCurrentCallback('commit', function () {
+					throw new Error("Commit callback error -- ignore");
+				});
+				Zotero.DB.addCurrentCallback('commit', function () {
+					laterCallbackRan = true;
+				});
+			});
+			var count = await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM " + tmpTable);
+			assert.equal(count, 1);
+			assert.ok(laterCallbackRan);
+			
+			await Zotero.DB.queryAsync("DROP TABLE " + tmpTable);
+		});
+		
+		it("should discard commit callbacks from a rolled-back transaction", async function () {
+			var callbackRan = false;
+			await executeTransactionWithForcedRollback(async function () {
+				await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (1)");
+				Zotero.DB.addCurrentCallback('commit', function () {
+					callbackRan = true;
+				});
+			});
+			
+			await Zotero.DB.executeTransaction(async function () {
+				await Zotero.DB.queryAsync("INSERT INTO " + tmpTable + " VALUES (2)");
+			});
+			assert.isFalse(callbackRan);
+			
+			await Zotero.DB.queryAsync("DROP TABLE " + tmpTable);
+		});
+		
 		it("should time out on nested transactions", async function () {
 			var e;
 			await Zotero.DB.executeTransaction(async function () {
@@ -354,6 +377,108 @@ describe("Zotero.DB", function () {
 			assert.ok(callback1Ran);
 			assert.ok(callback2Ran);
 		});
+		
+		// Corrupt a table's pages, leaving the header, the schema and both table roots
+		// readable so that the database still opens and bar can be written to
+		async function createDatabaseWithCorruptTable() {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE bar (a INTEGER PRIMARY KEY, b TEXT)");
+			await db.queryAsync("CREATE TABLE foo (a INTEGER PRIMARY KEY, b TEXT)");
+			await db.executeTransaction(async function () {
+				for (let i = 0; i < 500; i++) {
+					await db.queryAsync("INSERT INTO foo VALUES (?, ?)", [i, 'x'.repeat(300)]);
+				}
+			});
+			let pageSize = await db.valueQueryAsync("PRAGMA page_size");
+			await db.closeDatabase();
+			for (let suffix of ['-wal', '-shm', '-journal']) {
+				await IOUtils.remove(dbPath + suffix, { ignoreAbsent: true });
+			}
+			
+			let bytes = await IOUtils.read(dbPath);
+			for (let i = 4 * pageSize; i < bytes.length; i++) {
+				bytes[i] = 0xde;
+			}
+			await IOUtils.write(dbPath, bytes);
+			
+			db = new Zotero.DBConnection(dbPath);
+			// Corruption handling is skipped for external databases
+			db._externalDB = false;
+			return db;
+		}
+		
+		it("should detect corruption reported by the commit of a transaction", async function () {
+			let db = await createDatabaseWithCorruptTable();
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			// Decline the offer to recover
+			let promptStub = sinon.stub().returns(1);
+			Services.prompt = { confirmEx: promptStub };
+			var e;
+			try {
+				e = await getPromiseError(db.executeTransaction(async function () {
+					await db.queryAsync("INSERT INTO bar VALUES (1, 'written')");
+					// SQLite prohibits the commit once a statement in the transaction has
+					// hit the corrupt pages, so swallow that error the way a caller doing
+					// optional work would
+					try {
+						await db.valueQueryAsync("SELECT COUNT(*) FROM foo");
+					}
+					catch {}
+				}));
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				Zotero.skipLoading = false;
+				try {
+					await db.closeDatabase();
+				}
+				catch {}
+				Zotero.hideZoteroPaneOverlays();
+			}
+			
+			// The commit is what failed, so the error arrives without the query details
+			// that queryAsync() adds to a statement error
+			assert.include(e.message, "database disk image is malformed");
+			assert.notInclude(e.message, "[QUERY:");
+			assert.equal(promptStub.callCount, 1);
+			assert.include(
+				promptStub.args[0][2],
+				Zotero.getString('db.dbCorrupted', [Zotero.appName, 'test.sqlite'])
+			);
+		});
+		
+		it("shouldn't prompt twice for one corruption error in a transaction", async function () {
+			let db = await createDatabaseWithCorruptTable();
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			let promptStub = sinon.stub().returns(1);
+			Services.prompt = { confirmEx: promptStub };
+			var e;
+			try {
+				// queryAsync() checks the statement error itself, and the same error then
+				// propagates out of the transaction
+				e = await getPromiseError(db.executeTransaction(async function () {
+					await db.queryAsync("SELECT COUNT(*) FROM foo");
+				}));
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				Zotero.skipLoading = false;
+				try {
+					await db.closeDatabase();
+				}
+				catch {}
+				Zotero.hideZoteroPaneOverlays();
+			}
+			
+			assert.include(e.message, "database disk image is malformed");
+			assert.equal(promptStub.callCount, 1);
+		});
 	})
 	
 	
@@ -431,7 +556,840 @@ describe("Zotero.DB", function () {
 		});
 		
 	});
+	
 
+	describe("#_checkException()", function () {
+		afterEach(function () {
+			// Unlock the pane locked by recovery progress messages
+			Zotero.hideZoteroPaneOverlays();
+		});
+		
+		it("should save a verified copy and restart on a corruption error with stale journal files", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			// Corruption handling is skipped for external databases. Set after the database
+			// is created and closed so that opening it doesn't register the idle observer.
+			db._externalDB = false;
+			
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			let promptStub = sinon.stub().throws(new Error("Prompt shouldn't be shown"));
+			Services.prompt = { confirmEx: promptStub };
+			// Simulate the live database failing the quick check, as with a genuinely
+			// mismatched WAL -- SQLite ignores the fake WAL file, which has invalid magic
+			let quickCheckStub = sinon.stub(db, 'valueQueryAsync').resolves('row 1 missing');
+			try {
+				await db._checkException(new Error("database disk image is malformed"));
+				// Further corruption errors while the restart is pending should be ignored
+				await db._checkException(new Error("database disk image is malformed"));
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				quickCheckStub.restore();
+				Zotero.skipLoading = false;
+				await db.closeDatabase();
+			}
+			
+			assert.isTrue(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.repair.tmp.verified'));
+			assert.isTrue(quickCheckStub.calledOnceWithExactly("PRAGMA main.quick_check(1)"));
+			assert.isTrue(quitStub.calledOnce);
+			assert.isTrue(promptStub.notCalled);
+		});
+		
+		it("shouldn't start recovery if the main database passes a quick check", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			// Flip with the connection open so that the real quick check below doesn't reopen
+			// the database via internal initialization, which registers the idle observer
+			db._externalDB = false;
+			
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			let promptStub = sinon.stub().throws(new Error("Prompt shouldn't be shown"));
+			Services.prompt = { confirmEx: promptStub };
+			let progressSpy = sinon.spy(Zotero, 'showZoteroPaneProgressMeter');
+			try {
+				// SQLite ignores the fake WAL file, which has invalid magic, so the real
+				// quick check passes and the error is treated as attached-database corruption
+				assert.isTrue(
+					await db._checkException(new Error("database disk image is malformed"))
+				);
+				assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+				assert.isTrue(await IOUtils.exists(dbPath + '-wal'));
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				progressSpy.restore();
+				await db.closeDatabase();
+			}
+			assert.isTrue(quitStub.notCalled);
+			assert.isTrue(promptStub.notCalled);
+			// Progress text should have been shown during the check and the pane unlocked
+			// after the early return
+			assert.isTrue(progressSpy.called);
+			assert.isFalse(Zotero.locked);
+		});
+		
+		it("should restore another operation's progress display after an attached-database error", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			// Flip with the connection open so that the real quick check below doesn't reopen
+			// the database via internal initialization
+			db._externalDB = false;
+			
+			// Simulate another operation's determinate progress display, advanced partway
+			let outerToken = Zotero.showZoteroPaneProgressMeter("Other operation", true);
+			Zotero.updateZoteroPaneProgressMeter(30);
+			let progressSpy = sinon.spy(Zotero, 'showZoteroPaneProgressMeter');
+			try {
+				// The real quick check passes, so the error is treated as attached-database
+				// corruption, and the other operation's display should be restored
+				assert.isTrue(
+					await db._checkException(new Error("database disk image is malformed"))
+				);
+				assert.isTrue(progressSpy.calledWith("Other operation", true));
+				assert.isTrue(Zotero.locked);
+			}
+			finally {
+				progressSpy.restore();
+				await db.closeDatabase();
+			}
+			// Ownership should have been returned to the other operation, so its own token
+			// can still restore
+			Zotero.restoreZoteroPaneProgressMeter(outerToken);
+			assert.isFalse(Zotero.locked);
+		});
+		
+		it("should unlock the pane if recovery is declined", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			db._externalDB = false;
+			
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			// Cancel the corruption dialog
+			let promptStub = sinon.stub().returns(1);
+			Services.prompt = { confirmEx: promptStub };
+			let quickCheckStub = sinon.stub(db, 'valueQueryAsync').resolves('row 1 missing');
+			try {
+				assert.isFalse(
+					await db._checkException(new Error("database disk image is malformed"))
+				);
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				quickCheckStub.restore();
+				await db.closeDatabase();
+			}
+			assert.isTrue(promptStub.called);
+			assert.isTrue(quitStub.notCalled);
+			assert.isFalse(Zotero.locked);
+			assert.isFalse(await IOUtils.exists(dbPath + '.is.corrupt'));
+			// Later corruption errors can re-trigger handling
+			assert.isFalse(db._handlingCorruption);
+		});
+		
+		it("shouldn't start recovery if the quick check fails for a non-corruption reason", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			db._externalDB = false;
+			
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			let promptStub = sinon.stub().throws(new Error("Prompt shouldn't be shown"));
+			Services.prompt = { confirmEx: promptStub };
+			let quickCheckStub = sinon.stub(db, 'valueQueryAsync')
+				.rejects(new Error("disk I/O error"));
+			try {
+				assert.isTrue(
+					await db._checkException(new Error("database disk image is malformed"))
+				);
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				quickCheckStub.restore();
+				await db.closeDatabase();
+			}
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isTrue(quitStub.notCalled);
+			assert.isTrue(promptStub.notCalled);
+			assert.isFalse(Zotero.locked);
+		});
+		
+		it("should skip the quick check if main-database corruption is already confirmed", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			db._externalDB = false;
+			
+			let quitStub = sinon.stub(Zotero.Utilities.Internal, 'quit');
+			let promptService = Services.prompt;
+			let promptStub = sinon.stub().throws(new Error("Prompt shouldn't be shown"));
+			Services.prompt = { confirmEx: promptStub };
+			try {
+				// The quick check would pass here, but a caller that has already confirmed
+				// corruption with a full integrity check overrides it
+				await db._checkException(
+					new Error("database disk image is malformed"),
+					{ mainConfirmedCorrupt: true }
+				);
+			}
+			finally {
+				quitStub.restore();
+				Services.prompt = promptService;
+				Zotero.skipLoading = false;
+				await db.closeDatabase();
+			}
+			assert.isTrue(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isTrue(quitStub.calledOnce);
+			assert.isTrue(promptStub.notCalled);
+		});
+	});
+	
+
+	describe("#_getConnectionAsync()", function () {
+		afterEach(function () {
+			// Unlock the pane locked by recovery progress messages
+			Zotero.hideZoteroPaneOverlays();
+		});
+		
+		it("shouldn't treat an operational integrity-check error after an unclean shutdown as corruption", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			// Open through internal initialization so that the unclean-shutdown check runs
+			db._externalDB = false;
+			
+			let stub = sinon.stub(db, 'valueQueryAsync');
+			stub.callThrough();
+			stub.withArgs("PRAGMA integrity_check(1)").rejects(new Error("disk I/O error"));
+			try {
+				let e = await getPromiseError(db.queryAsync("SELECT COUNT(*) FROM foo"));
+				assert.include(e.message, "disk I/O error");
+			}
+			finally {
+				stub.restore();
+				await db.closeDatabase();
+			}
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.damaged'));
+		});
+		
+		it("should flag the connection as read-only if the database isn't writable", async function () {
+			if (Zotero.isWin) {
+				this.skip();
+			}
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await IOUtils.setPermissions(dbPath, 0o444);
+			// Open through internal initialization so that the journal mode is set
+			db._externalDB = false;
+			
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 0);
+				assert.isTrue(db.readOnly);
+			}
+			finally {
+				await db.closeDatabase();
+				await IOUtils.setPermissions(dbPath, 0o644);
+			}
+			
+			// The flag is cleared when the database can be written again
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			assert.isFalse(db.readOnly);
+			await db.closeDatabase();
+		});
+	});
+	
+
+	describe("#_handleCorruptionMarker()", function () {
+		afterEach(function () {
+			// Unlock the pane locked by recovery progress messages
+			Zotero.hideZoteroPaneOverlays();
+		});
+		
+		// Create a database whose only damage is index inconsistencies -- an index built over
+		// different values transplanted onto another table with the same row count -- which
+		// fails a full integrity check but passes a quick check
+		async function createDBWithIndexDamage(db, path, { unique = false, values = "(1), (2), (3)", dummyValues = "(4), (5), (6)" } = {}) {
+			let connection = await db.Sqlite.openConnection({ path });
+			try {
+				await connection.execute("CREATE TABLE foo (a INTEGER)");
+				await connection.execute(`INSERT INTO foo VALUES ${values}`);
+				await connection.execute("CREATE TABLE dummy (a INTEGER)");
+				await connection.execute(`INSERT INTO dummy VALUES ${dummyValues}`);
+				await connection.execute(`CREATE ${unique ? 'UNIQUE ' : ''}INDEX idx ON dummy(a)`);
+				await connection.execute("PRAGMA writable_schema=ON");
+				await connection.execute("UPDATE sqlite_master SET tbl_name='foo', "
+					+ `sql='CREATE ${unique ? 'UNIQUE ' : ''}INDEX idx ON foo(a)' WHERE name='idx'`);
+				await connection.execute("PRAGMA writable_schema=OFF");
+			}
+			finally {
+				await connection.close();
+			}
+		}
+		
+		it("should repair a backup with index damage by rebuilding indexes on a copy", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await createDBWithIndexDamage(db, dbPath + '.bak');
+			assert.isFalse(await db._integrityCheckFile(dbPath + '.bak'));
+			assert.isTrue(await db._integrityCheckFile(dbPath + '.bak', true));
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 3);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			// Restored database should pass a full integrity check, with the backup and its
+			// index damage left as is
+			assert.isTrue(await db._integrityCheckFile(dbPath));
+			assert.isFalse(await db._integrityCheckFile(dbPath + '.bak'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.bak.reindex.tmp'));
+		});
+		
+		it("should create a new database if the backup's indexes can't be rebuilt", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			// Duplicate values in the table make rebuilding the unique index impossible
+			await createDBWithIndexDamage(db, dbPath + '.bak', {
+				unique: true, values: "(1), (1)", dummyValues: "(4), (5)"
+			});
+			assert.isFalse(await db._integrityCheckFile(dbPath + '.bak'));
+			assert.isTrue(await db._integrityCheckFile(dbPath + '.bak', true));
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM sqlite_master"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			assert.isTrue(stub.called);
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.bak.reindex.tmp'));
+		});
+
+		it("should abort recovery on an operational error during index rebuilding", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await createDBWithIndexDamage(db, dbPath + '.bak');
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			await Zotero.File.putContentsAsync(dbPath + '.is.corrupt', '');
+			
+			// Simulate a journal file of the reindex copy that can't be removed
+			let stub = sinon.stub(db, '_removeJournalFiles');
+			stub.callThrough();
+			stub.withArgs(dbPath + '.bak.reindex.tmp').resolves(false);
+			let alertStub = sinon.stub(Zotero, 'alert');
+			try {
+				let e = await getPromiseError(db._handleCorruptionMarker());
+				assert.include(e.message, "reindex copy");
+			}
+			finally {
+				stub.restore();
+				alertStub.restore();
+				await db.closeDatabase();
+			}
+			// No new database should have been created, and the backup, damaged files, and
+			// corruption marker should remain for a retry
+			assert.isFalse(await IOUtils.exists(dbPath));
+			assert.isTrue(await IOUtils.exists(dbPath + '.bak'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged-wal'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.is.corrupt'));
+			assert.isTrue(alertStub.notCalled);
+		});
+		
+		it("should move a stale WAL file to .damaged-wal when restoring from backup", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await IOUtils.copy(dbPath, dbPath + '.bak');
+			
+			// Simulate a corrupted database and a stale WAL file left behind by a force-quit
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				// Restored database should be usable
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			
+			// Stale WAL file should have been moved alongside the .damaged file
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged'));
+			assert.equal(await Zotero.File.getContentsAsync(dbPath + '.damaged-wal'), 'stale wal data');
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+		});
+		
+		it("should keep a valid database file and remove a stale WAL file", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await IOUtils.copy(dbPath, dbPath + '.bak');
+			
+			// Add a row not in the backup, and simulate a stale WAL file next to the valid
+			// database file
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			try {
+				await db._handleCorruptionMarker();
+				// Database file should be kept as is, not restored from the backup
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+			
+			// Stale WAL file should have been removed, and no .damaged file created
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.damaged'));
+		});
+		
+		it("should keep a valid database file if an interrupted recovery already removed the journal files", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await IOUtils.copy(dbPath, dbPath + '.bak');
+			// Newer data not in the backup, with no journal files left
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			
+			await db._handleCorruptionMarker();
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+			assert.isFalse(await IOUtils.exists(dbPath + '.damaged'));
+		});
+		
+		it("should restore from backup if the database file was already moved by an interrupted recovery", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await IOUtils.copy(dbPath, dbPath + '.bak');
+			await IOUtils.move(dbPath, dbPath + '.damaged');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			assert.isTrue(await IOUtils.exists(dbPath));
+		});
+		
+		it("should create a new database if the backup is also corrupt", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			await Zotero.File.putContentsAsync(dbPath + '.bak', 'corrupted backup');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				// New empty database should have been created
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM sqlite_master"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			assert.isTrue(stub.called);
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged-wal'));
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+		});
+		
+		it("should create a new database if no backup exists", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await Zotero.File.putContentsAsync(dbPath, 'corrupted data');
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			let stub = sinon.stub(Zotero, 'alert');
+			try {
+				await db._handleCorruptionMarker();
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM sqlite_master"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+				stub.restore();
+			}
+			assert.isTrue(stub.called);
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged'));
+			assert.isTrue(await IOUtils.exists(dbPath + '.damaged-wal'));
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+		});
+	});
+	
+
+	describe("#_applyPendingRepair()", function () {
+		afterEach(function () {
+			// Unlock the pane locked by recovery progress messages
+			Zotero.hideZoteroPaneOverlays();
+		});
+		
+		it("should swap in a verified copy saved before a restart", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '-wal', 'stale wal data');
+			
+			// Save a verified copy, as _checkException() does before restarting
+			assert.isTrue(await db._checkValidWithoutJournalFiles(true));
+			assert.isTrue(await IOUtils.exists(dbPath + '.repair.tmp'));
+			
+			// Simulate the stale WAL data being checkpointed into the database file when the
+			// connection is closed
+			await Zotero.File.putContentsAsync(dbPath, 'poisoned data');
+			
+			// The verified copy should be swapped in
+			await db._applyPendingRepair();
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp.verified'));
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+		});
+		
+		it("should apply a valid repair file after rechecking if it doesn't match its verification record", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			assert.isTrue(await db._checkValidWithoutJournalFiles(true));
+			await Zotero.File.putContentsAsync(
+				dbPath + '.repair.tmp.verified', JSON.stringify({ size: 1, lastModified: 1 })
+			);
+			await Zotero.File.putContentsAsync(dbPath, 'poisoned data');
+			
+			await db._applyPendingRepair();
+			
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp.verified'));
+		});
+		
+		it("should remove an invalid repair file that doesn't match its verification record", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			await Zotero.File.putContentsAsync(dbPath + '.repair.tmp', 'corrupted repair data');
+			await Zotero.File.putContentsAsync(
+				dbPath + '.repair.tmp.verified', JSON.stringify({ size: 1, lastModified: 1 })
+			);
+			
+			await db._applyPendingRepair();
+			
+			// Repair file should have been rechecked, found invalid, and removed, with the
+			// database file left in place
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp'));
+			assert.isFalse(await IOUtils.exists(dbPath + '.repair.tmp.verified'));
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 0);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+		});
+		
+		it("should clean up leftover temporary files from interrupted checks", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			let suffixes = [
+				'.check.tmp',
+				'.check.tmp-wal',
+				'.repair.tmp-wal',
+				'.repair.tmp.verified',
+				'.bak.reindex.tmp',
+				'.bak.reindex.tmp-wal',
+				'.bak.reindex.tmp-shm'
+			];
+			for (let suffix of suffixes) {
+				await Zotero.File.putContentsAsync(dbPath + suffix, 'leftover data');
+			}
+			
+			await db._applyPendingRepair();
+			
+			for (let suffix of suffixes) {
+				assert.isFalse(await IOUtils.exists(dbPath + suffix), suffix);
+			}
+		});
+
+		it("shouldn't apply a pending repair file for an external database", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.closeDatabase();
+			// Save a copy without the row added below
+			await IOUtils.copy(dbPath, dbPath + '.repair.tmp');
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			
+			// On reopen, the repair file should be ignored
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+			assert.isTrue(await IOUtils.exists(dbPath + '.repair.tmp'));
+		});
+	});
+	
+
+	describe("#_downgradeDatabaseFromWAL()", function () {
+		it("should convert a cleanly closed WAL database to a rollback journal", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("PRAGMA journal_mode=WAL");
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await db.closeDatabase();
+			
+			assert.isTrue(await db._downgradeDatabaseFromWAL(dbPath));
+			
+			let header = await IOUtils.read(dbPath, { maxBytes: 20 });
+			assert.equal(header[18], 1);
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+			try {
+				assert.equal(await db.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+				assert.equal(await db.valueQueryAsync("PRAGMA main.journal_mode"), 'delete');
+			}
+			finally {
+				await db.closeDatabase();
+			}
+		});
+			
+		it("should replay a non-empty WAL", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("PRAGMA journal_mode=WAL");
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			// Copy the files before closing, so that the copied WAL contains uncheckpointed data
+			await IOUtils.copy(dbPath, dbPath + '.copy');
+			await IOUtils.copy(dbPath + '-wal', dbPath + '.copy-wal');
+			await db.closeDatabase(true);
+			await IOUtils.move(dbPath + '.copy', dbPath);
+			await IOUtils.move(dbPath + '.copy-wal', dbPath + '-wal');
+			assert.isAbove((await IOUtils.stat(dbPath + '-wal')).size, 0);
+			
+			let db2 = new Zotero.DBConnection(dbPath);
+			assert.isTrue(await db2._downgradeDatabaseFromWAL(dbPath));
+			try {
+				assert.equal(await db2.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db2.closeDatabase();
+			}
+		});
+
+		it("should preserve the original files if the converted database fails validation", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("PRAGMA journal_mode=WAL");
+			await db.queryAsync("CREATE TABLE foo (a TEXT)");
+			for (let i = 0; i < 100; i++) {
+				await db.queryAsync("INSERT INTO foo VALUES (?)", "x".repeat(4000));
+			}
+			await db.closeDatabase(true);
+
+			// Reopen and make a small change, so that the WAL contains only the pages it
+			// touched, and capture the files before the WAL is checkpointed at close
+			let db2 = new Zotero.DBConnection(dbPath);
+			await db2.queryAsync("PRAGMA journal_mode=WAL");
+			await db2.queryAsync("INSERT INTO foo VALUES ('y')");
+			await IOUtils.copy(dbPath, dbPath + '.copy');
+			await IOUtils.copy(dbPath + '-wal', dbPath + '.copy-wal');
+			await db2.closeDatabase(true);
+			await IOUtils.move(dbPath + '.copy', dbPath);
+			await IOUtils.move(dbPath + '.copy-wal', dbPath + '-wal');
+
+			// Zero out a page in the middle of the database file that the WAL doesn't
+			// contain, so that both the converted copy and the database file alone fail
+			// their integrity checks
+			let bytes = await IOUtils.read(dbPath);
+			bytes.fill(0, 65536, 69632);
+			await IOUtils.write(dbPath, bytes);
+			let origSize = bytes.length;
+
+			let db3 = new Zotero.DBConnection(dbPath);
+			let e = null;
+			try {
+				await db3._downgradeDatabaseFromWAL(dbPath);
+			}
+			catch (err) {
+				e = err;
+			}
+			assert.ok(e);
+			assert.isTrue(db3.isCorruptionError(e));
+			// The original files are untouched
+			assert.isTrue(await IOUtils.exists(dbPath + '-wal'));
+			assert.equal((await IOUtils.stat(dbPath)).size, origSize);
+			let header = await IOUtils.read(dbPath, { maxBytes: 20 });
+			assert.equal(header[18], 2);
+		});
+
+		it("should apply a WAL file left beside an already-converted database", async function () {
+			let dir = await getTempDirectory();
+			let dbPath = PathUtils.join(dir, 'test.sqlite');
+			let db = new Zotero.DBConnection(dbPath);
+			await db.queryAsync("PRAGMA journal_mode=WAL");
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			await IOUtils.copy(dbPath + '-wal', dbPath + '.wal-copy');
+			await db.closeDatabase(true);
+
+			// Convert the database, and then restore the WAL file, simulating a conversion
+			// interrupted between the file swap and the WAL removal
+			let db2 = new Zotero.DBConnection(dbPath);
+			assert.isTrue(await db2._downgradeDatabaseFromWAL(dbPath));
+			await IOUtils.move(dbPath + '.wal-copy', dbPath + '-wal');
+
+			assert.isTrue(await db2._downgradeDatabaseFromWAL(dbPath));
+			assert.isFalse(await IOUtils.exists(dbPath + '-wal'));
+			let header = await IOUtils.read(dbPath, { maxBytes: 20 });
+			assert.equal(header[18], 1);
+			try {
+				assert.equal(await db2.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db2.closeDatabase();
+			}
+		});
+
+		it("should convert the target of a symlinked database file", async function () {
+			if (Zotero.isWin) {
+				this.skip();
+			}
+			let dir = await getTempDirectory();
+			let targetPath = PathUtils.join(dir, 'target.sqlite');
+			let linkPath = PathUtils.join(dir, 'link.sqlite');
+			let db = new Zotero.DBConnection(targetPath);
+			await db.queryAsync("PRAGMA journal_mode=WAL");
+			await db.queryAsync("CREATE TABLE foo (a INT)");
+			await db.queryAsync("INSERT INTO foo VALUES (1)");
+			// Capture a non-empty WAL, which lives next to the symlink's target
+			await IOUtils.copy(targetPath, targetPath + '.copy');
+			await IOUtils.copy(targetPath + '-wal', targetPath + '.copy-wal');
+			await db.closeDatabase(true);
+			await IOUtils.move(targetPath + '.copy', targetPath);
+			await IOUtils.move(targetPath + '.copy-wal', targetPath + '-wal');
+			if (!Zotero.File.createSymlink(targetPath, linkPath)) {
+				// Filesystem doesn't support symlinks (e.g., CIFS)
+				this.skip();
+			}
+
+			let db2 = new Zotero.DBConnection(linkPath);
+			assert.isTrue(await db2._downgradeDatabaseFromWAL(linkPath));
+
+			assert.isFalse(await IOUtils.exists(targetPath + '-wal'));
+			let header = await IOUtils.read(targetPath, { maxBytes: 20 });
+			assert.equal(header[18], 1);
+			assert.isTrue(Zotero.File.pathToFile(linkPath).isSymlink());
+			try {
+				assert.equal(await db2.valueQueryAsync("SELECT COUNT(*) FROM foo"), 1);
+			}
+			finally {
+				await db2.closeDatabase();
+			}
+		});
+	});
+			
 
 	describe("#vacuum()", function () {
 		it("should vacuum the database with force option", async function () {
@@ -477,3 +1435,9 @@ describe("Zotero.DB", function () {
 		});
 	});
 });
+
+
+
+
+
+
diff --git a/test/tests/duplicatesTest.js b/test/tests/duplicatesTest.js
index d86d382de5..bb63295d91 100644
--- a/test/tests/duplicatesTest.js
+++ b/test/tests/duplicatesTest.js
@@ -20,7 +20,25 @@ describe("Duplicate Items", function () {
 	after(function () {
 		win.close();
 	});
-
+	
+	
+	describe("ISBN matching", function () {
+		it("should match books with equivalent ISBN-10 and ISBN-13", async function () {
+			var item1 = await createDataObject('item', { itemType: 'book', title: 'Effective Java' });
+			item1.setField('ISBN', '0134685997');
+			await item1.saveTx();
+			
+			var item2 = await createDataObject('item', { itemType: 'book', title: 'Effective Java, 3rd Edition' });
+			item2.setField('ISBN', '9780134685991');
+			await item2.saveTx();
+			
+			var duplicates = new Zotero.Duplicates(Zotero.Libraries.userLibraryID);
+			await duplicates.getSearchObject();
+			assert.sameMembers(duplicates.getSetItemsByItemID(item1.id), [item1.id, item2.id]);
+		});
+	});
+	
+	
 	async function merge(itemID) {
 		var userLibraryID = Zotero.Libraries.userLibraryID;
 			
diff --git a/test/tests/fileChangeWatcherTest.js b/test/tests/fileChangeWatcherTest.js
index 30383abb2a..7b2be15195 100644
--- a/test/tests/fileChangeWatcherTest.js
+++ b/test/tests/fileChangeWatcherTest.js
@@ -55,6 +55,14 @@ describe("Zotero.Sync.Storage.FileChangeWatcher", function () {
 			assert.ok(watcher._storageRoot, "Storage root should be set");
 		});
 
+		it("should identify the volume the storage directory is on", function () {
+			watcher.init();
+			// Also covers the statfs() struct layout the local-volume check reads
+			var info = watcher._statfsStorageRoot();
+			assert.match(info.fsTypeName, /^[a-z0-9]+$/);
+			assert.isTrue(watcher._storageRootIsLocalVolume());
+		});
+		
 		it("should return null on first call with no saved event ID", function () {
 			watcher.init();
 			let result = watcher.getChangedItemKeys();
@@ -400,6 +408,194 @@ describe("Zotero.Sync.Storage.FileChangeWatcher", function () {
 		});
 	});
 
+	function resetWatcherState() {
+		watcher._snapshotTaken = false;
+		watcher._scannedLibraries = new Set();
+		watcher._lastFullScan = {};
+		Zotero.Prefs.clear(watcher._SCANNED_LIBRARIES_PREF);
+	}
+
+	function markLibrariesScanned(...libraryIDs) {
+		for (let libraryID of libraryIDs) {
+			watcher._scannedLibraries.add(libraryID);
+			watcher._lastFullScan[libraryID] = Date.now();
+		}
+	}
+
+	describe("snapshots", function () {
+		var savedAvailable, savedBackend;
+		var stub;
+
+		beforeEach(function () {
+			savedAvailable = watcher.available;
+			savedBackend = watcher._backend;
+			watcher.available = true;
+			resetWatcherState();
+		});
+
+		afterEach(function () {
+			if (stub) {
+				stub.restore();
+				stub = null;
+			}
+			watcher.available = savedAvailable;
+			watcher._backend = savedBackend;
+			resetWatcherState();
+		});
+
+		it("should require a full scan of a library that hasn't been scanned", async function () {
+			stub = sinon.stub(watcher, 'getChangedItemKeys').returns(new Set());
+			markLibrariesScanned(1);
+			await watcher.snapshot();
+			assert.isFalse(watcher.needsFullScan(1, true));
+			assert.isTrue(watcher.needsFullScan(2, true));
+			// Once a full scan has been recorded, watcher results can be relied on
+			watcher.recordFullScan(2);
+			assert.isFalse(watcher.needsFullScan(2, true));
+		});
+
+		it("should require a full scan of every library after a backend fallback", async function () {
+			stub = sinon.stub(watcher, 'getChangedItemKeys').returns(null);
+			markLibrariesScanned(1, 2);
+			await watcher.snapshot();
+			assert.isTrue(watcher.needsFullScan(1, true));
+			assert.isTrue(watcher.needsFullScan(2, true));
+		});
+
+		it("should prune scan records for deleted libraries", async function () {
+			stub = sinon.stub(watcher, 'getChangedItemKeys').returns(new Set());
+			let userLibraryID = Zotero.Libraries.userLibraryID;
+			markLibrariesScanned(userLibraryID, 99999);
+			await watcher.snapshot();
+			assert.isFalse(watcher.needsFullScan(userLibraryID, true));
+			assert.isTrue(watcher.needsFullScan(99999, true));
+		});
+
+		it("should require a full scan on a manual sync with a live watcher", async function () {
+			stub = sinon.stub(watcher, 'getChangedItemKeys').returns(new Set());
+			markLibrariesScanned(1);
+			await watcher.snapshot();
+			watcher._backend = 'rdcw';
+			assert.isTrue(watcher.needsFullScan(1, false));
+			assert.isFalse(watcher.needsFullScan(1, true));
+			// The FSEvents journal is trusted on manual syncs
+			watcher._backend = 'fsevents';
+			assert.isFalse(watcher.needsFullScan(1, false));
+		});
+	});
+
+	describe("multi-library file syncs", function () {
+		var apiKey = Zotero.Utilities.randomString(24);
+		var server, httpd, port, baseURL;
+
+		beforeEach(async function () {
+			Zotero.HTTP.mock = sinon.FakeXMLHttpRequest;
+			server = sinon.fakeServer.create();
+			server.autoRespond = true;
+
+			({ httpd, port } = await startHTTPServer());
+			baseURL = `http://localhost:${port}/`;
+
+			await Zotero.Users.setCurrentUserID(1);
+			await Zotero.Users.setCurrentUsername("testuser");
+		});
+
+		afterEach(async function () {
+			Zotero.HTTP.mock = null;
+			await new Promise(resolve => httpd.stop(resolve));
+			resetWatcherState();
+		});
+
+		function makeEngine(libraryID) {
+			const { ConcurrentCaller } = ChromeUtils.importESModule(
+				"resource://zotero/concurrentCaller.mjs"
+			);
+			var caller = new ConcurrentCaller(1);
+			caller.setLogger(msg => Zotero.debug(msg));
+
+			var client = new Zotero.Sync.APIClient({
+				baseURL,
+				apiVersion: ZOTERO_CONFIG.API_VERSION,
+				apiKey,
+				caller,
+				background: true
+			});
+
+			return new Zotero.Sync.Storage.Engine({
+				libraryID,
+				controller: new Zotero.Sync.Storage.Mode.ZFS({
+					apiClient: client
+				}),
+				background: true,
+				stopOnError: false
+			});
+		}
+
+		it("should detect an externally modified group file when My Library syncs first", async function () {
+			var group = await createGroup();
+			group.libraryVersion = 5;
+			await group.saveTx();
+			group.storageVersion = 5;
+			await group.saveTx();
+
+			var item = await importFileAttachment('test.png', { libraryID: group.libraryID });
+
+			// Mark as in sync, with the file mtime in the past
+			var path = await item.getFilePathAsync();
+			var mtime = (Math.floor(new Date().getTime() / 1000) * 1000) - 2000;
+			await OS.File.setDates(path, null, mtime);
+			item.attachmentSyncedModificationTime = mtime;
+			item.attachmentSyncedHash = await item.attachmentHash;
+			item.attachmentSyncState = "in_sync";
+			await item.saveTx({ skipAll: true });
+
+			// Modify the file externally
+			await Zotero.File.putContentsAsync(path, Zotero.Utilities.randomString());
+
+			// Simulate a watcher backend that reports the group file change on the first
+			// drain and nothing after that
+			var savedAvailable = watcher.available;
+			var stub = sinon.stub(watcher, 'getChangedItemKeys');
+			stub.returns(new Set());
+			stub.onFirstCall().returns(new Set([item.key]));
+			watcher.available = true;
+			// Simulate the steady state, with both libraries previously scanned
+			resetWatcherState();
+			markLibrariesScanned(Zotero.Libraries.userLibraryID, group.libraryID);
+
+			var spy = sinon.spy(Zotero.Sync.Storage.Local, 'checkForUpdatedFiles');
+			try {
+				// Drain events once per session and then file-sync My Library first and the
+				// group second, as the sync runner does
+				await watcher.snapshot();
+				await makeEngine(Zotero.Libraries.userLibraryID).start();
+				await makeEngine(group.libraryID).start();
+			}
+			finally {
+				stub.restore();
+				spy.restore();
+				watcher.available = savedAvailable;
+			}
+
+			// The group library should have been checked with the changed item rather than
+			// via a full scan -- checkForUpdatedFiles() drains the passed array, so just
+			// check that one was passed
+			var call = spy.getCalls().find(c => c.args[0] == group.libraryID);
+			assert.ok(call, "checkForUpdatedFiles() should be called for the group library");
+			assert.isArray(
+				call.args[1],
+				"checkForUpdatedFiles() should be passed the changed group items"
+			);
+			assert.equal(
+				item.attachmentSyncState,
+				Zotero.Sync.Storage.Local.SYNC_STATE_TO_UPLOAD,
+				"Group file modified on disk should be marked for upload"
+			);
+
+			await group.eraseTx();
+		});
+	});
+
 	describe("ReadDirectoryChangesW backend (Windows)", function () {
 		before(async function () {
 			if (!Zotero.isWin) {
@@ -423,7 +619,6 @@ describe("Zotero.Sync.Storage.FileChangeWatcher", function () {
 		});
 
 		it("should initialize successfully");
-		it("should return null on first call (no persistent journal)");
 		it("should return an empty set when no files have changed");
 		it("should detect a modified attachment file");
 		it("should detect changes across multiple items");
@@ -431,7 +626,6 @@ describe("Zotero.Sync.Storage.FileChangeWatcher", function () {
 		it("should detect a new file added to a storage directory");
 		it("should re-arm overlapped I/O after draining notifications");
 		it("should return null on buffer overflow and re-arm");
-		it("should return null for periodic full scan after max age");
 		it("should only report valid 8-char item keys");
 	});
 
@@ -460,14 +654,12 @@ describe("Zotero.Sync.Storage.FileChangeWatcher", function () {
 		});
 
 		it("should initialize successfully");
-		it("should return null on first call (no persistent journal)");
 		it("should return an empty set when no files have changed");
 		it("should detect a modified attachment file");
 		it("should detect changes across multiple items");
 		it("should not report the same changes twice");
 		it("should detect a new file added to a storage directory");
 		it("should auto-watch newly created storage subdirectories");
-		it("should return null for periodic full scan after max age");
 		it("should only report valid 8-char item keys");
 	});
 
diff --git a/test/tests/fileDragDataProviderTest.js b/test/tests/fileDragDataProviderTest.js
new file mode 100644
index 0000000000..179a71f1fa
--- /dev/null
+++ b/test/tests/fileDragDataProviderTest.js
@@ -0,0 +1,48 @@
+"use strict";
+
+describe("Zotero.TempFileDragDataProvider", function () {
+	it("should hand out a copy of the file with the same name and remove its directory once emptied", async function () {
+		var attachment = await importFileAttachment('test.pdf');
+		var path = attachment.getFilePath();
+		var provider = new Zotero.TempFileDragDataProvider(path);
+		
+		var data = {};
+		provider.getFlavorData(null, 'application/x-moz-file', data);
+		var file = data.value.QueryInterface(Ci.nsIFile);
+		var copyPath = file.path;
+		var copyDir = PathUtils.parent(copyPath);
+		
+		assert.notEqual(copyPath, path);
+		assert.equal(file.leafName, PathUtils.filename(path));
+		assert.isTrue(copyPath.startsWith(Zotero.getTempDirectory().path));
+		assert.equal(
+			await Zotero.File.getBinaryContentsAsync(copyPath),
+			await Zotero.File.getBinaryContentsAsync(path)
+		);
+		
+		// Repeated requests get the same copy
+		var data2 = {};
+		provider.getFlavorData(null, 'application/x-moz-file', data2);
+		assert.equal(data2.value.QueryInterface(Ci.nsIFile).path, copyPath);
+		
+		// A copy the target may still be using stays
+		await Zotero.TempFileDragDataProvider.removeCopies({ onlyEmpty: true });
+		assert.isTrue(await IOUtils.exists(copyPath));
+		
+		// Once the target has moved the file away, the directory goes
+		await IOUtils.remove(copyPath);
+		await Zotero.TempFileDragDataProvider.removeCopies({ onlyEmpty: true });
+		assert.isFalse(await IOUtils.exists(copyDir));
+	});
+	
+	it("should remove leftover copies from earlier drags", async function () {
+		var attachment = await importFileAttachment('test.pdf');
+		var provider = new Zotero.TempFileDragDataProvider(attachment.getFilePath());
+		var data = {};
+		provider.getFlavorData(null, 'application/x-moz-file', data);
+		var copyDir = PathUtils.parent(data.value.QueryInterface(Ci.nsIFile).path);
+		
+		await Zotero.TempFileDragDataProvider.removeCopies();
+		assert.isFalse(await IOUtils.exists(copyDir));
+	});
+});
diff --git a/test/tests/fileInterfaceTest.js b/test/tests/fileInterfaceTest.js
index 0e79ec18f4..d367926c52 100644
--- a/test/tests/fileInterfaceTest.js
+++ b/test/tests/fileInterfaceTest.js
@@ -97,6 +97,126 @@ describe("Zotero_File_Interface", function () {
 		assert.propertyVal(matches[0], 'id', attachment.id);
 	});
 	
+	it("should import a single top-level collection without creating another collection", async function () {
+		var collection = await createDataObject('collection', { name: 'Exported' });
+		var subcollection = await createDataObject(
+			'collection', { name: 'Sub', parentID: collection.id }
+		);
+		var item = await createDataObject(
+			'item', { title: 'Collection', collections: [collection.id] }
+		);
+		var sharedItem = await createDataObject(
+			'item', { title: 'Both', collections: [collection.id, subcollection.id] }
+		);
+		
+		var file = OS.Path.join(await getTempDirectory(), 'exported.rdf');
+		var translation = new Zotero.Translate.Export();
+		translation.setCollection(collection);
+		translation.setLocation(Zotero.File.pathToFile(file));
+		translation.setTranslator('14763d24-8ba0-45df-8f52-b8d1108e7ac9');
+		await translation.translate();
+		
+		await win.Zotero_File_Interface.importFile({ file });
+		
+		// The imported collection is at the top level, rather than inside a collection named
+		// after the file
+		var collections = Zotero.Collections.getByLibrary(Zotero.Libraries.userLibraryID);
+		assert.isEmpty(collections.filter(c => c.name == 'exported'));
+		var imported = collections.filter(c => c.name == collection.name && c.id != collection.id);
+		assert.lengthOf(imported, 1);
+		
+		var titles = c => c.getChildItems().map(i => i.getField('title'));
+		assert.sameMembers(
+			titles(imported[0]), [item.getField('title'), sharedItem.getField('title')]
+		);
+		
+		var importedSubcollections = imported[0].getChildCollections();
+		assert.lengthOf(importedSubcollections, 1);
+		assert.equal(importedSubcollections[0].name, subcollection.name);
+		assert.sameMembers(titles(importedSubcollections[0]), [sharedItem.getField('title')]);
+	});
+	
+	it("should keep items outside a single imported collection out of it", async function () {
+		var group = await createGroup({ name: 'Import' + Zotero.Utilities.randomString() });
+		var libraryID = group.libraryID;
+		var collection = await createDataObject(
+			'collection', { name: 'Collection', libraryID }
+		);
+		var collectionItem = await createDataObject(
+			'item', { title: 'InCollection', libraryID, collections: [collection.id] }
+		);
+		var unfiledItem = await createDataObject('item', { title: 'Unfiled', libraryID });
+		
+		var file = OS.Path.join(await getTempDirectory(), 'library-export.rdf');
+		var translation = new Zotero.Translate.Export();
+		translation.setLibraryID(libraryID);
+		translation.setLocation(Zotero.File.pathToFile(file));
+		translation.setTranslator('14763d24-8ba0-45df-8f52-b8d1108e7ac9');
+		await translation.translate();
+		
+		await win.Zotero_File_Interface.importFile({ file });
+		
+		// The unfiled item doesn't belong to the imported collection, so the collection created
+		// for the import is kept to hold it
+		var importCollections = Zotero.Collections.getByLibrary(Zotero.Libraries.userLibraryID)
+			.filter(c => c.name == 'library-export');
+		assert.lengthOf(importCollections, 1);
+		var titles = c => c.getChildItems().map(i => i.getField('title'));
+		assert.sameMembers(titles(importCollections[0]), [unfiledItem.getField('title')]);
+		
+		var imported = importCollections[0].getChildCollections();
+		assert.lengthOf(imported, 1);
+		assert.equal(imported[0].name, collection.name);
+		assert.sameMembers(titles(imported[0]), [collectionItem.getField('title')]);
+	});
+	
+	it("should import multiple exported collections below the collection created for the import", async function () {
+		var collection1 = await createDataObject('collection', { name: 'First' });
+		var subcollection = await createDataObject(
+			'collection', { name: 'Sub', parentID: collection1.id }
+		);
+		var collection2 = await createDataObject('collection', { name: 'Second' });
+		var item1 = await createDataObject(
+			'item', { title: 'InFirst', collections: [collection1.id] }
+		);
+		var subItem = await createDataObject(
+			'item', { title: 'InSub', collections: [subcollection.id] }
+		);
+		var item2 = await createDataObject(
+			'item', { title: 'InSecond', collections: [collection2.id] }
+		);
+		
+		var file = OS.Path.join(await getTempDirectory(), 'multiple.rdf');
+		var translation = new Zotero.Translate.Export();
+		translation.setCollections([collection1, collection2]);
+		translation.setLocation(Zotero.File.pathToFile(file));
+		translation.setTranslator('14763d24-8ba0-45df-8f52-b8d1108e7ac9');
+		await translation.translate();
+		
+		await win.Zotero_File_Interface.importFile({ file });
+		
+		// Neither collection can stand in for the collection created for the import, so both are
+		// imported below it
+		var importCollections = Zotero.Collections.getByLibrary(Zotero.Libraries.userLibraryID)
+			.filter(c => c.name == 'multiple');
+		assert.lengthOf(importCollections, 1);
+		assert.isEmpty(importCollections[0].getChildItems());
+		
+		var titles = c => c.getChildItems().map(i => i.getField('title'));
+		var imported = importCollections[0].getChildCollections();
+		assert.sameMembers(imported.map(c => c.name), [collection1.name, collection2.name]);
+		
+		var importedFirst = imported.find(c => c.name == collection1.name);
+		assert.sameMembers(titles(importedFirst), [item1.getField('title')]);
+		var importedSubcollections = importedFirst.getChildCollections();
+		assert.lengthOf(importedSubcollections, 1);
+		assert.equal(importedSubcollections[0].name, subcollection.name);
+		assert.sameMembers(titles(importedSubcollections[0]), [subItem.getField('title')]);
+		
+		var importedSecond = imported.find(c => c.name == collection2.name);
+		assert.sameMembers(titles(importedSecond), [item2.getField('title')]);
+	});
+	
 	it('should import a MODS file', async function () {
 		var modsFile = OS.Path.join(getTestDataDirectory().path, "mods.xml");
 		
diff --git a/test/tests/fileRenamingDialogTest.js b/test/tests/fileRenamingDialogTest.js
new file mode 100644
index 0000000000..1774de358d
--- /dev/null
+++ b/test/tests/fileRenamingDialogTest.js
@@ -0,0 +1,448 @@
+describe("FileRenamingDialog", function () {
+	let win;
+	let group;
+
+	before(async function () {
+		group = await getGroup();
+		win = await loadWindow("chrome://zotero/content/fileRenamingDialog.xhtml");
+	});
+
+	after(function () {
+		if (win) {
+			win.close();
+		}
+	});
+
+	describe("#handleSettingsChange()", function () {
+		// Drives handleSettingsChange for a given library/template with SyncedSettings.set stubbed,
+		// returning the values the template setting would have been synced with
+		function collectTemplateSyncs(libraryID, template) {
+			let dialog = win.FileRenamingDialog;
+			dialog.libraryPicker.value = String(libraryID);
+			dialog._currentLibraryID = libraryID;
+			dialog.loadSettingsForLibrary(libraryID);
+			dialog.settingsEl.formatTemplate = template;
+
+			let sandbox = sinon.createSandbox();
+			let setStub = sandbox.stub(Zotero.SyncedSettings, "set").resolves();
+			let clearStub = sandbox.stub(Zotero.SyncedSettings, "clear").resolves();
+			sandbox.stub(Zotero.Prefs, "set");
+			try {
+				dialog.handleSettingsChange({
+					detail: {
+						autoRenameEnabled: true,
+						enabledFileTypes: 'application/pdf',
+						renameLinkedEnabled: false,
+						formatTemplate: template
+					}
+				});
+				return {
+					otherSynced: setStub.getCalls().some(c => c.args[1] !== 'attachmentRenameTemplate'),
+					templateValues: setStub.getCalls()
+						.filter(c => c.args[1] === 'attachmentRenameTemplate')
+						.map(c => c.args[2]),
+					templateCleared: clearStub.getCalls()
+						.some(c => c.args[1] === 'attachmentRenameTemplate')
+				};
+			}
+			finally {
+				sandbox.restore();
+			}
+		}
+
+		it("should not push an invalid template to a group's synced settings", function () {
+			let invalid = collectTemplateSyncs(group.libraryID, '{{ title');
+			assert.deepEqual(invalid.templateValues, [], "invalid template must not be synced");
+			assert.isTrue(invalid.otherSynced, "other group settings should still be synced");
+
+			let valid = collectTemplateSyncs(group.libraryID, '{{ title }}');
+			assert.deepEqual(valid.templateValues, ['{{ title }}'], "valid template must be synced");
+		});
+
+		it("should clear a group's template setting when the template is emptied", function () {
+			for (let empty of ['', '   ']) {
+				let result = collectTemplateSyncs(group.libraryID, empty);
+				assert.deepEqual(result.templateValues, [], `empty template ${JSON.stringify(empty)} must not be synced`);
+				assert.isTrue(result.templateCleared, "empty template must be cleared from a group's synced settings");
+				assert.isTrue(result.otherSynced, "other group settings should still be synced");
+			}
+		});
+
+		it("should not push an invalid template to the user library's synced settings", function () {
+			let invalid = collectTemplateSyncs(Zotero.Libraries.userLibraryID, '{{ title');
+			assert.deepEqual(invalid.templateValues, [], "invalid template must not be synced");
+
+			let valid = collectTemplateSyncs(Zotero.Libraries.userLibraryID, '{{ title }}');
+			assert.deepEqual(valid.templateValues, ['{{ title }}'], "valid template must be synced");
+		});
+	});
+
+	describe("invalid template prompt", function () {
+		const INVALID_TEMPLATE = '{{ title';
+
+		// Loads the given library and applies a template change through the dialog's change
+		// handler (with persistence stubbed by the caller), leaving the dialog dirty
+		function makeDirty(libraryID, template) {
+			let dialog = win.FileRenamingDialog;
+			dialog.libraryPicker.value = String(libraryID);
+			dialog._currentLibraryID = libraryID;
+			dialog.loadSettingsForLibrary(libraryID);
+			dialog.settingsEl.formatTemplate = template;
+			dialog.handleSettingsChange({
+				detail: {
+					autoRenameEnabled: dialog.settingsEl.autoRenameEnabled,
+					enabledFileTypes: dialog.settingsEl.enabledFileTypes,
+					renameLinkedEnabled: dialog.settingsEl.renameLinkedEnabled,
+					formatTemplate: template
+				}
+			});
+			return dialog;
+		}
+
+		function setupStubs(sandbox, confirmIndex) {
+			return {
+				set: sandbox.stub(Zotero.SyncedSettings, 'set').resolves(),
+				clear: sandbox.stub(Zotero.SyncedSettings, 'clear').resolves(),
+				prefSet: sandbox.stub(Zotero.Prefs, 'set'),
+				confirm: sandbox.stub(Zotero.Prompt, 'confirm').returns(confirmIndex)
+			};
+		}
+
+		function resetStubHistory(stubs) {
+			stubs.set.resetHistory();
+			stubs.clear.resetHistory();
+			stubs.prefSet.resetHistory();
+		}
+
+		function templateWrites(stubs) {
+			return {
+				sets: stubs.set.getCalls().filter(c => c.args[1] === 'attachmentRenameTemplate'),
+				clears: stubs.clear.getCalls().filter(c => c.args[1] === 'attachmentRenameTemplate')
+			};
+		}
+
+		function restoreDialog() {
+			let dialog = win.FileRenamingDialog;
+			dialog._forceClose = false;
+			dialog.libraryPicker.value = String(Zotero.Libraries.userLibraryID);
+			dialog._currentLibraryID = Zotero.Libraries.userLibraryID;
+			dialog.loadSettingsForLibrary(Zotero.Libraries.userLibraryID);
+		}
+
+		it("should keep the window open and not touch the template setting on cancel", async function () {
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 1);
+			let origClose = win.close;
+			let closeSpy = sinon.spy();
+			win.close = closeSpy;
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				let event = { preventDefault: sinon.spy() };
+				await dialog.handleWindowClose(event);
+				assert.isTrue(event.preventDefault.called, 'close must be blocked');
+				assert.isFalse(closeSpy.called, 'window must stay open on cancel');
+				assert.equal(stubs.confirm.callCount, 1, 'prompt shown once');
+				assert.isString(stubs.confirm.firstCall.args[0].title, 'prompt title must resolve to a string');
+				assert.isString(stubs.confirm.firstCall.args[0].text, 'prompt body must resolve to a string');
+				let { sets, clears } = templateWrites(stubs);
+				assert.lengthOf(sets, 0, 'template must not be synced on cancel');
+				assert.lengthOf(clears, 0, 'template must not be cleared on cancel');
+			}
+			finally {
+				win.close = origClose;
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+
+		it("should clear the group's template setting and close on reset", async function () {
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 0);
+			let origClose = win.close;
+			let closeSpy = sinon.spy();
+			win.close = closeSpy;
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				let event = { preventDefault: sinon.spy() };
+				await dialog.handleWindowClose(event);
+				assert.isString(stubs.confirm.firstCall.args[0].title, 'prompt title must resolve to a string');
+				assert.isString(stubs.confirm.firstCall.args[0].text, 'prompt body must resolve to a string');
+				assert.equal(stubs.confirm.callCount, 1, 'no rename prompt when the reset lands back on the baseline');
+				let { sets, clears } = templateWrites(stubs);
+				assert.lengthOf(sets, 0, 'template must not be synced on reset');
+				assert.lengthOf(clears, 1, 'template setting must be cleared');
+				assert.equal(clears[0].args[0], group.libraryID);
+				assert.isFalse(
+					stubs.prefSet.calledWith('autoRenameFiles.done', sinon.match.any),
+					'user-library done pref must not change for a group reset'
+				);
+				assert.isTrue(closeSpy.called, 'window must close after reset');
+			}
+			finally {
+				win.close = origClose;
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+
+		it("should clear the user library's template setting and recompute the done pref on reset", async function () {
+			let userLibraryID = Zotero.Libraries.userLibraryID;
+			// Make the baseline deterministic: default template stored, no rename pending
+			let origTemplate = Zotero.SyncedSettings.get(userLibraryID, 'attachmentRenameTemplate');
+			let origDone = Zotero.Prefs.get('autoRenameFiles.done');
+			await Zotero.SyncedSettings.clear(userLibraryID, 'attachmentRenameTemplate');
+			Zotero.Prefs.set('autoRenameFiles.done', true);
+
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 0);
+			let origClose = win.close;
+			let closeSpy = sinon.spy();
+			win.close = closeSpy;
+			try {
+				let dialog = makeDirty(userLibraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				let event = { preventDefault: sinon.spy() };
+				await dialog.handleWindowClose(event);
+				assert.isString(stubs.confirm.firstCall.args[0].title, 'prompt title must resolve to a string');
+				assert.isString(stubs.confirm.firstCall.args[0].text, 'prompt body must resolve to a string');
+				assert.equal(stubs.confirm.callCount, 1, 'no rename prompt when the reset lands back on the baseline');
+				let { sets, clears } = templateWrites(stubs);
+				assert.lengthOf(sets, 0, 'template must not be synced on reset');
+				assert.lengthOf(clears, 1, 'template setting must be cleared');
+				assert.equal(clears[0].args[0], userLibraryID);
+				// The reset lands back on the baseline, so no rename is pending
+				assert.isTrue(
+					stubs.prefSet.calledWith('autoRenameFiles.done', true),
+					'done pref must be recomputed against the baseline, not hard-set to false'
+				);
+				assert.isTrue(closeSpy.called, 'window must close after reset');
+			}
+			finally {
+				win.close = origClose;
+				sandbox.restore();
+				if (origTemplate) {
+					await Zotero.SyncedSettings.set(userLibraryID, 'attachmentRenameTemplate', origTemplate);
+				}
+				Zotero.Prefs.set('autoRenameFiles.done', origDone);
+				restoreDialog();
+			}
+		});
+
+		it("should prompt when an invalid template blurs directly to Done", async function () {
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 1);
+			let origClose = win.close;
+			let closeSpy = sinon.spy();
+			win.close = closeSpy;
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				dialog.settingsEl.handleTemplateBlur();
+				await dialog._handleDoneClick();
+				assert.isFalse(closeSpy.called, 'window must stay open on cancel');
+				assert.equal(stubs.confirm.callCount, 1, 'only the invalid-template prompt is shown');
+				let { sets, clears } = templateWrites(stubs);
+				assert.lengthOf(sets, 0);
+				assert.lengthOf(clears, 0);
+			}
+			finally {
+				win.close = origClose;
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+
+		it("should stay on the current library when switching libraries and the user cancels", async function () {
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 1);
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				dialog.libraryPicker.value = String(Zotero.Libraries.userLibraryID);
+				await dialog.handleLibraryChange();
+				assert.equal(dialog.libraryPicker.value, String(group.libraryID), 'picker must revert to the previous library');
+				assert.equal(dialog._currentLibraryID, group.libraryID, 'current library must not change');
+				let { sets, clears } = templateWrites(stubs);
+				assert.lengthOf(sets, 0);
+				assert.lengthOf(clears, 0);
+			}
+			finally {
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+
+		it("should reset the previous library's template and switch libraries on reset", async function () {
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 0);
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				dialog.libraryPicker.value = String(Zotero.Libraries.userLibraryID);
+				await dialog.handleLibraryChange();
+				let { clears } = templateWrites(stubs);
+				assert.lengthOf(clears, 1, 'previous library template setting must be cleared');
+				assert.equal(clears[0].args[0], group.libraryID);
+				assert.equal(dialog._currentLibraryID, Zotero.Libraries.userLibraryID, 'switch must proceed after reset');
+				assert.equal(dialog.libraryPicker.value, String(Zotero.Libraries.userLibraryID));
+			}
+			finally {
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+
+		it("should prompt to rename files after resetting the template on Done and skip the preview when declined", async function () {
+			await Zotero.SyncedSettings.set(group.libraryID, 'attachmentRenameTemplate', '{{ title }}-baseline');
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 0);
+			stubs.confirm.onSecondCall().returns(1);
+			let dialog = win.FileRenamingDialog;
+			let previewStub = sandbox.stub(dialog, '_openRenameFilesPreview').returns(true);
+			let origClose = win.close;
+			let closeSpy = sinon.spy();
+			win.close = closeSpy;
+			try {
+				makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				await dialog._handleDoneClick();
+				assert.equal(stubs.confirm.callCount, 2, 'reset prompt and rename prompt must both be shown');
+				let { clears } = templateWrites(stubs);
+				assert.lengthOf(clears, 1, 'template setting must be cleared');
+				assert.isFalse(previewStub.called, 'declining the rename must not open the preview');
+				assert.isTrue(closeSpy.called, 'window must close after the prompts');
+			}
+			finally {
+				win.close = origClose;
+				sandbox.restore();
+				await Zotero.SyncedSettings.clear(group.libraryID, 'attachmentRenameTemplate');
+				restoreDialog();
+			}
+		});
+
+		it("should prompt to rename files after resetting the template when switching libraries", async function () {
+			await Zotero.SyncedSettings.set(group.libraryID, 'attachmentRenameTemplate', '{{ title }}-baseline');
+			let sandbox = sinon.createSandbox();
+			let stubs = setupStubs(sandbox, 0);
+			let dialog = win.FileRenamingDialog;
+			let previewStub = sandbox.stub(dialog, '_openRenameFilesPreview').returns(true);
+			try {
+				makeDirty(group.libraryID, INVALID_TEMPLATE);
+				resetStubHistory(stubs);
+				dialog.libraryPicker.value = String(Zotero.Libraries.userLibraryID);
+				await dialog.handleLibraryChange();
+				assert.equal(stubs.confirm.callCount, 2, 'reset prompt and rename prompt must both be shown');
+				assert.isTrue(previewStub.calledOnceWith(group.libraryID), 'rename preview must open for the previous library');
+				assert.equal(dialog._currentLibraryID, Zotero.Libraries.userLibraryID, 'switch must proceed after the prompts');
+				assert.equal(dialog.libraryPicker.value, String(Zotero.Libraries.userLibraryID));
+			}
+			finally {
+				sandbox.restore();
+				await Zotero.SyncedSettings.clear(group.libraryID, 'attachmentRenameTemplate');
+				restoreDialog();
+			}
+		});
+
+		it("should only prompt when settings changed and the template is invalid", function () {
+			let sandbox = sinon.createSandbox();
+			setupStubs(sandbox, 1);
+			try {
+				let dialog = makeDirty(group.libraryID, INVALID_TEMPLATE);
+				assert.isTrue(dialog._shouldPromptInvalidTemplate(), 'changed + invalid must prompt');
+
+				makeDirty(group.libraryID, '{{ title }}{{ year }}');
+				assert.isFalse(dialog._shouldPromptInvalidTemplate(), 'changed + valid must not prompt');
+
+				dialog.loadSettingsForLibrary(group.libraryID);
+				dialog.settingsEl.formatTemplate = INVALID_TEMPLATE;
+				assert.isFalse(dialog._shouldPromptInvalidTemplate(), 'unchanged + invalid must not prompt');
+			}
+			finally {
+				sandbox.restore();
+				restoreDialog();
+			}
+		});
+	});
+
+	describe("template preview", function () {
+		it("should keep the last valid preview while typing and show an error on blur", function () {
+			let dialog = win.FileRenamingDialog;
+			let settingsEl = dialog.settingsEl;
+			let preview = settingsEl.querySelector('#file-renaming-format-preview');
+			let libraryID = dialog._currentLibraryID;
+			let sandbox = sinon.createSandbox();
+			sandbox.stub(Zotero.SyncedSettings, 'set').resolves();
+			sandbox.stub(Zotero.SyncedSettings, 'clear').resolves();
+			sandbox.stub(Zotero.Prefs, 'set');
+			try {
+				settingsEl.formatTemplate = '{{ title }}';
+				settingsEl.updatePreview();
+				let firstValidPreview = preview.innerText;
+
+				settingsEl.formatTemplate = '{{ title';
+				settingsEl.handleTemplateInput();
+				assert.equal(preview.innerText, firstValidPreview, 'last valid preview retained');
+				assert.isFalse(settingsEl.previewSection.classList.contains('is-hidden'), 'preview remains visible');
+				assert.isTrue(settingsEl.invalidMessage.classList.contains('is-hidden'), 'error remains hidden');
+
+				settingsEl.formatTemplate = '{{ title }}-updated';
+				settingsEl.handleTemplateInput();
+				let secondValidPreview = preview.innerText;
+				assert.notEqual(secondValidPreview, firstValidPreview, 'preview updates when valid again');
+
+				settingsEl.formatTemplate = '{{ title';
+				settingsEl.handleTemplateInput();
+				assert.equal(preview.innerText, secondValidPreview, 'latest valid preview retained');
+				settingsEl.handleTemplateBlur();
+				assert.isTrue(settingsEl.previewSection.classList.contains('is-hidden'), 'preview hidden on blur');
+				assert.isFalse(settingsEl.invalidMessage.classList.contains('is-hidden'), 'error shown on blur');
+			}
+			finally {
+				sandbox.restore();
+				dialog.loadSettingsForLibrary(libraryID);
+			}
+		});
+
+		it("should clear a stale syntax-error message when the template is cleared to whitespace", function () {
+			let settingsEl = win.FileRenamingDialog.settingsEl;
+			// Show the invalid state (updatePreview has no change side effects)
+			settingsEl.formatTemplate = '{{ title';
+			settingsEl.updatePreview();
+			assert.isFalse(settingsEl.invalidMessage.classList.contains('is-hidden'), 'error shown while invalid');
+			assert.isTrue(settingsEl.previewSection.classList.contains('is-hidden'), 'preview hidden while invalid');
+			// Deleting down to whitespace must clear the stale error and restore the preview
+			settingsEl.formatTemplate = '   ';
+			settingsEl.handleTemplateInput();
+			assert.isTrue(settingsEl.invalidMessage.classList.contains('is-hidden'), 'error cleared for whitespace');
+			assert.isFalse(settingsEl.previewSection.classList.contains('is-hidden'), 'preview restored for whitespace');
+		});
+
+		it("should validate the template as the engine renders it, ignoring newlines inside a tag", function () {
+			let settingsEl = win.FileRenamingDialog.settingsEl;
+			// The engine strips newlines before validating/rendering, so the dialog must judge the
+			// same normalized string -- a newline splitting `endif` here must not read as invalid
+			settingsEl.formatTemplate = '{{if title}}a{{end\nif}}';
+			assert.isTrue(settingsEl.templateValid, 'newline inside a tag must not read as invalid');
+		});
+
+		it("should validate the template at most once per keystroke", function () {
+			let settingsEl = win.FileRenamingDialog.settingsEl;
+			settingsEl.formatTemplate = '{{ title }}{{ year }}';
+			let sandbox = sinon.createSandbox();
+			// Stub persistence so the change handler runs without touching settings
+			sandbox.stub(Zotero.SyncedSettings, 'set').resolves();
+			sandbox.stub(Zotero.SyncedSettings, 'clear').resolves();
+			sandbox.stub(Zotero.Prefs, 'set');
+			let spy = sandbox.spy(settingsEl, '_validateTemplate');
+			try {
+				settingsEl.handleTemplateInput();
+				assert.isAtMost(spy.callCount, 1, 'template should be parsed at most once per keystroke');
+			}
+			finally {
+				sandbox.restore();
+			}
+		});
+	});
+});
diff --git a/test/tests/fileTest.js b/test/tests/fileTest.js
index e5d877807f..c7412b288a 100644
--- a/test/tests/fileTest.js
+++ b/test/tests/fileTest.js
@@ -199,6 +199,14 @@ describe("Zotero.File", function () {
 			assert.equal(closest, tmpDir);
 		});
 		
+		it("should return parent directory for a filename too long for the filesystem", async function () {
+			var tmpDir = await getTempDirectory();
+			var closest = await Zotero.File.getClosestDirectory(
+				OS.Path.join(tmpDir, 'a'.repeat(1000) + '.pdf')
+			);
+			assert.equal(closest, tmpDir);
+		});
+		
 		it("should return false for a path that doesn't exist at all", async function () {
 			assert.isFalse(await Zotero.File.getClosestDirectory('/a/b/c'));
 		});
@@ -326,7 +334,16 @@ describe("Zotero.File", function () {
 			var tmpPath = await getTempDirectory();
 			var destPath = OS.Path.join(tmpPath, 'missing');
 			var linkPath = OS.Path.join(tmpPath, 'link');
-			await OS.File.unixSymLink(destPath, linkPath);
+			var isSymlink = false;
+			try {
+				await OS.File.unixSymLink(destPath, linkPath);
+				isSymlink = Zotero.File.pathToFile(linkPath).isSymlink();
+			}
+			catch (e) {}
+			if (!isSymlink) {
+				// Symlink couldn't be created or isn't visible as one (e.g., on CIFS)
+				this.skip();
+			}
 			
 			assert.throws(() => Zotero.File.createDirectoryIfMissing(linkPath), /^Broken symlink/);
 		});
@@ -341,7 +358,16 @@ describe("Zotero.File", function () {
 			var tmpPath = await getTempDirectory();
 			var destPath = OS.Path.join(tmpPath, 'missing');
 			var linkPath = OS.Path.join(tmpPath, 'link');
-			await OS.File.unixSymLink(destPath, linkPath);
+			var isSymlink = false;
+			try {
+				await OS.File.unixSymLink(destPath, linkPath);
+				isSymlink = Zotero.File.pathToFile(linkPath).isSymlink();
+			}
+			catch (e) {}
+			if (!isSymlink) {
+				// Symlink couldn't be created or isn't visible as one (e.g., on CIFS)
+				this.skip();
+			}
 			
 			var e = await getPromiseError(Zotero.File.createDirectoryIfMissingAsync(linkPath));
 			assert.ok(e);
@@ -491,7 +517,7 @@ describe("Zotero.File", function () {
 			var e = {
 				operation: 'open',
 				becauseAccessDenied: true,
-				path: '/tmp/test'
+				path: PathUtils.join(Zotero.getTempDirectory().path, 'test')
 			};
 			try {
 				Zotero.File.checkFileAccessError(e, e.path, 'create');
diff --git a/test/tests/fulltextTest.js b/test/tests/fulltextTest.js
index 29e2b9b435..c46e8918b7 100644
--- a/test/tests/fulltextTest.js
+++ b/test/tests/fulltextTest.js
@@ -1,4 +1,465 @@
 describe("Zotero.FullText", function () {
+	describe("Content database", function () {
+		async function createTextAttachment(content) {
+			let tmpDir = await getTempDirectory();
+			let path = OS.Path.join(tmpDir, Zotero.Utilities.randomString() + ".txt");
+			await Zotero.File.putContentsAsync(path, content);
+			return Zotero.Attachments.importFromFile({
+				file: path,
+				contentType: 'text/plain',
+				charset: 'utf-8'
+			});
+		}
+
+		function contentSearch(item, value) {
+			let s = new Zotero.Search();
+			s.libraryID = item.libraryID;
+			s.addCondition('fulltextContent', 'contains', value);
+			return s.search();
+		}
+
+		it("should match content case- and diacritic-insensitively", async function () {
+			let item = await createTextAttachment("The Séance was held at dawn");
+			assert.include(await contentSearch(item, 'seance'), item.id);
+			assert.include(await contentSearch(item, 'SÉANCE'), item.id);
+		});
+
+		it("should match other forms of a word by prefix", async function () {
+			let item = await createTextAttachment("old archives were archived");
+			assert.include(await contentSearch(item, 'archive'), item.id);
+		});
+
+		it("should not match the middle or end of a word", async function () {
+			let suffix = await createTextAttachment("the condition holds");
+			assert.notInclude(await contentSearch(suffix, 'ion'), suffix.id);
+			let prefixed = await createTextAttachment("postcolonialism studies");
+			assert.notInclude(await contentSearch(prefixed, 'colonialism'), prefixed.id);
+		});
+
+		it("should prefix-match a short term used as an explicit condition", async function () {
+			let item = await createTextAttachment("the quick brown fox");
+			// Short terms are only skipped by unquoted quick search (canSearchContent), so "fo"
+			// matches "fox" as a word prefix here
+			assert.include(await contentSearch(item, 'fo'), item.id);
+		});
+
+		it("should prefix-match accent-insensitively", async function () {
+			let item = await createTextAttachment("zzcafés in paris");
+			assert.include(await contentSearch(item, 'zzcafé'), item.id);
+		});
+
+		it("should match a phrase with the final word as a prefix", async function () {
+			let item = await createTextAttachment("global climate changes are accelerating");
+			assert.include(await contentSearch(item, 'climate chang'), item.id);
+		});
+
+		it("should match a phrase across whitespace and hyphens", async function () {
+			// Word separators vary with extraction layout and compound styling, so whitespace
+			// and hyphen runs in the phrase and the content match each other
+			let newline = await createTextAttachment("the climate\nchange debate");
+			assert.include(await contentSearch(newline, 'climate change'), newline.id);
+			let hyphen = await createTextAttachment("climate-change research");
+			assert.include(await contentSearch(hyphen, 'climate change'), hyphen.id);
+			let spaced = await createTextAttachment("zzdecision making processes");
+			assert.include(await contentSearch(spaced, 'zzdecision-making'), spaced.id);
+		});
+
+		it("should not match a phrase across punctuation", async function () {
+			// These are index candidates -- FTS5 ignores what separates adjacent tokens -- so
+			// they exercise the verification scan of the cached text
+			let punct = await createTextAttachment("the climate. Change is coming");
+			assert.notInclude(await contentSearch(punct, 'climate change'), punct.id);
+			let slash = await createTextAttachment("climate/change models");
+			assert.notInclude(await contentSearch(slash, 'climate change'), slash.id);
+		});
+
+		it("should require punctuation in a single-word term to match literally", async function () {
+			let cpp = await createTextAttachment("the c++ standard library");
+			assert.include(await contentSearch(cpp, 'c++'), cpp.id);
+			// "code" is a candidate for the "c" token prefix, but "c++" doesn't appear
+			let plain = await createTextAttachment("zzcat code samples");
+			assert.notInclude(await contentSearch(plain, 'c++'), plain.id);
+		});
+
+		it("should not match anything for a separator-only term", async function () {
+			let item = await createTextAttachment("plain text with spaces");
+			assert.notInclude(await contentSearch(item, '--'), item.id);
+		});
+
+		it("should match a 2-character CJK query", async function () {
+			let item = await createTextAttachment("中文搜索系统设计");
+			assert.include(await contentSearch(item, '搜索'), item.id);
+		});
+
+		it("should match a longer CJK substring within a run", async function () {
+			let item = await createTextAttachment("中文搜索系统设计");
+			assert.include(await contentSearch(item, '搜索系统'), item.id);
+		});
+
+		it("should distinguish voiced and unvoiced kana in CJK content", async function () {
+			let item = await createTextAttachment("研究がん");
+			assert.include(await contentSearch(item, 'がん'), item.id);
+			assert.notInclude(await contentSearch(item, 'かん'), item.id);
+		});
+
+		it("should match a mixed CJK and non-CJK term literally", async function () {
+			let mixed = await createTextAttachment("москва日本 report");
+			let cjkOnly = await createTextAttachment("日本語の研究");
+			// Neither index covers the term alone, so it falls back to a scan of the cached
+			// text; a document containing only the CJK part doesn't match
+			let results = await contentSearch(mixed, 'москва日本');
+			assert.include(results, mixed.id);
+			assert.notInclude(results, cjkOnly.id);
+		});
+
+		it("should not match an unrelated CJK document", async function () {
+			let item = await createTextAttachment("天气预报很准确");
+			let other = await createTextAttachment("中文搜索系统设计");
+			let results = await contentSearch(item, '搜索');
+			assert.notInclude(results, item.id);
+			assert.include(results, other.id);
+		});
+
+		it("should record an index-state row when indexing", async function () {
+			let item = await createTextAttachment("index state recorded here");
+			let version = await Zotero.DB.valueQueryAsync(
+				"SELECT version FROM ftindex.fulltextIndexState WHERE itemID=?", item.id
+			);
+			assert.equal(version, 1);
+		});
+
+		it("should index queued items missing from the content index", async function () {
+			let item = await createTextAttachment("queued jabberwocky content");
+			// Simulate an item full-text indexed before the content index existed: drop its entries
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContentCJK WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+
+			// It's now in the queue and not findable by content
+			assert.isAbove(await Zotero.FullText.getAttachmentIndexQueueCount(), 0);
+			assert.notInclude(await contentSearch(item, 'jabberwocky'), item.id);
+
+			// Draining the queue re-indexes it from the cached text
+			await Zotero.FullText.processAttachmentIndexQueue();
+
+			assert.include(await contentSearch(item, 'jabberwocky'), item.id);
+			let version = await Zotero.DB.valueQueryAsync(
+				"SELECT version FROM ftindex.fulltextIndexState WHERE itemID=?", item.id
+			);
+			assert.equal(version, 1);
+		});
+
+		it("should re-extract a queued item whose cache file is missing", async function () {
+			let item = await importFileAttachment('test.pdf');
+			let cacheFile = Zotero.FullText.getItemCacheFile(item).path;
+			// Grab a real word from the extracted text to search for after re-extraction
+			let word = (await Zotero.File.getContentsAsync(cacheFile)).match(/[a-z]{5,}/i)[0];
+			// Simulate the storage folder being cleared after indexing (cache gone, file present),
+			// then re-queue the item
+			await OS.File.remove(cacheFile);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContentCJK WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+
+			// Draining the queue should re-extract from the file (not index empty)
+			await Zotero.FullText.processAttachmentIndexQueue();
+
+			assert.isTrue(await OS.File.exists(cacheFile));
+			assert.include(await contentSearch(item, word), item.id);
+		});
+
+		it("should not repeatedly re-extract a queued item with no extractable text", async function () {
+			let item = await importFileAttachment('test.pdf');
+			let cacheFile = Zotero.FullText.getItemCacheFile(item).path;
+			await OS.File.remove(cacheFile);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContentCJK WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+
+			let getFullText = sinon.stub(Zotero.PDFWorker, 'getFullText').resolves({
+				text: '',
+				extractedPages: 0,
+				totalPages: 1
+			});
+			try {
+				await Zotero.FullText.processAttachmentIndexQueue({ maxTime: 100 });
+			}
+			finally {
+				getFullText.restore();
+			}
+
+			assert.isTrue(getFullText.calledOnce);
+			let version = await Zotero.DB.valueQueryAsync(
+				"SELECT version FROM ftindex.fulltextIndexState WHERE itemID=?", item.id
+			);
+			assert.equal(version, 1);
+			assert.equal(await Zotero.FullText.getAttachmentIndexQueueCount(), 0);
+		});
+
+		it("should not count unindexable attachments as not indexed", async function () {
+			let before = (await Zotero.FullText.getIndexStats()).unindexedQueue;
+			// A Word document can't be full-text indexed, so it shouldn't inflate "not indexed"
+			let path = OS.Path.join(await getTempDirectory(), Zotero.Utilities.randomString() + ".doc");
+			await Zotero.File.putContentsAsync(path, "not really a word doc");
+			await Zotero.Attachments.importFromFile({
+				file: path, contentType: 'application/msword'
+			});
+			let after = (await Zotero.FullText.getIndexStats()).unindexedQueue;
+			assert.equal(after, before);
+		});
+
+		it("should index an unindexed attachment that has a local file", async function () {
+			let item = await createTextAttachment("filepresentunindexed content");
+			// Simulate a never-indexed attachment: no fulltextItems row, not in the index
+			await Zotero.DB.queryAsync("DELETE FROM fulltextItems WHERE itemID=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+			assert.notInclude(await contentSearch(item, 'filepresentunindexed'), item.id);
+			await Zotero.FullText.processAttachmentExtractionQueue();
+			assert.include(await contentSearch(item, 'filepresentunindexed'), item.id);
+		});
+
+		it("should record an unindexed attachment with no local file as missing", async function () {
+			let item = await createTextAttachment("nolocalfile content");
+			await Zotero.DB.queryAsync("DELETE FROM fulltextItems WHERE itemID=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+			// Remove the file so there's no local content to index
+			await OS.File.remove(await item.getFilePathAsync());
+			await Zotero.FullText.processAttachmentExtractionQueue();
+			let synced = await Zotero.DB.valueQueryAsync(
+				"SELECT synced FROM fulltextItems WHERE itemID=?", item.id
+			);
+			assert.equal(synced, Zotero.FullText.SYNC_STATE_MISSING);
+		});
+
+		it("should record an attachment as missing when its content can't be extracted", async function () {
+			// A file that isn't a valid EPUB: extraction fails, so the import leaves no fulltextItems
+			// row. The item must still leave the queue (recorded missing) rather than being retried
+			// endlessly.
+			let tmpDir = await getTempDirectory();
+			let path = OS.Path.join(tmpDir, Zotero.Utilities.randomString() + ".epub");
+			await Zotero.File.putContentsAsync(path, "not really an EPUB");
+			let item = await Zotero.Attachments.importFromFile({
+				file: path, contentType: 'application/epub+zip'
+			});
+			assert.isNotOk(await Zotero.DB.valueQueryAsync(
+				"SELECT 1 FROM fulltextItems WHERE itemID=?", item.id
+			));
+			await Zotero.FullText.processAttachmentExtractionQueue();
+			let synced = await Zotero.DB.valueQueryAsync(
+				"SELECT synced FROM fulltextItems WHERE itemID=?", item.id
+			);
+			assert.equal(synced, Zotero.FullText.SYNC_STATE_MISSING);
+			// No longer pending, so the drain won't keep retrying it
+			assert.equal(await Zotero.FullText.getAttachmentExtractionQueueCount(), 0);
+		});
+
+		it("should skip unindexed attachments while indexing is disabled and index them when re-enabled", async function () {
+			let item = await createTextAttachment("disabledpref content");
+			await Zotero.DB.queryAsync("DELETE FROM fulltextItems WHERE itemID=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextContent WHERE rowid=?", item.id);
+			await Zotero.DB.queryAsync("DELETE FROM ftindex.fulltextIndexState WHERE itemID=?", item.id);
+			Zotero.Prefs.set('fulltext.textMaxLength', 0);
+			try {
+				// Disabled: not counted as pending, and a pass records nothing (so it can't loop)
+				assert.equal(await Zotero.FullText.getAttachmentExtractionQueueCount(), 0);
+				await Zotero.FullText.processAttachmentExtractionQueue();
+				assert.isNotOk(await Zotero.DB.valueQueryAsync(
+					"SELECT 1 FROM fulltextItems WHERE itemID=?", item.id
+				));
+			}
+			finally {
+				Zotero.Prefs.clear('fulltext.textMaxLength');
+			}
+			// Re-enabled: eligible again and indexed
+			await Zotero.FullText.processAttachmentExtractionQueue();
+			assert.include(await contentSearch(item, 'disabledpref'), item.id);
+		});
+
+		it("should purge content index entries orphaned by item deletion", async function () {
+			let item = await createTextAttachment("orphanpurge content");
+			assert.include(await contentSearch(item, 'orphanpurge'), item.id);
+			// Simulate the FK cascade from a delete that bypassed Item.erase(): drop the
+			// fulltextItems row, leaving the content index entries orphaned
+			await Zotero.DB.queryAsync("DELETE FROM fulltextItems WHERE itemID=?", item.id);
+			await Zotero.FullText.purgeOrphanedContent();
+			assert.notInclude(await contentSearch(item, 'orphanpurge'), item.id);
+		});
+
+		it("should remove content from the index when cleared", async function () {
+			let item = await createTextAttachment("disposable singular content");
+			assert.include(await contentSearch(item, 'disposable'), item.id);
+			await Zotero.DB.executeTransaction(async function () {
+				await Zotero.FullText.clearItemWords(item.id);
+			});
+			assert.notInclude(await contentSearch(item, 'disposable'), item.id);
+		});
+
+		it("should keep content searchable after optimizing the index", async function () {
+			let item = await createTextAttachment("optimizable content");
+			// Failures are logged rather than thrown, so make sure the merge ran cleanly
+			let logError = sinon.spy(Zotero, 'logError');
+			try {
+				await Zotero.FullText.optimizeContentIndex({ force: true });
+			}
+			finally {
+				logError.restore();
+			}
+			assert.isTrue(logError.notCalled);
+			assert.include(await contentSearch(item, 'optimizable'), item.id);
+		});
+
+		it("should start each table's merge with a negative page count", async function () {
+			// A positive count only merges levels that already have enough segments of their own;
+			// SQLite requires a negative one to start a merge across all of them
+			await createTextAttachment("mergeprotocol content");
+			let queryAsync = sinon.spy(Zotero.DB, 'queryAsync');
+			try {
+				await Zotero.FullText.optimizeContentIndex({ force: true });
+			}
+			finally {
+				queryAsync.restore();
+			}
+			let merges = queryAsync.args.map(args => args[0])
+				.filter(sql => typeof sql == 'string' && sql.includes("VALUES('merge'"));
+			assert.isNotEmpty(merges);
+			for (let table of ['fulltextContent', 'fulltextContentCJK', 'fulltextNotes',
+					'fulltextNotesCJK']) {
+				let first = merges.find(sql => sql.includes(`ftindex.${table}(`));
+				assert.include(first, "VALUES('merge', -", table);
+			}
+		});
+
+		it("should keep content searchable after vacuuming the index", async function () {
+			let item = await createTextAttachment("vacuumable content");
+			await Zotero.FullText.vacuumContentIndex({ force: true });
+			assert.include(await contentSearch(item, 'vacuumable'), item.id);
+		});
+
+		it("should discard the index when it belongs to a different database instance", async function () {
+			let item = await createTextAttachment("instancemismatch content");
+			assert.include(await contentSearch(item, 'instancemismatch'), item.id);
+			// Simulate an index built against a different zotero.sqlite (e.g., the database was
+			// deleted and re-synced, reassigning local itemIDs) by changing the stored localUserKey
+			await Zotero.DB.queryAsync(
+				"UPDATE ftindex.fulltextIndexMeta SET value='xxxxxxxx' WHERE key='localUserKey'"
+			);
+			// Force a reconnect, which re-runs the content DB setup and detects the mismatch
+			await Zotero.DB.vacuum({ force: true });
+			assert.equal(
+				await Zotero.DB.valueQueryAsync("SELECT COUNT(*) FROM ftindex.fulltextIndexState"), 0
+			);
+			assert.notInclude(await contentSearch(item, 'instancemismatch'), item.id);
+		});
+
+		describe("Note indexing", function () {
+			async function createNote(noteText) {
+				let item = new Zotero.Item('note');
+				item.setNote(noteText);
+				await item.saveTx();
+				return item;
+			}
+
+			function noteSearch(item, value) {
+				let s = new Zotero.Search();
+				s.libraryID = item.libraryID;
+				s.addCondition('note', 'contains', value);
+				return s.search();
+			}
+
+			it("should match note content case- and diacritic-insensitively via the index", async function () {
+				let item = await createNote("<p>zqnnThe Séance was held at dawn</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.include(await noteSearch(item, 'zqnnthe seance'), item.id);
+			});
+
+			it("should match a just-edited note before it's re-indexed", async function () {
+				let item = await createNote("<p>zqnnoriginal content</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				item.setNote('<p style="color: red">zqnnréplacement content</p>');
+				await item.saveTx();
+				// The edit is matched right away, without waiting for background re-indexing, with
+				// the same accent-insensitive matching as the index (é folded)...
+				assert.include(await noteSearch(item, 'zqnnreplacement'), item.id);
+				// ...the old content no longer matches...
+				assert.notInclude(await noteSearch(item, 'zqnnoriginal'), item.id);
+				// ...and markup isn't matched
+				assert.notInclude(await noteSearch(item, 'color: red'), item.id);
+			});
+
+			it("should not match note markup", async function () {
+				let item = await createNote('<p style="color: red">zqnnstyled text</p>');
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.include(await noteSearch(item, 'zqnnstyled'), item.id);
+				assert.notInclude(await noteSearch(item, 'color: red'), item.id);
+			});
+
+			it("should scan plain text but not markup for a term too short for the index", async function () {
+				// "ai" and "re" are too short to index, so they fall back to scanning the note's
+				// normalized plain text. "ai" is in the text and matches; "re" appears only in "red"
+				// in the style attribute, so scanning plain text (not raw HTML) doesn't match it.
+				let item = await createNote('<p style="color: red">zqnn ai content</p>');
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.include(await noteSearch(item, 'ai'), item.id);
+				assert.notInclude(await noteSearch(item, 're'), item.id);
+			});
+
+			it("should match a mixed-script note term via the plain-text fallback", async function () {
+				// A mixed CJK/non-CJK term suits neither index, so it falls back to the plain-text scan
+				let item = await createNote("<p>zqnn研究ai</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.include(await noteSearch(item, '究ai'), item.id);
+			});
+
+			it("should match a mixed CJK and non-ASCII note term literally", async function () {
+				let mixed = await createNote("<p>zqnnмосква日本 report</p>");
+				let cjkOnly = await createNote("<p>zqnn日本語の研究</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				// The term suits neither index, so it scans the notes' plain text; a note
+				// containing only the CJK part doesn't match
+				let results = await noteSearch(mixed, 'москва日本');
+				assert.include(results, mixed.id);
+				assert.notInclude(results, cjkOnly.id);
+			});
+
+			it("shouldn't optimize the content index after indexing a note", async function () {
+				// Clear the count of items indexed since the last optimize
+				await Zotero.FullText.optimizeContentIndex({ force: true });
+				await createNote("<p>zqnnunoptimized content</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.isFalse(await Zotero.FullText.optimizeContentIndex());
+			});
+
+			it("should exclude a matching note with doesNotContain", async function () {
+				let item = await createNote("<p>zqnnexcludable content</p>");
+				await Zotero.FullText.processNoteIndexQueue();
+				let s = new Zotero.Search();
+				s.libraryID = item.libraryID;
+				s.addCondition('note', 'doesNotContain', 'zqnnexcludable');
+				assert.notInclude(await s.search(), item.id);
+			});
+
+			it("should fall back to scanning the HTML until the note backfill finishes", async function () {
+				let item = await createNote("<p>zqnnbackfill séance</p>");
+				// Rebuild the index (as after a delete-and-resync), leaving every note pending
+				// backfill
+				await Zotero.DB.queryAsync(
+					"UPDATE ftindex.fulltextIndexMeta SET value='xxxxxxxx' WHERE key='localUserKey'"
+				);
+				await Zotero.DB.vacuum({ force: true });
+				// The reconnect's index setup (which drops the mismatched tables) runs on the next
+				// query, as at startup before searches resume
+				await Zotero.DB.queryAsync("SELECT 1");
+				// The note isn't in the index yet, but an exact term still matches via the scan
+				assert.include(await noteSearch(item, 'zqnnbackfill'), item.id);
+				// Draining the queue enables diacritic-insensitive index matching
+				await Zotero.FullText.processNoteIndexQueue();
+				assert.include(await noteSearch(item, 'zqnnbackfill seance'), item.id);
+			});
+		});
+	});
+
 	describe("Indexing", function () {
 		beforeEach(function () {
 			Zotero.Prefs.clear('fulltext.textMaxLength');
@@ -35,6 +496,16 @@ describe("Zotero.FullText", function () {
 				);
 			})
 			
+			it("should index an HTML file", async function () {
+				var item = await importFileAttachment('test.html');
+				assert.equal(
+					((await Zotero.Fulltext.getIndexedState(item))),
+					Zotero.Fulltext.INDEX_STATE_INDEXED
+				);
+				var content = await Zotero.File.getContentsAsync(Zotero.Fulltext.getItemCacheFile(item).path);
+				assert.include(content, 'This is a test.');
+			})
+			
 			it("should skip indexing of a PDF if fulltext.textMaxLength is 0", async function () {
 				Zotero.Prefs.set('fulltext.textMaxLength', 0);
 				var item = await importFileAttachment('test.pdf');
@@ -110,6 +581,23 @@ describe("Zotero.FullText", function () {
 				assert.isTrue(await OS.File.exists(OS.Path.join(storageDir, '.zotero-ft-cache')));
 				assert.isFalse(await OS.File.exists(OS.Path.join(storageDir, filename)));
 			});
+
+			it("should preserve the SDT cache when reindexing a linked attachment", async function () {
+				var file = OS.Path.join(getTestDataDirectory().path, 'test.pdf');
+				var linkedFile = OS.Path.join(await getTempDirectory(), 'test.pdf');
+				await OS.File.copy(file, linkedFile);
+				var item = await Zotero.Attachments.linkFromFile({ file: linkedFile });
+
+				// The full-text cache of a linked file shares the item's
+				// storage directory with the SDT cache, so reindexing must
+				// not recreate the directory and destroy it
+				var storageDir = Zotero.Attachments.getStorageDirectory(item).path;
+				var sdtCacheFile = OS.Path.join(storageDir, '.zotero-sdt-cache');
+				await Zotero.File.putContentsAsync(sdtCacheFile, 'test');
+
+				assert.isTrue(await Zotero.Fulltext.indexPDF(linkedFile, item.id));
+				assert.isTrue(await OS.File.exists(sdtCacheFile));
+			});
 		});
 	});
 	
@@ -203,6 +691,43 @@ describe("Zotero.FullText", function () {
 		});
 	})
 	
+	describe("#processSyncedContentNow()", function () {
+		before(() => {
+			Zotero.Prefs.set('fulltext.pdfMaxPages', 0);
+		});
+		after(() => {
+			Zotero.Prefs.clear('fulltext.pdfMaxPages');
+		});
+
+		it("should index sync-delivered content without waiting for idle", async function () {
+			var item = await importFileAttachment('test.pdf');
+			// Simulate content delivered by sync: stored as TO_PROCESS with a processor cache file,
+			// not yet in the search index (PDF indexing is disabled, so it wasn't indexed locally)
+			await Zotero.FullText.setItemContent(
+				item.libraryID,
+				item.key,
+				{ content: "zqpromptsync electrophoresis", indexedChars: 28, totalChars: 28 },
+				5
+			);
+			function search(term) {
+				let s = new Zotero.Search();
+				s.libraryID = item.libraryID;
+				s.addCondition('fulltextContent', 'contains', term);
+				return s.search();
+			}
+			assert.notInclude(await search('zqpromptsync'), item.id);
+
+			// Processing it promptly (as on sync completion) makes it searchable without idle
+			await Zotero.FullText.processSyncedContentNow();
+
+			assert.include(await search('zqpromptsync'), item.id);
+			assert.equal(
+				await Zotero.DB.valueQueryAsync("SELECT synced FROM fulltextItems WHERE itemID=?", item.id),
+				Zotero.FullText.SYNC_STATE_IN_SYNC
+			);
+		});
+	});
+
 	describe("#setItemContent()", function () {
 		before(() => {
 			// Disable PDF indexing
@@ -217,7 +742,7 @@ describe("Zotero.FullText", function () {
 		it("should store data in .zotero-ft-unprocessed file", async function () {
 			var item = await importFileAttachment('test.pdf');
 			
-			var processorCacheFile = Zotero.Fulltext.getItemProcessorCacheFile(item).path;
+			var processorCacheFile = Zotero.Fulltext.getSyncedContentCacheFile(item).path;
 			
 			var version = 5;
 			await Zotero.Fulltext.setItemContent(
@@ -249,7 +774,7 @@ describe("Zotero.FullText", function () {
 				[item.id, Zotero.FullText.SYNC_STATE_UNSYNCED]
 			);
 			
-			var processorCacheFile = Zotero.FullText.getItemProcessorCacheFile(item).path;
+			var processorCacheFile = Zotero.FullText.getSyncedContentCacheFile(item).path;
 			var itemCacheFile = Zotero.FullText.getItemCacheFile(item).path;
 			await Zotero.File.putContentsAsync(itemCacheFile, "Test");
 			
@@ -300,7 +825,7 @@ describe("Zotero.FullText", function () {
 				version
 			);
 			
-			var processorCacheFile = Zotero.FullText.getItemProcessorCacheFile(item).path;
+			var processorCacheFile = Zotero.FullText.getSyncedContentCacheFile(item).path;
 			var itemCacheFile = Zotero.FullText.getItemCacheFile(item).path;
 			
 			assert.isTrue(await OS.File.exists(processorCacheFile));
@@ -339,7 +864,7 @@ describe("Zotero.FullText", function () {
 				version
 			);
 			
-			var processorCacheFile = Zotero.FullText.getItemProcessorCacheFile(item).path;
+			var processorCacheFile = Zotero.FullText.getSyncedContentCacheFile(item).path;
 			var itemCacheFile = Zotero.FullText.getItemCacheFile(item).path;
 			
 			assert.isTrue(await OS.File.exists(processorCacheFile));
diff --git a/test/tests/httpTest.js b/test/tests/httpTest.js
index 892b9bd4e1..3f9b6a2da5 100644
--- a/test/tests/httpTest.js
+++ b/test/tests/httpTest.js
@@ -454,15 +454,16 @@ describe("Zotero.HTTP", function () {
 				'/download/auth',
 				{
 					handle: function (request, response) {
-						let val;
-						try {
-							val = request.getHeader("Authorization");
-						}
-						catch (e) {
-							val = "";
+						if (!request.hasHeader("Authorization")) {
+							response.setStatusLine(null, 401, "Unauthorized");
+							response.setHeader("WWW-Authenticate", 'Basic realm="Test"', false);
+							response.write("denied");
+							return;
 						}
 						response.setStatusLine(null, 200, "OK");
-						response.setHeader("X-Echo-Auth", val, false);
+						response.setHeader(
+							"X-Echo-Auth", request.getHeader("Authorization"), false
+						);
 						response.write("ok");
 					}
 				}
@@ -610,6 +611,35 @@ describe("Zotero.HTTP", function () {
 			assert.equal(req.status, 200);
 			assert.equal(req.headers.get("X-Echo-Auth"), expected);
 		});
+
+		it("should encode non-ASCII credentials the same way as request()", async function () {
+			let url = `http://user:p%C3%A4ssw%E2%82%ACrd`
+				+ `@127.0.0.1:${port}/download/auth`;
+			let dest = PathUtils.join(tmpDir, "auth-utf8.bin");
+			let req = await Zotero.HTTP.download(Services.io.newURI(url), dest);
+			assert.equal(req.status, 200);
+			
+			let xmlhttp = await Zotero.HTTP.request("GET", url);
+			assert.equal(
+				req.headers.get("X-Echo-Auth"),
+				xmlhttp.getResponseHeader("X-Echo-Auth")
+			);
+		});
+
+		it("should preserve literal %HH sequences in the password in request() and download()", async function () {
+			let username = "user";
+			let password = "example%41pass";
+			let expected = "Basic " + btoa(username + ":" + password);
+			let url = `http://${username}:${encodeURIComponent(password)}`
+				+ `@127.0.0.1:${port}/download/auth`;
+			
+			let xmlhttp = await Zotero.HTTP.request("GET", url);
+			assert.equal(xmlhttp.getResponseHeader("X-Echo-Auth"), expected);
+			
+			let dest = PathUtils.join(tmpDir, "auth-percent.bin");
+			let req = await Zotero.HTTP.download(Services.io.newURI(url), dest);
+			assert.equal(req.headers.get("X-Echo-Auth"), expected);
+		});
 	});
 
 
diff --git a/test/tests/importExportTest.js b/test/tests/importExportTest.js
index 5f0b7554ea..eea3ff14f0 100644
--- a/test/tests/importExportTest.js
+++ b/test/tests/importExportTest.js
@@ -69,6 +69,67 @@ describe("Import/Export", function () {
 			);
 		});
 		
+		it("should reproduce the collection hierarchy of a collection export", async function () {
+			var collection = await createDataObject('collection', { name: 'Top' });
+			var subcollection = await createDataObject(
+				'collection', { name: 'Sub', parentID: collection.id }
+			);
+			var subsubcollection = await createDataObject(
+				'collection', { name: 'Subsub', parentID: subcollection.id }
+			);
+			var topItem = await createDataObject(
+				'item', { title: 'Top', collections: [collection.id] }
+			);
+			var topAndSubItem = await createDataObject(
+				'item', { title: 'TopAndSub', collections: [collection.id, subcollection.id] }
+			);
+			var subsubItem = await createDataObject(
+				'item', { title: 'Subsub', collections: [subsubcollection.id] }
+			);
+			
+			// Export the collection
+			var file = OS.Path.join(await getTempDirectory(), 'export.rdf');
+			var translation = new Zotero.Translate.Export();
+			translation.setCollection(collection);
+			translation.setLocation(Zotero.File.pathToFile(file));
+			translation.setTranslator('14763d24-8ba0-45df-8f52-b8d1108e7ac9');
+			await translation.translate();
+			
+			// Import it into another collection
+			var targetCollection = await createDataObject('collection');
+			translation = new Zotero.Translate.Import();
+			translation.setLocation(Zotero.File.pathToFile(file));
+			translation.setTranslator((await translation.getTranslators())[0]);
+			await translation.translate({
+				libraryID: Zotero.Libraries.userLibraryID,
+				collections: [targetCollection.id]
+			});
+			
+			var titles = c => c.getChildItems().map(i => i.getField('title')).sort();
+			
+			// Items belong to the imported collections, not to the collection they were
+			// imported into
+			assert.lengthOf(titles(targetCollection), 0);
+			
+			var newCollections = targetCollection.getChildCollections();
+			assert.lengthOf(newCollections, 1);
+			assert.equal(newCollections[0].name, collection.name);
+			assert.sameMembers(
+				titles(newCollections[0]),
+				[topItem.getField('title'), topAndSubItem.getField('title')]
+			);
+			
+			newCollections = newCollections[0].getChildCollections();
+			assert.lengthOf(newCollections, 1);
+			assert.equal(newCollections[0].name, subcollection.name);
+			assert.sameMembers(titles(newCollections[0]), [topAndSubItem.getField('title')]);
+			
+			newCollections = newCollections[0].getChildCollections();
+			assert.lengthOf(newCollections, 1);
+			assert.equal(newCollections[0].name, subsubcollection.name);
+			assert.sameMembers(titles(newCollections[0]), [subsubItem.getField('title')]);
+		});
+		
 		// Not currently supported
 		it.skip("should import related items", async function () {
 			var libraryID = Zotero.Libraries.userLibraryID;
diff --git a/test/tests/integrationTest.js b/test/tests/integrationTest.js
index 3427d95ca2..d137045c40 100644
--- a/test/tests/integrationTest.js
+++ b/test/tests/integrationTest.js
@@ -1088,6 +1088,21 @@ describe("Zotero.Integration", function () {
 		});
 		
 		describe('#refresh', function () {
+			it('should delete the bibliography when the last citation is removed', async function () {
+				var docID = this.test.fullTitle();
+				setAddEditItems(testItems[0]);
+				await initDoc(docID);
+				await execCommand('addEditCitation', docID);
+				await execCommand('addEditBibliography', docID);
+				var doc = applications[docID].doc;
+				assert.equal(doc.fields.length, 2);
+
+				await doc.fields[0].delete();
+				await execCommand('refresh', docID);
+
+				assert.equal(doc.fields.length, 0);
+			});
+
 			it ('should properly disambiguate author after editing in the database', async function () {
 				var docID = this.test.fullTitle();
 				let testItem1 = await createDataObject('item', {libraryID: Zotero.Libraries.userLibraryID});
diff --git a/test/tests/itemFieldsTest.js b/test/tests/itemFieldsTest.js
index 143e6f9efc..5ea3e09f09 100644
--- a/test/tests/itemFieldsTest.js
+++ b/test/tests/itemFieldsTest.js
@@ -45,6 +45,16 @@ describe("Zotero.ItemFields", function () {
 		});
 	});
 	
+	describe("#isDate()", function () {
+		it("should treat base and mapped date-type fields as dates", function () {
+			assert.isTrue(Zotero.ItemFields.isDate('date'));
+			assert.isTrue(Zotero.ItemFields.isDate('dateDecided'));
+			assert.isTrue(Zotero.ItemFields.isDate('originalDate'));
+			assert.isTrue(Zotero.ItemFields.isDate('priorityDate'));
+			assert.isFalse(Zotero.ItemFields.isDate('title'));
+		});
+	});
+
 	describe("#getDirection()", function () {
 		it("should follow app locale for primary field", function () {
 			assert.equal(Zotero.ItemFields.getDirection('book', 'dateAdded', ''), Zotero.dir)
diff --git a/test/tests/itemPaneTest.js b/test/tests/itemPaneTest.js
index ce9afb8a78..d8101b19d4 100644
--- a/test/tests/itemPaneTest.js
+++ b/test/tests/itemPaneTest.js
@@ -250,6 +250,57 @@ describe("Item pane", function () {
 		});
 	});
 	
+	describe("Message pane", function () {
+		it("should update items-in-view count when an item is added with no selection", async function () {
+			var collection = await createDataObject('collection');
+			await ZoteroPane.collectionsView.selectCollection(collection.id);
+			await waitForItemsLoad(win);
+			
+			var messageBox = doc.querySelector('#zotero-item-pane-message-box');
+			var emptyMessage = await doc.l10n.formatValue('item-pane-message-unselected', { count: 0 });
+			var oneItemMessage = await doc.l10n.formatValue('item-pane-message-unselected', { count: 1 });
+			for (let i = 0; i < 100 && !messageBox.textContent.includes(emptyMessage); i++) {
+				await Zotero.Promise.delay(10);
+			}
+			assert.include(messageBox.textContent, emptyMessage);
+			
+			await createDataObject('item', { collections: [collection.id] }, { skipSelect: true });
+			
+			for (let i = 0; i < 100 && !messageBox.textContent.includes(oneItemMessage); i++) {
+				await Zotero.Promise.delay(10);
+			}
+			assert.include(messageBox.textContent, oneItemMessage);
+		});
+		
+		it("should update items-in-view count when a restored item is removed from the trash with no selection", async function () {
+			var group = await createGroup();
+			var item = await createDataObject('item', { libraryID: group.libraryID, deleted: true }, { skipSelect: true });
+			await selectTrash(win, group.libraryID);
+			
+			var messageBox = doc.querySelector('#zotero-item-pane-message-box');
+			var emptyMessage = await doc.l10n.formatValue('item-pane-message-unselected', { count: 0 });
+			var oneItemMessage = await doc.l10n.formatValue('item-pane-message-unselected', { count: 1 });
+			for (let i = 0; i < 100 && !messageBox.textContent.includes(oneItemMessage); i++) {
+				await Zotero.Promise.delay(10);
+			}
+			assert.include(messageBox.textContent, oneItemMessage);
+			
+			// Restore the item without notifications, so that the row remains until a
+			// 'refresh' notification arrives (e.g., from retractions or full-text
+			// indexing) and the tree notices that the item is no longer deleted
+			item.deleted = false;
+			await item.saveTx({ skipNotifier: true });
+			assert.include(messageBox.textContent, oneItemMessage);
+			
+			await Zotero.Notifier.trigger('refresh', 'item', [item.id]);
+			
+			for (let i = 0; i < 100 && !messageBox.textContent.includes(emptyMessage); i++) {
+				await Zotero.Promise.delay(10);
+			}
+			assert.include(messageBox.textContent, emptyMessage);
+		});
+	});
+	
 	describe("Info pane", function () {
 		before(async () => {
 			await activateZoteroPane();
@@ -267,6 +318,7 @@ describe("Item pane", function () {
 		it("should refresh on item update", async function () {
 			var item = new Zotero.Item('book');
 			var id = await item.saveTx();
+			await ZoteroPane.selectItem(id);
 			
 			var itemBox = doc.getElementById('zotero-editpane-info-box');
 			var label = itemBox.querySelectorAll('[fieldname="series"]')[1];
@@ -768,16 +820,50 @@ describe("Item pane", function () {
 			rowIDs = [...section.querySelectorAll(".row")].map(node => node.dataset.id);
 			assert.deepEqual(rowIDs, [`L${item.libraryID}`, `C${collectionParent.id}`, `C${collectionChild.id}`]);
 		});
+
+		it("should mark every selected collection as current for a multiple-collection selection", async function () {
+			// Select both collections the item belongs to. Select the (sub)collection
+			// first so its row is revealed, then toggle the parent into the selection.
+			let cv = ZoteroPane.collectionsView;
+			await cv.selectByID("C" + collectionChild.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + collectionParent.id));
+			await ZoteroPane.onCollectionSelected();
+			await ZoteroPane.itemsView.waitForLoad();
+			// Select within the current (multi-collection) view rather than
+			// ZoteroPane.selectItem(), which would navigate and drop the selection
+			await ZoteroPane.itemsView.selectItem(item.id);
+			// itemSelected() pushes the current selection into the item pane; force a
+			// render so the section reflects the multi-collection selection (item-pane
+			// render is skipped when the selected item itself hasn't changed)
+			await ZoteroPane.itemSelected();
+			await ZoteroPane.itemPane.render();
+
+			section = ZoteroPane.itemPane._itemDetails.getPane("libraries-collections");
+			let parentBox = section.querySelector(`.row[data-id="C${collectionParent.id}"] .box`);
+			let childBox = section.querySelector(`.row[data-id="C${collectionChild.id}"] .box`);
+			let libraryBox = section.querySelector(`.row[data-id="L${item.libraryID}"] .box`);
+
+			// Both selected collections are bolded (.current); the unselected library row is not
+			assert.isTrue(parentBox.classList.contains('current'));
+			assert.isTrue(childBox.classList.contains('current'));
+			assert.isFalse(libraryBox.classList.contains('current'));
+
+			await selectLibrary(win);
+		});
 	});
 
 	describe("Attachments pane", function () {
 		let paneID = "attachments";
 
-		beforeEach(function () {
+		beforeEach(async function () {
 			Zotero.Prefs.set("panes.attachments.open", true);
 			Zotero.Prefs.set("showAttachmentPreview", true);
 			Zotero_Tabs.select("zotero-pane");
 			win.resizeTo(1000, 800);
+			// Wait for the resize to take effect, since some tests shrink the window without
+			// waiting for the restore at the end
+			await waitForCallback(() => win.outerWidth == 1000 && win.outerHeight == 800, 100, 3);
 		});
 
 		afterEach(function () {
@@ -953,7 +1039,10 @@ describe("Item pane", function () {
 			await item.saveTx();
 
 			await ZoteroPane.selectItem(item.id);
-			assert.isTrue(await waitForPreviewBoxRender(attachmentsBox));
+			// Scroll to the pane, since pinning doesn't reliably render it if it's out of view
+			await waitForScrollToPane(itemDetails, paneID);
+			// Pass the item id so we don't return early due to a previous item's completed render
+			assert.isTrue(await waitForPreviewBoxRender(attachmentsBox, item.id));
 			// No preview
 			assert.isFalse(await isPreviewDisplayed(attachmentsBox));
 			// No row
@@ -1114,6 +1203,8 @@ describe("Item pane", function () {
 			let annotation = await createAnnotation('highlight', attachment1);
 
 			await itemDetails._renderPromise;
+			// Scroll to the pane, since pinning doesn't reliably render it if it's out of view
+			await waitForScrollToPane(itemDetails, paneID);
 			await waitForPreviewBoxReader(attachmentsBox, attachment1.id);
 
 			assert.isFalse(attachmentsBox.hidden);
@@ -1140,6 +1231,7 @@ describe("Item pane", function () {
 
 			// Select item with attachment (no annotation)
 			await itemDetails._renderPromise;
+			await waitForScrollToPane(itemDetails, paneID);
 			await waitForPreviewBoxReader(attachmentsBox, attachment2.id);
 
 			assert.isFalse(attachmentsBox.hidden);
@@ -1159,6 +1251,7 @@ describe("Item pane", function () {
 
 			// Select item without attachment
 			await itemDetails._renderPromise;
+			await waitForScrollToPane(itemDetails, paneID);
 
 			assert.isFalse(attachmentsBox.hidden);
 			assert.equal(attachmentsBox.querySelectorAll("attachment-row").length, 0);
@@ -1166,6 +1259,7 @@ describe("Item pane", function () {
 			// Again, select item with attachment (1 annotation)
 			await ZoteroPane.selectItem(item1.id);
 			await itemDetails._renderPromise;
+			await waitForScrollToPane(itemDetails, paneID);
 			await waitForPreviewBoxReader(attachmentsBox, attachment1.id);
 
 			assert.isFalse(attachmentsBox.hidden);
@@ -1309,10 +1403,13 @@ describe("Item pane", function () {
 
 			// Should be able to render the correct preview
 			await ZoteroPane.selectItem(item1.id);
+			// Scroll to the pane, since pinning doesn't reliably render it if it's out of view
+			await waitForScrollToPane(itemDetails, paneID);
 			await waitForPreviewBoxReader(attachmentsBox, attachment1.id);
 			assert.isTrue(await isPreviewDisplayed(attachmentsBox));
 
 			await ZoteroPane.selectItem(item2.id);
+			await waitForScrollToPane(itemDetails, paneID);
 			await waitForPreviewBoxReader(attachmentsBox, attachment2.id);
 			assert.isTrue(await isPreviewDisplayed(attachmentsBox));
 
@@ -2596,4 +2693,839 @@ describe("Item pane", function () {
 			await waitForToggle('reader toolbar');
 		});
 	});
+	
+	describe("Batch Edit", function () {
+		let createdItems = [];
+		let _createDataObject = async (...args) => {
+			let item = await createDataObject(...args);
+			createdItems.push(item);
+			return item;
+		};
+		afterEach(async function () {
+			for (let item of createdItems.reverse()) {
+				await item.eraseTx();
+			}
+			createdItems = [];
+		});
+
+		it("should enter and exit batch edit mode", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle' });
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle' });
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+			await waitForFrame();
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			// Enter batch edit mode
+			assert.equal(itemPane.mode, "batch-edit-prompt");
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			assert.ok(batchEditEnableBtn, "batch edit enable button should exist");
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			// Should now be in item mode with batch editing enabled
+			assert.equal(itemPane.mode, "item");
+
+			// Header should hide title-head and show items selected label
+			let header = itemDetails._header;
+			assert.ok(header.classList.contains('no-title-head'), "title-head should be hidden in batch edit mode");
+			assert.ok(header.querySelector('[data-l10n-id="item-pane-batch-editing-header"]'), "batch editing header label should be in header");
+
+			// Exit batch edit mode by changing selection to a single item
+			await ZoteroPane.selectItem(item1.id);
+			await waitForFrame();
+
+			// Should be back in batch-edit-prompt mode when re-selecting both
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+			await waitForFrame();
+			assert.equal(itemPane.mode, "batch-edit-prompt");
+		});
+		it("should restore collapsed info section state after exiting batch edit via selection change", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle' });
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle' });
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			// Select item1 and collapse the info section
+			await ZoteroPane.selectItem(item1.id);
+			await waitForFrame();
+			let infoSection = itemDetails.querySelector('collapsible-section[data-pane="info"]');
+			infoSection.open = false;
+			assert.isFalse(infoSection.open, "info section should be collapsed");
+
+			// Select both items to enter batch edit prompt
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+			await waitForFrame();
+			assert.equal(itemPane.mode, "batch-edit-prompt");
+
+			// Enter batch edit mode
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+			assert.equal(itemPane.mode, "item");
+
+			// Info section should be forced open with no twisty
+			infoSection = itemDetails.querySelector('collapsible-section[data-pane="info"]');
+			assert.isTrue(infoSection.open, "info section should be open in batch edit mode");
+			let twisty = infoSection.querySelector('.twisty');
+			assert.isTrue(twisty.hidden, "twisty should be hidden in batch edit mode");
+
+			// Change selection to just one item -- exits batch edit
+			await ZoteroPane.selectItem(item1.id);
+			await waitForFrame();
+
+			// Info section should restore its previous collapsed state
+			infoSection = itemDetails.querySelector('collapsible-section[data-pane="info"]');
+			assert.isFalse(infoSection.open, "info section should be collapsed after exiting batch edit");
+			twisty = infoSection.querySelector('.twisty');
+			assert.isFalse(twisty.hidden, "twisty should be visible after exiting batch edit");
+		});
+		it("should apply autocomplete value to all items in batch edit mode", async function () {
+			let sharedTitle = "Journal of Shared Research";
+			let differentTitle = "Journal of Different Research";
+
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item1.setField('publicationTitle', sharedTitle);
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item2.setField('publicationTitle', sharedTitle);
+			await item2.saveTx();
+
+			let item3 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item3.setField('publicationTitle', differentTitle);
+			await item3.saveTx();
+
+			let item4 = await _createDataObject('item', { itemType: 'journalArticle' });
+			await item4.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id, item3.id, item4.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+			
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+			
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let pubTitleField = itemBox.querySelector('editable-text[fieldname="publicationTitle"]');
+			assert.ok(pubTitleField, "publicationTitle field should exist");
+			
+			pubTitleField._ignoredWindowInactiveBlur = false;
+			await activateZoteroPane();
+			await Zotero.Promise.delay(50);
+			pubTitleField.focus();
+
+			// 2 value options + 1 "no value" option
+			await waitForCallback(() => pubTitleField.ref.mController.matchCount === 3, 100, 10);
+			let controller = pubTitleField.ref.mController;
+			// Options are sorted by frequency (most common first); empty values are ignored
+			assert.equal(controller.matchCount, 3);
+			assert.equal(controller.getValueAt(0), sharedTitle);
+			assert.equal(controller.getFinalCompleteValueAt(0), sharedTitle);
+			assert.equal(controller.getValueAt(1), differentTitle);
+			assert.equal(controller.getFinalCompleteValueAt(1), differentTitle);
+			// Last option should be "no value"
+			assert.equal(controller.getStyleAt(2), 'options-ac-no-value');
+
+			let modifyPromise = waitForItemEvent('modify');
+			pubTitleField.ref.dispatchEvent(new KeyboardEvent(
+				'keydown', { key: "ArrowDown", code: 'ArrowDown', keyCode: KeyboardEvent.DOM_VK_DOWN, bubbles: true, }
+			));
+			await Zotero.Promise.delay(50);
+			pubTitleField.ref.dispatchEvent(new KeyboardEvent(
+				'keydown', { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN, bubbles: true }
+			));
+			await modifyPromise;
+
+			assert.equal(item1.getField('publicationTitle'), sharedTitle);
+			assert.equal(item2.getField('publicationTitle'), sharedTitle);
+			assert.equal(item3.getField('publicationTitle'), sharedTitle);
+			assert.equal(item4.getField('publicationTitle'), sharedTitle);
+		});
+
+		it("should not show View Online button for URL and DOI fields in batch edit mode", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item1.setField('url', 'https://example.com/1');
+			item1.setField('DOI', '10.1234/test1');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item2.setField('url', 'https://example.com/2');
+			item2.setField('DOI', '10.1234/test2');
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			let urlLink = itemBox.querySelector('#itembox-field-url-link');
+			let doiLink = itemBox.querySelector('#itembox-field-DOI-link');
+
+			// View Online buttons should be hidden in batch edit mode
+			assert.ok(urlLink.hidden, "URL View Online button should be hidden in batch edit mode");
+			assert.ok(doiLink.hidden, "DOI View Online button should be hidden in batch edit mode");
+		});
+
+		it("should not show date field status or tooltip in batch edit mode", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item1.setField('date', '2024-01-15');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle' });
+			item2.setField('date', '2023-06-20');
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// Date field status indicator (y m d) should not be present
+			let dateStatus = itemBox.querySelector('#zotero-date-field-status');
+			assert.isNull(dateStatus, "date field status should not be present in batch edit mode");
+
+			// Date field should not have a tooltip
+			let dateField = itemBox.querySelector('editable-text[fieldname="date"]');
+			assert.ok(dateField, "date field should exist");
+			assert.isNull(dateField.getAttribute('tooltiptext'), "date field should not have a tooltip in batch edit mode");
+		});
+
+		it("should focus a read-only multiple-values field via its label, keeping the Multiple placeholder", async function () {
+			let multiplePlaceholder = Zotero.getString('item-pane-batch-editing-multiple-values-placeholder');
+
+			// Differing dateAdded values make the read-only dateAdded field show the "Multiple" placeholder
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle', dateAdded: '2020-01-01 00:00:00' });
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle', dateAdded: '2021-06-15 00:00:00' });
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+			await waitForFrame();
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			await activateZoteroPane();
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			let dateAddedField = itemBox.querySelector('editable-text[fieldname="dateAdded"]');
+			assert.ok(dateAddedField, "dateAdded field should exist");
+			assert.isTrue(dateAddedField.readOnly, "dateAdded field should be read-only");
+			assert.isTrue(dateAddedField.multipleValues, "dateAdded should show multiple values");
+			assert.equal(dateAddedField.placeholder, multiplePlaceholder);
+			assert.isFalse(dateAddedField.focused, "dateAdded field should not start focused");
+
+			// Read-only multiple-values fields are focusable for keyboard access.
+			// Clicking the label focuses the value, which should show an empty input
+			// with the "Multiple" placeholder
+			let dateAddedLabel = itemBox.querySelector('#itembox-field-dateAdded-label');
+			assert.ok(dateAddedLabel, "dateAdded label should exist");
+			dateAddedLabel.click();
+			await waitForFrame();
+
+			assert.isTrue(dateAddedField.focused, "clicking a read-only field's label should focus it");
+			// The field stays read-only, so it can't actually be edited
+			assert.isTrue(dateAddedField.readOnly, "field should remain read-only when focused");
+			assert.equal(dateAddedField.ref.value, '', "focused read-only field should show no value");
+			assert.equal(
+				dateAddedField.ref.placeholder,
+				multiplePlaceholder,
+				"the 'Multiple' placeholder should remain while focused"
+			);
+		});
+
+		it("should not show 'Multiple' for a read-only date field when all items share the same value", async function () {
+			let multiplePlaceholder = Zotero.getString('item-pane-batch-editing-multiple-values-placeholder');
+
+			// Both items share an identical dateAdded, so the read-only dateAdded
+			// field should display that single value rather than the "Multiple"
+			// placeholder
+			let sharedDateAdded = '2020-01-01 12:00:00';
+			let item1 = await _createDataObject('item', { itemType: 'journalArticle', dateAdded: sharedDateAdded });
+			let item2 = await _createDataObject('item', { itemType: 'journalArticle', dateAdded: sharedDateAdded });
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+			await waitForFrame();
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			let dateAddedField = itemBox.querySelector('editable-text[fieldname="dateAdded"]');
+			assert.ok(dateAddedField, "dateAdded field should exist");
+			assert.isTrue(dateAddedField.readOnly, "dateAdded field should be read-only");
+
+			// Underlying values are identical, so the field must not be in
+			// multiple-values mode
+			assert.isFalse(
+				dateAddedField.multipleValues,
+				"dateAdded should not be in multiple-values mode when all items share the same value"
+			);
+			assert.notEqual(
+				dateAddedField.placeholder,
+				multiplePlaceholder,
+				"the 'Multiple' placeholder should not be shown when the value is identical"
+			);
+			// The shared value should be displayed
+			assert.equal(
+				dateAddedField.value,
+				itemBox.dateTimeFromUTC(item1.getField('dateAdded')),
+				"the shared date value should be displayed"
+			);
+		});
+
+		it("should show union of fields from all item types in cross-type batch edit", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'book' });
+			item1.setField('publisher', 'Test Publisher');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'audioRecording' });
+			item2.setField('label', 'Test Label');
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// Shared base field 'publisher' should appear (book: publisher, audioRecording: label)
+			let publisherField = itemBox.querySelector('editable-text[fieldname="publisher"]');
+			assert.ok(publisherField, "publisher (base field) should appear");
+
+			// Shared base field 'medium' should appear (book: format, audioRecording: audioRecordingFormat)
+			let mediumField = itemBox.querySelector('editable-text[fieldname="medium"]');
+			assert.ok(mediumField, "medium (base field) should appear");
+
+			// Book-only fields should appear
+			let editionField = itemBox.querySelector('editable-text[fieldname="edition"]');
+			assert.ok(editionField, "edition (book-only) should appear");
+
+			// audioRecording-only fields should appear
+			let runningTimeField = itemBox.querySelector('editable-text[fieldname="runningTime"]');
+			assert.ok(runningTimeField, "runningTime (audioRecording-only) should appear");
+		});
+		it("should use base field label when field is shared across types, type-specific label otherwise", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'book' });
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'audioRecording' });
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// Shared field 'publisher' should use base field label
+			let publisherLabel = itemBox.querySelector('#itembox-field-publisher-label');
+			assert.ok(publisherLabel, "publisher label should exist");
+			assert.equal(publisherLabel.textContent, Zotero.ItemFields.getLocalizedString('publisher'));
+
+			// audioRecording-only field 'runningTime' should use type-specific label
+			let runningTimeLabel = itemBox.querySelector('#itembox-field-runningTime-label');
+			assert.ok(runningTimeLabel, "runningTime label should exist");
+			assert.equal(runningTimeLabel.textContent, Zotero.ItemFields.getLocalizedString('runningTime'));
+		});
+		it("should show 'Multiple' placeholder for shared base-mapped fields with different values across types", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'book' });
+			item1.setField('publisher', 'Book Publisher');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'audioRecording' });
+			item2.setField('label', 'Audio Label');
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let publisherField = itemBox.querySelector('editable-text[fieldname="publisher"]');
+			assert.ok(publisherField, "publisher field should exist");
+			assert.isTrue(publisherField.multipleValues, "publisher should show multiple values");
+			assert.equal(
+				publisherField.placeholder,
+				Zotero.getString('item-pane-batch-editing-multiple-values-placeholder')
+			);
+		});
+		it("should apply value to base-mapped fields across different item types", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'book' });
+			item1.setField('publisher', 'Old Publisher');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'audioRecording' });
+			item2.setField('label', 'Old Label');
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let publisherField = itemBox.querySelector('editable-text[fieldname="publisher"]');
+
+			// Simulate editing the field
+			publisherField._ignoredWindowInactiveBlur = false;
+			await activateZoteroPane();
+			await Zotero.Promise.delay(50);
+			publisherField.focus();
+			await Zotero.Promise.delay(50);
+
+			// Type a new value
+			let modifyPromise = waitForItemEvent('modify');
+			publisherField.value = 'New Shared Publisher';
+			publisherField.blur();
+			await modifyPromise;
+
+			// Both items should have the new value in their type-specific fields
+			assert.equal(item1.getField('publisher'), 'New Shared Publisher', "book publisher should be updated");
+			assert.equal(item2.getField('label'), 'New Shared Publisher', "audioRecording label should be updated");
+		});
+		it("should skip items when setting a type-specific field that doesn't apply to all items", async function () {
+			let item1 = await _createDataObject('item', { itemType: 'audioRecording' });
+			item1.setField('runningTime', '3:45');
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'book' });
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let runningTimeField = itemBox.querySelector('editable-text[fieldname="runningTime"]');
+			assert.ok(runningTimeField, "runningTime field should exist");
+
+			// Simulate editing the field
+			runningTimeField._ignoredWindowInactiveBlur = false;
+			await activateZoteroPane();
+			await Zotero.Promise.delay(50);
+			runningTimeField.focus();
+			await Zotero.Promise.delay(50);
+
+			// Type a new value -- should not throw for book
+			let modifyPromise = waitForItemEvent('modify');
+			runningTimeField.value = '5:00';
+			runningTimeField.blur();
+			await modifyPromise;
+
+			assert.equal(item1.getField('runningTime'), '5:00', "audioRecording runningTime should be updated");
+			// Book should be unaffected -- no error thrown
+		});
+		it("should show 'Multiple' for Added By in group library batch edit with different users", async function () {
+			let group = await createGroup();
+			await Zotero.Users.setName(1, 'User One');
+			await Zotero.Users.setName(2, 'User Two');
+
+			let item1 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item1.setField('createdByUserID', 1);
+			await item1.saveTx();
+
+			let item2 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item2.setField('createdByUserID', 2);
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// "Added By" field should show "Multiple..." placeholder
+			let addedByRow = itemBox.querySelector('.meta-label[fieldname="addedBy"]');
+			assert.ok(addedByRow, "addedBy row should exist");
+			let addedByValue = addedByRow.parentElement.querySelector('editable-text');
+			assert.isTrue(addedByValue.multipleValues, "addedBy should have multipleValues");
+			assert.equal(
+				addedByValue.placeholder,
+				Zotero.getString('item-pane-batch-editing-multiple-values-placeholder'),
+				"addedBy should show Multiple placeholder"
+			);
+			assert.equal(addedByValue.value, '', "addedBy value should be empty");
+			assert.notEqual(addedByValue.ref.tabIndex, -1, "addedBy should be focusable");
+
+			// Group erasure cascades to items
+			await group.eraseTx();
+		});
+		it("should show user name for Added By in group library batch edit when all items have the same user", async function () {
+			let group = await createGroup();
+			await Zotero.Users.setName(1, 'Same User');
+
+			let item1 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item1.setField('createdByUserID', 1);
+			await item1.saveTx();
+
+			let item2 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item2.setField('createdByUserID', 1);
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// "Added By" field should show the user name
+			let addedByRow = itemBox.querySelector('.meta-label[fieldname="addedBy"]');
+			assert.ok(addedByRow, "addedBy row should exist");
+			let addedByValue = addedByRow.parentElement.querySelector('editable-text');
+			assert.equal(addedByValue.value, 'Same User', "addedBy should show user name");
+			// With a single shared value there is no "Multiple" placeholder, so the read-only
+			// field should stay reachable by keyboard users, same as in non-batch mode
+			assert.isFalse(addedByValue.multipleValues, "addedBy should not be in multiple-values mode");
+			assert.equal(addedByValue.placeholder, '', "addedBy should not show the Multiple placeholder");
+			assert.notEqual(addedByValue.ref.tabIndex, -1, "addedBy should remain focusable");
+
+			await group.eraseTx();
+		});
+		it("should keep focus on a read-only user field across a re-render in batch edit mode", async function () {
+			let group = await createGroup();
+			await Zotero.Users.setName(1, 'Same User');
+
+			let item1 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item1.setField('createdByUserID', 1);
+			await item1.saveTx();
+
+			let item2 = createUnsavedDataObject('item', { libraryID: group.libraryID });
+			item2.setField('createdByUserID', 1);
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			await activateZoteroPane();
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+
+			// Focus the read-only "added by" field (single shared user, so it is focusable)
+			let addedByValue = itemBox.querySelector('.meta-label[fieldname="addedBy"]')
+				?.parentElement.querySelector('editable-text');
+			assert.ok(addedByValue, "addedBy field should exist");
+			addedByValue.focus();
+			assert.isTrue(addedByValue.focused, "addedBy field should be focused");
+
+			// A re-render (which batch edits trigger on every save) must not drop focus --
+			// the field has to be identifiable by _saveFieldFocus/_restoreFieldFocus
+			await itemBox._forceRenderAll();
+
+			let newAddedByValue = itemBox.querySelector('.meta-label[fieldname="addedBy"]')
+				?.parentElement.querySelector('editable-text');
+			assert.ok(newAddedByValue, "addedBy field should still exist after re-render");
+			assert.isTrue(
+				newAddedByValue.focused,
+				"focus should be restored to the addedBy field after a re-render"
+			);
+
+			await group.eraseTx();
+		});
+		it("should undo and redo a batch field edit", async function () {
+			let item1 = await createDataObject('item', { itemType: 'journalArticle' });
+			item1.setField('publicationTitle', 'Journal Alpha');
+			await item1.saveTx();
+
+			let item2 = await createDataObject('item', { itemType: 'journalArticle' });
+			item2.setField('publicationTitle', 'Journal Beta');
+			await item2.saveTx();
+
+			let item3 = await createDataObject('item', { itemType: 'journalArticle' });
+			item3.setField('publicationTitle', 'Journal Gamma');
+			await item3.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id, item3.id]);
+			Zotero.UndoHistory.clear();
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let pubTitleField = itemBox.querySelector('editable-text[fieldname="publicationTitle"]');
+			assert.ok(pubTitleField, "publicationTitle field should exist");
+
+			assert.equal(pubTitleField.value, '', "field value should be empty before edit");
+			assert.equal(pubTitleField.placeholder, Zotero.getString('item-pane-batch-editing-multiple-values-placeholder'), "field should show Multiple placeholder before edit");
+
+			pubTitleField._ignoredWindowInactiveBlur = false;
+			await activateZoteroPane();
+			await Zotero.Promise.delay(50);
+			pubTitleField.focus();
+
+			// Options sorted alphabetically: Alpha, Beta, Gamma + "no value" option
+			await waitForCallback(() => pubTitleField.ref.mController.matchCount === 4, 100, 500);
+			// Select "Journal Alpha" from autocomplete (first entry)
+			let modifyPromise = waitForItemEvent('modify');
+			pubTitleField.ref.dispatchEvent(new KeyboardEvent(
+				'keydown', { key: "ArrowDown", code: 'ArrowDown', keyCode: KeyboardEvent.DOM_VK_DOWN, bubbles: true }
+			));
+			await Zotero.Promise.delay(50);
+			pubTitleField.ref.dispatchEvent(new KeyboardEvent(
+				'keydown', { key: "Enter", code: "Enter", keyCode: KeyboardEvent.DOM_VK_RETURN, bubbles: true }
+			));
+			await modifyPromise;
+			// waitForItemEvent resolves during Notifier.commit, but UndoHistory's
+			// commit callback runs after -- wait a tick for it to complete.
+			await Zotero.Promise.delay(0);
+
+			assert.equal(item1.getField('publicationTitle'), 'Journal Alpha');
+			assert.equal(item2.getField('publicationTitle'), 'Journal Alpha');
+			assert.equal(item3.getField('publicationTitle'), 'Journal Alpha');
+			assert.isTrue(Zotero.UndoHistory.canUndo(), "should be able to undo");
+
+			// Undo should revert all items
+			await Zotero.UndoHistory.undo();
+			assert.equal(item1.getField('publicationTitle'), 'Journal Alpha',
+				"item1 should be unchanged (already had the selected value)");
+			assert.equal(item2.getField('publicationTitle'), 'Journal Beta',
+				"item2 should revert to original");
+			assert.equal(item3.getField('publicationTitle'), 'Journal Gamma',
+				"item3 should revert to original");
+
+			// Re-query since render() rebuilds the DOM
+			pubTitleField = itemBox.querySelector('editable-text[fieldname="publicationTitle"]');
+			assert.equal(pubTitleField.value, '', "field value should be empty after undo");
+			assert.equal(pubTitleField.placeholder, Zotero.getString('item-pane-batch-editing-multiple-values-placeholder'), "field should show Multiple placeholder after undo");
+
+			// Redo should re-apply to all items
+			await Zotero.UndoHistory.redo();
+			assert.equal(item1.getField('publicationTitle'), 'Journal Alpha');
+			assert.equal(item2.getField('publicationTitle'), 'Journal Alpha');
+			assert.equal(item3.getField('publicationTitle'), 'Journal Alpha');
+		});
+		it("should transform title case for all items in batch edit mode", async function () {
+			let titleCaseTitle = "The Great Gatsby";
+			let sentenceCaseTitle = "to kill a mockingbird";
+
+			// Create two books with different titles in different cases
+			let item1 = await _createDataObject('item', { itemType: 'book' });
+			item1.setField('title', titleCaseTitle);
+			await item1.saveTx();
+
+			let item2 = await _createDataObject('item', { itemType: 'book' });
+			item2.setField('title', sentenceCaseTitle);
+			await item2.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			// Find the title field
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let titleField = itemBox.querySelector('editable-text[fieldname="title"]');
+			assert.ok(titleField, "title field should exist");
+
+			// Find and click the options button for the title field
+			let optionsButton = itemBox.querySelector('#itembox-field-title-options');
+			assert.ok(optionsButton, "options button should exist");
+
+			// Click the options button to open the context menu
+			let menuPromise = new Promise((resolve) => {
+				let observer = new MutationObserver((mutations) => {
+					for (let mutation of mutations) {
+						for (let node of mutation.addedNodes) {
+							if (node.tagName === 'menupopup') {
+								observer.disconnect();
+								resolve(node);
+							}
+						}
+					}
+				});
+				observer.observe(itemBox.querySelector('#info-box > popupset'), { childList: true });
+			});
+
+			optionsButton.click();
+			let menupopup = await menuPromise;
+
+			let titleCaseMenuItem = Array.from(menupopup.querySelectorAll('menuitem'))
+				.find(item => item.getAttribute('label') === Zotero.getString('zotero.item.textTransform.titlecase'));
+			assert.ok(titleCaseMenuItem, "title case menu item should exist");
+
+			let modifyPromise = waitForItemEvent('modify');
+			titleCaseMenuItem.click();
+			// Label should not flash individual values -- it stays as "Multiple" in batch mode
+			assert.equal(titleField.value, '', "title field value should remain empty in batch mode");
+			assert.equal(titleField.placeholder, Zotero.getString('item-pane-batch-editing-multiple-values-placeholder'), "title field should still show Multiple placeholder");
+			await modifyPromise;
+
+			assert.equal(item1.getField('title'), "The Great Gatsby", "item1 should remain in title case");
+			assert.equal(item2.getField('title'), "To Kill a Mockingbird", "item2 should be transformed to title case");
+		});
+
+		it("should show options button and transform case when primary item field is empty", async function () {
+			// Item 1 has no seriesTitle, items 2 and 3 do
+			let item1 = await createDataObject('item', { itemType: 'journalArticle' });
+			await item1.saveTx();
+
+			let item2 = await createDataObject('item', { itemType: 'journalArticle' });
+			item2.setField('seriesTitle', 'advances in neural information processing');
+			await item2.saveTx();
+
+			let item3 = await createDataObject('item', { itemType: 'journalArticle' });
+			item3.setField('seriesTitle', 'proceedings of the ACM conference');
+			await item3.saveTx();
+
+			await ZoteroPane.selectItems([item1.id, item2.id, item3.id]);
+
+			let itemPane = win.ZoteroPane.itemPane;
+			let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+			let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+			batchEditEnableBtn.click();
+			await itemDetails._renderPromise;
+
+			let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+			let optionsButton = itemBox.querySelector('#itembox-field-seriesTitle-options');
+			assert.ok(optionsButton, "options button should exist for seriesTitle");
+			assert.isFalse(optionsButton.hidden, "options button should be visible when extra items have values");
+
+			// Open the context menu via the options button
+			let menuPromise = new Promise((resolve) => {
+				let observer = new MutationObserver((mutations) => {
+					for (let mutation of mutations) {
+						for (let node of mutation.addedNodes) {
+							if (node.tagName === 'menupopup') {
+								observer.disconnect();
+								resolve(node);
+							}
+						}
+					}
+				});
+				observer.observe(itemBox.querySelector('#info-box > popupset'), { childList: true });
+			});
+
+			optionsButton.click();
+			let menupopup = await menuPromise;
+
+			let titleCaseMenuItem = Array.from(menupopup.querySelectorAll('menuitem'))
+				.find(mi => mi.getAttribute('label') === Zotero.getString('zotero.item.textTransform.titlecase'));
+			assert.ok(titleCaseMenuItem, "title case menu item should exist");
+
+			let modifyPromise = waitForItemEvent('modify');
+			titleCaseMenuItem.click();
+			await modifyPromise;
+
+			assert.equal(item1.getField('seriesTitle'), '', "item1 should remain empty");
+			assert.equal(item2.getField('seriesTitle'), 'Advances in Neural Information Processing',
+				"item2 should be transformed to title case");
+			assert.equal(item3.getField('seriesTitle'), 'Proceedings of the ACM Conference',
+				"item3 should be transformed to title case");
+		});
+	});
+
+	it("should focus read-only fields with multiple values, showing the Multiple placeholder", async function () {
+		let item1 = await createDataObject('item', { itemType: 'journalArticle', dateAdded: '2020-01-01 00:00:00' });
+		let item2 = await createDataObject('item', { itemType: 'journalArticle', dateAdded: '2021-06-15 00:00:00' });
+
+		await ZoteroPane.selectItems([item1.id, item2.id]);
+
+		let itemPane = win.ZoteroPane.itemPane;
+		let itemDetails = ZoteroPane.itemPane._itemDetails;
+
+		let batchEditEnableBtn = doc.getElementById('batch-edit-prompt-enable');
+		batchEditEnableBtn.click();
+		await itemDetails._renderPromise;
+
+		await activateZoteroPane();
+
+		let itemBox = itemPane.querySelector('#zotero-editpane-info-box');
+		let dateAddedField = itemBox.querySelector('editable-text[fieldname="dateAdded"]');
+		assert.ok(dateAddedField, "dateAdded field should exist");
+		assert.isTrue(dateAddedField.readOnly, "dateAdded should be read-only");
+		assert.isTrue(dateAddedField.multipleValues, "dateAdded should have multiple values");
+		assert.equal(
+			dateAddedField.placeholder,
+			Zotero.getString('item-pane-batch-editing-multiple-values-placeholder')
+		);
+
+		assert.notEqual(dateAddedField.ref.tabIndex, -1, "tabIndex should not be -1");
+
+		dateAddedField.focus();
+		await waitForFrame();
+
+		assert.isTrue(dateAddedField.focused, "read-only multiple-values field should be focusable");
+		assert.isTrue(dateAddedField.readOnly, "field should remain read-only when focused");
+		assert.equal(dateAddedField.ref.value, '', "focused read-only field should show no value");
+		assert.equal(
+			dateAddedField.ref.placeholder,
+			Zotero.getString('item-pane-batch-editing-multiple-values-placeholder'),
+			"Multiple placeholder should remain while focused"
+		);
+		await item2.eraseTx();
+		await item1.eraseTx();
+	});
 });
diff --git a/test/tests/itemTest.js b/test/tests/itemTest.js
index f765150226..7be0af6367 100644
--- a/test/tests/itemTest.js
+++ b/test/tests/itemTest.js
@@ -1067,6 +1067,30 @@ describe("Zotero.Item", function () {
 				attachment.getFilePath()
 			);
 		});
+		
+		it("should return false for a stored file with a directory path instead of a filename", async function () {
+			var item = await importTextAttachment();
+			// Corrupt paths from a third-party tool that bypassed the setter
+			for (let path of ["storage:/", "storage:D:\\foo\\bar\\", "storage:foo/bar.pdf"]) {
+				item._attachmentPath = path;
+				assert.isFalse(item.getFilePath(), path);
+				assert.isFalse(await item.getFilePathAsync(), path);
+			}
+		});
+		
+		it("should return a path for a stored file with a backslash in the filename", async function () {
+			// Backslashes are only valid in filenames on Linux/macOS
+			if (Zotero.isWin) this.skip();
+			
+			var item = await importTextAttachment();
+			var storageDir = Zotero.getStorageDirectory().path;
+			item._attachmentPath = "storage:foo\\bar.txt";
+			
+			assert.equal(
+				item.getFilePath(),
+				OS.Path.join(storageDir, item.key, "foo\\bar.txt")
+			);
+		});
 	});
 	
 	
@@ -1158,7 +1182,37 @@ describe("Zotero.Item", function () {
 			
 			assert.equal(attachment.attachmentFilename, filename);
 		});
-		
+
+		it("should reject a filename containing a directory path", async function () {
+			var item = await createDataObject('item');
+
+			var attachment = new Zotero.Item("attachment");
+			attachment.attachmentLinkMode = Zotero.Attachments.LINK_MODE_IMPORTED_FILE;
+			attachment.parentID = item.id;
+			assert.throws(() => attachment.attachmentFilename = "D:/Foo/Bar/test.pdf", /directory path/);
+			assert.throws(() => attachment.attachmentFilename = "D:\\Foo\\Bar\\test.pdf", /directory path/);
+			assert.throws(() => attachment.attachmentFilename = "\\\\server\\share\\test.pdf", /directory path/);
+		});
+
+		it("should allow a filename containing a bare backslash", async function () {
+			var item = await createDataObject('item');
+
+			var attachment = new Zotero.Item("attachment");
+			attachment.attachmentLinkMode = Zotero.Attachments.LINK_MODE_IMPORTED_FILE;
+			attachment.parentID = item.id;
+			attachment.attachmentFilename = "foo\\bar.pdf";
+			assert.equal(attachment.attachmentFilename, "foo\\bar.pdf");
+		});
+
+		it("should return the basename for a stored file with a corrupt non-'storage:' path", function () {
+			var attachment = new Zotero.Item("attachment");
+			attachment.attachmentLinkMode = Zotero.Attachments.LINK_MODE_IMPORTED_FILE;
+			// Legacy corrupt data that bypassed the setter (an old relative descriptor with no
+			// 'storage:' prefix); the getter must not throw via PathUtils
+			attachment._attachmentPath = "../../Foo Bar/Documents/~STUFF/paper .pdf";
+			assert.equal(attachment.attachmentFilename, "paper .pdf");
+		});
+
 		it("should get a filename for a base-dir-relative file", function () {
 			var dir = getTestDataDirectory().path;
 			Zotero.Prefs.set('saveRelativeAttachmentPath', true)
@@ -2155,7 +2209,25 @@ describe("Zotero.Item", function () {
 			// "second" -> "third", old value is "second", and we don't notify about "extra" because it's not changed this time
 			assert.deepPropertyVal(extraData[ids[0]], 'changed', { title: 'second' });
 		});
-		
+
+		it("should report the previous itemType in notifier extraData on consecutive type changes", async function () {
+			var item = await createDataObject('item', { itemType: 'book' });
+
+			var promise = waitForNotifierEvent('modify', 'item');
+			item.setType(Zotero.ItemTypes.getID('journalArticle'));
+			await item.saveTx();
+			var { ids, extraData } = await promise;
+			assert.propertyVal(extraData[ids[0]].changed, 'itemType', 'book');
+
+			promise = waitForNotifierEvent('modify', 'item');
+			item.setType(Zotero.ItemTypes.getID('case'));
+			await item.saveTx();
+			({ ids, extraData } = await promise);
+			// Without clearing the 'itemType' alias from _previousData after the prior save,
+			// this would report the stale 'book' instead of 'journalArticle' (#5964)
+			assert.propertyVal(extraData[ids[0]].changed, 'itemType', 'journalArticle');
+		});
+
 		// 'deleted' and 'tags' use a different, newer mechanism for marking changes
 		it("should include changed 'deleted' value in notifier extraData", async function () {
 			var item = await createDataObject('item');
diff --git a/test/tests/itemsTest.js b/test/tests/itemsTest.js
index 2f101ed204..9842f2bd60 100644
--- a/test/tests/itemsTest.js
+++ b/test/tests/itemsTest.js
@@ -766,4 +766,37 @@ describe("Zotero.Items", function () {
 			assert.include(ids, item2.id);
 		});
 	});
+
+	describe("#getLastReadAttachmentIDs()", function () {
+		it("should return the read attachments themselves, not their parents", async function () {
+			let group = await createGroup();
+			let libraryID = group.libraryID;
+			let now = Math.round(Date.now() / 1000);
+
+			let item = await createDataObject('item', { libraryID });
+			let readAttachment = await importPDFAttachment(item);
+			readAttachment.attachmentLastRead = now;
+			await readAttachment.saveTx();
+			let unreadAttachment = await importPDFAttachment(item);
+
+			let ids = await Zotero.Items.getLastReadAttachmentIDs(libraryID);
+			// The read attachment is included, but not its parent or its unread sibling
+			assert.include(ids, readAttachment.id);
+			assert.notInclude(ids, item.id);
+			assert.notInclude(ids, unreadAttachment.id);
+		});
+
+		it("should return standalone attachments", async function () {
+			let group = await createGroup();
+			let libraryID = group.libraryID;
+			let now = Math.round(Date.now() / 1000);
+
+			let att = await importPDFAttachment(null, { libraryID });
+			att.attachmentLastRead = now;
+			await att.saveTx();
+
+			let ids = await Zotero.Items.getLastReadAttachmentIDs(libraryID);
+			assert.include(ids, att.id);
+		});
+	});
 });
diff --git a/test/tests/libraryTest.js b/test/tests/libraryTest.js
index 872ed00f92..5edf54c7f8 100644
--- a/test/tests/libraryTest.js
+++ b/test/tests/libraryTest.js
@@ -63,6 +63,27 @@ describe("Zotero.Library", function () {
 		});
 	});
 	
+	describe("#clientVersion", function () {
+		it("should be settable to increasing values", function () {
+			let library = new Zotero.Library();
+			assert.throws(() => library.clientVersion = -2);
+			assert.throws(() => library.clientVersion = "a");
+			assert.throws(() => library.clientVersion = 1.1);
+			assert.doesNotThrow(() => library.clientVersion = 0);
+			assert.doesNotThrow(() => library.clientVersion = 5);
+		});
+		it("should not be possible to decrement", function () {
+			let library = new Zotero.Library();
+			library.clientVersion = 5;
+			assert.throws(() => library.clientVersion = 0);
+		});
+		it("should not be possible to set to -1", function () {
+			let library = new Zotero.Library();
+			library.clientVersion = 5;
+			assert.throws(() => library.clientVersion = -1);
+		});
+	});
+
 	describe("#editable", function () {
 		it("should return editable status", function () {
 			let library = Zotero.Libraries.get(Zotero.Libraries.userLibraryID);
diff --git a/test/tests/lookupTest.js b/test/tests/lookupTest.js
index 245c0cfe53..da594dfa23 100644
--- a/test/tests/lookupTest.js
+++ b/test/tests/lookupTest.js
@@ -49,6 +49,22 @@ describe("Add Item by Identifier", function () {
 		});
 	});
 	
+	it("should focus the items list after adding items", async function () {
+		// Make sure the items list is non-empty (and therefore focusable)
+		await createDataObject('item');
+		await waitForItemsLoad(win);
+		// Stub the lookup itself so the test doesn't hit external services
+		var stub = sinon.stub(win.Zotero_Lookup, "addItemsFromIdentifier").resolves([{}]);
+		try {
+			var textbox = win.document.getElementById("zotero-lookup-textbox");
+			await win.Zotero_Lookup.accept(textbox);
+			assert.equal(win.document.activeElement.id, win.ZoteroPane.itemsView.id);
+		}
+		finally {
+			stub.restore();
+		}
+	});
+
 	it.skip("should add a DOI with an open-access PDF");
 	
 	// e.g., arXiv
diff --git a/test/tests/mendeleyDecryptTest.js b/test/tests/mendeleyDecryptTest.js
new file mode 100644
index 0000000000..38287d3543
--- /dev/null
+++ b/test/tests/mendeleyDecryptTest.js
@@ -0,0 +1,293 @@
+describe('Mendeley Decrypt', function () {
+	var {
+		decryptDatabase,
+		getProfileUUID,
+		isDatabaseInUse,
+		isEncryptedDatabase
+	} = ChromeUtils.importESModule("chrome://zotero/content/import/mendeley/mendeleyDecrypt.mjs");
+
+	const PROFILE_UUID = '57173eea-07fc-3382-a3f7-548dff05def8';
+	const ENCRYPTED_DB = `${PROFILE_UUID}@www.mendeley.com.sqlite`;
+
+	var encryptedPath, tmpDirectory;
+
+	before(function () {
+		encryptedPath = OS.Path.join(getTestDataDirectory().path, ENCRYPTED_DB);
+	});
+
+	beforeEach(async function () {
+		tmpDirectory = OS.Path.join(Zotero.getTempDirectory().path, Zotero.Utilities.randomString());
+		await Zotero.File.createDirectoryIfMissingAsync(tmpDirectory);
+	});
+
+	afterEach(async function () {
+		await IOUtils.remove(tmpDirectory, { recursive: true, ignoreAbsent: true });
+	});
+
+	describe('#getProfileUUID()', function () {
+		it('should return the UUID from a Mendeley database filename', function () {
+			assert.equal(getProfileUUID(encryptedPath), PROFILE_UUID);
+		});
+
+		it("should return null if the filename doesn't contain a UUID", function () {
+			assert.isNull(getProfileUUID('/tmp/1@www.mendeley.com.sqlite'));
+			assert.isNull(getProfileUUID('/tmp/online.sqlite'));
+		});
+	});
+
+	describe('#isEncryptedDatabase()', function () {
+		it('should detect an encrypted Mendeley database', async function () {
+			assert.isTrue(await isEncryptedDatabase(encryptedPath));
+		});
+
+		it('should not detect an unencrypted SQLite database', async function () {
+			assert.isFalse(
+				await isEncryptedDatabase(OS.Path.join(getTestDataDirectory().path, 'test.sqlite'))
+			);
+		});
+
+		it('should not detect a missing file', async function () {
+			assert.isFalse(await isEncryptedDatabase(OS.Path.join(tmpDirectory, 'nonexistent.sqlite')));
+		});
+	});
+
+	describe('#isDatabaseInUse()', function () {
+		var dbPath;
+
+		beforeEach(async function () {
+			dbPath = OS.Path.join(tmpDirectory, ENCRYPTED_DB);
+			await IOUtils.copy(encryptedPath, dbPath);
+		});
+
+		it('should return false without a write-ahead log', async function () {
+			assert.isFalse(await isDatabaseInUse(dbPath));
+		});
+
+		it('should return true with a non-empty write-ahead log', async function () {
+			await IOUtils.write(dbPath + '-wal', new Uint8Array(32));
+			assert.isTrue(await isDatabaseInUse(dbPath));
+		});
+
+		it('should return false with an empty write-ahead log', async function () {
+			await IOUtils.write(dbPath + '-wal', new Uint8Array());
+			assert.isFalse(await isDatabaseInUse(dbPath));
+		});
+
+		it('should return true with a shared-memory file', async function () {
+			await IOUtils.write(dbPath + '-shm', new Uint8Array(32));
+			assert.isTrue(await isDatabaseInUse(dbPath));
+		});
+	});
+
+	describe('#decryptDatabase()', function () {
+		it('should decrypt a database into one Zotero can read', async function () {
+			var decryptedPath = OS.Path.join(tmpDirectory, ENCRYPTED_DB);
+			await decryptDatabase(encryptedPath, decryptedPath);
+
+			var db = new Zotero.DBConnection(decryptedPath);
+			try {
+				assert.equal(await db.valueQueryAsync("PRAGMA integrity_check"), 'ok');
+				assert.isTrue(await db.tableExists('Documents'));
+				assert.equal(
+					await db.valueQueryAsync("SELECT COUNT(*) FROM Documents"), 3
+				);
+				assert.equal(
+					await db.valueQueryAsync("SELECT uuid FROM Profiles"), PROFILE_UUID
+				);
+			}
+			finally {
+				await db.closeDatabase();
+			}
+		});
+
+		it('should leave the encrypted database untouched', async function () {
+			var before = await IOUtils.read(encryptedPath);
+			await decryptDatabase(encryptedPath, OS.Path.join(tmpDirectory, ENCRYPTED_DB));
+			assert.deepEqual(Array.from(await IOUtils.read(encryptedPath)), Array.from(before));
+		});
+
+		it('should reject a database whose key cannot be derived', async function () {
+			// The key is folded with the profile UUID, so a renamed database can't
+			// be decrypted
+			var renamedPath = OS.Path.join(tmpDirectory, '1@www.mendeley.com.sqlite');
+			await IOUtils.copy(encryptedPath, renamedPath);
+			var error = await getPromiseError(
+				decryptDatabase(renamedPath, OS.Path.join(tmpDirectory, 'out.sqlite'))
+			);
+			assert.equal(error.message, 'Cannot derive Mendeley database key');
+		});
+
+		it('should reject a file that is not an encrypted database', async function () {
+			var notADatabasePath = OS.Path.join(tmpDirectory, 'x@www.mendeley.com.sqlite');
+			await Zotero.File.putContentsAsync(notADatabasePath, 'not a database');
+			var error = await getPromiseError(
+				decryptDatabase(notADatabasePath, OS.Path.join(tmpDirectory, 'out.sqlite'))
+			);
+			assert.equal(error.message, 'Unsupported Mendeley database encryption');
+		});
+	});
+
+	describe('Importing an encrypted database', function () {
+		const BITCOIN_TITLE = 'Bitcoin: A Peer-to-Peer Electronic Cash System';
+		const BITCOIN_PDF = 'Nakamoto - Unknown - Bitcoin A Peer-to-Peer Electronic Cash System.pdf';
+
+		var win;
+
+		const getDecryptedCopies = async function () {
+			let dirs = [];
+			for (let entry of await IOUtils.getChildren(Zotero.getTempDirectory().path)) {
+				if (PathUtils.filename(entry).startsWith('mendeley-')) {
+					dirs.push(entry);
+				}
+			}
+			return dirs;
+		};
+
+		before(async function () {
+			win = await loadZoteroPane();
+		});
+
+		after(function () {
+			win.close();
+		});
+
+		it('should import items and remove the decrypted copy', async function () {
+			this.timeout(60000);
+			assert.lengthOf(await getDecryptedCopies(), 0);
+
+			await win.Zotero_File_Interface.importFile({
+				file: Zotero.File.pathToFile(encryptedPath),
+				createNewCollection: true
+			});
+
+			let collections = Zotero.Collections
+				.getByLibrary(Zotero.Libraries.userLibraryID)
+				.filter(c => c.name.startsWith('Mendeley Import'));
+			assert.lengthOf(collections, 1);
+			let titles = collections[0].getChildItems().map(item => item.getField('title'));
+			assert.include(titles, BITCOIN_TITLE);
+
+			assert.lengthOf(await getDecryptedCopies(), 0);
+		});
+
+		it('should look for attachments beside the encrypted database', async function () {
+			this.timeout(60000);
+			// A backup from another machine, whose absolute Downloaded paths don't exist here
+			let backupPath = OS.Path.join(tmpDirectory, ENCRYPTED_DB);
+			await IOUtils.copy(encryptedPath, backupPath);
+			let downloadedDirectory = OS.Path.join(tmpDirectory, 'Downloaded');
+			await Zotero.File.createDirectoryIfMissingAsync(downloadedDirectory);
+			await IOUtils.copy(
+				OS.Path.join(getTestDataDirectory().path, 'test.pdf'),
+				OS.Path.join(downloadedDirectory, BITCOIN_PDF)
+			);
+
+			var translation;
+			await win.Zotero_File_Interface.importFile({
+				file: Zotero.File.pathToFile(backupPath),
+				createNewCollection: false,
+				onBeforeImport: (t) => {
+					translation = t;
+				}
+			});
+
+			let item = translation.newItems.find(i => i.getField('title') == BITCOIN_TITLE);
+			let attachments = Zotero.Items.get(item.getAttachments());
+			assert.lengthOf(attachments, 1);
+			assert.isTrue(await OS.File.exists(await attachments[0].getFilePathAsync()));
+		});
+
+		it('should remove the decrypted copy if the import fails', async function () {
+			this.timeout(60000);
+			// Fails after the database has been decrypted but before it's read
+			var error = await getPromiseError(
+				win.Zotero_File_Interface.importFile({
+					file: Zotero.File.pathToFile(encryptedPath),
+					createNewCollection: false,
+					onBeforeImport: () => {
+						throw new Error('Import failed');
+					}
+				})
+			);
+			assert.equal(error.message, 'Import failed');
+			assert.lengthOf(await getDecryptedCopies(), 0);
+		});
+
+		it('should not import if cancelled while decrypting', async function () {
+			this.timeout(60000);
+			var numCollections = Zotero.Collections
+				.getByLibrary(Zotero.Libraries.userLibraryID).length;
+			var controller = new AbortController();
+			var onBeforeImport = sinon.stub();
+			// Cancelled once the decrypted database is being written out
+			var createDirectory = Zotero.File.createDirectoryIfMissingAsync;
+			Zotero.File.createDirectoryIfMissingAsync = async function (path, options) {
+				await createDirectory.call(Zotero.File, path, options);
+				if (PathUtils.filename(path).startsWith('mendeley-')) {
+					controller.abort();
+				}
+			};
+			var result;
+			try {
+				result = await win.Zotero_File_Interface.importFile({
+					file: Zotero.File.pathToFile(encryptedPath),
+					createNewCollection: true,
+					onBeforeImport,
+					signal: controller.signal
+				});
+			}
+			finally {
+				Zotero.File.createDirectoryIfMissingAsync = createDirectory;
+			}
+
+			assert.isFalse(result);
+			assert.isFalse(onBeforeImport.called);
+			assert.lengthOf(
+				Zotero.Collections.getByLibrary(Zotero.Libraries.userLibraryID), numCollections
+			);
+			assert.lengthOf(await getDecryptedCopies(), 0);
+		});
+
+		it('should keep the decrypted copy unreadable by other users', async function () {
+			if (Zotero.isWin) {
+				this.skip();
+			}
+			this.timeout(60000);
+			// The directory is removed once the import finishes, so check its
+			// permissions as it's created
+			var permissions;
+			var createDirectory = Zotero.File.createDirectoryIfMissingAsync;
+			Zotero.File.createDirectoryIfMissingAsync = async function (path, options) {
+				await createDirectory.call(Zotero.File, path, options);
+				if (PathUtils.filename(path).startsWith('mendeley-')) {
+					({ permissions } = await IOUtils.stat(path));
+				}
+			};
+			try {
+				await win.Zotero_File_Interface.importFile({
+					file: Zotero.File.pathToFile(encryptedPath),
+					createNewCollection: false
+				});
+			}
+			finally {
+				Zotero.File.createDirectoryIfMissingAsync = createDirectory;
+			}
+			assert.equal(permissions, 0o700);
+		});
+
+		it('should refuse to import while Mendeley has the database open', async function () {
+			let inUsePath = OS.Path.join(tmpDirectory, ENCRYPTED_DB);
+			await IOUtils.copy(encryptedPath, inUsePath);
+			await IOUtils.write(inUsePath + '-wal', new Uint8Array(32));
+
+			let error = await getPromiseError(
+				win.Zotero_File_Interface.importFile({
+					file: Zotero.File.pathToFile(inUsePath),
+					createNewCollection: true
+				})
+			);
+			assert.equal(error.message, 'Mendeley database in use');
+			assert.lengthOf(await getDecryptedCopies(), 0);
+		});
+	});
+});
diff --git a/test/tests/noteeditorTest.js b/test/tests/noteeditorTest.js
index 1be1a3dc09..8c2909c587 100644
--- a/test/tests/noteeditorTest.js
+++ b/test/tests/noteeditorTest.js
@@ -23,4 +23,212 @@ describe("Note Editor", function () {
 			noteEditor.onInit(() => resolve(noteEditor));
 		});
 	};
+
+	async function openEditor(options = {}) {
+		let item = new Zotero.Item('note');
+		item.setNote('<p>Test note</p>');
+		await item.saveTx();
+
+		let editorInstance = await Zotero.Notes.open(item.id, null, options);
+		await editorInstance._initPromise;
+		return editorInstance;
+	}
+
+	async function focusEditor(editorInstance, chromeWindow) {
+		let iframeWindow = editorInstance._iframeWindow;
+		editorInstance.focus();
+		await waitForCallback(
+			() => chromeWindow.document.commandDispatcher.focusedWindow == iframeWindow
+				&& iframeWindow.document.activeElement?.isContentEditable,
+			50, 10
+		);
+	}
+
+	function isCommandEnabled(chromeWindow, command) {
+		chromeWindow.goUpdateCommand(command);
+		return chromeWindow.document.getElementById(command).getAttribute('disabled') != 'true';
+	}
+
+	function insertTextWithNativeUndo(input, text) {
+		input.focus();
+		let textInputProcessor = Components.classes['@mozilla.org/text-input-processor;1']
+			.createInstance(Components.interfaces.nsITextInputProcessor);
+		assert.isTrue(textInputProcessor.beginInputTransactionForTests(win));
+		assert.isTrue(textInputProcessor.commitCompositionWith(text));
+	}
+
+	describe("Edit menu", function () {
+		afterEach(function () {
+			win.Zotero_Tabs.closeAll();
+		});
+
+		it("should dispatch history commands to a focused note editor", async function () {
+			let editorInstance = await openEditor();
+			let iframeWindow = editorInstance._iframeWindow;
+			let editorWindow = iframeWindow.wrappedJSObject;
+
+			await focusEditor(editorInstance, win);
+			assert.isFalse(isCommandEnabled(win, 'cmd_undo'));
+
+			editorInstance._postMessage({ action: 'insertHTML', pos: null, html: '<p>redo me</p>' });
+			await waitForCallback(() => editorWindow.canUndo(), 50, 10);
+			assert.isTrue(isCommandEnabled(win, 'cmd_undo'));
+
+			win.goDoCommand('cmd_undo');
+			await waitForCallback(() => editorWindow.canRedo(), 50, 10);
+			assert.isFalse(editorWindow.canUndo());
+			assert.isTrue(isCommandEnabled(win, 'cmd_redo'));
+
+			win.goDoCommand('cmd_redo');
+			await waitForCallback(() => editorWindow.canUndo(), 50, 10);
+			assert.isFalse(editorWindow.canRedo());
+
+			let noteBeforeCrash = editorWindow.getDataSync(false).html;
+			editorInstance._postMessage({ action: 'crash' });
+			await waitForCallback(() => !editorWindow.canUndo(), 50, 10);
+			assert.isFalse(isCommandEnabled(win, 'cmd_undo'));
+			assert.isFalse(editorWindow.doUndo());
+			assert.equal(editorWindow.getDataSync(false).html, noteBeforeCrash);
+		});
+
+		it("should dispatch history commands in a separate note window", async function () {
+			let editorInstance = await openEditor({ openInWindow: true });
+			let iframeWindow = editorInstance._iframeWindow;
+			let noteWin = iframeWindow.browsingContext.topChromeWindow;
+			let editorWindow = iframeWindow.wrappedJSObject;
+
+			try {
+				await focusEditor(editorInstance, noteWin);
+				editorInstance._postMessage({ action: 'insertHTML', pos: null, html: '<p>redo me</p>' });
+				await waitForCallback(() => editorWindow.canUndo(), 50, 10);
+				assert.isTrue(isCommandEnabled(noteWin, 'cmd_undo'));
+
+				noteWin.goDoCommand('cmd_undo');
+				await waitForCallback(() => editorWindow.canRedo(), 50, 10);
+				assert.isTrue(isCommandEnabled(noteWin, 'cmd_redo'));
+
+				noteWin.goDoCommand('cmd_redo');
+				await waitForCallback(() => editorWindow.canUndo(), 50, 10);
+				assert.isFalse(editorWindow.canRedo());
+			}
+			finally {
+				noteWin.close();
+			}
+		});
+
+		it("should preserve native history in a focused Find input", async function () {
+			let editorInstance = await openEditor();
+			let iframeWindow = editorInstance._iframeWindow;
+			let editorWindow = iframeWindow.wrappedJSObject;
+
+			editorInstance._postMessage({ action: 'insertHTML', pos: null, html: '<p>note edit</p>' });
+			await waitForCallback(() => editorWindow.canUndo(), 50, 10);
+			let noteBeforeUndo = editorWindow.getDataSync(false).html;
+
+			editorInstance._postMessage({ action: 'openFindBar' });
+			let input = await waitForCallback(
+				() => iframeWindow.document.querySelector('.findbar > input[type="text"]'),
+				50, 20
+			);
+			input.focus();
+			await waitForCallback(
+				() => win.document.commandDispatcher.focusedWindow == iframeWindow
+					&& iframeWindow.document.activeElement == input,
+				50, 10
+			);
+
+			assert.isFalse(isCommandEnabled(win, 'cmd_undo'));
+			insertTextWithNativeUndo(input, 'typed');
+			assert.equal(input.value, 'typed');
+			assert.isTrue(isCommandEnabled(win, 'cmd_undo'));
+
+			win.goDoCommand('cmd_undo');
+			await waitForCallback(() => input.value == '', 50, 10);
+			assert.isTrue(isCommandEnabled(win, 'cmd_redo'));
+
+			win.goDoCommand('cmd_redo');
+			await waitForCallback(() => input.value == 'typed', 50, 10);
+			assert.isTrue(editorWindow.canUndo());
+			assert.equal(editorWindow.getDataSync(false).html, noteBeforeUndo);
+		});
+
+		it("should replace its controller during reinitialization", async function () {
+			let editorInstance = await openEditor();
+			let controllers = editorInstance._iframeWindow.controllers;
+			let controllerCount = controllers.getControllerCount();
+			let oldControllerID = controllers.getControllerId(
+				editorInstance._undoRedoController
+			);
+
+			await editorInstance.reinit();
+			await editorInstance._initPromise;
+
+			assert.equal(controllers.getControllerCount(), controllerCount);
+			let controllerIDs = [];
+			for (let i = 0; i < controllerCount; i++) {
+				controllerIDs.push(controllers.getControllerId(controllers.getControllerAt(i)));
+			}
+			assert.notInclude(controllerIDs, oldControllerID);
+			assert.equal(
+				controllers.getControllerId(controllers.getControllerAt(0)),
+				controllers.getControllerId(editorInstance._undoRedoController)
+			);
+		});
+	});
+
+	describe("Saving", function () {
+		it("should retry a save that times out waiting for the database", async function () {
+			let editorInstance = await openEditor();
+			let crash = sinon.stub(Zotero, 'crash');
+			let executeTransaction = sinon.stub(Zotero.DB, 'executeTransaction');
+			executeTransaction.onFirstCall().rejects(new Zotero.DBConnection.TimeoutError());
+			executeTransaction.callThrough();
+			try {
+				await editorInstance._save({ state: {}, html: '<p>Retried note</p>' });
+			}
+			finally {
+				executeTransaction.restore();
+				crash.restore();
+			}
+			assert.isTrue(crash.notCalled);
+			assert.equal(editorInstance._item.getNote(), '<p>Retried note</p>');
+		});
+
+		it("shouldn't let a retried save overwrite newer note content", async function () {
+			let editorInstance = await openEditor();
+			let crash = sinon.stub(Zotero, 'crash');
+			let executeTransaction = sinon.stub(Zotero.DB, 'executeTransaction');
+			executeTransaction.onFirstCall().rejects(new Zotero.DBConnection.TimeoutError());
+			executeTransaction.callThrough();
+			try {
+				let timedOut = editorInstance._save({ state: {}, html: '<p>Older note</p>' });
+				await editorInstance._save({ state: {}, html: '<p>Newer note</p>' });
+				await timedOut;
+			}
+			finally {
+				executeTransaction.restore();
+				crash.restore();
+			}
+			assert.equal(editorInstance._item.getNote(), '<p>Newer note</p>');
+		});
+
+		it("shouldn't let a save with nothing to save supersede a pending retry", async function () {
+			let editorInstance = await openEditor();
+			let crash = sinon.stub(Zotero, 'crash');
+			let executeTransaction = sinon.stub(Zotero.DB, 'executeTransaction');
+			executeTransaction.onFirstCall().rejects(new Zotero.DBConnection.TimeoutError());
+			executeTransaction.callThrough();
+			try {
+				let timedOut = editorInstance._save({ state: {}, html: '<p>Pending note</p>' });
+				// What saveSync() passes through when the editor has no unsaved changes
+				await editorInstance._save(null);
+				await timedOut;
+			}
+			finally {
+				executeTransaction.restore();
+				crash.restore();
+			}
+			assert.equal(editorInstance._item.getNote(), '<p>Pending note</p>');
+		});
+	});
 });
diff --git a/test/tests/pluginAPITest.js b/test/tests/pluginAPITest.js
index cf282aba74..70db8ca94b 100644
--- a/test/tests/pluginAPITest.js
+++ b/test/tests/pluginAPITest.js
@@ -943,7 +943,7 @@ describe("Plugin API", function () {
 					contextKeys: [
 						...defaultContextKeys,
 						"items",
-						"collectionTreeRow",
+						"collectionTreeRows",
 					]
 				},
 				"main/library/collection": {
@@ -953,7 +953,7 @@ describe("Plugin API", function () {
 					},
 					contextKeys: [
 						...defaultContextKeys,
-						"collectionTreeRow",
+						"collectionTreeRows",
 					]
 				},
 				"main/library/addAttachment": {
diff --git a/test/tests/preferences_accountTest.js b/test/tests/preferences_accountTest.js
index 357a980f6d..9b3531ec32 100644
--- a/test/tests/preferences_accountTest.js
+++ b/test/tests/preferences_accountTest.js
@@ -77,7 +77,7 @@ describe("Account Preferences", function () {
 				await performLogin("Username");
 
 				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
-				assert.equal(doc.getElementById('sync-unauthorized').getAttribute('hidden'), 'true');
+				assert.isTrue(doc.getElementById('sync-unauthorized').hidden);
 				assert.isTrue(launchURLStub.calledOnce);
 			});
 
@@ -116,6 +116,23 @@ describe("Account Preferences", function () {
 			});
 
 
+			it("should revoke the API key when it can't be stored locally", async function () {
+				var setAPIKeyStub = sinon.stub(Zotero.Sync.Data.Local, 'setAPIKey')
+					.rejects(new Error("User canceled OS unlock entry"));
+				try {
+					let e = await getPromiseError(performLogin("Username"));
+					assert.ok(e);
+					assert.isTrue(deleteAPIKey.calledOnce);
+					assert.equal(deleteAPIKey.firstCall.thisValue.apiKey, apiKey);
+					assert.equal(doc.querySelector('.account-login-default').hidden, false);
+					assert.equal(doc.querySelector('.account-login-pending').hidden, true);
+				}
+				finally {
+					setAPIKeyStub.restore();
+				}
+			});
+
+
 			it("should delete API key and display auth form when 'Unlink Account' clicked", async function () {
 				await performLogin("Username");
 				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
@@ -154,7 +171,7 @@ describe("Account Preferences", function () {
 
 				await win.Zotero_Preferences.Sync.unlinkAccount();
 				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
-				assert.equal(doc.getElementById('sync-unauthorized').getAttribute('hidden'), 'true');
+				assert.isTrue(doc.getElementById('sync-unauthorized').hidden);
 			});
 
 			it("should clear sync errors from the toolbar after logging in", async function () {
diff --git a/test/tests/queryTextboxTest.js b/test/tests/queryTextboxTest.js
new file mode 100644
index 0000000000..53a48457a2
--- /dev/null
+++ b/test/tests/queryTextboxTest.js
@@ -0,0 +1,159 @@
+"use strict";
+
+describe("query-textbox", function () {
+	var win, textbox;
+
+	before(async function () {
+		win = await loadZoteroPane();
+		textbox = win.document.getElementById('zotero-tb-search').searchTextbox;
+	});
+
+	after(async function () {
+		await Zotero.Tags.setColor(Zotero.Libraries.userLibraryID, 'zzcompletion', false);
+		textbox.value = '';
+		win.close();
+	});
+
+	it("should render the query in spans covering the whole value", function () {
+		textbox.value = 'by:smith crispr';
+		let layer = textbox.shadowRoot.querySelector('.query-highlight');
+		assert.equal(layer.textContent, 'by:smith crispr');
+		assert.deepEqual(
+			[...layer.children].map(span => span.className),
+			['query-token-field', 'query-token-operator', 'query-token-value',
+				'query-token-space', 'query-token-text']
+		);
+		assert.isTrue(textbox.hasAttribute('highlighted'));
+	});
+
+	it("should leave a query without conditions to the input", function () {
+		textbox.value = 'just some words';
+		assert.isFalse(textbox.hasAttribute('highlighted'));
+		assert.equal(
+			textbox.shadowRoot.querySelector('.query-highlight').textContent, ''
+		);
+	});
+
+	it("should offer tags and creators from the library", async function () {
+		let item = await createDataObject('item', { tags: [{ tag: 'zzcompletion' }] });
+		item.setCreator(0, { firstName: 'Zora', lastName: 'Zzcompletion', creatorType: 'author' });
+		// A two-field creator with only a last name, whose value has no
+		// leading space to quote
+		item.setCreator(1, { firstName: '', lastName: 'Zzlastonly', creatorType: 'author' });
+		await item.saveTx();
+
+		// updateCompletions() resolves once the library lookup has filled
+		// the list
+		let offered = async (query, value) => {
+			textbox.value = query;
+			textbox.inputField.setSelectionRange(query.length, query.length);
+			await textbox.updateCompletions();
+			let list = win.document.querySelector('.query-completions richlistbox');
+			assert.isTrue(
+				[...list.children].some(row => row.completion.label === value), value
+			);
+		};
+		await Zotero.Tags.setColor(Zotero.Libraries.userLibraryID, 'zzcompletion', '#FF6666');
+		await offered('tag:zzcomp', 'zzcompletion');
+		// A colored tag carries its color, for the swatch in the list
+		let list = win.document.querySelector('.query-completions richlistbox');
+		let row = [...list.children].find(r => r.completion.label === 'zzcompletion');
+		assert.equal(row.completion.color, '#FF6666');
+		await offered('by:zzcomp', 'Zora Zzcompletion');
+		await offered('by:zzlast', 'Zzlastonly');
+	});
+
+	it("should offer completions for a condition name and then its values", async function () {
+		textbox.value = 'ty';
+		textbox.inputField.setSelectionRange(2, 2);
+		textbox.updateCompletions();
+		let list = win.document.querySelector('.query-completions richlistbox');
+		// The list is shown the first time there's something to offer
+		assert.notEqual(win.document.querySelector('.query-completions').state, 'closed');
+		let labels = [...list.children].map(row => row.completion.label);
+		assert.include(labels, 'type:');
+
+		// Completing a condition name offers what it takes next
+		list.selectedIndex = labels.indexOf('type:');
+		textbox._acceptCompletion();
+		assert.equal(textbox.value, 'type:');
+		assert.equal(textbox.inputField.selectionStart, 'type:'.length);
+		labels = [...list.children].map(row => row.completion.label);
+		assert.include(labels, 'journal article');
+
+		// Arrowing up from nothing selected starts at the end of the list
+		textbox._handleCompletionKey(new win.KeyboardEvent('keydown', { key: 'ArrowUp' }));
+		assert.equal(list.selectedIndex, list.itemCount - 1);
+
+		list.selectedIndex = labels.indexOf('journal article');
+		textbox._acceptCompletion();
+		assert.equal(textbox.value, 'type:"journal article"');
+		assert.deepEqual(
+			Zotero.SearchQuery.parse(textbox.value).tree.children,
+			[{ condition: 'itemType', operator: 'is', value: 'journalArticle' }]
+		);
+
+		textbox.value = 'crispr ';
+		textbox.inputField.setSelectionRange(7, 7);
+		textbox.updateCompletions();
+		assert.equal(win.document.querySelector('.query-completions').state, 'closed');
+	});
+
+	it("should accept the completion under the mouse", async function () {
+		textbox.value = 'ty';
+		textbox.inputField.setSelectionRange(2, 2);
+		await textbox.updateCompletions();
+		let list = win.document.querySelector('.query-completions richlistbox');
+		let row = [...list.children].find(r => r.completion.label === 'type:');
+		row.dispatchEvent(new win.MouseEvent('mousedown', { bubbles: true }));
+		assert.equal(textbox.value, 'type:');
+	});
+
+	it("should not reopen the list after accepting a value", async function () {
+		await createDataObject('item', { tags: [{ tag: 'zzaccepted' }] });
+		textbox.value = 'tag:zzaccep';
+		textbox.inputField.setSelectionRange(11, 11);
+		await textbox.updateCompletions();
+		let list = win.document.querySelector('.query-completions richlistbox');
+		let index = [...list.children].findIndex(row => row.completion.label === 'zzaccepted');
+		assert.isAbove(index, -1);
+		list.selectedIndex = index;
+		// Control the follow-up lookup, so the result demonstrably arrives
+		// only after the acceptance has hidden the list
+		let resolveLookup;
+		let stub = sinon.stub(textbox, '_lookupValues').returns(new Promise((resolve) => {
+			resolveLookup = resolve;
+		}));
+		try {
+			textbox._acceptCompletion();
+			assert.equal(textbox.value, 'tag:zzaccepted');
+			resolveLookup([{ text: 'zzaccepted', label: 'zzaccepted' }]);
+			await Zotero.Promise.delay(0);
+			assert.include(['closed', 'hiding'],
+				win.document.querySelector('.query-completions').state);
+		}
+		finally {
+			stub.restore();
+		}
+	});
+
+	it("should close the completion list on Enter without a selection", async function () {
+		textbox.value = 'ty';
+		textbox.inputField.setSelectionRange(2, 2);
+		await textbox.updateCompletions();
+		assert.notEqual(win.document.querySelector('.query-completions').state, 'closed');
+		textbox._handleCompletionKey(new win.KeyboardEvent('keydown', { key: 'Enter' }));
+		assert.include(['closed', 'hiding'],
+			win.document.querySelector('.query-completions').state);
+	});
+
+	it("should hide completions when the value is set", async function () {
+		textbox.value = 'ty';
+		textbox.inputField.setSelectionRange(2, 2);
+		await textbox.updateCompletions();
+		assert.notEqual(win.document.querySelector('.query-completions').state, 'closed');
+		textbox.value = 'something else';
+		assert.include(['closed', 'hiding'],
+			win.document.querySelector('.query-completions').state);
+	});
+});
diff --git a/test/tests/readerTest.js b/test/tests/readerTest.js
index c456133f12..36c68d5fbb 100644
--- a/test/tests/readerTest.js
+++ b/test/tests/readerTest.js
@@ -200,6 +200,158 @@ describe("Reader", function () {
 			reader.close();
 		});
 
+		async function cleanupReaders(...readers) {
+			for (let reader of readers.filter(Boolean)) {
+				reader.close();
+			}
+			await Zotero.Promise.delay(100);
+			for (let reader of readers.filter(Boolean)) {
+				let index = Zotero.Reader._readers.indexOf(reader);
+				if (index !== -1) {
+					reader.uninit();
+					Zotero.Reader._readers.splice(index, 1);
+				}
+			}
+		}
+
+		it('should reopen a reader whose tab closes during a notifier transaction', async function () {
+			let reader, reopenedReader;
+			let title = Zotero.Promise.defer();
+			let updates = [];
+			let sandbox = sinon.createSandbox();
+			let transactionOpen = false;
+
+			try {
+				let attachment = await importFileAttachment('test.pdf');
+				reader = await Zotero.Reader.open(attachment.id);
+				await reader._initPromise;
+				let oldTabContainer = win.document.getElementById(reader.tabID);
+				sandbox.stub(attachment, 'getTabTitle').returns(title.promise);
+				let updateTitleSpy = sandbox.spy(reader, 'updateTitle');
+				let setTitleSpy = sandbox.spy(reader, '_setTitleValue');
+				let disposeSpy = sandbox.spy(reader._blockingObserver, 'dispose');
+				updates.push(reader.updateTitle());
+
+				Zotero.Notifier.begin();
+				transactionOpen = true;
+				win.Zotero_Tabs.close(reader.tabID);
+				await waitForCallback(() => !oldTabContainer.isConnected, 10, 5);
+				assert.isTrue(reader._isTabClosed);
+				sinon.assert.calledOnce(disposeSpy);
+				assert.isNull(reader._blockingObserver);
+				Zotero.Reader.notify('modify', 'item', [attachment.id], {});
+				updates.push(...updateTitleSpy.getCalls().slice(1).map(call => call.returnValue));
+				assert.equal(updateTitleSpy.callCount, 2);
+
+				reopenedReader = await Zotero.Reader.open(attachment.id);
+				assert.notStrictEqual(reopenedReader, reader);
+
+				title.resolve('Stale title');
+				await Promise.all(updates);
+				sinon.assert.notCalled(setTitleSpy);
+				await reopenedReader._initPromise;
+
+				await Zotero.Notifier.commit();
+				transactionOpen = false;
+				assert.isFalse(Zotero.Reader._readers.includes(reader));
+			}
+			finally {
+				title.resolve('Stale title');
+				try {
+					await Promise.all(updates);
+				}
+				catch {}
+				sandbox.restore();
+				if (transactionOpen) Zotero.Notifier.reset();
+				await cleanupReaders(reader, reopenedReader);
+			}
+		});
+
+		it('should reuse a queued unloaded reader tab and preserve its close callback', async function () {
+			let reader, reloadedReader, openResult, tabID, unloadedTab;
+			let closeCalls = 0, callbackHadExpectedReceiver, callbackSawOpenReader;
+			let transactionOpen = false;
+
+			try {
+				let attachment = await importFileAttachment('test.pdf');
+				reader = await Zotero.Reader.open(attachment.id);
+				await reader._initPromise;
+				tabID = reader.tabID;
+				let oldTabContainer = win.document.getElementById(tabID);
+				win.Zotero_Tabs.select('zotero-pane');
+				Zotero.Notifier.begin();
+				transactionOpen = true;
+				win.Zotero_Tabs.unload(tabID);
+				await waitForCallback(() => !oldTabContainer.isConnected, 10, 5);
+				unloadedTab = win.Zotero_Tabs._getTab(tabID).tab;
+				unloadedTab.onClose = function () {
+					closeCalls++;
+					callbackHadExpectedReceiver = this === unloadedTab;
+					callbackSawOpenReader = reloadedReader && !reloadedReader._isTabClosed;
+				};
+
+				openResult = await Zotero.Reader.open(attachment.id);
+				assert.isTrue(openResult === undefined, 'should select the unloaded tab');
+				reloadedReader = await waitForCallback(
+					() => Zotero.Reader._readers.find(r => r !== reader && r.tabID === tabID),
+					50, 5
+				);
+				await reloadedReader._initPromise;
+
+				await Zotero.Notifier.commit();
+				transactionOpen = false;
+				assert.strictEqual(Zotero.Reader.getByTabID(tabID), reloadedReader);
+
+				win.Zotero_Tabs.close(tabID);
+				await waitForCallback(
+					() => !Zotero.Reader._readers.includes(reloadedReader), 10, 5);
+				assert.equal(closeCalls, 1);
+				assert.isTrue(callbackHadExpectedReceiver);
+				assert.isTrue(callbackSawOpenReader);
+				assert.isTrue(reloadedReader._isTabClosed);
+			}
+			finally {
+				if (transactionOpen) Zotero.Notifier.reset();
+				let tab = tabID && win.Zotero_Tabs._getTab(tabID).tab;
+				if (tab) tab.onClose = null;
+				if (tab) win.Zotero_Tabs.close(tabID);
+				await cleanupReaders(reader, reloadedReader, openResult);
+			}
+		});
+
+		it('should open a reader window while a closed tab reader is pending', async function () {
+			let reader, windowReader, unloadedTabID;
+			let transactionOpen = false;
+
+			try {
+				let attachment = await importFileAttachment('test.pdf');
+				reader = await Zotero.Reader.open(attachment.id);
+				await reader._initPromise;
+				({ id: unloadedTabID } = win.Zotero_Tabs.add({
+					type: 'reader-unloaded',
+					data: { itemID: attachment.id },
+				}));
+				Zotero.Notifier.begin();
+				transactionOpen = true;
+				win.Zotero_Tabs.close(reader.tabID);
+
+				windowReader = await Zotero.Reader.open(
+					attachment.id, null, { openInWindow: true });
+				await windowReader._initPromise;
+				assert.equal(win.Zotero_Tabs._getTab(unloadedTabID).tab.type, 'reader-unloaded');
+
+				await Zotero.Notifier.commit();
+				transactionOpen = false;
+			}
+			finally {
+				if (transactionOpen) Zotero.Notifier.reset();
+				if (win.Zotero_Tabs._getTab(unloadedTabID).tab) {
+					win.Zotero_Tabs.close(unloadedTabID);
+				}
+				await cleanupReaders(reader, windowReader);
+			}
+		});
+
 		describe("#importFromEPUB()", function () {
 			let bookEpubPath; // The EPUB itself
 			let bookSdrPath; // The KOReader "sidecar" folder
diff --git a/test/tests/recognizeDocumentTest.js b/test/tests/recognizeDocumentTest.js
index a799f4fd64..9188d04e3d 100644
--- a/test/tests/recognizeDocumentTest.js
+++ b/test/tests/recognizeDocumentTest.js
@@ -16,6 +16,8 @@ describe("Document Recognition", function () {
 		
 		this.timeout(60000);
 		Zotero.Prefs.set('autoRenameFiles.onMetadataChange', false); // Prevent auto-rename triggering during recognition
+		// EPUB recognition translates the EPUB's RDF metadata
+		yield Zotero.Translators.init();
 		// Load Zotero pane and install PDF tools
 		yield Promise.all([
 			loadZoteroPane().then(w => win = w)
@@ -39,6 +41,10 @@ describe("Document Recognition", function () {
 		
 		queue.cancel();
 		Zotero.RecognizeDocument._recognize.restore && Zotero.RecognizeDocument._recognize.restore();
+		// Restore stub if a test failed before restoring it, so that retries don't fail with
+		// "Attempted to wrap translate which is already wrapped"
+		Zotero.Translate.Search.prototype.translate.restore
+			&& Zotero.Translate.Search.prototype.translate.restore();
 		Zotero.Prefs.clear('autoRenameFiles.linked');
 	});
 	
diff --git a/test/tests/retractionsTest.js b/test/tests/retractionsTest.js
index 5b35ca2724..c3b0a61abc 100644
--- a/test/tests/retractionsTest.js
+++ b/test/tests/retractionsTest.js
@@ -88,7 +88,7 @@ describe("Retractions", function () {
 	
 	function bannerShown() {
 		var container = win.document.getElementById('retracted-items-container');
-		if (container.getAttribute('collapsed') == 'true') {
+		if (container.hasAttribute('collapsed')) {
 			return false;
 		}
 		if (!container.hasAttribute('collapsed')) {
@@ -199,6 +199,118 @@ describe("Retractions", function () {
 			
 			assert.isFalse(Zotero.Retractions.isRetracted(item));
 		});
+		
+		it("should refresh stored data for a version bump when the list is unchanged", async function () {
+			var doi = '10.1234/cdefg';
+			var hash = Zotero.Utilities.Internal.sha1(doi);
+			var line = Zotero.Retractions.TYPE_DOI + hash.substr(0, 5) + ' 12345\n';
+			var version = Zotero.Retractions._version;
+			var reason = "Error in Data";
+			
+			server.respond(function (req) {
+				if (req.method == 'GET' && req.url == baseURL + 'list') {
+					// The list itself never changes, so a conditional request gets a 304
+					if (req.requestHeaders['If-None-Match'] == 'unchanged') {
+						req.respond(304, {}, '');
+						return;
+					}
+					req.respond(200, { 'Content-Type': 'text/plain', 'ETag': 'unchanged' }, line);
+				}
+				else if (req.method == 'POST' && req.url == baseURL + 'search') {
+					req.respond(
+						200,
+						{ 'Content-Type': 'application/json' },
+						JSON.stringify([
+							{
+								doi: hash,
+								retractionDOI: '10.1234/defgh',
+								date: '2019-01-02',
+								reasons: [reason],
+								urls: []
+							}
+						])
+					);
+				}
+			});
+			
+			try {
+				await Zotero.Retractions.updateFromServer();
+				
+				let promise = waitForItemEvent('refresh');
+				let item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
+				item.setField('DOI', doi);
+				await item.saveTx();
+				await promise;
+				assert.sameMembers((await Zotero.Retractions.getData(item)).reasons, [reason]);
+				
+				// An update with the same version gets a 304 and leaves the stored data alone
+				reason = "Error in Text";
+				await Zotero.Retractions.updateFromServer();
+				assert.sameMembers((await Zotero.Retractions.getData(item)).reasons, ["Error in Data"]);
+				
+				// A version bump skips the conditional request and rewrites it
+				Zotero.Retractions._version = version + 1;
+				await Zotero.Retractions.updateFromServer();
+				assert.sameMembers((await Zotero.Retractions.getData(item)).reasons, [reason]);
+			}
+			finally {
+				Zotero.Retractions._version = version;
+			}
+		});
+		
+		it("should keep a hidden retraction hidden across an update", async function () {
+			var doi = '10.1234/defgh';
+			var hash = Zotero.Utilities.Internal.sha1(doi);
+			var line = Zotero.Retractions.TYPE_DOI + hash.substr(0, 5) + ' 12345\n';
+			var etags = ['first', 'second'];
+			
+			server.respond(function (req) {
+				if (req.method == 'GET' && req.url == baseURL + 'list') {
+					req.respond(
+						200,
+						{ 'Content-Type': 'text/plain', 'ETag': etags.shift() || 'second' },
+						line
+					);
+				}
+				else if (req.method == 'POST' && req.url == baseURL + 'search') {
+					req.respond(
+						200,
+						{ 'Content-Type': 'application/json' },
+						JSON.stringify([
+							{
+								doi: hash,
+								retractionDOI: '10.1234/efghi',
+								date: '2019-01-02',
+								reasons: ["Error in Data"],
+								urls: []
+							}
+						])
+					);
+				}
+			});
+			
+			await Zotero.Retractions.updateFromServer();
+			
+			let promise = waitForItemEvent('refresh');
+			let item = createUnsavedDataObject('item', { itemType: 'journalArticle' });
+			item.setField('DOI', doi);
+			await item.saveTx();
+			await promise;
+			assert.isTrue(Zotero.Retractions.isRetracted(item));
+			
+			await Zotero.Retractions.hideRetraction(item);
+			assert.isFalse(Zotero.Retractions.isRetracted(item));
+			
+			// The stored flag is what survives a restart, so it has to outlast an update
+			await Zotero.Retractions.updateFromServer();
+			assert.isFalse(Zotero.Retractions.isRetracted(item));
+			assert.equal(
+				await Zotero.DB.valueQueryAsync(
+					"SELECT flag FROM retractedItems WHERE itemID=?", item.id
+				),
+				Zotero.Retractions.FLAG_HIDDEN
+			);
+		});
 	});
 	
 	
diff --git a/test/tests/schemaTest.js b/test/tests/schemaTest.js
index 7d7a146df0..d9083018e9 100644
--- a/test/tests/schemaTest.js
+++ b/test/tests/schemaTest.js
@@ -16,13 +16,60 @@ describe("Zotero.Schema", function () {
 		it("should set last client version", async function () {
 			var sql = "REPLACE INTO settings (setting, key, value) VALUES ('client', 'lastVersion', ?)";
 			await Zotero.DB.queryAsync(sql, "5.0old");
-			
+
 			await Zotero.Schema.updateSchema();
-			
+
 			var sql = "SELECT value FROM settings WHERE setting='client' AND key='lastVersion'";
 			var lastVersion = await Zotero.DB.valueQueryAsync(sql);
 			assert.equal(await Zotero.DB.valueQueryAsync(sql), Zotero.version);
 		});
+
+		it("shouldn't repeat forced backup when retrying a failed update", async function () {
+			// Backups are disabled in the test profile
+			Zotero.Prefs.set('backup.numBackups', 2);
+			await Zotero.DB.queryAsync(
+				"DELETE FROM settings WHERE setting='backup' AND key='lastSchemaUpdateState'"
+			);
+
+			await Zotero.Schema.setIntegrityCheckRequired(true);
+
+			var backupSpy = sinon.spy(Zotero.DB, 'backUpDatabase');
+			var integrityCheckStub = sinon.stub(Zotero.Schema, 'integrityCheck')
+				.rejects(new Error("Simulated failure"));
+			try {
+				// First attempt makes a forced backup and fails
+				var e = await getPromiseError(Zotero.Schema.updateSchema());
+				assert.equal(e.message, "Simulated failure");
+				assert.equal(backupSpy.callCount, 1);
+
+				// Retrying with the same pending state doesn't make another backup
+				e = await getPromiseError(Zotero.Schema.updateSchema());
+				assert.equal(e.message, "Simulated failure");
+				assert.equal(backupSpy.callCount, 1);
+
+				// If the backup no longer exists, retrying makes a new one
+				await IOUtils.remove(Zotero.DB.path + '.bak');
+				e = await getPromiseError(Zotero.Schema.updateSchema());
+				assert.equal(e.message, "Simulated failure");
+				assert.equal(backupSpy.callCount, 2);
+
+				// A successful update clears the stored state
+				integrityCheckStub.restore();
+				await Zotero.Schema.updateSchema();
+				assert.isFalse(await Zotero.DB.valueQueryAsync(
+					"SELECT value FROM settings WHERE setting='backup' AND key='lastSchemaUpdateState'"
+				));
+
+				// A new pending state makes a fresh backup
+				await Zotero.Schema.setIntegrityCheckRequired(true);
+				await Zotero.Schema.updateSchema();
+				assert.equal(backupSpy.callCount, 3);
+			}
+			finally {
+				integrityCheckStub.restore();
+				backupSpy.restore();
+			}
+		});
 	});
 	
 	describe("Global Schema", function () {
@@ -47,8 +94,44 @@ describe("Zotero.Schema", function () {
 			});
 		});
 		
+		describe("date-type field conversion", function () {
+			it("should convert stored text values of date-type fields to multipart dates", async function () {
+				var item = await createDataObject('item', { itemType: 'patent' });
+				// A value stored while the field was a text field
+				var fieldID = Zotero.ItemFields.getID('priorityDate');
+				var valueID = Zotero.ID.get('itemDataValues');
+				await Zotero.DB.queryAsync(
+					"INSERT INTO itemDataValues (valueID, value, valueNormalized) VALUES (?, ?, ?)",
+					[valueID, '1969-04-20', null]
+				);
+				await Zotero.DB.queryAsync(
+					"INSERT INTO itemData VALUES (?, ?, ?)",
+					[item.id, fieldID, valueID]
+				);
+
+				schema.version++;
+				await Zotero.Schema._updateGlobalSchemaForTest(schema);
+				await item.reload(['itemData'], true);
+
+				var stored = await Zotero.DB.valueQueryAsync(
+					"SELECT value FROM itemData JOIN itemDataValues USING (valueID) "
+						+ "WHERE itemID=? AND fieldID=?",
+					[item.id, fieldID]
+				);
+				assert.isTrue(Zotero.Date.isMultipart(stored));
+				assert.equal(item.getField('priorityDate'), '1969-04-20');
+
+				// The converted value matches a date search on the base field
+				var s = new Zotero.Search();
+				s.libraryID = item.libraryID;
+				s.addCondition('originalDate', 'isBefore', '1970');
+				var matches = await s.search();
+				assert.include(matches, item.id);
+			});
+		});
+
 		describe("#migrateExtraFields()", function () {
-			async function migrate() {
+			async function migrate(options) {
 				schema.version++;
 				schema.itemTypes.find(x => x.itemType == 'book').fields.splice(0, 1, { field: 'fooBar' })
 				var newLocales = {};
@@ -58,7 +141,7 @@ describe("Zotero.Schema", function () {
 					newLocales[locale] = o;
 				});
 				await Zotero.Schema._updateGlobalSchemaForTest(schema);
-				await Zotero.Schema.migrateExtraFields();
+				await Zotero.Schema.migrateExtraFields(options);
 			}
 			
 			it("should add a new field and migrate values from Extra", async function () {
@@ -149,6 +232,21 @@ describe("Zotero.Schema", function () {
 				assert.isTrue(item.synced);
 			});
 			
+			it("shouldn't report progress if Extra fields can't be migrated", async function () {
+				var item = await createDataObject('item', { itemType: 'book' });
+				item.setField('numPages', "10");
+				item.setField('extra', 'number-of-pages: 11');
+				item.synced = true;
+				await item.saveTx();
+				
+				var onProgress = sinon.spy();
+				await migrate({ onProgress });
+				
+				assert.isFalse(onProgress.called);
+				assert.equal(item.getField('extra'), 'number-of-pages: 11');
+				assert.isTrue(item.synced);
+			});
+			
 			it("should change item type if 'type:' is defined", async function () {
 				var item = await createDataObject('item', { itemType: 'document' });
 				item.setField('extra', 'type: personal_communication');
@@ -488,11 +586,18 @@ describe("Zotero.Schema", function () {
 			await resetDB({
 				thisArg: this,
 				skipBundledFiles: true,
-				dbFile: OS.Path.join(getTestDataDirectory().path, 'zotero-4.0.sqlite.zip')
+				dbFile: OS.Path.join(getTestDataDirectory().path, 'zotero-4.0.sqlite.zip'),
+				// Backups are disabled in the test profile
+				prefs: { 'backup.numBackups': 2 }
 			});
 			// Make sure we can open the Zotero pane without errors
 			win = await loadZoteroPane();
 			win.close();
+			
+			// A backup should have been made before the upgrade
+			assert.isTrue(
+				await IOUtils.exists(PathUtils.join(Zotero.DataDirectory.dir, 'zotero.sqlite.bak'))
+			);
 		});
 	});
 })
diff --git a/test/tests/sdtTest.js b/test/tests/sdtTest.js
new file mode 100644
index 0000000000..a9630bbbcb
--- /dev/null
+++ b/test/tests/sdtTest.js
@@ -0,0 +1,461 @@
+describe("Zotero.SDT", function () {
+	const SDT_CACHE_FILE_NAME = '.zotero-sdt-cache';
+	const TEST_PDF_HASH = 'e54589353710950c4b7ff70829a60036';
+	const SDT_PACK_MAGIC = [0x89, 0x53, 0x44, 0x54, 0x0d, 0x0a, 0x1a, 0x0a];
+	const STALE_SDT_PACK_BASE64 = 'iVNEVA0KGgoBAQAAGAAAAGAAAABGAAAAAAAAADMAAAAAAAAAAQAAAIXMMQ6DMBBE0btMbaIxBcW2uQIVnYUXkSa2dk2kCPnuEVwgX6/+J6qVVd2LQU60b1UIat4Q8FHzV3lDYg/IqenTNDXNEIwcp4FxYJxJuT1ILgjwctiq12xPvkPAP6H3H6tWKkhMTy1WsoquVspMUbJSKjBU0lHKSUxKzVGyUgKxk/PzSlLzSoIS89JTlayiow1idaINY2NrY3WU8ktLcjLzQKKxtQBjYGBgqFYqqSxIVbJSKkgsSkwvSizIUNJRKkmtKFGyUgpJLS5RCHYJUUhOTM5I1VOqBQA=';
+	const STALE_PROCESSOR_VERSION_SDT_PACK_BASE64 = 'iVNEVA0KGgoBAQAAGAAAAHMAAABGAAAAAAAAADMAAAAAAAAAAQAAAB3MsQ7CIBQF0H+5MzWXtpSW1V9wcsPySF2EQGtiGv7daHLmcyKXtEqtqcCd2D9Z4JBDhMJbSn2mF5xuCsHvci3idwlw6NlPHXVHfSPd34XkHQo1HWWVX7b5usFBzGjmZTCD1VwM1/FhY7Sc+8VP5DChtS+rVipITE8tVrKKrlbKTFGyUiowVNJRyklMSs1RslICsZPz80pS80qCEvPSU5WsoqMNYnWiDWNja2N1lPJLS3Iy80CisbUAY2BgYKhWKqksSFWyUipILEpML0osyFDSUSpJrShRslIKSS0uUQh2CVFITkzOSNVTqgUA';
+	const WRONG_PROCESSOR_TYPE_SDT_PACK_BASE64 = 'iVNEVA0KGgoBAQAAGAAAAHMAAABGAAAAAAAAADMAAAAAAAAAAQAAAB3MsQ6DIBQF0H+5szYXFRXW/kKnbojP2KUQwCaN4d8bm5z5nIgpeMk5JNgT5RsFFhKPBQ0+kvIrvGFVbbC6IvckrsgKi47d2FK1VA/S/t1IPtEghyN5ubbd5f3a9KBn0+t+UjSaflimbZs4d8aNZD+i1h+rVipITE8tVrKKrlbKTFGyUiowVNJRyklMSs1RslICsZPz80pS80qCEvPSU5WsoqMNYnWiDWNja2N1lPJLS3Iy80CisbUAY2BgYKhWKqksSFWyUipILEpML0osyFDSUSpJrShRslIKSS0uUQh2CVFITkzOSNVTqgUA';
+	let testSDTPackBytes;
+	let documentWorkerMetadata;
+
+	before(async function () {
+		let pako = getTestRequire()('pako');
+		documentWorkerMetadata = JSON.parse(await Zotero.File.getContentsFromURLAsync(
+			'resource://zotero/document-worker/metadata.json'
+		));
+		testSDTPackBytes = makeEmptyTestSDTPackV1(documentWorkerMetadata, pako);
+	});
+
+	it("should return a valid cached pack", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item);
+
+		let progress = [];
+		let result = await getValidPack(item, {
+			onProgress: value => progress.push(value),
+		});
+
+		assert.equal(result.packVersion, documentWorkerMetadata.SDT_PACK_VERSION);
+		assert.equal(result.schemaMajorVersion, parseInt(documentWorkerMetadata.SDT_SCHEMA_VERSION));
+		assertPackMagic(result);
+		assert.deepEqual(progress, []);
+	});
+
+	it("should generate the pack when missing", async function () {
+		let item = await importFileAttachment('test.pdf');
+		let cachePath = getSDTCachePath(item);
+		await OS.File.remove(cachePath, { ignoreAbsent: true });
+
+		let workerStub = stubStructuredDocumentTextWorker();
+		try {
+			let result = await getValidPack(item);
+			assert.isTrue(workerStub.calledOnce);
+			assert.equal(workerStub.firstCall.args[0], item.id);
+			assert.isTrue(await OS.File.exists(cachePath));
+			assertPackMagic(result);
+
+			// A second call should hit the cache
+			await getValidPack(item);
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should share a single generation between concurrent getPack() calls", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await OS.File.remove(getSDTCachePath(item), { ignoreAbsent: true });
+
+		let unblockWorker;
+		let workerBlocked = new Promise((resolve) => {
+			unblockWorker = resolve;
+		});
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.callsFake(async () => {
+				await workerBlocked;
+				return { buf: getTestSDTPackBuffer() };
+			});
+		try {
+			// One generation per item at a time -- this is also what keeps
+			// concurrent generations from racing on the cache file write
+			let promise1 = Zotero.SDT.getPack(item.id);
+			let promise2 = Zotero.SDT.getPack(item.id);
+			await waitForStubCall(workerStub);
+			unblockWorker();
+
+			let [result1, result2] = await Promise.all([promise1, promise2]);
+			assert.isTrue(result1.ok, result1.reason);
+			assert.isTrue(result2.ok, result2.reason);
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			unblockWorker();
+			workerStub.restore();
+		}
+	});
+
+	it("should share generation progress between concurrent getPack() calls", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await OS.File.remove(getSDTCachePath(item), { ignoreAbsent: true });
+
+		let unblockWorker;
+		let workerBlocked = new Promise((resolve) => {
+			unblockWorker = resolve;
+		});
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.callsFake(async (itemID, options = {}) => {
+				options.onProgress(10);
+				await workerBlocked;
+				options.onProgress(60);
+				return { buf: getTestSDTPackBuffer() };
+			});
+		try {
+			let progress1 = [];
+			let progress2 = [];
+			let promise1 = Zotero.SDT.getPack(item.id, {
+				onProgress: progress => progress1.push(progress),
+			});
+			await waitForProgress(progress1, 10);
+			assert.deepEqual(progress1, [10]);
+
+			let promise2 = Zotero.SDT.getPack(item.id, {
+				onProgress: progress => progress2.push(progress),
+			});
+			await waitForProgress(progress2, 10);
+			assert.deepEqual(progress2, [10]);
+
+			unblockWorker();
+			let [result1, result2] = await Promise.all([promise1, promise2]);
+			assert.isTrue(result1.ok, result1.reason);
+			assert.isTrue(result2.ok, result2.reason);
+			assert.isTrue(workerStub.calledOnce);
+			assert.deepEqual(progress1, [10, 60]);
+			assert.deepEqual(progress2, [10, 60]);
+		}
+		finally {
+			unblockWorker();
+			workerStub.restore();
+		}
+	});
+
+	it("should regenerate a stale pack", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item, getStaleSDTPackBytes());
+
+		let workerStub = stubStructuredDocumentTextWorker();
+		try {
+			await getValidPack(item);
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should return a stale-processor pack and regenerate it in the background", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item, getStaleProcessorVersionSDTPackBytes());
+
+		let unblockWorker;
+		let workerBlocked = new Promise((resolve) => {
+			unblockWorker = resolve;
+		});
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.callsFake(async () => {
+				await workerBlocked;
+				return { buf: getTestSDTPackBuffer() };
+			});
+		try {
+			// The old pack is returned immediately while regeneration is
+			// still blocked in the worker
+			let result = await getValidPack(item);
+			assert.deepEqual(
+				new Uint8Array(result.bytes),
+				getStaleProcessorVersionSDTPackBytes()
+			);
+			await waitForStubCall(workerStub);
+
+			unblockWorker();
+			await waitForCacheBytes(item, getTestSDTPackBytes());
+
+			// The next call returns the fresh pack without re-extracting
+			result = await getValidPack(item);
+			assert.deepEqual(new Uint8Array(result.bytes), getTestSDTPackBytes());
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			unblockWorker();
+			workerStub.restore();
+		}
+	});
+
+	it("should regenerate a pack with the wrong processor type", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item, getWrongProcessorTypeSDTPackBytes());
+
+		let workerStub = stubStructuredDocumentTextWorker();
+		try {
+			await getValidPack(item);
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should regenerate a pack with an incompatible schema major version", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item, getIncompatibleSchemaMajorSDTPackBytes());
+
+		let workerStub = stubStructuredDocumentTextWorker();
+		try {
+			let result = await getValidPack(item);
+			assert.isTrue(workerStub.calledOnce);
+			assert.equal(result.schemaMajorVersion,
+				parseInt(documentWorkerMetadata.SDT_SCHEMA_VERSION));
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should retry generation after a transient failure", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await OS.File.remove(getSDTCachePath(item), { ignoreAbsent: true });
+
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText');
+		workerStub.onFirstCall().rejects(new Error('Transient extraction failure'));
+		workerStub.callsFake(async () => ({ buf: getTestSDTPackBuffer() }));
+		try {
+			let result = await Zotero.SDT.getPack(item.id);
+			assert.isFalse(result.ok);
+			assert.equal(result.reason, 'failed');
+
+			await getValidPack(item);
+			assert.isTrue(workerStub.calledTwice);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("shouldn't re-extract a password-protected file until it changes", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await OS.File.remove(getSDTCachePath(item), { ignoreAbsent: true });
+
+		let error = new Error('Password required');
+		error.name = 'PasswordException';
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.rejects(error);
+		try {
+			let result = await Zotero.SDT.getPack(item.id);
+			assert.isFalse(result.ok);
+			assert.equal(result.reason, 'password-required');
+
+			result = await Zotero.SDT.getPack(item.id);
+			assert.isFalse(result.ok);
+			assert.equal(result.reason, 'password-required');
+			assert.isTrue(workerStub.calledOnce);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should regenerate a stale-processor pack before resolving ensure()", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await writeTestSDTCache(item, getStaleProcessorVersionSDTPackBytes());
+
+		let workerStub = stubStructuredDocumentTextWorker();
+		try {
+			// Unlike getPack(), ensure() doesn't return early with the old
+			// pack -- once it resolves, the cache must already be current
+			assert.isTrue(await Zotero.SDT.ensure(item.id));
+			assert.isTrue(workerStub.calledOnce);
+			assert.deepEqual(
+				await IOUtils.read(getSDTCachePath(item)),
+				getTestSDTPackBytes()
+			);
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should return false from ensure() when generation fails", async function () {
+		let item = await importFileAttachment('test.pdf');
+		await OS.File.remove(getSDTCachePath(item), { ignoreAbsent: true });
+
+		let workerStub = sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.rejects(new Error('Extraction failure'));
+		try {
+			assert.isFalse(await Zotero.SDT.ensure(item.id));
+		}
+		finally {
+			workerStub.restore();
+		}
+	});
+
+	it("should return unavailable for unsupported items", async function () {
+		let item = await importFileAttachment('test.txt');
+		let result = await Zotero.SDT.getPack(item.id);
+		assert.isFalse(result.ok);
+		assert.equal(result.reason, 'unavailable');
+	});
+
+	it("should generate and open a pack with the real document worker", async function () {
+		// Cold worker startup fetches the wasm runtime and segmentation models
+		this.timeout(120000);
+
+		let item = await importFileAttachment('test.pdf');
+		let cachePath = getSDTCachePath(item);
+		await OS.File.remove(cachePath, { ignoreAbsent: true });
+
+		// getPack() succeeds only if the worker-produced pack parses with the
+		// bundled SDT module, matches its schema major version, and is
+		// stamped with the source file's hash, so this catches version
+		// drift between the document-worker and the bundled module
+		let progress = [];
+		let result = await getValidPack(item, {
+			onProgress: value => progress.push(value),
+		});
+		assert.isTrue(await OS.File.exists(cachePath));
+		assertPackMagic(result);
+		assert.deepEqual(progress, progress.slice().sort((a, b) => a - b));
+		assert.equal(progress[0], 0);
+		assert.equal(progress.at(-1), 100);
+		assert.isTrue(progress.some(value => value > 0 && value < 100));
+
+		// getReader() should return a parsed pack from the cache without
+		// re-extracting
+		let reader = await Zotero.SDT.getReader(item.id);
+		assert.isOk(reader);
+		let metadata = await reader.getMetadata();
+		assert.equal(metadata.source.hash, TEST_PDF_HASH);
+	});
+
+	function getSDTCachePath(item) {
+		return OS.Path.join(Zotero.Attachments.getStorageDirectory(item).path, SDT_CACHE_FILE_NAME);
+	}
+
+	async function writeTestSDTCache(item, bytes = getTestSDTPackBytes()) {
+		// The fixture packs embed the hash of test.pdf, so they have to be
+		// regenerated if the test PDF ever changes
+		assert.equal(await item.attachmentHash, TEST_PDF_HASH,
+			'fixture pack source hash should match test.pdf');
+		let cachePath = getSDTCachePath(item);
+		await OS.File.writeAtomic(cachePath, bytes, { tmpPath: `${cachePath}.tmp` });
+		return cachePath;
+	}
+
+	async function getValidPack(item, options) {
+		let result = await Zotero.SDT.getPack(item.id, options);
+		assert.isTrue(result.ok, result.reason);
+		return result;
+	}
+
+	function assertPackMagic(result) {
+		assert.deepEqual(Array.from(new Uint8Array(result.bytes, 0, 8)), SDT_PACK_MAGIC);
+	}
+
+	async function waitForStubCall(stub) {
+		while (!stub.called) {
+			await Zotero.Promise.delay(5);
+		}
+	}
+
+	async function waitForProgress(progress, value) {
+		while (!progress.includes(value)) {
+			await Zotero.Promise.delay(5);
+		}
+	}
+
+	async function waitForCacheBytes(item, expected) {
+		let cachePath = getSDTCachePath(item);
+		while (true) {
+			let bytes = await IOUtils.read(cachePath);
+			if (bytes.length === expected.length && bytes.every((b, i) => b === expected[i])) {
+				return;
+			}
+			await Zotero.Promise.delay(10);
+		}
+	}
+
+	function stubStructuredDocumentTextWorker() {
+		return sinon.stub(Zotero.PDFWorker, 'getStructuredDocumentText')
+			.callsFake(async () => ({ buf: getTestSDTPackBuffer() }));
+	}
+
+	function getTestSDTPackBuffer() {
+		let bytes = getTestSDTPackBytes();
+		return bytes.buffer;
+	}
+
+	function getStaleSDTPackBytes() {
+		return decodeBase64Bytes(STALE_SDT_PACK_BASE64);
+	}
+
+	function getStaleProcessorVersionSDTPackBytes() {
+		return decodeBase64Bytes(STALE_PROCESSOR_VERSION_SDT_PACK_BASE64);
+	}
+
+	function getWrongProcessorTypeSDTPackBytes() {
+		return decodeBase64Bytes(WRONG_PROCESSOR_TYPE_SDT_PACK_BASE64);
+	}
+
+	function getIncompatibleSchemaMajorSDTPackBytes() {
+		let bytes = getTestSDTPackBytes();
+		let currentMajor = parseInt(documentWorkerMetadata.SDT_SCHEMA_VERSION);
+		bytes[9] = currentMajor === 0xff ? currentMajor - 1 : currentMajor + 1;
+		return bytes;
+	}
+
+	function getTestSDTPackBytes() {
+		return testSDTPackBytes.slice();
+	}
+
+	function getTestRequire() {
+		let scope = {};
+		Services.scriptloader.loadSubScript('resource://zotero/require.js', scope);
+		return scope.require;
+	}
+
+	// Minimal empty SDT pack for cache tests. This intentionally implements
+	// only pack format v1; a pack-format change should require test review,
+	// while schema and processor version bumps should not.
+	function makeEmptyTestSDTPackV1(metadata, pako) {
+		if (metadata.SDT_PACK_VERSION !== 1) {
+			throw new Error('Unsupported test SDT pack version');
+		}
+		const HEADER_LENGTH = 16;
+		const INDEX_LENGTH = 16;
+		let schemaVersion = metadata.SDT_SCHEMA_VERSION.split('.').map(Number);
+		let metadataBytes = pako.deflateRaw(JSON.stringify({
+			processor: {
+				type: 'pdf',
+				version: metadata.SDT_PROCESSOR_VERSIONS.pdf,
+			},
+			dateCreated: '2026-01-01T00:00:00.000Z',
+			source: { hash: TEST_PDF_HASH },
+		}));
+		let catalogBytes = pako.deflateRaw(JSON.stringify({
+			pages: [],
+			outline: [],
+		}));
+		let payloadOffset = HEADER_LENGTH + INDEX_LENGTH;
+		let bytes = new Uint8Array(
+			payloadOffset + metadataBytes.byteLength + catalogBytes.byteLength
+		);
+		bytes.set(SDT_PACK_MAGIC, 0);
+		bytes.set([metadata.SDT_PACK_VERSION, ...schemaVersion], 8);
+		let view = new DataView(bytes.buffer);
+		view.setUint32(12, INDEX_LENGTH, true);
+		view.setUint32(HEADER_LENGTH, metadataBytes.byteLength, true);
+		view.setUint32(HEADER_LENGTH + 4, catalogBytes.byteLength, true);
+		// The final eight index bytes are zeroes: one empty content offset
+		// and one empty block-start entry.
+		bytes.set(metadataBytes, payloadOffset);
+		bytes.set(catalogBytes, payloadOffset + metadataBytes.byteLength);
+		return bytes;
+	}
+
+	function decodeBase64Bytes(base64) {
+		let binary = atob(base64);
+		let bytes = new Uint8Array(binary.length);
+		for (let i = 0; i < binary.length; i++) {
+			bytes[i] = binary.charCodeAt(i);
+		}
+		return bytes;
+	}
+});
diff --git a/test/tests/searchQueryTest.js b/test/tests/searchQueryTest.js
new file mode 100644
index 0000000000..ada581fe8d
--- /dev/null
+++ b/test/tests/searchQueryTest.js
@@ -0,0 +1,1109 @@
+"use strict";
+
+describe("Zotero.SearchQuery", function () {
+	function clauses(query) {
+		let { tree } = Zotero.SearchQuery.parse(query);
+		return tree ? tree.children : [];
+	}
+
+	describe("#parse()", function () {
+		it("should parse a field, operator, and value", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("by:smith");
+			assert.equal(text, "");
+			assert.deepEqual(tree.children, [
+				{ condition: 'creator', operator: 'contains', value: 'smith' }
+			]);
+		});
+
+		it("should separate free text from clauses, in either order", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("by:smith crispr screens");
+			assert.equal(text, "crispr screens");
+			assert.lengthOf(tree.children, 1);
+			assert.equal(Zotero.SearchQuery.parse("crispr by:smith").text, "crispr");
+		});
+
+		it("should treat text that only looks like a clause as text", function () {
+			for (let query of ["10.1234/foo:bar", "Vol 2: The Return", "https://example.com/a:b"]) {
+				let { tree, text } = Zotero.SearchQuery.parse(query);
+				assert.isNull(tree, query);
+				assert.equal(text, query.replace(/\s+/g, ' '), query);
+			}
+		});
+	});
+
+	describe("operators and comparisons", function () {
+		it("should accept operator words as the Advanced Search reads", function () {
+			assert.deepEqual(clauses("title is grounded"), [
+				{ condition: 'title', operator: 'is', value: 'grounded' }
+			]);
+			assert.deepEqual(clauses("date before 2015"), [
+				{ condition: 'date', operator: 'isBefore', value: '2015' }
+			]);
+			assert.deepEqual(clauses("year since 2020"), [
+				{ condition: 'date', operator: 'isAfter', value: '2020' }
+			]);
+			// Every date-type field compares as a date
+			assert.deepEqual(clauses("filing date is before 2020"), [
+				{ condition: 'filingDate', operator: 'isBefore', value: '2020' }
+			]);
+			assert.deepEqual(clauses("original date is before 2020"), [
+				{ condition: 'originalDate', operator: 'isBefore', value: '2020' }
+			]);
+		});
+
+		it("should parse an operator of several words, preferring the longest", function () {
+			assert.deepEqual(clauses("title begins with grounded"), [
+				{ condition: 'title', operator: 'beginsWith', value: 'grounded' }
+			]);
+			assert.deepEqual(clauses("type is not book"), [
+				{ condition: 'itemType', operator: 'isNot', value: 'book' }
+			]);
+		});
+
+		it("should compare dates with before, after, and since as fields", function () {
+			assert.deepEqual(clauses("after:2020"), [
+				{ condition: 'date', operator: 'isAfter', value: '2020' }
+			]);
+			assert.deepEqual(clauses("before:2015"), [
+				{ condition: 'date', operator: 'isBefore', value: '2015' }
+			]);
+		});
+
+		it("should keep the unit in a relative date", async function () {
+			assert.deepEqual(clauses("added in the last 3 days"), [
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '3 days' }
+			]);
+			assert.equal(Zotero.SearchQuery.parse("added in the last 3 days").text, "");
+
+			let item = await createDataObject('item');
+			let search = Zotero.SearchQuery.getSearch("added in the last 3 days", {
+				libraryID: Zotero.Libraries.userLibraryID
+			});
+			assert.include(await search.search(), item.id);
+		});
+
+		it("should count weeks in days, which the date comparison understands", function () {
+			assert.deepEqual(clauses("added in the last 2 weeks"), [
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '14 days' }
+			]);
+		});
+
+		it("should read natural comparisons written with 'is'", function () {
+			assert.deepEqual(clauses("year is before 2020"), [
+				{ condition: 'date', operator: 'isBefore', value: '2020' }
+			]);
+			assert.deepEqual(clauses("added is in the last 2 weeks"), [
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '14 days' }
+			]);
+			assert.deepEqual(clauses("number of tags is greater than 5"), [
+				{ condition: 'numTags', operator: 'isGreaterThan', value: '5' }
+			]);
+			// A condition that doesn't compare still matches the word
+			assert.deepEqual(clauses("title is before"), [
+				{ condition: 'title', operator: 'is', value: 'before' }
+			]);
+		});
+
+		it("should accept 'starts with' and 'within the last'", function () {
+			assert.deepEqual(clauses("title starts with grounded"), [
+				{ condition: 'title', operator: 'beginsWith', value: 'grounded' }
+			]);
+			assert.deepEqual(clauses("added within the last 3 days"), [
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '3 days' }
+			]);
+		});
+
+		it("should compare numbers", function () {
+			assert.deepEqual(clauses("number of tags > 5"), [
+				{ condition: 'numTags', operator: 'isGreaterThan', value: '5' }
+			]);
+			assert.deepEqual(clauses("number of notes greater than 2"), [
+				{ condition: 'numNotes', operator: 'isGreaterThan', value: '2' }
+			]);
+		});
+
+		it("should read a colon after a word operator as punctuation", function () {
+			assert.deepEqual(clauses("year before:2020"), [
+				{ condition: 'date', operator: 'isBefore', value: '2020' }
+			]);
+			assert.deepEqual(clauses("year is before:2020"), [
+				{ condition: 'date', operator: 'isBefore', value: '2020' }
+			]);
+			assert.deepEqual(clauses("tag is:foo"), [
+				{ condition: 'tag', operator: 'is', value: 'foo' }
+			]);
+		});
+
+		it("should support empty and non-empty conditions", function () {
+			assert.deepEqual(clauses("creator is empty"), [
+				{ condition: 'creator', operator: 'isEmpty', value: '' }
+			]);
+			assert.deepEqual(clauses("abstract is not empty"), [
+				{ condition: 'abstractNote', operator: 'isNotEmpty', value: '' }
+			]);
+		});
+	});
+
+	describe("ranges", function () {
+		// The comparisons are exclusive, so a range that takes in 1970 and
+		// 2000 is written as after 1969 and before 2001
+		let years = {
+			joinMode: 'all',
+			children: [
+				{ condition: 'date', operator: 'isAfter', value: '1969' },
+				{ condition: 'date', operator: 'isBefore', value: '2001' }
+			]
+		};
+
+		it("should read a range as the comparisons that bracket it", function () {
+			assert.deepEqual(clauses("year is between 1970 and 2000"), [years]);
+			assert.deepEqual(clauses("year between 1970 and 2000"), [years]);
+		});
+
+		it("should accept a range written without a word between the ends", function () {
+			let queries = [
+				"year:1970-2000",
+				"year is 1970-2000",
+				"year:1970..2000",
+				"year:1970 to 2000",
+				"year from 1970 to 2000",
+				"year:1970 - 2000",
+				"year:1970–2000",
+				// A whole range reads as one word too, for a locale that
+				// doesn't put spaces between its words
+				"year:1970to2000"
+			];
+			for (let query of queries) {
+				assert.deepEqual(clauses(query), [years], query);
+			}
+		});
+
+		it("should step a range end by however much it was written with", function () {
+			assert.deepEqual(clauses("added between 2024-02 and 2024-06"), [{
+				joinMode: 'all',
+				children: [
+					{ condition: 'dateAdded', operator: 'isAfter', value: '2024-01' },
+					{ condition: 'dateAdded', operator: 'isBefore', value: '2024-07' }
+				]
+			}]);
+			assert.deepEqual(clauses("date:2020-03-01..2020-03-15"), [{
+				joinMode: 'all',
+				children: [
+					{ condition: 'date', operator: 'isAfter', value: '2020-02-29' },
+					{ condition: 'date', operator: 'isBefore', value: '2020-03-16' }
+				]
+			}]);
+		});
+
+		it("should compare counts as numbers", function () {
+			assert.deepEqual(clauses("number of tags between 2 and 5"), [{
+				joinMode: 'all',
+				children: [
+					{ condition: 'numTags', operator: 'isGreaterThan', value: '1' },
+					{ condition: 'numTags', operator: 'isLessThan', value: '6' }
+				]
+			}]);
+		});
+
+		it("should match either end when a range is excluded", function () {
+			assert.deepEqual(clauses("year is not between 1970 and 2000"), [{
+				joinMode: 'any',
+				children: [
+					{ condition: 'date', operator: 'isBefore', value: '1970' },
+					{ condition: 'date', operator: 'isAfter', value: '2000' }
+				]
+			}]);
+		});
+
+		it("should read a value that isn't a range as a value", function () {
+			// A date of its own, a range a condition that doesn't compare
+			// can't take, a quoted value, and ends in the wrong order
+			assert.deepEqual(clauses("date:2020-01-05"), [
+				{ condition: 'date', operator: 'is', value: '2020-01-05' }
+			]);
+			assert.deepEqual(clauses("title:1970-2000"), [
+				{ condition: 'title', operator: 'contains', value: '1970-2000' }
+			]);
+			assert.deepEqual(clauses('year:"1970-2000"'), [
+				{ condition: 'date', operator: 'is', value: '1970-2000' }
+			]);
+			assert.deepEqual(clauses("year:2000-1970"), [
+				{ condition: 'date', operator: 'is', value: '2000-1970' }
+			]);
+			// `and` joins clauses, so it separates ends only after `between`
+			assert.deepEqual(clauses("year:1970 and tag:foo"), [
+				{ condition: 'date', operator: 'is', value: '1970' },
+				{ condition: 'tag', operator: 'is', value: 'foo' }
+			]);
+			// Each separator goes with the form it belongs to
+			assert.isNull(Zotero.SearchQuery.parse("year is between 1970 to 2000").tree);
+		});
+
+		it("should scope a range on a child field to one child", function () {
+			// Both ends are about the same attachment, so the level scopes the
+			// pair rather than each comparison
+			assert.deepEqual(clauses("attachment last read between 2020 and 2025"), [{
+				joinMode: 'all',
+				level: 'attachment',
+				children: [
+					{ condition: 'lastRead', operator: 'isAfter', value: '2019' },
+					{ condition: 'lastRead', operator: 'isBefore', value: '2026' }
+				]
+			}]);
+		});
+
+		it("should match a child in the range, not one at each end", async function () {
+			let read = async (parent, year) => {
+				let attachment = await importFileAttachment('test.pdf', { parentItemID: parent.id });
+				attachment.attachmentLastRead = Math.floor(Date.UTC(year, 5, 15) / 1000);
+				await attachment.saveTx();
+			};
+			let inRange = await createDataObject('item');
+			await read(inRange, 2022);
+			let straddling = await createDataObject('item');
+			await read(straddling, 2010);
+			await read(straddling, 2030);
+
+			let ids = await Zotero.SearchQuery.getSearch(
+				"attachment last read between 2020 and 2025",
+				{ libraryID: Zotero.Libraries.userLibraryID }
+			).search();
+			assert.include(ids, inRange.id);
+			assert.notInclude(ids, straddling.id);
+		});
+
+		it("should repeat the field of a range for a value after 'or'", function () {
+			assert.deepEqual(clauses("year:2020-2025 or 1999"), [
+				{
+					joinMode: 'all',
+					children: [
+						{ condition: 'date', operator: 'isAfter', value: '2019' },
+						{ condition: 'date', operator: 'isBefore', value: '2026' }
+					]
+				},
+				{ condition: 'date', operator: 'is', value: '1999' }
+			]);
+		});
+
+		it("should read a day the month doesn't have as a value", function () {
+			// Stepping past the end of the month would widen the range into
+			// the month after it
+			assert.deepEqual(clauses("date:2023-02-29..2023-02-29"), [
+				{ condition: 'date', operator: 'is', value: '2023-02-29..2023-02-29' }
+			]);
+			// A day the month does have still reads as a range
+			assert.deepEqual(clauses("date:2024-02-29..2024-02-29"), [{
+				joinMode: 'all',
+				children: [
+					{ condition: 'date', operator: 'isAfter', value: '2024-02-28' },
+					{ condition: 'date', operator: 'isBefore', value: '2024-03-01' }
+				]
+			}]);
+		});
+
+		it("should recognize a range before both ends are typed", function () {
+			let queries = [
+				"year is between",
+				"year is between 19",
+				"year is between 1970 and",
+				"year is between 1970 and 19"
+			];
+			for (let query of queries) {
+				// Nothing to match on yet, and not text to search for
+				let { tree, text } = Zotero.SearchQuery.parse("crispr " + query);
+				assert.isNull(tree, query);
+				assert.equal(text, "crispr", query);
+				// Every character still belongs to a token, for highlighting
+				let tokens = Zotero.SearchQuery.tokenize(query);
+				assert.equal(tokens[tokens.length - 1].end, query.length, query);
+			}
+		});
+
+		it("should find items dated anywhere in the range, ends included", async function () {
+			let items = {};
+			for (let date of ['1969', '1970', '1985-06-15', '2000-12-31', '2001']) {
+				items[date] = await createDataObject('item', { setTitle: true });
+				items[date].setField('date', date);
+				await items[date].saveTx();
+			}
+
+			for (let query of ["year is between 1970 and 2000", "year:1970-2000"]) {
+				let search = Zotero.SearchQuery.getSearch(query, {
+					libraryID: Zotero.Libraries.userLibraryID
+				});
+				let ids = await search.search();
+				assert.include(ids, items['1970'].id, query);
+				assert.include(ids, items['1985-06-15'].id, query);
+				assert.include(ids, items['2000-12-31'].id, query);
+				assert.notInclude(ids, items['1969'].id, query);
+				assert.notInclude(ids, items['2001'].id, query);
+			}
+		});
+	});
+
+	describe("grouping and precedence", function () {
+		it("should group with parentheses and join modes", function () {
+			let { tree } = Zotero.SearchQuery.parse('by:smith and (tag:foo or tag:bar)');
+			assert.equal(tree.joinMode, 'all');
+			assert.lengthOf(tree.children, 2);
+			assert.equal(tree.children[0].condition, 'creator');
+			assert.equal(tree.children[1].joinMode, 'any');
+			assert.deepEqual(tree.children[1].children, [
+				{ condition: 'tag', operator: 'is', value: 'foo' },
+				{ condition: 'tag', operator: 'is', value: 'bar' }
+			]);
+		});
+
+		it("should bind 'and' tighter than 'or'", function () {
+			let { tree } = Zotero.SearchQuery.parse("by:smith or by:jones and tag:foo");
+			assert.equal(tree.joinMode, 'any');
+			assert.lengthOf(tree.children, 2);
+			assert.equal(tree.children[0].value, 'smith');
+			assert.equal(tree.children[1].joinMode, 'all');
+			assert.deepEqual(tree.children[1].children.map(c => c.value), ['jones', 'foo']);
+		});
+
+		it("should find what 'a or b and c' means", async function () {
+			let smith = await createDataObject('item');
+			smith.setCreators([{ firstName: "A", lastName: "Smith", creatorType: "author" }]);
+			await smith.saveTx();
+			let jonesTagged = await createDataObject('item');
+			jonesTagged.setCreators([{ firstName: "B", lastName: "Jones", creatorType: "author" }]);
+			jonesTagged.addTag("zzfoo");
+			await jonesTagged.saveTx();
+			// Jones without the tag is excluded, since `and` binds tighter
+			let jonesOnly = await createDataObject('item');
+			jonesOnly.setCreators([{ firstName: "C", lastName: "Jones", creatorType: "author" }]);
+			await jonesOnly.saveTx();
+
+			let search = Zotero.SearchQuery.getSearch("by:smith or by:jones and tag:zzfoo", {
+				libraryID: Zotero.Libraries.userLibraryID
+			});
+			let ids = await search.search();
+			assert.include(ids, smith.id);
+			assert.include(ids, jonesTagged.id);
+			assert.notInclude(ids, jonesOnly.id);
+		});
+
+		it("should treat adjacency as 'and' for precedence", function () {
+			let tree = Zotero.SearchQuery.parse("by:smith tag:a or tag:b").tree;
+			assert.equal(tree.joinMode, 'any');
+			assert.equal(tree.children[0].joinMode, 'all');
+			assert.deepEqual(tree.children[0].children.map(c => c.value), ['smith', 'a']);
+			assert.equal(tree.children[1].value, 'b');
+
+			tree = Zotero.SearchQuery.parse("by:smith or by:jones tag:foo").tree;
+			assert.equal(tree.joinMode, 'any');
+			assert.equal(tree.children[0].value, 'smith');
+			assert.deepEqual(tree.children[1].children.map(c => c.value), ['jones', 'foo']);
+		});
+
+		it("should keep parentheses that aren't grouping clauses", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("by:smith The (Dis)United States");
+			assert.lengthOf(tree.children, 1);
+			assert.equal(text, "The (Dis)United States");
+		});
+	});
+
+	describe("repeated values after 'or'", function () {
+		it("should repeat the preceding field for a bare value", function () {
+			let { tree } = Zotero.SearchQuery.parse('creator is "smith" and (tag is foo or bar)');
+			assert.deepEqual(tree.children[1].children, [
+				{ condition: 'tag', operator: 'is', value: 'foo' },
+				{ condition: 'tag', operator: 'is', value: 'bar' }
+			]);
+		});
+
+		it("should read a repeated value the same way as the first", function () {
+			assert.deepEqual(clauses('type:book or "journal article"').map(c => c.value),
+				['book', 'journalArticle']);
+			assert.deepEqual(clauses("annotation color:red or blue").map(c => c.value),
+				['#ff6666', '#2ea8e5']);
+			// A value the condition doesn't accept isn't a clause at all
+			let { tree, text } = Zotero.SearchQuery.parse("type:book or widget");
+			assert.lengthOf(tree.children, 1);
+			assert.equal(tree.children[0].value, 'book');
+			// The join word itself isn't text to search for
+			assert.equal(text, "widget");
+		});
+
+		it("should repeat the operator along with the field", function () {
+			assert.deepEqual(clauses("added in the last 2 days or 3 days"), [
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '2 days' },
+				{ condition: 'dateAdded', operator: 'isInTheLast', value: '3 days' }
+			]);
+			assert.equal(
+				Zotero.SearchQuery.parse("added in the last 2 days or 3 days").text, ""
+			);
+		});
+
+		it("should repeat only the clause the 'or' follows", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("by:smith research or development");
+			assert.deepEqual(tree.children, [
+				{ condition: 'creator', operator: 'contains', value: 'smith' }
+			]);
+			assert.equal(text, "research development");
+		});
+
+		it("should not repeat the preceding field after 'and'", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("by:smith and crispr");
+			assert.deepEqual(tree.children, [
+				{ condition: 'creator', operator: 'contains', value: 'smith' }
+			]);
+			assert.equal(text, "crispr");
+		});
+
+		it("should not repeat a field into something written as a clause", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("tag:foo or type:widget");
+			assert.deepEqual(tree.children, [
+				{ condition: 'tag', operator: 'is', value: 'foo' }
+			]);
+			assert.equal(text, "type:widget");
+		});
+	});
+
+	describe("quoting", function () {
+		it("should keep quoted values together", function () {
+			assert.deepEqual(clauses('tag:"to read"'), [
+				{ condition: 'tag', operator: 'is', value: 'to read' }
+			]);
+		});
+
+		it("should accept curly quotes and a spaced colon", function () {
+			assert.deepEqual(clauses("by:“Mary Ann Test”"), [
+				{ condition: 'creator', operator: 'contains', value: 'Mary Ann Test' }
+			]);
+			assert.deepEqual(clauses("tag : foo"), [
+				{ condition: 'tag', operator: 'is', value: 'foo' }
+			]);
+		});
+
+		it("should read an unterminated quote as text", function () {
+			let { tree, text } = Zotero.SearchQuery.parse('by:"Mary Ann');
+			assert.isNull(tree);
+			assert.equal(text, 'by:"Mary Ann');
+		});
+
+		it("should format a value so it reads back as one value", function () {
+			for (let value of ['to read', '"Death is different"', 'it\'s "fine" (really)']) {
+				let query = 'tag:' + Zotero.SearchQuery.formatValue(value);
+				assert.deepEqual(clauses(query), [
+					{ condition: 'tag', operator: 'is', value }
+				], query);
+			}
+		});
+	});
+
+	describe("invalid input", function () {
+		it("should ignore an unknown field name", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("colour:blue");
+			assert.isNull(tree);
+			assert.equal(text, "colour:blue");
+		});
+
+		it("should ignore an operator the field doesn't take", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("type before book");
+			assert.isNull(tree);
+			assert.include(text, "type");
+		});
+
+		it("should read an unusable clause as text", function () {
+			for (let query of ["annotation color:chartreuse", 'title:""', "tag: ("]) {
+				let { tree } = Zotero.SearchQuery.parse(query);
+				assert.isNull(tree, query);
+			}
+		});
+
+		it("should reject a value a condition's own filter rejects", function () {
+			for (let query of ["number of tags > five", "number of tags:foo"]) {
+				assert.isNull(Zotero.SearchQuery.parse(query).tree, query);
+			}
+			assert.deepEqual(clauses("number of tags > 5"), [
+				{ condition: 'numTags', operator: 'isGreaterThan', value: '5' }
+			]);
+		});
+	});
+
+	describe("values shown in the interface", function () {
+		it("should accept an item type by its displayed name", function () {
+			for (let query of ["type:\"journal article\"", "type is journal article"]) {
+				assert.equal(clauses(query)[0].value, 'journalArticle', query);
+			}
+			assert.equal(clauses("type is Book Section")[0].value, 'bookSection');
+			// The stored name is Zotero's, not something to type
+			assert.isEmpty(clauses("type:journalArticle"));
+		});
+
+		it("should accept an annotation color by name", function () {
+			assert.deepEqual(clauses("annotation color:yellow"), [
+				{
+					condition: 'annotationColor',
+					operator: 'is',
+					value: '#ffd400',
+					level: 'annotation'
+				}
+			]);
+			// The stored hex is Zotero's, not something to type
+			assert.isEmpty(clauses("annotation color:#5fb236"));
+		});
+
+		it("should accept 'color' for annotation color", function () {
+			let { tree } = Zotero.SearchQuery.parse("type is annotation and color is red");
+			assert.deepEqual(tree.children[1], {
+				condition: 'annotationColor',
+				operator: 'is',
+				value: '#ff6666',
+				level: 'annotation'
+			});
+			assert.deepEqual(clauses("color:yellow"), [
+				{
+					condition: 'annotationColor',
+					operator: 'is',
+					value: '#ffd400',
+					level: 'annotation'
+				}
+			]);
+		});
+
+		it("should store an annotation type as its id", function () {
+			assert.deepEqual(clauses("annotation type:highlight"), [
+				{
+					condition: 'annotationType',
+					operator: 'is',
+					value: String(Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT),
+					level: 'annotation'
+				}
+			]);
+		});
+
+		it("should accept storage types, including web links", function () {
+			assert.deepEqual(clauses('attachment storage type:"Web Link"').map(c => c.value),
+				['webLink']);
+			assert.deepEqual(clauses('attachment storage type:"Linked File"').map(c => c.value),
+				['linkedFile']);
+		});
+
+		it("should read an unknown value as text", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("type:widget");
+			assert.isNull(tree);
+			assert.equal(text, "type:widget");
+		});
+	});
+
+	describe("name conditions", function () {
+		it("should match within a name for 'is', which compares the full name", function () {
+			assert.deepEqual(clauses("creator is okonkwo"), [
+				{ condition: 'creator', operator: 'contains', value: 'okonkwo' }
+			]);
+			assert.deepEqual(clauses("author is not okonkwo"), [
+				{ condition: 'author', operator: 'doesNotContain', value: 'okonkwo' }
+			]);
+		});
+
+		it("should find an item by a creator's last name", async function () {
+			let item = await createDataObject('item');
+			item.setCreators([
+				{ firstName: "Adaeze", lastName: "Okonkwo", creatorType: "author" }
+			]);
+			await item.saveTx();
+
+			for (let query of ["creator is okonkwo", "by:okonkwo", "creator is Adaeze"]) {
+				let search = Zotero.SearchQuery.getSearch(query, {
+					libraryID: Zotero.Libraries.userLibraryID
+				});
+				assert.include(await search.search(), item.id, query);
+			}
+		});
+	});
+
+	describe("multi-word names", function () {
+		it("should parse a field name of several words", function () {
+			assert.deepEqual(clauses("annotation comment:unclear"), [
+				{
+					condition: 'annotationComment',
+					operator: 'contains',
+					value: 'unclear',
+					level: 'annotation'
+				}
+			]);
+		});
+
+		it("should accept a condition by the name shown in the interface", function () {
+			let localized = Zotero.SearchConditions.getLocalizedName('publicationTitle');
+			assert.deepEqual(clauses(localized + ":Nature"), [
+				{ condition: 'publicationTitle', operator: 'contains', value: 'Nature' }
+			]);
+			// The stored name is Zotero's, not something to type
+			assert.isFalse(Zotero.SearchQuery.getField('publicationTitle'));
+		});
+
+		it("should scope a child-item field to its level", function () {
+			assert.deepEqual(clauses("attachment tag:important"), [
+				{ condition: 'tag', operator: 'is', value: 'important', level: 'attachment' }
+			]);
+			// A condition with a level of its own is scoped to it as well
+			assert.deepEqual(clauses("annotation text:important"), [
+				{
+					condition: 'annotationText',
+					operator: 'contains',
+					value: 'important',
+					level: 'annotation'
+				}
+			]);
+			// Bare `annotation` could mean the text or the comment, so it's
+			// neither
+			assert.isNull(Zotero.SearchQuery.parse("annotation:important").tree);
+		});
+	});
+
+	describe("'has' and 'no' shorthand", function () {
+		it("should read 'has <condition>' and 'no <condition>' as non-empty and empty conditions", function () {
+			assert.deepEqual(clauses('type is "journal article" and no doi'), [
+				{ condition: 'itemType', operator: 'is', value: 'journalArticle' },
+				{ condition: 'DOI', operator: 'isEmpty', value: '' }
+			]);
+			assert.deepEqual(clauses("has doi"), [
+				{ condition: 'DOI', operator: 'isNotEmpty', value: '' }
+			]);
+			// A word that isn't a condition keeps the `no` as text
+			let { tree, text } = Zotero.SearchQuery.parse("no dice");
+			assert.isNull(tree);
+			assert.equal(text, "no dice");
+			// Before a clause of its own, the `no` is text as well
+			({ tree, text } = Zotero.SearchQuery.parse("no title:foo"));
+			assert.deepEqual(tree.children, [
+				{ condition: 'title', operator: 'contains', value: 'foo' }
+			]);
+			assert.equal(text, "no");
+		});
+
+		it("should compare counts for a count-backed target", async function () {
+			assert.deepEqual(clauses("no annotation"), [
+				{ condition: 'numAnnotations', operator: 'is', value: '0' }
+			]);
+			assert.deepEqual(clauses("no tag"), [
+				{ condition: 'numTags', operator: 'is', value: '0' }
+			]);
+			assert.deepEqual(clauses("has attachment"), [
+				{ condition: 'numAttachments', operator: 'isGreaterThan', value: '0' }
+			]);
+
+			// An image annotation with no text is still an annotation
+			let item = await createDataObject('item');
+			let attachment = await importFileAttachment('test.pdf', { parentItemID: item.id });
+			await createAnnotation('image', attachment);
+			let bare = await createDataObject('item');
+
+			let ids = await Zotero.SearchQuery.getSearch("has annotation", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.include(ids, item.id);
+			assert.notInclude(ids, bare.id);
+
+			ids = await Zotero.SearchQuery.getSearch("no annotation", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.include(ids, bare.id);
+			assert.notInclude(ids, item.id);
+		});
+
+		it("should read the plural forms as counts", function () {
+			assert.deepEqual(clauses("no tags"), [
+				{ condition: 'numTags', operator: 'is', value: '0' }
+			]);
+			assert.deepEqual(clauses("has attachments"), [
+				{ condition: 'numAttachments', operator: 'isGreaterThan', value: '0' }
+			]);
+		});
+
+		it("should keep 'no' on a child-scoped field as text", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("no attachment title");
+			assert.isNull(tree);
+			assert.equal(text, "no attachment title");
+			// `has` on one means a child with the field filled in
+			assert.deepEqual(clauses("has attachment title"), [
+				{ condition: 'title', operator: 'isNotEmpty', value: '', level: 'attachment' }
+			]);
+		});
+
+		it("should read 'no' after 'or' as a condition, not a repeated value", function () {
+			let { tree, text } = Zotero.SearchQuery.parse("tag:foo or no doi");
+			assert.equal(tree.joinMode, 'any');
+			assert.deepEqual(tree.children, [
+				{ condition: 'tag', operator: 'is', value: 'foo' },
+				{ condition: 'DOI', operator: 'isEmpty', value: '' }
+			]);
+			assert.equal(text, "");
+		});
+	});
+
+	describe("#getSearch()", function () {
+		it("should return false for a query with no clauses", function () {
+			assert.isFalse(Zotero.SearchQuery.getSearch("crispr screens"));
+		});
+
+		it("should match free text the way the mode does", function () {
+			// A quicksearch condition expands into the fields it covers
+			let conditions = mode => Object.values(
+				Zotero.SearchQuery.getSearch("by:smith crispr", { mode }).getConditions()
+			).map(condition => condition.condition);
+			assert.notInclude(conditions('fields'), 'fulltextContent');
+			assert.include(conditions('fields'), 'tag');
+			assert.include(conditions('everything'), 'fulltextContent');
+			// Best Match with no index falls back to matching text
+			assert.notInclude(conditions('bestMatch'), 'bestMatch');
+		});
+
+		it("should find items matching both the clauses and the text", async function () {
+			let match = await createDataObject('item', { title: "Glucose monitoring in the wild" });
+			match.setCreators([{ firstName: "Ada", lastName: "Nakamura", creatorType: "author" }]);
+			await match.saveTx();
+			let wrongText = await createDataObject('item', { title: "Something else entirely" });
+			wrongText.setCreators([{ firstName: "Ada", lastName: "Nakamura", creatorType: "author" }]);
+			await wrongText.saveTx();
+
+			let search = Zotero.SearchQuery.getSearch("by:nakamura glucose", {
+				libraryID: Zotero.Libraries.userLibraryID,
+				mode: 'fields'
+			});
+			let ids = await search.search();
+			assert.include(ids, match.id);
+			assert.notInclude(ids, wrongText.id);
+		});
+
+		it("should keep an 'any' query separate from the free text", async function () {
+			let tagged = await createDataObject('item', { title: "Glucose sensing" });
+			tagged.addTag("wearables");
+			await tagged.saveTx();
+			let otherTag = await createDataObject('item', { title: "Glucose sensing" });
+			otherTag.addTag("clinical");
+			await otherTag.saveTx();
+			let noMatch = await createDataObject('item', { title: "Unrelated" });
+			noMatch.addTag("wearables");
+			await noMatch.saveTx();
+
+			let search = Zotero.SearchQuery.getSearch("(tag:wearables or tag:clinical) glucose", {
+				libraryID: Zotero.Libraries.userLibraryID,
+				mode: 'fields'
+			});
+			let ids = await search.search();
+			assert.include(ids, tagged.id);
+			assert.include(ids, otherTag.id);
+			assert.notInclude(ids, noMatch.id);
+		});
+
+		it("should match items by conditions on their children", async function () {
+			// The tag lives on the attachment, the type on the item
+			let book = await createDataObject('item', { itemType: 'book' });
+			let attachment = await importFileAttachment('test.pdf', { parentItemID: book.id });
+			attachment.addTag('zzchildtag');
+			await attachment.saveTx();
+			let untagged = await createDataObject('item', { itemType: 'book' });
+
+			let ids = await Zotero.SearchQuery.getSearch("type:book tag:zzchildtag", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.include(ids, book.id);
+			assert.notInclude(ids, untagged.id);
+			assert.notInclude(ids, attachment.id);
+
+			// Attachment content alongside an item-level condition
+			let article = await createDataObject('item', { itemType: 'journalArticle' });
+			await importFileAttachment('search/foobar.html', { parentItemID: article.id });
+			ids = await Zotero.SearchQuery.getSearch(
+				'type:"journal article" attachment content:"foo bar"',
+				{ libraryID: Zotero.Libraries.userLibraryID }
+			).search();
+			assert.include(ids, article.id);
+			assert.notInclude(ids, book.id);
+		});
+
+		it("should scope a condition that matches at a child level", async function () {
+			let item = await createDataObject('item');
+			item.setCreators([{ firstName: "Ada", lastName: "Ferrer", creatorType: "author" }]);
+			await item.saveTx();
+			let attachment = await importFileAttachment('test.pdf', { parentItemID: item.id });
+			let annotation = await createAnnotation('highlight', attachment);
+			annotation.annotationText = 'zzmarker';
+			await annotation.saveTx();
+
+			let search = Zotero.SearchQuery.getSearch("by:ferrer annotation text:zzmarker", {
+				libraryID: Zotero.Libraries.userLibraryID
+			});
+			assert.sameMembers(await search.search(), [item.id]);
+		});
+
+		it("should return child rows for a child item type", async function () {
+			let item = await createDataObject('item');
+			item.setCreators([{ firstName: 'Ada', lastName: 'Zzpin', creatorType: 'author' }]);
+			await item.saveTx();
+			let attachment = await importFileAttachment('test.pdf', { parentItemID: item.id });
+			let other = await createDataObject('item');
+			let otherAttachment = await importFileAttachment('test.pdf', { parentItemID: other.id });
+
+			// The type names the rows to return; other conditions map to them
+			let ids = await Zotero.SearchQuery.getSearch("type:attachment by:zzpin", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.sameMembers(ids, [attachment.id]);
+
+			// Alone, every attachment
+			ids = await Zotero.SearchQuery.getSearch("type:attachment", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.include(ids, attachment.id);
+			assert.include(ids, otherAttachment.id);
+			assert.notInclude(ids, item.id);
+
+			// Annotations are rows too
+			let annotation = await createAnnotation('highlight', attachment);
+			ids = await Zotero.SearchQuery.getSearch("type:annotation by:zzpin", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.sameMembers(ids, [annotation.id]);
+
+			// Negated, it's an ordinary condition on items
+			ids = await Zotero.SearchQuery.getSearch("type is not attachment", {
+				libraryID: Zotero.Libraries.userLibraryID
+			}).search();
+			assert.include(ids, item.id);
+			assert.notInclude(ids, attachment.id);
+		});
+	});
+
+	describe("#addToSearch()", function () {
+		it("should build a search that matches the right items", async function () {
+			let match = await createDataObject('item', {
+				itemType: 'book',
+				title: "Grounded theory and its discontents"
+			});
+			match.setCreators([{ firstName: "Alice", lastName: "Smith", creatorType: "author" }]);
+			match.addTag("methodology");
+			await match.saveTx();
+
+			let wrongCreator = await createDataObject('item', { itemType: 'book' });
+			wrongCreator.addTag("methodology");
+			await wrongCreator.saveTx();
+
+			let wrongTag = await createDataObject('item', { itemType: 'book' });
+			wrongTag.setCreators([{ firstName: "Alice", lastName: "Smith", creatorType: "author" }]);
+			await wrongTag.saveTx();
+
+			let { tree } = Zotero.SearchQuery.parse('by:smith and (tag:methodology or tag:missing)');
+			let search = new Zotero.Search();
+			search.libraryID = Zotero.Libraries.userLibraryID;
+			Zotero.SearchQuery.addToSearch(search, tree);
+			let ids = await search.search();
+
+			assert.include(ids, match.id);
+			assert.notInclude(ids, wrongCreator.id);
+			assert.notInclude(ids, wrongTag.id);
+		});
+	});
+
+	describe("#tokenize()", function () {
+		it("should cover every character of the input", function () {
+			let query = 'by:smith and (tag:"to read" or bar) crispr';
+			let tokens = Zotero.SearchQuery.tokenize(query);
+			assert.equal(tokens[0].start, 0);
+			assert.equal(tokens[tokens.length - 1].end, query.length);
+			for (let i = 1; i < tokens.length; i++) {
+				assert.equal(tokens[i].start, tokens[i - 1].end);
+			}
+		});
+
+		it("should recognize a condition before its value is typed", function () {
+			let types = Zotero.SearchQuery.tokenize("tag:")
+				.map(token => token.type);
+			assert.deepEqual(types, ['field', 'operator']);
+
+			// Nothing to match on yet, and not text to search for
+			let { tree, text } = Zotero.SearchQuery.parse("crispr tag:");
+			assert.isNull(tree);
+			assert.equal(text, "crispr");
+			assert.isFalse(Zotero.SearchQuery.getSearch("tag:"));
+		});
+
+		it("should label field, operator, and value tokens for highlighting", function () {
+			let types = Zotero.SearchQuery.tokenize("by:smith crispr")
+				.filter(token => token.type !== 'space')
+				.map(token => token.type);
+			assert.deepEqual(types, ['field', 'operator', 'value', 'text']);
+		});
+	});
+
+	describe("multiple libraries", function () {
+		it("should match in whatever library the results come from", async function () {
+			let group = await createGroup();
+			let groupItem = await createDataObject('item',
+				{ libraryID: group.libraryID, tags: [{ tag: 'zzlib' }] });
+
+			let query = Zotero.SearchQuery.getSearch('tag:zzlib');
+			assert.isNull(query.libraryID);
+
+			// Scoped to a row the way CollectionTreeRow scopes a filter search
+			let scope = new Zotero.Search();
+			scope.libraryID = group.libraryID;
+			scope.addCondition('noChildren', 'true');
+			let scoped = new Zotero.Search();
+			scoped.fromJSON(query.toJSON());
+			scoped.setScope(scope, true);
+			assert.sameMembers(await scoped.search(), [groupItem.id]);
+		});
+	});
+
+	describe("#getCompletions()", function () {
+		let labels = (query, caret) => (Zotero.SearchQuery.getCompletions(query, caret)
+			|| { completions: [] }).completions.map(c => c.label);
+
+		it("should complete a condition name partway through a word", function () {
+			let completions = Zotero.SearchQuery.getCompletions("ta");
+			assert.equal(completions.type, 'field');
+			assert.equal(completions.start, 0);
+			assert.equal(completions.end, 2);
+			assert.include(completions.completions.map(c => c.label), "tag:");
+			// One row per condition, by its shortest name
+			assert.notInclude(completions.completions.map(c => c.label), "tag name:");
+		});
+
+		it("should complete a condition name of several words", function () {
+			let completions = Zotero.SearchQuery.getCompletions("annotation ty");
+			assert.deepEqual(completions.completions.map(c => c.label), ["annotation type:"]);
+			assert.equal(completions.start, 0);
+
+			// The words before it are still text
+			completions = Zotero.SearchQuery.getCompletions("crispr annotation ty");
+			assert.deepEqual(completions.completions.map(c => c.label), ["annotation type:"]);
+			assert.equal(completions.start, "crispr ".length);
+		});
+
+		it("should complete a condition name after other text", function () {
+			let completions = Zotero.SearchQuery.getCompletions("crispr ta");
+			assert.equal(completions.start, 7);
+			assert.include(completions.completions.map(c => c.label), "tag:");
+		});
+
+		it("should complete the values a condition takes", function () {
+			assert.include(labels("type:"), "journal article");
+			assert.include(labels("type:jour"), "journal article");
+			// Inserted so that the parser reads it back
+			let completions = Zotero.SearchQuery.getCompletions("type:jour");
+			let article = completions.completions.find(c => c.label === "journal article");
+			assert.equal(article.text, '"journal article"');
+			assert.equal(completions.start, "type:".length);
+
+			assert.include(labels("annotation color:"), "yellow");
+			// A color value carries its color, for the swatch in the list
+			let yellow = Zotero.SearchQuery.getCompletions("color:").completions
+				.find(c => c.label === "yellow");
+			assert.equal(yellow.color, '#ffd400');
+		});
+
+		it("should replace an opening quote along with the value being completed", function () {
+			let head = 'type:"jour';
+			let completions = Zotero.SearchQuery.getCompletions(head);
+			let article = completions.completions.find(c => c.label === "journal article");
+			let result = head.slice(0, completions.start) + article.text;
+			assert.equal(result, 'type:"journal article"');
+			assert.equal(clauses(result)[0].value, 'journalArticle');
+		});
+
+		it("should defer to a lookup for values that come from the library", function () {
+			let completions = Zotero.SearchQuery.getCompletions("tag:zz");
+			assert.equal(completions.lookup.fieldName, 'tag');
+			assert.equal(completions.prefix, 'zz');
+			assert.equal(completions.start, "tag:".length);
+			assert.isEmpty(completions.completions);
+
+			// Creator conditions search both single- and two-field names
+			completions = Zotero.SearchQuery.getCompletions("by:smi");
+			assert.equal(completions.lookup.fieldName, 'creator');
+			assert.equal(completions.lookup.fieldMode, 2);
+
+			// The word form of an operator reads the same as the colon
+			completions = Zotero.SearchQuery.getCompletions("creator is a");
+			assert.equal(completions.lookup.fieldName, 'creator');
+			assert.equal(completions.prefix, 'a');
+			assert.equal(completions.start, "creator is ".length);
+			completions = Zotero.SearchQuery.getCompletions("creator is not a");
+			assert.equal(completions.prefix, 'a');
+			// The last condition in the query is the one being typed
+			completions = Zotero.SearchQuery.getCompletions("tag is x creator is a");
+			assert.equal(completions.lookup.fieldName, 'creator');
+			assert.equal(completions.prefix, 'a');
+			assert.include(labels("item type is boo"), "book");
+
+			// Nothing typed yet, so there's nothing to narrow the library to
+			assert.isNull(Zotero.SearchQuery.getCompletions("tag:"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("by:"));
+			// A condition with a fixed set of values still offers all of them
+			assert.include(labels("type:"), "journal article");
+		});
+
+		it("should complete a value repeated with 'or'", function () {
+			let completions = Zotero.SearchQuery.getCompletions("type:book or jour");
+			assert.include(completions.completions.map(c => c.label), "journal article");
+			assert.equal(completions.start, "type:book or ".length);
+			// A library lookup, as for the first value
+			completions = Zotero.SearchQuery.getCompletions("tag:foo or zz");
+			assert.equal(completions.lookup.fieldName, 'tag');
+			assert.equal(completions.prefix, 'zz');
+		});
+
+		it("should complete a condition after 'has' or 'no' without a colon", function () {
+			let head = "type:book and no d";
+			let completions = Zotero.SearchQuery.getCompletions(head);
+			let doi = completions.completions.find(c => c.label === 'doi');
+			assert.isDefined(doi);
+			let result = head.slice(0, completions.start) + doi.text;
+			assert.deepEqual(clauses(result)[1],
+				{ condition: 'DOI', operator: 'isEmpty', value: '' });
+			// Only conditions that can be empty are offered
+			let names = labels("no t");
+			assert.include(names, 'title');
+			assert.notInclude(names, 'type');
+			assert.notInclude(names, 'type:');
+			assert.include(labels("has d"), 'doi');
+			// Count-backed targets complete by their bare names, even ones
+			// that aren't conditions on their own
+			assert.include(labels("no att"), 'attachment');
+			// The plural forms work but complete by the shortest name
+			let tagNames = labels("no ta");
+			assert.include(tagNames, 'tag');
+			assert.notInclude(tagNames, 'tags');
+		});
+
+		it("should have nothing to offer for free text", function () {
+			assert.isNull(Zotero.SearchQuery.getCompletions("crispr "));
+			// Partway through a word, where a completion would leave a tail
+			assert.isNull(Zotero.SearchQuery.getCompletions("tag:foo", 2));
+		});
+
+		it("should offer nothing inside an unfinished quote", function () {
+			assert.isNull(Zotero.SearchQuery.getCompletions('"annotation t'));
+			assert.isNull(Zotero.SearchQuery.getCompletions('title:"annotation t'));
+		});
+
+		it("should not read a possible operator as a new field", function () {
+			assert.isNull(Zotero.SearchQuery.getCompletions("year is b"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("title does not c"));
+		});
+
+		it("should offer nothing after an operator the condition doesn't take", function () {
+			// The word at the value position gets neither the values the
+			// operator can't apply to nor a new-field suggestion
+			assert.isNull(Zotero.SearchQuery.getCompletions("type before boo"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("type is before boo"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("annotation color greater than y"));
+		});
+
+		it("should not offer a field for the value being typed", function () {
+			assert.isNull(Zotero.SearchQuery.getCompletions("title is ta"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("title contains ta"));
+			assert.isNull(Zotero.SearchQuery.getCompletions("title is before"));
+			// A word after a complete clause can still start one
+			let completions = Zotero.SearchQuery.getCompletions("title is grounded ta");
+			assert.include(completions.completions.map(c => c.label), "tag:");
+		});
+	});
+});
diff --git a/test/tests/searchTest.js b/test/tests/searchTest.js
index cc296eb5b5..aa564c7efd 100644
--- a/test/tests/searchTest.js
+++ b/test/tests/searchTest.js
@@ -19,7 +19,7 @@ describe("Zotero.Search", function () {
 			assert.sameMembers(matches, [item.id]);
 		});
 	});
-	
+
 	// This is for Zotero.Search._loadConditions()
 	describe("Loading", function () {
 		it("should convert old-style 'collection' condition value", async function () {
@@ -39,9 +39,45 @@ describe("Zotero.Search", function () {
 			var matches = await s.search();
 			assert.sameMembers(matches, [item.id]);
 		});
+
+		it("should migrate a stored `childNote` condition to `note` at the item level", async function () {
+			var text = 'zloadcn' + Zotero.Utilities.randomString();
+			var item = await createDataObject('item', { title: 'zloadcnitem' });
+			var note = new Zotero.Item('note');
+			note.libraryID = item.libraryID;
+			note.parentID = item.id;
+			note.setNote('<p>' + text + '</p>');
+			await note.saveTx();
+
+			// Save a 'note' search with no result level, then rewrite the stored condition to the
+			// obsolete childNote to stand in for a legacy saved search
+			var s = new Zotero.Search();
+			s.libraryID = item.libraryID;
+			s.name = "Test";
+			s.addCondition('note', 'contains', text);
+			await s.saveTx();
+			await Zotero.DB.queryAsync(
+				"UPDATE savedSearchConditions SET condition=? WHERE savedSearchID=? AND condition=?",
+				['childNote', s.id, 'note']
+			);
+			await s.reload(['conditions'], true);
+
+			var conds = Object.values(s.getConditions());
+			assert.include(conds.map(c => c.condition), 'note');
+			assert.notInclude(conds.map(c => c.condition), 'childNote');
+			// An item result level is seeded so the note rolls up to its parent, as childNote did
+			var resultLevel = conds.find(c => c.condition == 'resultLevel');
+			assert.ok(resultLevel);
+			assert.equal(resultLevel.operator, 'item');
+			assert.sameMembers(s.toJSON().conditions.map(c => c.condition), ['note', 'resultLevel']);
+			assert.sameMembers(await s.search(), [item.id]);
+
+			await item.eraseTx();
+			await s.eraseTx();
+		});
 	});
-	
-	
+
+
 	describe("#save()", function () {
 		it("should fail without a name", async function () {
 			var s = new Zotero.Search;
@@ -73,7 +109,6 @@ describe("Zotero.Search", function () {
 			assert.propertyVal(condition, 'condition', 'title')
 			assert.propertyVal(condition, 'operator', 'is')
 			assert.propertyVal(condition, 'value', 'test')
-			assert.propertyVal(condition, 'required', false)
 		});
 		
 		it("should add a condition to an existing search", async function () {
@@ -122,11 +157,77 @@ describe("Zotero.Search", function () {
 		});
 	});
 
+	describe("#combineConditions()", function () {
+		function pred(sql, params = []) {
+			return { sql, params };
+		}
+
+		it("should AND predicates in 'all' mode", function () {
+			var r = Zotero.Search.combineConditions([pred('A'), pred('B')]);
+			assert.equal(r.sql, 'A AND B');
+		});
+
+		it("should OR and parenthesize predicates in 'any' mode", function () {
+			var r = Zotero.Search.combineConditions([
+				{ marker: 'joinMode', operator: 'any' }, pred('A'), pred('B')
+			]);
+			assert.equal(r.sql, '(A OR B)');
+		});
+
+		it("should combine a nested group", function () {
+			var r = Zotero.Search.combineConditions([
+				pred('A'),
+				{ marker: 'groupStart' },
+				{ marker: 'joinMode', operator: 'any' },
+				pred('B'),
+				pred('C'),
+				{ marker: 'groupEnd' }
+			]);
+			assert.equal(r.sql, 'A AND (B OR C)');
+		});
+
+		it("should collect params in order", function () {
+			var r = Zotero.Search.combineConditions([pred('A=?', [1]), pred('B=?', [2])]);
+			assert.equal(r.sql, 'A=? AND B=?');
+			assert.deepEqual(r.params, [1, 2]);
+		});
+
+	});
+
+	describe("#mapPredicate()", function () {
+		var c = (sql, from, to, neg) => Zotero.Search.mapPredicate(sql, from, to, neg);
+
+		it("should leave a predicate unchanged when the result level is 'any'", function () {
+			assert.equal(c('X', 'item', 'any'), 'X');
+			assert.equal(c('X', 'any', 'any'), 'X');
+		});
+
+		it("should not roll up a negated level-agnostic condition", function () {
+			assert.equal(c('X', 'any', 'item', true), 'X');
+		});
+
+		it("should match nothing for unrelated branches (note vs annotation)", function () {
+			assert.equal(c('X', 'note', 'annotation'), '0');
+		});
+
+		it("should leave a multi-level field unchanged at a level it matches at", function () {
+			// e.g., title exists on both items and attachments, so at either result level the
+			// predicate is used as-is (the result-level FROM filters to the right rows)
+			assert.equal(c('X', ['item', 'attachment'], 'item'), 'X');
+			assert.equal(c('X', ['item', 'attachment'], 'attachment'), 'X');
+			assert.equal(c('X', ['item', 'attachment'], 'any'), 'X');
+		});
+
+	});
+
 	describe("#search()", function () {
 		var userLibraryID;
 		var fooItem;
 		var foobarItem;
 		var bazItem;
+		var importedURLItem;
+		var linkedFileItem;
+		var linkedURLItem;
 		var fooItemGroup;
 		var foobarItemGroup;
 		var bazItemGroup;
@@ -141,6 +242,25 @@ describe("Zotero.Search", function () {
 			foobarItem = await importFileAttachment("search/foobar.html");
 			bazItem = await importFileAttachment("search/baz.pdf");
 			userLibraryID = fooItem.libraryID;
+			let testPDF = getTestDataDirectory();
+			testPDF.append('test.pdf');
+			importedURLItem = await Zotero.Attachments.importSnapshotFromFile({
+				file: testPDF,
+				libraryID: userLibraryID,
+				title: 'imported-url-pdf',
+				url: 'http://example.com/imported-url.pdf',
+				contentType: 'application/pdf',
+				singleFile: true
+			});
+			linkedFileItem = await Zotero.Attachments.linkFromFile({
+				file: OS.Path.join(getTestDataDirectory().path, 'test.pdf'),
+				title: 'linked-file-pdf'
+			});
+			linkedURLItem = await Zotero.Attachments.linkFromURL({
+				url: 'http://example.com/linked-url.pdf',
+				title: 'linked-url',
+				contentType: 'application/pdf'
+			});
 			
 			let group = await getGroup();
 			fooItemGroup = await importFileAttachment("search/foo.html", { libraryID: group.libraryID });
@@ -152,12 +272,602 @@ describe("Zotero.Search", function () {
 			yield fooItem.eraseTx();
 			yield foobarItem.eraseTx();
 			yield bazItem.eraseTx();
+			yield importedURLItem.eraseTx();
+			yield linkedFileItem.eraseTx();
+			yield linkedURLItem.eraseTx();
 			yield fooItemGroup.eraseTx();
 			yield foobarItemGroup.eraseTx();
 			yield bazItemGroup.eraseTx();
 		});
 		
 		describe("Conditions", function () {
+			describe("Nested condition groups", function () {
+				it("should match A AND (B OR C)", async function () {
+					var ab = await createDataObject('item', { title: 'zgrpA', tags: [{ tag: 'zgrpB' }] });
+					var ac = await createDataObject('item', { title: 'zgrpA', tags: [{ tag: 'zgrpC' }] });
+					await createDataObject('item', { title: 'zgrpA' });
+					await createDataObject('item', { tags: [{ tag: 'zgrpB' }] });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('joinMode', 'all');
+					s.addCondition('title', 'contains', 'zgrpA');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('joinMode', 'any');
+					s.addCondition('tag', 'is', 'zgrpB');
+					s.addCondition('tag', 'is', 'zgrpC');
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [ab.id, ac.id]);
+				});
+
+				it("should match A OR (B AND C)", async function () {
+					var a = await createDataObject('item', { title: 'zg2A' });
+					var bc = await createDataObject('item', { title: 'zg2B', tags: [{ tag: 'zg2C' }] });
+					await createDataObject('item', { title: 'zg2B' });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('joinMode', 'any');
+					s.addCondition('title', 'contains', 'zg2A');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('joinMode', 'all');
+					s.addCondition('title', 'contains', 'zg2B');
+					s.addCondition('tag', 'is', 'zg2C');
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [a.id, bc.id]);
+				});
+
+				it("should match nested groups A AND (B OR (C AND D))", async function () {
+					var ab = await createDataObject('item', { title: 'zg3A', tags: [{ tag: 'zg3B' }] });
+					var acd = await createDataObject('item', { title: 'zg3A zg3C', tags: [{ tag: 'zg3D' }] });
+					await createDataObject('item', { title: 'zg3A zg3C' });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('joinMode', 'all');
+					s.addCondition('title', 'contains', 'zg3A');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('joinMode', 'any');
+					s.addCondition('tag', 'is', 'zg3B');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('joinMode', 'all');
+					s.addCondition('title', 'contains', 'zg3C');
+					s.addCondition('tag', 'is', 'zg3D');
+					s.addCondition('groupEnd', 'true', '');
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [ab.id, acd.id]);
+				});
+
+			});
+
+			describe("Cross-level scope", function () {
+				it("should match a top-level item by a condition on a descendant annotation", async function () {
+					var text = 'zscopematch' + Zotero.Utilities.randomString();
+
+					// Author Smith, with a matching annotation on a child PDF -- should match
+					var item = await createDataObject('item', {
+						creators: [{ lastName: 'Zscopesmith', creatorType: 'author' }]
+					});
+					var attachment = await importPDFAttachment(item);
+					var annotation = await createAnnotation('highlight', attachment);
+					annotation.annotationText = text;
+					await annotation.saveTx();
+
+					// Author Smith, but no matching annotation -- shouldn't match
+					var noAnnotation = await createDataObject('item', {
+						creators: [{ lastName: 'Zscopesmith', creatorType: 'author' }]
+					});
+
+					// Matching annotation, but a different author -- shouldn't match
+					var other = await createDataObject('item', {
+						creators: [{ lastName: 'Zscopejones', creatorType: 'author' }]
+					});
+					var otherAttachment = await importPDFAttachment(other);
+					var otherAnnotation = await createAnnotation('highlight', otherAttachment);
+					otherAnnotation.annotationText = text;
+					await otherAnnotation.saveTx();
+
+					// creator is Smith AND (has an annotation whose text matches)
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('creator', 'contains', 'Zscopesmith');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('annotationText', 'contains', text);
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+					await noAnnotation.eraseTx();
+					await other.eraseTx();
+				});
+
+				it("should match an annotation by its top-level item's title", async function () {
+					// Title exists on both items and attachments, so targeting annotations must
+					// reach the top-level item's title, not just the parent attachment's
+					var title = 'zanntitle' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title });
+					var attachment = await importPDFAttachment(item);
+					var annotation = await createAnnotation('highlight', attachment);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('title', 'contains', title);
+					assert.sameMembers(await s.search(), [annotation.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should match an annotation by its parent attachment's title", async function () {
+					// The other half of the union: an attachment's own title still matches
+					var title = 'zatttitle' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item');
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('title', title);
+					await attachment.saveTx();
+					var annotation = await createAnnotation('highlight', attachment);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('title', 'contains', title);
+					assert.sameMembers(await s.search(), [annotation.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should match annotations by type and color", async function () {
+					var item = await createDataObject('item');
+					var attachment = await importPDFAttachment(item);
+
+					var highlight = await createAnnotation('highlight', attachment);
+					highlight.annotationColor = '#ff6666';
+					await highlight.saveTx();
+
+					var note = await createAnnotation('note', attachment);
+					note.annotationColor = '#5fb236';
+					await note.saveTx();
+
+					// Type 'is' returns only the matching annotation
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('annotationType', 'is',
+						Zotero.Annotations.ANNOTATION_TYPE_HIGHLIGHT.toString());
+					assert.sameMembers(await s.search(), [highlight.id]);
+
+					// Color 'is' returns only the matching annotation
+					s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('annotationColor', 'is', '#5fb236');
+					assert.sameMembers(await s.search(), [note.id]);
+
+					// 'isNot' returns the other annotation -- not the parent item, the
+					// attachment, or every item in the library
+					s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('annotationType', 'isNot',
+						Zotero.Annotations.ANNOTATION_TYPE_NOTE.toString());
+					var matches = await s.search();
+					assert.include(matches, highlight.id);
+					assert.notInclude(matches, note.id);
+					assert.notInclude(matches, item.id);
+					assert.notInclude(matches, attachment.id);
+
+					await item.eraseTx();
+				});
+
+				it("should return descendant annotations as results with a top-level condition", async function () {
+					var text = 'zresult' + Zotero.Utilities.randomString();
+
+					// Smith item with two matching and one non-matching annotation
+					var item = await createDataObject('item', {
+						creators: [{ lastName: 'Zresultsmith', creatorType: 'author' }]
+					});
+					var attachment = await importPDFAttachment(item);
+					var match1 = await createAnnotation('highlight', attachment);
+					match1.annotationText = text;
+					await match1.saveTx();
+					var match2 = await createAnnotation('highlight', attachment);
+					match2.annotationText = text;
+					await match2.saveTx();
+					await createAnnotation('highlight', attachment); // random text -- no match
+
+					// Different author with a matching annotation -- shouldn't match
+					var other = await createDataObject('item', {
+						creators: [{ lastName: 'Zresultjones', creatorType: 'author' }]
+					});
+					var otherAttachment = await importPDFAttachment(other);
+					var otherAnnotation = await createAnnotation('highlight', otherAttachment);
+					otherAnnotation.annotationText = text;
+					await otherAnnotation.saveTx();
+
+					// Result level annotations: the matching annotations on Smith's items
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('creator', 'contains', 'Zresultsmith');
+					s.addCondition('annotationText', 'contains', text);
+					assert.sameMembers(await s.search(), [match1.id, match2.id]);
+
+					await item.eraseTx();
+					await other.eraseTx();
+				});
+
+				it("should match annotations for a negated annotation condition at the annotation result level", async function () {
+					// At the annotation result level, a negated annotation condition matches
+					// the annotations that lack the value
+					var text = 'zneg' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item');
+					var attachment = await importPDFAttachment(item);
+					var withText = await createAnnotation('highlight', attachment);
+					withText.annotationText = text;
+					await withText.saveTx();
+					var withoutText = await createAnnotation('highlight', attachment);
+					withoutText.annotationText = 'zsomethingelse';
+					await withoutText.saveTx();
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('annotationText', 'doesNotContain', text);
+					assert.sameMembers(await s.search(), [withoutText.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should match an item in a collection by a child attachment's content", async function () {
+					// Collection (item-level) and Attachment Content (rolls up from the
+					// attachment) both resolve at the top-level item and intersect there
+					var collection = await createDataObject('collection');
+					// In the collection, with a child attachment whose content matches
+					var match = await createDataObject('item', { collections: [collection.id] });
+					await importFileAttachment("search/foobar.html", { parentID: match.id });
+					// In the collection, but no matching attachment content
+					var noContent = await createDataObject('item', { collections: [collection.id] });
+					// Has the matching content, but isn't in the collection
+					var notInCollection = await createDataObject('item');
+					await importFileAttachment("search/foobar.html", { parentID: notInCollection.id });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('collection', 'is', collection.key);
+					s.addCondition('fulltextContent', 'contains', 'foo bar');
+					assert.sameMembers(await s.search(), [match.id]);
+
+					await match.eraseTx();
+					await noContent.eraseTx();
+					await notInCollection.eraseTx();
+				});
+
+				it("should return a collection's matching descendants at a descendant result level", async function () {
+					// Collection (item-level) maps down to the annotation result level, so
+					// a matching annotation under a collection item is returned even though the
+					// top-level item doesn't itself match the annotation condition
+					var text = 'zcoll' + Zotero.Utilities.randomString();
+					var collection = await createDataObject('collection');
+					var item = await createDataObject('item', { collections: [collection.id] });
+					var attachment = await importPDFAttachment(item);
+					var match = await createAnnotation('highlight', attachment);
+					match.annotationText = text;
+					await match.saveTx();
+					// A matching annotation, but its item isn't in the collection
+					var other = await createDataObject('item');
+					var otherAttachment = await importPDFAttachment(other);
+					var otherAnnotation = await createAnnotation('highlight', otherAttachment);
+					otherAnnotation.annotationText = text;
+					await otherAnnotation.saveTx();
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('collection', 'is', collection.key);
+					s.addCondition('annotationText', 'contains', text);
+					assert.sameMembers(await s.search(), [match.id]);
+
+					await item.eraseTx();
+					await other.eraseTx();
+				});
+
+				it("should match an itemData field at the item or attachment level it lives at", async function () {
+					// title (like url/accessDate) exists on both top-level items and
+					// attachments, so it matches the right thing at each result level without
+					// rolling an attachment title up to its parent (or a parent title down)
+					var itemTitle = 'zti' + Zotero.Utilities.randomString();
+					var attTitle = 'zta' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title: itemTitle });
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('title', attTitle);
+					await attachment.saveTx();
+
+					let search = (level, value) => {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('resultLevel', level);
+						s.addCondition('title', 'contains', value);
+						return s.search();
+					};
+
+					// Attachment result level matches the attachment's own title, not its parent's
+					assert.sameMembers(await search('attachment', attTitle), [attachment.id]);
+					assert.sameMembers(await search('attachment', itemTitle), []);
+					// Item result level matches the item's own title, and an attachment title
+					// does not roll up to the item (option C: no rollup)
+					assert.sameMembers(await search('item', itemTitle), [item.id]);
+					assert.sameMembers(await search('item', attTitle), []);
+
+					await item.eraseTx();
+				});
+
+				it("should match Any Field against an attachment's own fields at the attachment result level", async function () {
+					// 'Any Field' expands to the generic 'field' condition, which covers every
+					// searchable field, including the ones attachments have -- so it matches an
+					// attachment's own URL, not just its parent item's
+					var itemURL = 'https://example.com/zaf' + Zotero.Utilities.randomString();
+					var attURL = 'https://example.com/zaf' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item');
+					item.setField('url', itemURL);
+					await item.saveTx();
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('url', attURL);
+					await attachment.saveTx();
+
+					let search = (value) => {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('resultLevel', 'attachment');
+						s.addCondition('anyField', 'contains', value);
+						return s.search();
+					};
+
+					assert.sameMembers(await search(attURL), [attachment.id]);
+					// The parent item's URL isn't the attachment's, as with a single-field condition
+					assert.sameMembers(await search(itemURL), []);
+
+					await item.eraseTx();
+				});
+
+				it("should match an item by Any Field in a group at the attachment level", async function () {
+					// "top-level items matching, in the same attachment, Any Field contains X"
+					var url = 'https://example.com/zafg' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item');
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('url', url);
+					await attachment.saveTx();
+					var other = await createDataObject('item');
+					await importPDFAttachment(other);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('resultLevel', 'attachment');
+					s.addCondition('anyField', 'contains', url);
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+					await other.eraseTx();
+				});
+
+				it("should map a bare descendant condition to the result level (no group)", async function () {
+					var text = 'zbarecorr' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title: 'zbarecorritem' });
+					var attachment = await importPDFAttachment(item);
+					var annotation = await createAnnotation('highlight', attachment);
+					annotation.annotationText = text;
+					await annotation.saveTx();
+
+					// Result level item + a plain annotation condition (no group) rolls up
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('annotationText', 'contains', text);
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should match an item by its tag and a descendant annotation's comment", async function () {
+					// A cross-level search combining levels: a top-level item that itself has a
+					// given tag AND has a descendant annotation whose comment contains a word, returned
+					// at the item result level. The tag (level-agnostic) and the annotation
+					// comment (annotation level) both resolve at the item and intersect there.
+					var tag = 'ztag' + Zotero.Utilities.randomString();
+					var word = 'zword' + Zotero.Utilities.randomString();
+
+					// Tagged, with a descendant annotation whose comment contains the word
+					var item = await createDataObject('item', { tags: [{ tag }] });
+					var attachment = await importPDFAttachment(item);
+					await createAnnotation('highlight', attachment, { comment: 'foo ' + word + ' bar' });
+
+					// Tagged, but no matching annotation comment
+					var tagOnly = await createDataObject('item', { tags: [{ tag }] });
+					await importPDFAttachment(tagOnly);
+
+					// Has the matching annotation comment, but not the tag
+					var annotationOnly = await createDataObject('item');
+					var annAttachment = await importPDFAttachment(annotationOnly);
+					await createAnnotation('highlight', annAttachment, { comment: 'foo ' + word + ' bar' });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('tag', 'is', tag);
+					s.addCondition('annotationComment', 'contains', word);
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+					await tagOnly.eraseTx();
+					await annotationOnly.eraseTx();
+				});
+
+				it("should map a bare full-text condition to the result level (no group)", async function () {
+					// A top-level full-text condition matches the item that owns the matching
+					// attachment, materializing and mapping to the result level
+					var item = await createDataObject('item', { title: 'zbareft' });
+					await importFileAttachment("search/foobar.html", { parentID: item.id });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('fulltextContent', 'contains', 'foo bar');
+					// The standalone foobarItem also matches and is itself a top-level item, so it's
+					// returned alongside the child attachment's parent
+					assert.sameMembers(await s.search(), [item.id, foobarItem.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should return a standalone attachment whose annotation matches, at the item result level", async function () {
+					// A standalone (top-level) attachment is itself a top-level item, so its annotation
+					// maps up to the attachment's own id and the attachment is returned
+					var word = 'zsa' + Zotero.Utilities.randomString();
+					var standalone = await importPDFAttachment(); // top-level PDF, no parent
+					await createAnnotation('highlight', standalone, { comment: 'x ' + word + ' y' });
+					
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('annotationComment', 'contains', word);
+					assert.sameMembers(await s.search(), [standalone.id]);
+					
+					await standalone.eraseTx();
+				});
+				
+				it("should return a standalone attachment whose annotation has a tag, in a search for top-level items", async function () {
+					// Same as above, but for a level-agnostic condition (tag), which rolls up
+					// separately from a fixed-level one like annotationComment
+					var tag = 'zsat' + Zotero.Utilities.randomString();
+					var standalone = await importPDFAttachment(); // top-level PDF, no parent
+					var annotation = await createAnnotation('highlight', standalone);
+					annotation.addTag(tag);
+					await annotation.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('tag', 'is', tag);
+					assert.sameMembers(await s.search(), [standalone.id]);
+					
+					await standalone.eraseTx();
+				});
+				
+
+				it("should bind a same-entity group below a non-item result level", async function () {
+					// Result level attachment + a group scoped to annotation: find attachments
+					// that have a single annotation matching all of the group's conditions.
+					// Exercises mapping where the parent level is 'attachment', not 'item'.
+					var text = 'zsame' + Zotero.Utilities.randomString();
+					var comment = 'zsamec' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title: 'zsameitem' });
+
+					// One annotation matches both text and comment -> this attachment matches
+					var attachmentBoth = await importPDFAttachment(item);
+					var both = await createAnnotation('highlight', attachmentBoth, { comment });
+					both.annotationText = text;
+					await both.saveTx();
+
+					// Two separate annotations, one matching each -> shouldn't match
+					var attachmentSplit = await importPDFAttachment(item);
+					var hasText = await createAnnotation('highlight', attachmentSplit);
+					hasText.annotationText = text;
+					await hasText.saveTx();
+					await createAnnotation('highlight', attachmentSplit, { comment });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'attachment'); // result level = attachments
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('resultLevel', 'annotation'); // the same annotation
+					s.addCondition('annotationText', 'contains', text);
+					s.addCondition('annotationComment', 'contains', comment);
+					s.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await s.search(), [attachmentBoth.id]);
+
+					await item.eraseTx();
+				});
+
+				it("should roll a tag on a descendant up to the result item", async function () {
+					var tag = 'zroll' + Zotero.Utilities.randomString();
+					// Tagged child attachment (the item itself is untagged)
+					var viaChild = await createDataObject('item', { title: 'zrollchild' });
+					var attachment = await importPDFAttachment(viaChild);
+					attachment.addTag(tag);
+					await attachment.saveTx();
+					// Tagged directly
+					var viaSelf = await createDataObject('item', { title: 'zrollself', tags: [{ tag }] });
+					// Untagged
+					var untagged = await createDataObject('item', { title: 'zrollmiss' });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('tag', 'is', tag);
+					// The child's tag rolls up to its item; the directly tagged item matches too
+					assert.sameMembers(await s.search(), [viaChild.id, viaSelf.id]);
+
+					await viaChild.eraseTx();
+					await viaSelf.eraseTx();
+					await untagged.eraseTx();
+				});
+
+				it("should not propagate a tag down to descendant result items", async function () {
+					var tag = 'zdown' + Zotero.Utilities.randomString();
+					// The item is tagged, but its attachment is not
+					var item = await createDataObject('item', { title: 'zdownitem', tags: [{ tag }] });
+					await importPDFAttachment(item);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'attachment');
+					s.addCondition('tag', 'is', tag);
+					// Rollup is up-only: a parent's tag must not match its child attachment
+					assert.lengthOf(await s.search(), 0);
+
+					await item.eraseTx();
+				});
+
+				it("should not error when a condition can't reach the result level", async function () {
+					// A note can't be (or be under) an attachment, so this is empty -- but it
+					// must not throw a SQL param error: the dead predicate drops to the constant
+					// '0', and its bound value param must be dropped with it
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'attachment');
+					s.addCondition('joinMode', 'any');
+					s.addCondition('note', 'contains', 'zsqltest');
+					assert.lengthOf(await s.search(), 0);
+
+					// Same in 'all' mode
+					var s2 = new Zotero.Search();
+					s2.libraryID = userLibraryID;
+					s2.addCondition('resultLevel', 'attachment');
+					s2.addCondition('note', 'contains', 'zsqltest');
+					assert.lengthOf(await s2.search(), 0);
+				});
+
+				it("should project to all descendant annotations when there's no annotation condition", async function () {
+					// Result level annotations with only a top-level condition -> every
+					// annotation under matching items
+					var item = await createDataObject('item', {
+						creators: [{ lastName: 'Zprojsmith', creatorType: 'author' }]
+					});
+					var attachment = await importPDFAttachment(item);
+					var a1 = await createAnnotation('highlight', attachment);
+					var a2 = await createAnnotation('highlight', attachment);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'annotation');
+					s.addCondition('creator', 'contains', 'Zprojsmith');
+					assert.sameMembers(await s.search(), [a1.id, a2.id]);
+
+					await item.eraseTx();
+				});
+			});
+
 			describe("collection", function () {
 				it("should find item in collection", async function () {
 					var col = await createDataObject('collection');
@@ -216,6 +926,32 @@ describe("Zotero.Search", function () {
 					var matches = await s.search();
 					assert.lengthOf(matches, 0);
 				});
+
+				it("should have same result after the same search conditions is removed and added", async function () {
+					var titleOne = 'zremadd' + Zotero.Utilities.randomString();
+					var titleTwo = 'zremadd' + Zotero.Utilities.randomString();
+					var itemOne = await createDataObject('item', { title: titleOne });
+					var itemTwo = await createDataObject('item', { title: titleTwo });
+
+					var s = new Zotero.Search();
+					s.libraryID = itemOne.libraryID;
+					s.addCondition("joinMode", "any");
+					// Match both items
+					s.addCondition('title', 'contains', titleOne);
+					s.addCondition('title', 'contains', titleTwo);
+					var matches = await s.search();
+					assert.sameMembers(matches, [itemOne.id, itemTwo.id]);
+
+					// Remove the first condition and add it again
+					s.removeCondition(1);
+					s.addCondition('title', 'contains', titleOne);
+					matches = await s.search();
+					// Result should be the same
+					assert.sameMembers(matches, [itemOne.id, itemTwo.id]);
+					
+					await itemOne.eraseTx();
+					await itemTwo.eraseTx();
+				});
 			});
 			
 			describe("tag", function () {
@@ -234,6 +970,177 @@ describe("Zotero.Search", function () {
 				});
 			});
 			
+			describe("numTags", function () {
+				it("should match by tag count", async function () {
+					var item1 = await createDataObject('item');
+					var item2 = await createDataObject('item');
+					item2.addTag(Zotero.Utilities.randomString());
+					item2.addTag(Zotero.Utilities.randomString());
+					await item2.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numTags', 'is', '0');
+					var matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numTags', 'is', '2');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numTags', 'isGreaterThan', '1');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numTags', 'isLessThan', '1');
+					matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+				});
+			});
+			
+			describe("numNotes/numAttachments/numAnnotations", function () {
+				it("should match top-level items by child note and attachment counts", async function () {
+					var item1 = await createDataObject('item');
+					var item2 = await createDataObject('item');
+					var note = new Zotero.Item('note');
+					note.setNote('foo');
+					note.parentItemID = item2.id;
+					await note.saveTx();
+					var attachment = await importFileAttachment('test.png', { parentID: item2.id });
+					
+					var s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numNotes', 'is', '0');
+					var matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+					// Rows that can't have child notes aren't matched
+					assert.notInclude(matches, note.id);
+					assert.notInclude(matches, attachment.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numNotes', 'is', '1');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numAttachments', 'is', '1');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+					assert.notInclude(matches, attachment.id);
+					
+					// A trashed note doesn't count
+					note.deleted = true;
+					await note.saveTx();
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('numNotes', 'is', '0');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+				});
+				
+				it("should count annotations on an attachment and under a top-level item", async function () {
+					var item = await createDataObject('item');
+					var attachment = await importPDFAttachment(item);
+					var annotation = await createAnnotation('highlight', attachment);
+					var plainItem = await createDataObject('item');
+					
+					var s = new Zotero.Search();
+					s.libraryID = item.libraryID;
+					s.addCondition('numAnnotations', 'is', '1');
+					var matches = await s.search();
+					// The attachment's own count and the item's total both match
+					assert.include(matches, attachment.id);
+					assert.include(matches, item.id);
+					assert.notInclude(matches, plainItem.id);
+					assert.notInclude(matches, annotation.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item.libraryID;
+					s.addCondition('numAnnotations', 'is', '0');
+					matches = await s.search();
+					assert.include(matches, plainItem.id);
+					assert.notInclude(matches, item.id);
+					assert.notInclude(matches, attachment.id);
+					assert.notInclude(matches, annotation.id);
+				});
+			});
+			
+			describe("is", function () {
+				it("should match a value in a different case", async function () {
+					var item = await createDataObject('item', { itemType: 'journalArticle' });
+					item.setField('publicationTitle', 'Review of Finance');
+					await item.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = item.libraryID;
+					s.addCondition('publicationTitle', 'is', 'review of finance');
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+				
+				it("should match a value with different accents", async function () {
+					var item = await createDataObject('item', { itemType: 'journalArticle' });
+					item.setField('publicationTitle', 'Revue de Séance');
+					await item.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = item.libraryID;
+					s.addCondition('publicationTitle', 'is', 'revue de seance');
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+			});
+			
+			describe("isEmpty/isNotEmpty", function () {
+				it("should match items with an empty or non-empty text field", async function () {
+					var item1 = await createDataObject('item');
+					var item2 = await createDataObject('item');
+					item2.setField('place', 'Berlin');
+					await item2.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('place', 'isEmpty');
+					var matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+					
+					s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('place', 'isNotEmpty');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+				});
+				
+				it("should match items with an empty date field", async function () {
+					var item1 = await createDataObject('item');
+					var item2 = await createDataObject('item');
+					item2.setField('date', '2020-01-01');
+					await item2.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = item1.libraryID;
+					s.addCondition('date', 'isEmpty');
+					var matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+				});
+			});
+			
 			describe("dateAdded", function () {
 				it("should handle 'today'", async function () {
 					var item = await createDataObject('item');
@@ -255,6 +1162,38 @@ describe("Zotero.Search", function () {
 				});
 			});
 			
+			describe("date-type item fields", function () {
+				it("should compare dates and still accept text operators", async function () {
+					let item1 = await createDataObject('item', { itemType: 'patent' });
+					item1.setField('filingDate', '2019-06-08');
+					await item1.saveTx();
+					let item2 = await createDataObject('item', { itemType: 'patent' });
+					item2.setField('filingDate', '2021-01-15');
+					await item2.saveTx();
+
+					// A value with no parsable year has nothing to compare
+					let item3 = await createDataObject('item', { itemType: 'patent' });
+					item3.setField('filingDate', 'Foo');
+					await item3.saveTx();
+
+					let s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('filingDate', 'isBefore', '2020');
+					let matches = await s.search();
+					assert.include(matches, item1.id);
+					assert.notInclude(matches, item2.id);
+					assert.notInclude(matches, item3.id);
+
+					// A text operator, as in an existing saved search
+					s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('filingDate', 'contains', '2021');
+					matches = await s.search();
+					assert.include(matches, item2.id);
+					assert.notInclude(matches, item1.id);
+				});
+			});
+
 			describe("fileTypeID", function () {
 				it("should search by attachment file type", async function () {
 					let s = new Zotero.Search();
@@ -264,7 +1203,76 @@ describe("Zotero.Search", function () {
 					assert.sameMembers(matches, [fooItem.id, foobarItem.id]);
 				});
 			});
-			
+
+			describe("attachmentStorageType", function () {
+				it("should find stored files", async function () {
+					let s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('attachmentStorageType', 'is', 'storedFile');
+					let matches = await s.search();
+					assert.includeMembers(matches, [
+						fooItem.id,
+						foobarItem.id,
+						bazItem.id,
+						importedURLItem.id
+					]);
+					assert.notInclude(matches, linkedFileItem.id);
+					assert.notInclude(matches, linkedURLItem.id);
+				});
+
+				it("should find linked files", async function () {
+					let s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('attachmentStorageType', 'is', 'linkedFile');
+					let matches = await s.search();
+					assert.include(matches, linkedFileItem.id);
+					assert.notInclude(matches, bazItem.id);
+					assert.notInclude(matches, linkedURLItem.id);
+				});
+
+				it("should find web links", async function () {
+					let s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('attachmentStorageType', 'is', 'webLink');
+					let matches = await s.search();
+					assert.include(matches, linkedURLItem.id);
+					assert.notInclude(matches, bazItem.id);
+					assert.notInclude(matches, linkedFileItem.id);
+				});
+
+				it("should match a top-level item via a child attachment", async function () {
+					let item = await createDataObject('item');
+					let attachment = await importPDFAttachment(item);
+
+					let s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('attachmentStorageType', 'is', 'storedFile');
+					let matches = await s.search();
+					assert.include(matches, item.id);
+					assert.notInclude(matches, attachment.id);
+
+					await item.eraseTx();
+				});
+			});
+
+			describe("lastRead", function () {
+				it("should roll a child attachment's last-read date up to its top-level item", async function () {
+					var item = await createDataObject('item', { title: 'zlastread' });
+					var attachment = await importPDFAttachment(item);
+					attachment.attachmentLastRead = Math.round(Date.now() / 1000);
+					await attachment.saveTx();
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('resultLevel', 'item');
+					s.addCondition('lastRead', 'isInTheLast', '1 days');
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+				});
+			});
+
 			describe("fulltextContent", function () {
 				it("should find text in HTML files", async function () {
 					var s = new Zotero.Search();
@@ -374,6 +1382,56 @@ describe("Zotero.Search", function () {
 					assert.notIncludeMembers(matches, [foobarItem.id]);
 					assert.includeMembers(matches, [fooItem.id, bazItem.id]);
 				});
+
+				// fulltextContent inside a group must combine with its siblings under the
+				// group's own join mode, not the search's top-level mode (it used to be
+				// applied as a global post-filter keyed on the top-level join mode)
+				it("should obey the group join mode for a grouped fulltextContent", async function () {
+					// OR: (title is foo.html OR full-text "foo bar") matches the title item and the text item
+					var orSearch = new Zotero.Search();
+					orSearch.libraryID = userLibraryID;
+					orSearch.addCondition('groupStart', 'true', '');
+					orSearch.addCondition('joinMode', 'any');
+					orSearch.addCondition('title', 'is', fooItem.getField('title'));
+					orSearch.addCondition('fulltextContent', 'contains', 'foo bar');
+					orSearch.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await orSearch.search(), [fooItem.id, foobarItem.id]);
+
+					// AND: title is foo.html OR (title is foobar.html AND full-text "nomatchphrase").
+					// The group's full-text doesn't match, so only fooItem (the OR branch) matches.
+					var andSearch = new Zotero.Search();
+					andSearch.libraryID = userLibraryID;
+					andSearch.addCondition('joinMode', 'any');
+					andSearch.addCondition('title', 'is', fooItem.getField('title'));
+					andSearch.addCondition('groupStart', 'true', '');
+					andSearch.addCondition('joinMode', 'all');
+					andSearch.addCondition('title', 'is', foobarItem.getField('title'));
+					andSearch.addCondition('fulltextContent', 'contains', 'nomatchphrase');
+					andSearch.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await andSearch.search(), [fooItem.id]);
+				});
+
+				it("should compose a grouped fulltextContent in doesNotContain and regexp modes", async function () {
+					// doesNotContain: (full-text doesNotContain "foo" AND title is baz.pdf) -> bazItem
+					var neg = new Zotero.Search();
+					neg.libraryID = userLibraryID;
+					neg.addCondition('groupStart', 'true', '');
+					neg.addCondition('joinMode', 'all');
+					neg.addCondition('fulltextContent', 'doesNotContain', 'foo');
+					neg.addCondition('title', 'is', bazItem.getField('title'));
+					neg.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await neg.search(), [bazItem.id]);
+
+					// regexp: (title is foo.html OR full-text regexp "foo.+bar") -> both
+					var re = new Zotero.Search();
+					re.libraryID = userLibraryID;
+					re.addCondition('groupStart', 'true', '');
+					re.addCondition('joinMode', 'any');
+					re.addCondition('title', 'is', fooItem.getField('title'));
+					re.addCondition('fulltextContent/regexp', 'contains', 'foo.+bar');
+					re.addCondition('groupEnd', 'true', '');
+					assert.sameMembers(await re.search(), [fooItem.id, foobarItem.id]);
+				});
 			});
 			
 			describe("annotationText", function () {
@@ -406,55 +1464,6 @@ describe("Zotero.Search", function () {
 				});
 			});
 			
-			describe("fulltextWord", function () {
-				it("should return matches with full-text conditions", async function () {
-					let s = new Zotero.Search();
-					s.libraryID = userLibraryID;
-					s.addCondition('fulltextWord', 'contains', 'foo');
-					let matches = await s.search();
-					assert.lengthOf(matches, 2);
-					assert.sameMembers(matches, [fooItem.id, foobarItem.id]);
-				});
-		
-				it("should not return non-matches with full-text conditions", async function () {
-					let s = new Zotero.Search();
-					s.libraryID = userLibraryID;
-					s.addCondition('fulltextWord', 'contains', 'nomatch');
-					let matches = await s.search();
-					assert.lengthOf(matches, 0);
-				});
-		
-				it("should return matches for full-text conditions in ALL mode", async function () {
-					let s = new Zotero.Search();
-					s.libraryID = userLibraryID;
-					s.addCondition('joinMode', 'all');
-					s.addCondition('fulltextWord', 'contains', 'foo');
-					s.addCondition('fulltextWord', 'contains', 'bar');
-					let matches = await s.search();
-					assert.deepEqual(matches, [foobarItem.id]);
-				});
-		
-				it("should not return non-matches for full-text conditions in ALL mode", async function () {
-					let s = new Zotero.Search();
-					s.libraryID = userLibraryID;
-					s.addCondition('joinMode', 'all');
-					s.addCondition('fulltextWord', 'contains', 'mjktkiuewf');
-					s.addCondition('fulltextWord', 'contains', 'zijajkvudk');
-					let matches = await s.search();
-					assert.lengthOf(matches, 0);
-				});
-		
-				it("should return a match that satisfies only one of two full-text condition in ANY mode", async function () {
-					let s = new Zotero.Search();
-					s.libraryID = userLibraryID;
-					s.addCondition('joinMode', 'any');
-					s.addCondition('fulltextWord', 'contains', 'bar');
-					s.addCondition('fulltextWord', 'contains', 'nomatch');
-					let matches = await s.search();
-					assert.deepEqual(matches, [foobarItem.id]);
-				});
-			});
-			
 			describe("includeParentsAndChildren", function () {
 				it("should handle ANY search with no-op condition", async function () {
 					var s = new Zotero.Search();
@@ -478,6 +1487,47 @@ describe("Zotero.Search", function () {
 					var matches = await s.search();
 					assert.lengthOf(matches, 0);
 				});
+
+				it("should include a match's parents and children", async function () {
+					var itemTitle = 'zincp' + Zotero.Utilities.randomString();
+					var attTitle = 'zinca' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title: itemTitle });
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('title', attTitle);
+					await attachment.saveTx();
+
+					let run = (value) => {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('title', 'is', value);
+						s.addCondition('includeParentsAndChildren', 'true');
+						return s.search();
+					};
+					// Matching the parent pulls in its child, and matching the child its parent
+					assert.sameMembers(await run(itemTitle), [item.id, attachment.id]);
+					assert.sameMembers(await run(attTitle), [item.id, attachment.id]);
+
+					await item.eraseTx();
+				});
+			});
+
+			describe("noChildren", function () {
+				it("should keep only top-level items", async function () {
+					var title = 'znochild' + Zotero.Utilities.randomString();
+					var item = await createDataObject('item', { title });
+					var attachment = await importPDFAttachment(item);
+					attachment.setField('title', title);
+					await attachment.saveTx();
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('title', 'contains', title);
+					s.addCondition('noChildren', 'true');
+					// The child attachment matches the title too, but noChildren excludes it
+					assert.sameMembers(await s.search(), [item.id]);
+
+					await item.eraseTx();
+				});
 			});
 			
 			describe("key", function () {
@@ -492,34 +1542,57 @@ describe("Zotero.Search", function () {
 			});
 
 			describe("anyField", function () {
+				it("should expand an 'any field' within its own group", async function () {
+					// (anyField contains "znestfoo" OR title contains "zzznomatch") -> the
+					// item matches via Any Field. If the Any Field expansion leaked to the
+					// top level (ANDed) instead of staying in this OR-group, the
+					// non-matching title would exclude it.
+					var item = await createDataObject('item', { title: "znestfoo" });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('groupStart', 'true', '');
+					s.addCondition('joinMode', 'any');
+					s.addCondition('anyField', 'contains', "znestfoo");
+					s.addCondition('title', 'contains', "zzznomatch");
+					s.addCondition('groupEnd', 'true', '');
+					var matches = await s.search();
+					assert.includeMembers(matches, [item.id]);
+
+					await item.eraseTx();
+				});
 				it("should return matches for multiple 'any field' conditions with joinMode=any", async function () {
-					var itemOne = await createDataObject('item', { title: "one" });
-					var itemTwo = await createDataObject('item', { title: "two" });
-					
+					var titleOne = 'zanyj' + Zotero.Utilities.randomString();
+					var titleTwo = 'zanyk' + Zotero.Utilities.randomString();
+					var itemOne = await createDataObject('item', { title: titleOne });
+					var itemTwo = await createDataObject('item', { title: titleTwo });
+
 					var s = new Zotero.Search();
 					s.libraryID = userLibraryID;
 					s.addCondition('joinMode', 'any');
-					s.addCondition('anyField', 'contains', "one");
-					s.addCondition('anyField', 'contains', "two");
+					s.addCondition('anyField', 'contains', titleOne);
+					s.addCondition('anyField', 'contains', titleTwo);
 					var matches = await s.search();
 					assert.sameMembers(matches, [itemOne.id, itemTwo.id]);
 				});
 				it("should return matches for 'any field' and title condition with joinMode=any", async function () {
-					var itemOne = await createDataObject('item', { title: "three" });
-					var itemTwo = await createDataObject('item', { title: "four" });
-					
+					var titleOne = 'zanyt' + Zotero.Utilities.randomString();
+					var titleTwo = 'zanyu' + Zotero.Utilities.randomString();
+					var itemOne = await createDataObject('item', { title: titleOne });
+					var itemTwo = await createDataObject('item', { title: titleTwo });
+
 					var s = new Zotero.Search();
 					s.libraryID = userLibraryID;
 					s.addCondition('joinMode', 'any');
-					s.addCondition('anyField', 'contains', "three");
-					s.addCondition('title', 'contains', "four");
+					s.addCondition('anyField', 'contains', titleOne);
+					s.addCondition('title', 'contains', titleTwo);
 					var matches = await s.search();
 					assert.sameMembers(matches, [itemOne.id, itemTwo.id]);
 				});
 				it("should return matches for a single 'any field' condition", async function () {
-					var itemOne = await createDataObject('item', { title: "five" });
+					var itemOne = await createDataObject('item', { title: 'zanys' + Zotero.Utilities.randomString() });
 					var itemTwo = await createDataObject('item');
-					
+
 					var s = new Zotero.Search();
 					s.libraryID = userLibraryID;
 					s.addCondition('anyField', 'contains', itemOne.getDisplayTitle());
@@ -527,18 +1600,81 @@ describe("Zotero.Search", function () {
 					assert.sameMembers(matches, [itemOne.id]);
 				});
 				it("should return matches for two 'any field' condition with joinMode=all", async function () {
-					var itemOne = await createDataObject('item', { title: "six-seven" });
-					var itemTwo = await createDataObject('item', { title: "seven-six" });
-					
+					var wordOne = 'zanyv' + Zotero.Utilities.randomString();
+					var wordTwo = 'zanyw' + Zotero.Utilities.randomString();
+					var itemOne = await createDataObject('item', { title: wordOne + '-' + wordTwo });
+					var itemTwo = await createDataObject('item', { title: wordTwo + '-' + wordOne });
+
 					var s = new Zotero.Search();
 					s.libraryID = userLibraryID;
-					s.addCondition('anyField', 'contains', "six");
-					s.addCondition('anyField', 'contains', "seven");
+					s.addCondition('anyField', 'contains', wordOne);
+					s.addCondition('anyField', 'contains', wordTwo);
 					s.addCondition('joinMode', 'all');
 					var matches = await s.search();
 					assert.sameMembers(matches, [itemOne.id, itemTwo.id]);
 				});
+				it("should return matches for annotation text", async function () {
+					var attachment = await importPDFAttachment();
+					var annotation = await createAnnotation('highlight', attachment);
+					var str = annotation.annotationText.substr(0, 7);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('anyField', 'contains', str);
+					var matches = await s.search();
+					assert.include(matches, annotation.id);
+				});
+				it("should return matches for annotation comment", async function () {
+					var attachment = await importPDFAttachment();
+					var annotation = await createAnnotation('note', attachment);
+					var str = annotation.annotationComment.substr(0, 7);
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('anyField', 'contains', str);
+					var matches = await s.search();
+					assert.include(matches, annotation.id);
+				});
 			});
+			describe("titleCreatorYear", function () {
+				it("should match title, creator, and year but not other fields", async function () {
+					var word = 'ztcy' + Zotero.Utilities.randomString();
+					// Matches via title
+					var byTitle = await createDataObject('item', { title: 'a ' + word + ' b' });
+					// Matches via creator
+					var byCreator = await createDataObject('item', {
+						creators: [{ creatorType: 'author', lastName: word, firstName: 'X' }]
+					});
+					// Has the word only in a field outside the title/creator/year set
+					var byOther = await createDataObject('item');
+					byOther.setField('abstractNote', 'a ' + word + ' b');
+					await byOther.saveTx();
+					
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('titleCreatorYear', 'contains', word);
+					assert.sameMembers(await s.search(), [byTitle.id, byCreator.id]);
+
+					await Zotero.Items.erase([byTitle.id, byCreator.id, byOther.id]);
+				});
+				it("should exclude items whose title contains the value for doesNotContain", async function () {
+					var word = 'ztcy' + Zotero.Utilities.randomString();
+					// Title contains the word -- must be excluded
+					var withWord = await createDataObject('item', { title: 'a ' + word + ' b' });
+					// Title lacks the word and has no publicationTitle/year/etc. -- must match
+					var withoutWord = await createDataObject('item', { title: 'nothing here' });
+
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('titleCreatorYear', 'doesNotContain', word);
+					var matches = await s.search();
+					assert.include(matches, withoutWord.id);
+					assert.notInclude(matches, withWord.id);
+
+					await Zotero.Items.erase([withWord.id, withoutWord.id]);
+				});
+			});
+			
 			
 			describe("savedSearch", function () {
 				it("should return items in the saved search", async function () {
@@ -610,6 +1746,150 @@ describe("Zotero.Search", function () {
 				});
 			});
 			
+			describe("Accent-insensitive matching", function () {
+				it("should match accented and unaccented text interchangeably", async function () {
+					// Unaccented term against accented text
+					var item = await createDataObject('item', { title: 'zdiaséance', libraryID: userLibraryID });
+					var s1 = new Zotero.Search();
+					s1.libraryID = userLibraryID;
+					s1.addCondition('title', 'contains', 'zdiaseance');
+					assert.sameMembers(await s1.search(), [item.id]);
+
+					// Accented term against unaccented text
+					var item2 = await createDataObject('item', { title: 'zdiaresume', libraryID: userLibraryID });
+					var s2 = new Zotero.Search();
+					s2.libraryID = userLibraryID;
+					s2.addCondition('title', 'contains', 'zdiarésumé');
+					assert.sameMembers(await s2.search(), [item2.id]);
+				});
+
+				it("should match an accented creator from an unaccented term", async function () {
+					var item = await createDataObject('item', {
+						libraryID: userLibraryID,
+						creators: [{ firstName: 'Étiennezdia', lastName: 'Müllerzdia', creatorType: 'author' }]
+					});
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('creator', 'contains', 'etiennezdia mullerzdia');
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+
+				it("should match an accented tag from an unaccented term", async function () {
+					var item = await createDataObject('item', {
+						libraryID: userLibraryID,
+						tags: [{ tag: 'résumézdia' }]
+					});
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('tag', 'contains', 'resumezdia');
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+
+				it("should match non-ASCII text case-insensitively", async function () {
+					// SQLite's default LIKE folds only ASCII case, so uppercase Greek/Cyrillic values
+					// have to be stored normalized (lowercased) to match a lowercase search term
+					var greek = await createDataObject('item', { title: 'zdiaΘΕΜΑ', libraryID: userLibraryID });
+					var cyrillic = await createDataObject('item', { title: 'zdiaПРИВЕТ', libraryID: userLibraryID });
+					var s1 = new Zotero.Search();
+					s1.libraryID = userLibraryID;
+					s1.addCondition('title', 'contains', 'zdiaθεμα');
+					assert.sameMembers(await s1.search(), [greek.id]);
+					var s2 = new Zotero.Search();
+					s2.libraryID = userLibraryID;
+					s2.addCondition('title', 'contains', 'zdiaпривет');
+					assert.sameMembers(await s2.search(), [cyrillic.id]);
+				});
+
+				it("should match ligatures, superscripts, fractions, and non-decomposing letters", async function () {
+					var item = await createDataObject('item', { title: 'zdiasøren œuvre file x² ½ straße', libraryID: userLibraryID });
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('title', 'contains', 'zdiasoren oeuvre file x2 1/2 strasse');
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+
+				it("should ignore rich-text formatting tags in item fields", async function () {
+					// A word wrapped in supported formatting (here small-caps) -- the tags shouldn't
+					// break a phrase match across the word or be matchable themselves
+					var item = await createDataObject('item', {
+						title: 'The <span style="font-variant:small-caps;">zdiadrosophila</span> genome',
+						libraryID: userLibraryID
+					});
+					async function titleMatches(term) {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('title', 'contains', term);
+						return s.search();
+					}
+					// A phrase running from the formatted word into the next one matches
+					assert.sameMembers(await titleMatches('zdiadrosophila genome'), [item.id]);
+					// The tag markup itself isn't matched
+					assert.lengthOf(await titleMatches('small-caps'), 0);
+				});
+
+				it("should fold curly quotes and dashes to their ASCII forms", async function () {
+					// Word processors and translators produce curly quotes and en/em dashes; a
+					// search typed with straight quotes and hyphens should still match
+					var quoted = await createDataObject('item', {
+						title: 'zdia“pp. 10–12”', // curly quotes + en dash: "pp. 10-12"
+						libraryID: userLibraryID
+					});
+					var emDash = await createDataObject('item', {
+						title: 'zdiamind—body problem', // em dash
+						libraryID: userLibraryID
+					});
+					async function titleMatches(term) {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('title', 'contains', term);
+						return s.search();
+					}
+					// Straight quotes and hyphen match the curly quotes and en dash
+					assert.sameMembers(await titleMatches('zdia"pp. 10-12"'), [quoted.id]);
+					// Em dash folds to a hyphen too
+					assert.sameMembers(await titleMatches('zdiamind-body'), [emDash.id]);
+				});
+
+				it("should distinguish voiced kana and composed Hangul", async function () {
+					// NFKD decomposes が into か + a combining mark and 한 into jamo; without
+					// recomposition, the base character would substring-match the composed one
+					var ja = await createDataObject('item', { title: 'zdiaがん', libraryID: userLibraryID });
+					var ko = await createDataObject('item', { title: 'zdia한국', libraryID: userLibraryID });
+
+					async function titleMatches(term) {
+						var s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('title', 'contains', term);
+						return s.search();
+					}
+
+					// The composed character matches itself
+					assert.sameMembers(await titleMatches('zdiaがん'), [ja.id]);
+					assert.sameMembers(await titleMatches('zdia한국'), [ko.id]);
+					// The base character must not match the composed/voiced one
+					assert.lengthOf(await titleMatches('zdiaかん'), 0);
+					assert.lengthOf(await titleMatches('zdia하'), 0);
+				});
+
+				it("should populate normalized columns for existing rows on backfill", async function () {
+					var item = await createDataObject('item', { title: 'zdiabörkbackfill', libraryID: userLibraryID });
+					// Simulate pre-migration data by clearing the normalized column
+					await Zotero.DB.queryAsync(
+						"UPDATE itemDataValues SET valueNormalized=NULL WHERE value=?",
+						'zdiabörkbackfill'
+					);
+					var s = new Zotero.Search();
+					s.libraryID = userLibraryID;
+					s.addCondition('title', 'contains', 'zdiaborkbackfill');
+					assert.lengthOf(await s.search(), 0);
+
+					await Zotero.DB.queryAsync("REPLACE INTO settings VALUES ('search', 'normalizeBackfill', 1)");
+					await Zotero.Schema.populateNormalizedSearchColumns();
+
+					assert.sameMembers(await s.search(), [item.id]);
+				});
+			});
+
 			describe("Quick search", function () {
 				describe("All Fields & Tags", function () {
 					it("should match annotation for tag search", async function () {
@@ -720,6 +2000,72 @@ describe("Zotero.Search", function () {
 						assert.equal(matches.length, 1);
 						assert.equal(matches[0], fooItem.id);
 					});
+
+					async function importTextContent(content) {
+						let path = OS.Path.join(await getTempDirectory(), Zotero.Utilities.randomString() + ".txt");
+						await Zotero.File.putContentsAsync(path, content);
+						return Zotero.Attachments.importFromFile({
+							file: path, contentType: 'text/plain', charset: 'utf-8', title: 'xxxx'
+						});
+					}
+
+					it("should match full-text content by word prefix", async function () {
+						let item = await importTextContent("zqs electrophoresis protocol");
+						let s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('quicksearch-everything', 'contains', 'electro');
+						assert.include(await s.search(), item.id);
+					});
+
+					it("should match unquoted words as prefixes anywhere in the content", async function () {
+						let item = await importTextContent("the climate of the region has seen many changes");
+						let s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('quicksearch-everything', 'contains', 'clim chang');
+						assert.include(await s.search(), item.id);
+					});
+
+					it("should require every word of a multi-word search", async function () {
+						let both = await importTextContent("zqsalpha zqsbeta zqsgamma");
+						let one = await importTextContent("zqsalpha zqsdelta");
+						let s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						s.addCondition('quicksearch-everything', 'contains', 'zqsalpha zqsgamma');
+						let matches = await s.search();
+						assert.include(matches, both.id);
+						assert.notInclude(matches, one.id);
+					});
+
+					it("should skip content matching for a term too short for the index", async function () {
+						let item = await importTextContent("elephant");
+						let s = new Zotero.Search();
+						s.libraryID = userLibraryID;
+						// A 1-2-character unquoted term isn't matched against content (avoiding
+						// per-keystroke churn); the title is "xxxx", so nothing matches
+						s.addCondition('quicksearch-everything', 'contains', 'el');
+						assert.notInclude(await s.search(), item.id);
+					});
+
+					it("should skip note matching for a short term but honor a quoted one", async function () {
+						let note = new Zotero.Item('note');
+						note.libraryID = userLibraryID;
+						note.setNote('<p>zqsnote re content</p>');
+						await note.saveTx();
+						await Zotero.FullText.processNoteIndexQueue();
+						async function matches(term) {
+							let s = new Zotero.Search();
+							s.libraryID = userLibraryID;
+							s.addCondition('quicksearch-everything', 'contains', term);
+							return s.search();
+						}
+						// A long term matches the note's content
+						assert.include(await matches('zqsnote'), note.id);
+						// "re" is too short for the index, so an unquoted term doesn't scan note
+						// content (avoiding a per-keystroke scan) and nothing else matches it
+						assert.notInclude(await matches('re'), note.id);
+						// Quoting makes the quick search Enter-triggered, so the short term is matched
+						assert.include(await matches('"re"'), note.id);
+					});
 				});
 			});
 			
@@ -802,6 +2148,33 @@ describe("Zotero.Search", function () {
 	});
 	
 	describe("#fromJSON()", function () {
+		it("should migrate a `childNote` condition to `note` at the item level", async function () {
+			var text = 'zjsoncn' + Zotero.Utilities.randomString();
+			var item = await createDataObject('item', { title: 'zjsoncnitem' });
+			var note = new Zotero.Item('note');
+			note.libraryID = item.libraryID;
+			note.parentID = item.id;
+			note.setNote('<p>' + text + '</p>');
+			await note.saveTx();
+
+			var s = new Zotero.Search();
+			s.libraryID = item.libraryID;
+			s.fromJSON({
+				name: 'Test',
+				conditions: [{ condition: 'childNote', operator: 'contains', value: text }]
+			});
+
+			var conds = Object.values(s.getConditions());
+			assert.include(conds.map(c => c.condition), 'note');
+			assert.notInclude(conds.map(c => c.condition), 'childNote');
+			var resultLevel = conds.find(c => c.condition == 'resultLevel');
+			assert.ok(resultLevel);
+			assert.equal(resultLevel.operator, 'item');
+			assert.sameMembers(await s.search(), [item.id]);
+
+			await item.eraseTx();
+		});
+
 		it("should update all data", async function () {
 			let s = new Zotero.Search();
 			s.name = "Test";
diff --git a/test/tests/serverTest.js b/test/tests/serverTest.js
index 7ab6bbc898..36fb6454b4 100644
--- a/test/tests/serverTest.js
+++ b/test/tests/serverTest.js
@@ -240,6 +240,45 @@ describe("Zotero.Server", function () {
 					assert.equal(req.status, 204);
 				});
 
+				it("should not trim whitespace bytes from a binary part body", async function () {
+					let called = false;
+					let endpoint = "/test/" + Zotero.Utilities.randomString();
+					// Begins and ends with whitespace bytes, which trimming would strip
+					let raw = new Uint8Array([0x0a, 0x20, 0x25, 0x50, 0x44, 0x46, 0xff, 0x0d, 0x0a]);
+					let expected = String.fromCharCode(...raw);
+
+					Zotero.Server.Endpoints[endpoint] = function () {};
+					Zotero.Server.Endpoints[endpoint].prototype = {
+						supportedMethods: ["POST"],
+						supportedDataTypes: ["multipart/form-data"],
+
+						init: function (options) {
+							called = true;
+							assert.isArray(options.data);
+							assert.equal(options.data.length, 1);
+							assert.equal(options.data[0].body, expected);
+							return 204;
+						}
+					};
+
+					let formData = new FormData();
+					formData.append("file", new Blob([raw]), "f.bin");
+
+					let req = await Zotero.HTTP.request(
+						"POST",
+						serverPath + endpoint,
+						{
+							headers: {
+								"Content-Type": "multipart/form-data"
+							},
+							body: formData
+						}
+					);
+
+					assert.ok(called);
+					assert.equal(req.status, 204);
+				});
+
 				it("should support an empty body", async function () {
 					var called = false;
 					var endpoint = "/test/" + Zotero.Utilities.randomString();
@@ -286,6 +325,39 @@ describe("Zotero.Server", function () {
 					assert.ok(called);
 					assert.equal(req.status, 204);
 				});
+
+				it("should reject a missing boundary without processing the endpoint", async function () {
+					let called = false;
+					let endpoint = "/test/" + Zotero.Utilities.randomString();
+
+					Zotero.Server.Endpoints[endpoint] = function () {};
+					Zotero.Server.Endpoints[endpoint].prototype = {
+						supportedMethods: ["POST"],
+						supportedDataTypes: ["multipart/form-data"],
+
+						init: function () {
+							called = true;
+							return 204;
+						}
+					};
+
+					let req = await Zotero.HTTP.request(
+						"POST",
+						serverPath + endpoint,
+						{
+							headers: {
+								"Content-Type": "multipart/form-data;charset=utf-8"
+							},
+							body: "invalid multipart data",
+							responseType: "text",
+							successCodes: [400]
+						}
+					);
+
+					assert.equal(req.status, 400);
+					assert.equal(req.responseText, "Invalid multipart/form-data provided\n");
+					assert.isFalse(called);
+				});
 			});
 			describe("application/pdf", function () {
 				it('should provide a stream', async function () {
diff --git a/test/tests/server_connectorTest.js b/test/tests/server_connectorTest.js
index e5223f7051..ca19f95b97 100644
--- a/test/tests/server_connectorTest.js
+++ b/test/tests/server_connectorTest.js
@@ -235,7 +235,7 @@ describe("Connector Server", function () {
 			// My Library be selected, and the item should be in it
 			var ids = await promise;
 			assert.equal(
-				win.ZoteroPane.collectionsView.getSelectedLibraryID(),
+				win.ZoteroPane.collectionsView.getSelectedLibraryIDs()[0],
 				Zotero.Libraries.userLibraryID
 			);
 			assert.lengthOf(ids, 1);
@@ -246,7 +246,36 @@ describe("Connector Server", function () {
 			var req = await reqPromise;
 			assert.equal(req.status, 201);
 		});
-		
+
+		it("should target only the focused row for a cross-library multiple-collection selection", async function () {
+			// A collection in My Library plus a collection in a group library, with the group
+			// collection focused. The Connector saves to a single target, so it should use the
+			// focused row and not the collection from the other library.
+			var group = await createGroup();
+			var userCollection = await createDataObject('collection');
+			var groupCollection = await createDataObject('collection', { libraryID: group.libraryID });
+			var cv = win.ZoteroPane.collectionsView;
+
+			// Reveal the group collection, then focus the My Library collection and toggle the
+			// group collection so it becomes the focused row
+			await select(win, groupCollection);
+			await select(win, userCollection);
+			var groupRow = cv.getRowIndexByID(groupCollection.treeViewID);
+			cv.selection.toggleSelect(groupRow);
+			await waitForItemsLoad(win);
+
+			// Sanity check: both rows selected, with the group collection focused
+			assert.equal(cv.selection.focused, groupRow);
+			assert.sameMembers(
+				win.ZoteroPane.getCollectionTreeRows().map(r => r.ref.libraryID),
+				[Zotero.Libraries.userLibraryID, group.libraryID]
+			);
+
+			var target = Zotero.Server.Connector.getSaveTarget();
+			assert.equal(target.library.libraryID, group.libraryID);
+			assert.equal(target.collection.id, groupCollection.id);
+		});
+
 		it("should use the provided proxy to deproxify item url", async function () {
 			await selectLibrary(win, Zotero.Libraries.userLibraryID);
 			await waitForItemsLoad(win);
@@ -520,7 +549,7 @@ describe("Connector Server", function () {
 			// My Library be selected, and the item should be in it
 			var ids = await promise;
 			assert.equal(
-				win.ZoteroPane.collectionsView.getSelectedLibraryID(),
+				win.ZoteroPane.collectionsView.getSelectedLibraryIDs()[0],
 				Zotero.Libraries.userLibraryID
 			);
 			assert.lengthOf(ids, 1);
@@ -701,6 +730,52 @@ describe("Connector Server", function () {
 			assert.isTrue(JSON.parse(response.responseText));
 		});
 
+		it("should respond with 'true' if the item has a PMCID", async function () {
+			const sessionID = Zotero.Utilities.randomString();
+			const itemID = Zotero.Utilities.randomString();
+			const body = {
+				sessionID,
+				items: [
+					{
+						id: itemID,
+						itemType: "journalArticle",
+						title: "Test Article with PMCID",
+						PMCID: "PMC9262588",
+					}
+				]
+			};
+			
+			let response = await httpRequest(
+				"POST",
+				connectorServerPath + "/connector/saveItems", 
+				{
+					headers: {
+						"Content-Type": "application/json"
+					},
+					body: JSON.stringify(body)
+				}
+			);
+			
+			assert.equal(response.status, 201);
+			
+			response = await httpRequest(
+				"POST",
+				connectorServerPath + "/connector/hasAttachmentResolvers",
+				{
+					headers: {
+						"Content-Type": "application/json"
+					},
+					body: JSON.stringify({
+						sessionID,
+						itemID
+					}),
+				}
+			);
+			
+			assert.equal(response.status, 200);
+			assert.isTrue(JSON.parse(response.responseText));
+		});
+
 		it("should respond with 'false' if the item has no OA attachments", async function () {
 			const sessionID = Zotero.Utilities.randomString();
 			const itemID = Zotero.Utilities.randomString();
@@ -1784,7 +1859,7 @@ describe("Connector Server", function () {
 			
 			assert.equal(req.status, 201);
 			assert.equal(
-				win.ZoteroPane.collectionsView.getSelectedLibraryID(),
+				win.ZoteroPane.collectionsView.getSelectedLibraryIDs()[0],
 				Zotero.Libraries.userLibraryID
 			);
 			
diff --git a/test/tests/server_localAPITest.js b/test/tests/server_localAPITest.js
index 39a16e67ce..08e9df56b9 100644
--- a/test/tests/server_localAPITest.js
+++ b/test/tests/server_localAPITest.js
@@ -2,7 +2,8 @@
 
 describe("Local API Server", function () {
 	let apiRoot;
-	
+	let serverID;
+
 	let collection;
 	let subcollection;
 	let collectionItem1;
@@ -23,6 +24,93 @@ describe("Local API Server", function () {
 		});
 	}
 
+	// API key used by write tests; set up in the Write requests before() hook.
+	let writeAPIKey;
+
+	function apiRequest(method, endpoint, options = {}) {
+		let { body, headers, skipAPIKey, skipServerID, ...rest } = options;
+		let requestHeaders = {
+			'Zotero-Allowed-Request': '1',
+			...(headers || {})
+		};
+		if (!skipAPIKey && writeAPIKey
+				&& !requestHeaders['Zotero-API-Key']
+				&& !endpoint.includes('key=')) {
+			requestHeaders['Zotero-API-Key'] = writeAPIKey;
+		}
+		if (!skipServerID && serverID && !requestHeaders['Zotero-Server-ID']) {
+			requestHeaders['Zotero-Server-ID'] = serverID;
+		}
+		let requestBody = body;
+		if (body !== undefined && typeof body !== 'string'
+				&& !(body instanceof ArrayBuffer)
+				&& !ArrayBuffer.isView(body)) {
+			requestBody = JSON.stringify(body);
+			if (!requestHeaders['Content-Type']) {
+				requestHeaders['Content-Type'] = 'application/json';
+			}
+		}
+		return Zotero.HTTP.request(method, apiRoot + endpoint, {
+			headers: requestHeaders,
+			body: requestBody,
+			responseType: 'json',
+			...rest
+		});
+	}
+
+	function apiPost(endpoint, options = {}) {
+		return apiRequest('POST', endpoint, options);
+	}
+
+	function apiPut(endpoint, options = {}) {
+		return apiRequest('PUT', endpoint, options);
+	}
+
+	function apiPatch(endpoint, options = {}) {
+		return apiRequest('PATCH', endpoint, options);
+	}
+
+	function apiDelete(endpoint, options = {}) {
+		return apiRequest('DELETE', endpoint, options);
+	}
+
+	// Counter so each test generates a fresh write token (server caches them for 12h)
+	let writeTokenCounter = 0;
+	function newWriteToken() {
+		writeTokenCounter++;
+		return ('writeToken' + writeTokenCounter + 'x'.repeat(32))
+			.substring(0, 32);
+	}
+
+	function authorizePost(body, { responseType = 'json', successCodes } = {}) {
+		let options = {
+			headers: {
+				'Zotero-Allowed-Request': '1',
+				'Content-Type': 'application/json',
+				'Zotero-Server-ID': serverID,
+			},
+			body: typeof body === 'string' ? body : JSON.stringify(body),
+			responseType
+		};
+		if (successCodes) {
+			options.successCodes = successCodes;
+		}
+		return Zotero.HTTP.request('POST', apiRoot + '/local/authorize', options);
+	}
+
+	// Stub the dialog and obtain a remembered API key directly via the endpoint
+	async function setupRememberedAPIKey(appName = 'Test Suite') {
+		let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+			.resolves({ allow: true, remember: true });
+		try {
+			let { response } = await authorizePost({ appName });
+			return response.key;
+		}
+		finally {
+			stub.restore();
+		}
+	}
+
 	before(async function () {
 		apiRoot = 'http://127.0.0.1:' + Zotero.Server.port + '/api';
 
@@ -30,6 +118,9 @@ describe("Local API Server", function () {
 			thisArg: this
 		});
 
+		// Regenerated in the settings table on reset, so read it back afterward
+		serverID = Zotero.Server.LocalAPI.getServerID();
+
 		collection = await createDataObject('collection', { setTitle: true });
 		subcollection = await createDataObject('collection', { setTitle: true, parentID: collection.id });
 		collectionItem1 = await createDataObject('item', {
@@ -85,6 +176,78 @@ describe("Local API Server", function () {
 		});
 	});
 	
+	describe("Zotero-Server-ID", function () {
+		it("should return the server ID in a response header", async function () {
+			let xhr = await apiGet('/users/0/items');
+			assert.equal(xhr.getResponseHeader('Zotero-Server-ID'), serverID);
+		});
+
+		it("should accept a read with a matching server ID", async function () {
+			let xhr = await apiGet('/users/0/items', {
+				headers: {
+					'Zotero-Allowed-Request': '1',
+					'Zotero-Server-ID': serverID,
+				}
+			});
+			assert.equal(xhr.status, 200);
+		});
+
+		it("should accept a read with no server ID", async function () {
+			// apiGet() doesn't send the header
+			let xhr = await apiGet('/users/0/items');
+			assert.equal(xhr.status, 200);
+		});
+
+		it("should reject a read with a mismatched server ID with 412", async function () {
+			let xhr = await apiGet('/users/0/items', {
+				headers: {
+					'Zotero-Allowed-Request': '1',
+					'Zotero-Server-ID': 'wrongServerID',
+				},
+				responseType: 'text',
+				successCodes: [412]
+			});
+			assert.equal(xhr.status, 412);
+			// The rejection still carries the real server ID, so a client with a
+			// stale ID can recover
+			assert.equal(xhr.getResponseHeader('Zotero-Server-ID'), serverID);
+		});
+
+		it("should require a server ID on writes with 428", async function () {
+			let xhr = await apiPost('/users/0/items', {
+				body: [],
+				skipServerID: true,
+				skipAPIKey: true,
+				responseType: 'text',
+				successCodes: [428]
+			});
+			assert.equal(xhr.status, 428);
+		});
+
+		it("should reject a write with a mismatched server ID with 412", async function () {
+			let xhr = await apiPost('/users/0/items', {
+				body: [],
+				headers: { 'Zotero-Server-ID': 'wrongServerID' },
+				skipAPIKey: true,
+				responseType: 'text',
+				successCodes: [412]
+			});
+			assert.equal(xhr.status, 412);
+		});
+
+		it("should validate the server ID before the API key on writes", async function () {
+			// A valid server ID but no API key passes the server-ID check and
+			// then fails authentication with 401
+			let xhr = await apiPost('/users/0/items', {
+				body: [],
+				skipAPIKey: true,
+				responseType: 'text',
+				successCodes: [401]
+			});
+			assert.equal(xhr.status, 401);
+		});
+	});
+
 	describe("<userOrGroupPrefix>/collections", function () {
 		it("should return all collections", async function () {
 			let { response } = await apiGet('/users/0/collections');
@@ -272,9 +435,10 @@ describe("Local API Server", function () {
 			});
 
 			describe("=versions", function () {
-				it("should output a JSON object mapping keys to versions", async function () {
+				it("should output a JSON object mapping keys to local versions", async function () {
 					let { response } = await apiGet('/users/0/items?format=versions');
-					assert.propertyVal(response, collectionItem1.key, collectionItem1.version);
+					assert.isAbove(collectionItem1.clientVersion, 0);
+					assert.propertyVal(response, collectionItem1.key, collectionItem1.clientVersion);
 				});
 			});
 		});
@@ -325,11 +489,25 @@ describe("Local API Server", function () {
 		
 		describe("?since", function () {
 			it("should filter the results", async function () {
-				let { response: response1 } = await apiGet('/users/0/items?since=' + (Zotero.Libraries.userLibrary.libraryVersion + 1));
+				let version = Zotero.Libraries.userLibrary.clientVersion;
+				
+				let { response: response1 } = await apiGet('/users/0/items?since=' + version);
 				assert.isEmpty(response1);
 
 				let { response: response2 } = await apiGet('/users/0/items?since=0');
 				assert.lengthOf(response2, allItems.length);
+
+				let tempItem = await createDataObject('item');
+				let { response: response3 } = await apiGet('/users/0/items?since=' + version);
+				assert.lengthOf(response3, 1);
+				assert.equal(response3[0].key, tempItem.key);
+				assert.equal(response3[0].version, tempItem.clientVersion);
+				assert.equal(tempItem.clientVersion, version + 1);
+				
+				await tempItem.eraseTx();
+
+				let { response: response4 } = await apiGet('/users/0/items?since=' + version);
+				assert.lengthOf(response4, 0);
 			});
 		});
 
@@ -364,7 +542,45 @@ describe("Local API Server", function () {
 		});
 	});
 
+	describe("/users/<userID>/groups", function () {
+		it("should omit Last-Modified-Version", async function () {
+			let group = await getGroup();
+			let xhr = await apiGet('/users/0/groups');
+			assert.isNull(xhr.getResponseHeader('Last-Modified-Version'));
+			assert.include(xhr.response.map(g => g.id), group.id);
+		});
+
+		it("should ignore ?since", async function () {
+			let group = await getGroup();
+			let { response: all } = await apiGet('/users/0/groups');
+			let { response: since } = await apiGet(`/users/0/groups?since=${group.version + 1}`);
+			assert.sameDeepMembers(since, all);
+		});
+
+		it("should map group IDs to metadata versions with ?format=versions", async function () {
+			let group = await getGroup();
+			let { response } = await apiGet('/users/0/groups?format=versions');
+			assert.propertyVal(response, String(group.id), group.version);
+		});
+	});
+
 	describe("/groups/<groupID>", function () {
+		it("should report the synced group version at the top level, in data, and in Last-Modified-Version", async function () {
+			let group = await getGroup();
+			// Changing the group library's contents doesn't affect the group metadata version
+			let item = await createDataObject('item', { libraryID: group.libraryID });
+			let xhr = await apiGet(`/groups/${group.groupID}`);
+			let response = xhr.response;
+			assert.notEqual(group.version, group.clientVersion);
+			assert.equal(response.version, group.version);
+			assert.equal(response.data.version, group.version);
+			assert.equal(
+				parseInt(xhr.getResponseHeader('Last-Modified-Version')),
+				group.version
+			);
+			await item.eraseTx();
+		});
+
 		it("should return 404 for unknown group", async function () {
 			let { response } = await apiGet(
 				'/groups/99999999999',
@@ -376,4 +592,1719 @@ describe("Local API Server", function () {
 			assert.equal(response, "Not found");
 		});
 	});
+
+	// ===================================================================
+	// Write request tests
+	// ===================================================================
+
+	describe("Write requests", function () {
+		before(async function () {
+			Zotero.Server.LocalAPI._resetAuthorizeRateLimit();
+			writeAPIKey = await setupRememberedAPIKey();
+		});
+
+		// Reset the local/authorize rate limit between tests so a long sequence of
+		// stubbed prompts can run without tripping the per-minute 429 throttle.
+		beforeEach(function () {
+			Zotero.Server.LocalAPI._resetAuthorizeRateLimit();
+		});
+
+		describe("POST /api/local/authorize", function () {
+			it("should return a key on allow", async function () {
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: true, remember: false });
+				try {
+					let { response, status } = await authorizePost({ appName: 'AllowApp' });
+					assert.equal(status, 200);
+					assert.isString(response.key);
+					assert.lengthOf(response.key, 32);
+					assert.isFalse(response.remember);
+				}
+				finally {
+					stub.restore();
+				}
+			});
+
+			it("should mark a key as remembered when Always Allow is chosen", async function () {
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: true, remember: true });
+				try {
+					let { response } = await authorizePost({ appName: 'RememberApp' });
+					assert.isTrue(response.remember);
+				}
+				finally {
+					stub.restore();
+				}
+			});
+
+			it("should return 403 on deny", async function () {
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: false, remember: false });
+				try {
+					let { response, status } = await authorizePost(
+						{ appName: 'DeniedApp' }, { successCodes: [403] });
+					assert.equal(status, 403);
+					assert.isTrue(response.denied);
+				}
+				finally {
+					stub.restore();
+				}
+			});
+
+			it("should require appName", async function () {
+				let { status } = await authorizePost(
+					{}, { responseType: 'text', successCodes: [400] });
+				assert.equal(status, 400);
+			});
+
+			it("should pass appName into the prompt", async function () {
+				let captured;
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.callsFake(async (appName) => {
+						captured = appName;
+						return { allow: false };
+					});
+				try {
+					await authorizePost(
+						{ appName: 'MyTestApp 1.0' }, { responseType: 'text', successCodes: [403] });
+				}
+				finally {
+					stub.restore();
+				}
+				assert.equal(captured, 'MyTestApp 1.0');
+			});
+
+			it("should rate-limit after 5 confirmation-requiring requests in a minute", async function () {
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: false, remember: false });
+				try {
+					for (let i = 0; i < 5; i++) {
+						await authorizePost(
+							{ appName: 'Throttle ' + i }, { responseType: 'text', successCodes: [403] });
+					}
+					let xhr = await authorizePost(
+						{ appName: 'Throttle 6' }, { responseType: 'text', successCodes: [429] });
+					assert.equal(xhr.status, 429);
+					let retryAfter = parseInt(xhr.getResponseHeader('Retry-After'));
+					assert.isAbove(retryAfter, 0);
+					assert.isAtMost(retryAfter, 60);
+				}
+				finally {
+					stub.restore();
+				}
+			});
+
+			it("should not count rejected (pre-prompt) requests against the rate limit", async function () {
+				// 5 bad-appName requests fail before the prompt and don't consume slots
+				for (let i = 0; i < 5; i++) {
+					await authorizePost(
+						{}, { responseType: 'text', successCodes: [400] });
+				}
+				// A subsequent valid request still goes through
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: false, remember: false });
+				try {
+					let { status } = await authorizePost(
+						{ appName: 'AfterBadReqs' }, { successCodes: [403] });
+					assert.equal(status, 403);
+				}
+				finally {
+					stub.restore();
+				}
+			});
+		});
+
+		describe("Authorization management", function () {
+			it("should report a count of remembered authorizations", async function () {
+				let before = await Zotero.Server.LocalAPI.getAuthorizationCount();
+				await setupRememberedAPIKey('CountedApp');
+				let after = await Zotero.Server.LocalAPI.getAuthorizationCount();
+				assert.equal(after, before + 1);
+			});
+
+			it("should drop every stored key when cleared", async function () {
+				await setupRememberedAPIKey('ToClearApp');
+				assert.isAbove(await Zotero.Server.LocalAPI.getAuthorizationCount(), 0);
+				await Zotero.Server.LocalAPI.clearAuthorizations();
+				assert.equal(await Zotero.Server.LocalAPI.getAuthorizationCount(), 0);
+
+				// Previously-issued keys must no longer authenticate writes
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'Zotero-API-Key': writeAPIKey,
+					},
+					skipAPIKey: true,
+					successCodes: [401],
+					responseType: 'text'
+				});
+				assert.equal(status, 401);
+
+				// Restore the suite-wide key so later tests still work
+				writeAPIKey = await setupRememberedAPIKey('Test Suite');
+			});
+		});
+
+		describe("Authentication", function () {
+			it("should reject write requests with no API key (401)", async function () {
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() },
+					skipAPIKey: true,
+					successCodes: [401],
+					responseType: 'text'
+				});
+				assert.equal(status, 401);
+			});
+
+			it("should reject write requests with an unknown API key (401)", async function () {
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'Zotero-API-Key': 'not-a-real-key-at-all',
+					},
+					skipAPIKey: true,
+					successCodes: [401],
+					responseType: 'text'
+				});
+				assert.equal(status, 401);
+			});
+
+			it("should accept the API key via ?key= query parameter", async function () {
+				let { status, response } = await apiPost(
+					`/users/0/items?key=${encodeURIComponent(writeAPIKey)}`,
+					{
+						body: [{ itemType: 'book', title: 'QueryKey Item' }],
+						headers: { 'Zotero-Write-Token': newWriteToken() },
+						skipAPIKey: true,
+					}
+				);
+				assert.equal(status, 200);
+				let key = response.successful['0'].key;
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, key);
+				if (item) await item.eraseTx();
+			});
+
+			it("should accept the API key via Authorization: Bearer header", async function () {
+				let { status, response } = await apiPost(
+					`/users/0/items`,
+					{
+						body: [{ itemType: 'book', title: 'BearerKey Item' }],
+						headers: {
+							'Zotero-Write-Token': newWriteToken(),
+							'Authorization': `Bearer ${writeAPIKey}`,
+						},
+						skipAPIKey: true,
+					}
+				);
+				assert.equal(status, 200);
+				let key = response.successful['0'].key;
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, key);
+				if (item) await item.eraseTx();
+			});
+
+			it("should consume a single-use API key after one write", async function () {
+				let oneShot;
+				let stub = sinon.stub(Zotero.Server.LocalAPI, '_promptForAuthorization')
+					.resolves({ allow: true, remember: false });
+				try {
+					let { response } = await authorizePost({ appName: 'OneShotApp' });
+					oneShot = response.key;
+				}
+				finally {
+					stub.restore();
+				}
+
+				let { status, response } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'Zotero-API-Key': oneShot,
+					},
+					skipAPIKey: true,
+				});
+				assert.equal(status, 200);
+				let key = response.successful['0'].key;
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, key);
+				if (item) await item.eraseTx();
+
+				// Second use must be rejected
+				let { status: status2 } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'Zotero-API-Key': oneShot,
+					},
+					skipAPIKey: true,
+					successCodes: [401],
+					responseType: 'text'
+				});
+				assert.equal(status2, 401);
+			});
+
+			it("should allow remembered keys to be reused", async function () {
+				// Use the suite key twice -- it's marked remember:true
+				let first = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				let second = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.equal(first.status, 200);
+				assert.equal(second.status, 200);
+				for (let resp of [first, second]) {
+					let key = resp.response.successful['0'].key;
+					let item = await Zotero.Items.getByLibraryAndKeyAsync(
+						Zotero.Libraries.userLibraryID, key);
+					if (item) await item.eraseTx();
+				}
+			});
+
+			it("should not require API key for GET requests", async function () {
+				let { status } = await apiGet('/users/0/items');
+				assert.equal(status, 200);
+			});
+
+			it("should persist remembered keys to <profileDir>/localAPIKeys.json", async function () {
+				let path = PathUtils.join(Zotero.Profile.dir, 'localAPIKeys.json');
+				assert.isTrue(await IOUtils.exists(path));
+				let text = await IOUtils.readUTF8(path);
+				let json = JSON.parse(text);
+				assert.isArray(json.keys);
+				assert.isTrue(json.keys.some(k => k.key === writeAPIKey && k.remember));
+			});
+		});
+
+		describe("POST <userOrGroupPrefix>/items", function () {
+			it("should create a single item", async function () {
+				let { response } = await apiPost('/users/0/items', {
+					body: [{
+						itemType: 'book',
+						title: 'New Book From API',
+					}],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.isObject(response);
+				assert.isObject(response.successful);
+				assert.isObject(response.success);
+				assert.isObject(response.unchanged);
+				assert.isObject(response.failed);
+				assert.isEmpty(Object.keys(response.failed));
+				assert.lengthOf(Object.keys(response.successful), 1);
+				let entry = response.successful['0'];
+				assert.equal(entry.data.itemType, 'book');
+				assert.equal(entry.data.title, 'New Book From API');
+				assert.match(entry.key, /^[23456789ABCDEFGHIJKLMNPQRSTUVWXYZ]{8}$/);
+				assert.equal(response.success['0'], entry.key);
+				// Top-level version and data.version report the same (local) version
+				assert.equal(entry.version, entry.data.version);
+				// Cleanup
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, entry.key);
+				if (item) await item.eraseTx();
+			});
+
+			it("should create multiple items in one request", async function () {
+				let { response } = await apiPost('/users/0/items', {
+					body: [
+						{ itemType: 'book', title: 'Book A' },
+						{ itemType: 'journalArticle', title: 'Article B' }
+					],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.successful), 2);
+				assert.equal(response.successful['0'].data.title, 'Book A');
+				assert.equal(response.successful['1'].data.itemType, 'journalArticle');
+				// Cleanup
+				for (let i of ['0', '1']) {
+					let key = response.successful[i].key;
+					let item = await Zotero.Items.getByLibraryAndKeyAsync(
+						Zotero.Libraries.userLibraryID, key);
+					if (item) await item.eraseTx();
+				}
+			});
+
+			it("should report failed items in 'failed'", async function () {
+				let { response } = await apiPost('/users/0/items', {
+					body: [
+						{ itemType: 'book', title: 'Valid Book' },
+						{ itemType: 'noSuchType', title: 'Invalid' },
+					],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.successful), 1);
+				assert.lengthOf(Object.keys(response.failed), 1);
+				let failure = response.failed['1'];
+				assert.equal(failure.code, 400);
+				assert.include(failure.message.toLowerCase(), 'itemtype');
+				// Cleanup
+				let key = response.successful['0'].key;
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, key);
+				if (item) await item.eraseTx();
+			});
+
+			it("should reject non-array body", async function () {
+				let { status } = await apiPost('/users/0/items', {
+					body: { itemType: 'book' },
+					headers: { 'Zotero-Write-Token': newWriteToken() },
+					successCodes: [400],
+					responseType: 'text'
+				});
+				assert.equal(status, 400);
+			});
+
+			it("should reject batches over 50 items with 413", async function () {
+				let body = [];
+				for (let i = 0; i < 51; i++) {
+					body.push({ itemType: 'book', title: 'Book ' + i });
+				}
+				let { status } = await apiPost('/users/0/items', {
+					body,
+					headers: { 'Zotero-Write-Token': newWriteToken() },
+					successCodes: [413],
+					responseType: 'text'
+				});
+				assert.equal(status, 413);
+			});
+
+			it("should reject duplicate write tokens with 412", async function () {
+				let token = newWriteToken();
+				await apiPost('/users/0/items', {
+					body: [{ itemType: 'book', title: 'First with token' }],
+					headers: { 'Zotero-Write-Token': token }
+				});
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book', title: 'Second with token' }],
+					headers: { 'Zotero-Write-Token': token },
+					successCodes: [412],
+					responseType: 'text'
+				});
+				assert.equal(status, 412);
+			});
+
+			it("should accept write tokens of 5-32 chars", async function () {
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book', title: 'Short token' }],
+					headers: { 'Zotero-Write-Token': 'short' }
+				});
+				assert.equal(status, 200);
+			});
+
+			it("should reject write tokens shorter than 5 chars with 400", async function () {
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': 'abcd' },
+					successCodes: [400],
+					responseType: 'text'
+				});
+				assert.equal(status, 400);
+			});
+
+			it("should update an existing item with key+version", async function () {
+				let item = await createDataObject('item', { itemType: 'book', setTitle: true });
+				let { response } = await apiPost('/users/0/items', {
+					body: [{
+						key: item.key,
+						version: item.clientVersion,
+						itemType: 'book',
+						title: 'Updated Title',
+					}],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.successful), 1);
+				assert.equal(response.successful['0'].data.title, 'Updated Title');
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('title'), 'Updated Title');
+				await item.eraseTx();
+			});
+
+			it("should fail an object with stale version", async function () {
+				let item = await createDataObject('item', { itemType: 'book', setTitle: true });
+				let { response } = await apiPost('/users/0/items', {
+					body: [{
+						key: item.key,
+						version: item.clientVersion - 5,
+						itemType: 'book',
+						title: 'Stale Update',
+					}],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.failed), 1);
+				assert.equal(response.failed['0'].code, 412);
+				await item.eraseTx();
+			});
+
+			it("should fail a keyed object without version or If-Unmodified-Since-Version with 428", async function () {
+				let item = await createDataObject('item', { itemType: 'book', setTitle: true });
+				let title = item.getField('title');
+				let { response } = await apiPost('/users/0/items', {
+					body: [{
+						key: item.key,
+						itemType: 'book',
+						title: 'No Precondition',
+					}],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.failed), 1);
+				assert.equal(response.failed['0'].code, 428);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('title'), title);
+				await item.eraseTx();
+			});
+
+			it("should allow a keyed object without version when If-Unmodified-Since-Version is provided", async function () {
+				let item = await createDataObject('item', { itemType: 'book', setTitle: true });
+				let { response } = await apiPost('/users/0/items', {
+					body: [{
+						key: item.key,
+						itemType: 'book',
+						title: 'Updated Via Header',
+					}],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'If-Unmodified-Since-Version':
+							String(Zotero.Libraries.userLibrary.clientVersion),
+					}
+				});
+				assert.lengthOf(Object.keys(response.successful), 1);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('title'), 'Updated Via Header');
+				await item.eraseTx();
+			});
+
+			it("should return 412 on stale If-Unmodified-Since-Version", async function () {
+				let staleVersion = Zotero.Libraries.userLibrary.clientVersion;
+				// Bump the library by creating a sentinel item
+				let sentinel = await createDataObject('item');
+				let { status } = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: {
+						'Zotero-Write-Token': newWriteToken(),
+						'If-Unmodified-Since-Version': String(staleVersion)
+					},
+					successCodes: [412],
+					responseType: 'text'
+				});
+				assert.equal(status, 412);
+				await sentinel.eraseTx();
+			});
+
+			it("should include Last-Modified-Version response header", async function () {
+				let xhr = await apiPost('/users/0/items', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				let header = xhr.getResponseHeader('Last-Modified-Version');
+				assert.isNotEmpty(header);
+				assert.equal(
+					parseInt(header),
+					Zotero.Libraries.userLibrary.clientVersion);
+				let key = xhr.response.successful['0'].key;
+				let item = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, key);
+				if (item) await item.eraseTx();
+			});
+		});
+
+		describe("PUT <userOrGroupPrefix>/items/<key>", function () {
+			it("should fully replace an item's fields", async function () {
+				let item = await createDataObject('item', {
+					itemType: 'book',
+					setTitle: true,
+				});
+				item.setField('publisher', 'Original Pub');
+				await item.saveTx();
+
+				let { status } = await apiPut(`/users/0/items/${item.key}`, {
+					body: {
+						key: item.key,
+						version: item.clientVersion,
+						itemType: 'book',
+						title: 'New Title After PUT',
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('title'), 'New Title After PUT');
+				// PUT should clear unspecified fields
+				assert.equal(reloaded.getField('publisher'), '');
+				await item.eraseTx();
+			});
+
+			it("should reject without version or If-Unmodified-Since-Version", async function () {
+				let item = await createDataObject('item');
+				let { status } = await apiPut(`/users/0/items/${item.key}`, {
+					body: { itemType: 'book', title: 'x' },
+					successCodes: [428],
+					responseType: 'text'
+				});
+				assert.equal(status, 428);
+				await item.eraseTx();
+			});
+
+			it("should return 412 on stale version", async function () {
+				let item = await createDataObject('item');
+				let { status } = await apiPut(`/users/0/items/${item.key}`, {
+					body: {
+						itemType: 'book',
+						title: 'x',
+						version: item.clientVersion - 1,
+					},
+					successCodes: [412],
+					responseType: 'text'
+				});
+				assert.equal(status, 412);
+				await item.eraseTx();
+			});
+
+			it("should reject invalid key with 400", async function () {
+				let { status } = await apiPut('/users/0/items/badkey!!', {
+					body: { itemType: 'book' },
+					successCodes: [400],
+					responseType: 'text'
+				});
+				assert.equal(status, 400);
+			});
+		});
+
+		describe("PATCH <userOrGroupPrefix>/items/<key>", function () {
+			it("should leave unspecified fields untouched", async function () {
+				let item = await createDataObject('item', {
+					itemType: 'book',
+					setTitle: true,
+				});
+				item.setField('publisher', 'Keep Me');
+				await item.saveTx();
+				let savedTitle = item.getField('title');
+
+				let { status } = await apiPatch(`/users/0/items/${item.key}`, {
+					body: {
+						publisher: 'New Publisher',
+						version: item.clientVersion,
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('title'), savedTitle);
+				assert.equal(reloaded.getField('publisher'), 'New Publisher');
+				await item.eraseTx();
+			});
+
+			it("should clear a field when explicitly set to ''", async function () {
+				let item = await createDataObject('item', { itemType: 'book' });
+				item.setField('publisher', 'Will Be Cleared');
+				await item.saveTx();
+				let { status } = await apiPatch(`/users/0/items/${item.key}`, {
+					body: { publisher: '', version: item.clientVersion },
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.equal(reloaded.getField('publisher'), '');
+				await item.eraseTx();
+			});
+
+			it("should accept If-Unmodified-Since-Version against the object version even after the library version advances", async function () {
+				let itemA = await createDataObject('item', { itemType: 'book' });
+				let versionA = itemA.clientVersion;
+				// Another write advances the library version past itemA's version
+				let itemB = await createDataObject('item', { itemType: 'book' });
+				assert.isAbove(itemB.clientVersion, versionA);
+
+				// itemA itself is unchanged, so a write with its version must succeed
+				let { status } = await apiPatch(`/users/0/items/${itemA.key}`, {
+					body: { publisher: 'Updated' },
+					headers: { 'If-Unmodified-Since-Version': String(versionA) },
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, itemA.key);
+				assert.equal(reloaded.getField('publisher'), 'Updated');
+				await itemA.eraseTx();
+				await itemB.eraseTx();
+			});
+		});
+
+		describe("DELETE <userOrGroupPrefix>/items/<key>", function () {
+			it("should delete a single item", async function () {
+				let item = await createDataObject('item');
+				let versionBefore = Zotero.Libraries.userLibrary.clientVersion;
+				let xhr = await apiDelete(`/users/0/items/${item.key}`, {
+					headers: {
+						'If-Unmodified-Since-Version': String(item.clientVersion),
+					},
+					successCodes: [204]
+				});
+				assert.equal(xhr.status, 204);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.isFalse(!!reloaded);
+				// The deletion advances the library version
+				assert.isAbove(
+					parseInt(xhr.getResponseHeader('Last-Modified-Version')),
+					versionBefore
+				);
+			});
+
+			it("should require If-Unmodified-Since-Version (428)", async function () {
+				let item = await createDataObject('item');
+				let { status } = await apiDelete(`/users/0/items/${item.key}`, {
+					successCodes: [428],
+					responseType: 'text'
+				});
+				assert.equal(status, 428);
+				await item.eraseTx();
+			});
+
+			it("should return 412 on stale If-Unmodified-Since-Version", async function () {
+				let item = await createDataObject('item');
+				let { status } = await apiDelete(`/users/0/items/${item.key}`, {
+					headers: {
+						'If-Unmodified-Since-Version': String(item.clientVersion - 1),
+					},
+					successCodes: [412],
+					responseType: 'text'
+				});
+				assert.equal(status, 412);
+				await item.eraseTx();
+			});
+
+			it("should return 404 for unknown key", async function () {
+				let { status } = await apiDelete('/users/0/items/ABCDEFGH', {
+					headers: { 'If-Unmodified-Since-Version': '999' },
+					successCodes: [404],
+					responseType: 'text'
+				});
+				assert.equal(status, 404);
+			});
+		});
+
+		describe("DELETE <userOrGroupPrefix>/items?itemKey=", function () {
+			it("should delete multiple items", async function () {
+				let item1 = await createDataObject('item');
+				let item2 = await createDataObject('item');
+				let { status } = await apiDelete(
+					`/users/0/items?itemKey=${item1.key},${item2.key}`,
+					{
+						headers: {
+							'If-Unmodified-Since-Version':
+								String(Zotero.Libraries.userLibrary.clientVersion),
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(status, 204);
+				assert.isFalse(!!(await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item1.key)));
+				assert.isFalse(!!(await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item2.key)));
+			});
+
+			it("should ignore unknown keys mixed in", async function () {
+				let item = await createDataObject('item');
+				let { status } = await apiDelete(
+					`/users/0/items?itemKey=${item.key},ZZZZZZZZ`,
+					{
+						headers: {
+							'If-Unmodified-Since-Version':
+								String(Zotero.Libraries.userLibrary.clientVersion),
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(status, 204);
+			});
+
+			it("should reject batches over 50 keys with 413", async function () {
+				let keys = [];
+				for (let i = 0; i < 51; i++) {
+					keys.push("AAAAAAA" + (i % 9 + 1));
+				}
+				let { status } = await apiDelete(
+					'/users/0/items?itemKey=' + keys.join(','),
+					{
+						headers: {
+							'If-Unmodified-Since-Version':
+								String(Zotero.Libraries.userLibrary.clientVersion),
+						},
+						successCodes: [413],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 413);
+			});
+		});
+
+		describe("POST <userOrGroupPrefix>/collections", function () {
+			it("should create a collection", async function () {
+				let { response } = await apiPost('/users/0/collections', {
+					body: [{ name: 'New Test Collection' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.successful), 1);
+				let key = response.successful['0'].key;
+				let col = Zotero.Collections.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, key);
+				assert.equal(col.name, 'New Test Collection');
+				await col.eraseTx();
+			});
+
+			it("should set parentCollection when provided", async function () {
+				let parent = await createDataObject('collection');
+				let { response } = await apiPost('/users/0/collections', {
+					body: [{ name: 'Child', parentCollection: parent.key }],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				let key = response.successful['0'].key;
+				let child = Zotero.Collections.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, key);
+				assert.equal(child.parentKey, parent.key);
+				await child.eraseTx();
+				await parent.eraseTx();
+			});
+		});
+
+		describe("PUT/PATCH/DELETE <userOrGroupPrefix>/collections/<key>", function () {
+			it("should update a collection via PUT", async function () {
+				let col = await createDataObject('collection', { name: 'Before' });
+				let { status } = await apiPut(`/users/0/collections/${col.key}`, {
+					body: {
+						version: col.clientVersion,
+						name: 'After PUT',
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = Zotero.Collections.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, col.key);
+				assert.equal(reloaded.name, 'After PUT');
+				await col.eraseTx();
+			});
+
+			it("should patch a collection's name", async function () {
+				let col = await createDataObject('collection', { name: 'Before' });
+				let { status } = await apiPatch(`/users/0/collections/${col.key}`, {
+					body: { name: 'After PATCH', version: col.clientVersion },
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = Zotero.Collections.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, col.key);
+				assert.equal(reloaded.name, 'After PATCH');
+				await col.eraseTx();
+			});
+
+			it("should delete a collection", async function () {
+				let col = await createDataObject('collection');
+				let { status } = await apiDelete(`/users/0/collections/${col.key}`, {
+					headers: {
+						'If-Unmodified-Since-Version': String(col.clientVersion),
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = Zotero.Collections.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, col.key);
+				assert.isFalse(!!reloaded);
+			});
+		});
+
+		describe("POST/PUT/DELETE <userOrGroupPrefix>/searches", function () {
+			it("should create a saved search", async function () {
+				let { response } = await apiPost('/users/0/searches', {
+					body: [{
+						name: 'My Saved Search',
+						conditions: [
+							{ condition: 'title', operator: 'contains', value: 'foo' }
+						]
+					}],
+					headers: { 'Zotero-Write-Token': newWriteToken() }
+				});
+				assert.lengthOf(Object.keys(response.successful), 1);
+				let key = response.successful['0'].key;
+				let search = Zotero.Searches.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, key);
+				assert.equal(search.name, 'My Saved Search');
+				await search.eraseTx();
+			});
+
+			it("should delete a search", async function () {
+				let search = await createDataObject('search', { name: 'To Delete' });
+				let { status } = await apiDelete(`/users/0/searches/${search.key}`, {
+					headers: {
+						'If-Unmodified-Since-Version': String(search.clientVersion),
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = Zotero.Searches.getByLibraryAndKey(
+					Zotero.Libraries.userLibraryID, search.key);
+				assert.isFalse(!!reloaded);
+			});
+		});
+
+		describe("DELETE <userOrGroupPrefix>/tags", function () {
+			it("should remove tags from the library", async function () {
+				let item = await createDataObject('item');
+				item.setTags(['tagToDelete', 'tagToKeep']);
+				await item.saveTx();
+				assert.isAtLeast(Zotero.Tags.getID('tagToDelete'), 1);
+				let itemVersionBefore = item.clientVersion;
+
+				let xhr = await apiDelete('/users/0/tags?tag=tagToDelete', {
+					headers: {
+						'If-Unmodified-Since-Version':
+							String(Zotero.Libraries.userLibrary.clientVersion),
+					},
+					successCodes: [204]
+				});
+				assert.equal(xhr.status, 204);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				assert.notInclude(reloaded.getTags().map(t => t.tag), 'tagToDelete');
+				assert.include(reloaded.getTags().map(t => t.tag), 'tagToKeep');
+				// The tag deletion advances the modified items' versions
+				assert.isAbove(reloaded.clientVersion, itemVersionBefore);
+				assert.equal(
+					parseInt(xhr.getResponseHeader('Last-Modified-Version')),
+					reloaded.clientVersion
+				);
+				await item.eraseTx();
+			});
+
+			it("should split tag names on ||", async function () {
+				let item = await createDataObject('item');
+				item.setTags(['multi1', 'multi2', 'keep']);
+				await item.saveTx();
+				let { status } = await apiDelete('/users/0/tags?tag=multi1||multi2', {
+					headers: {
+						'If-Unmodified-Since-Version':
+							String(Zotero.Libraries.userLibrary.clientVersion),
+					},
+					successCodes: [204]
+				});
+				assert.equal(status, 204);
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, item.key);
+				let tags = reloaded.getTags().map(t => t.tag);
+				assert.notInclude(tags, 'multi1');
+				assert.notInclude(tags, 'multi2');
+				assert.include(tags, 'keep');
+				await item.eraseTx();
+			});
+
+			it("should require If-Unmodified-Since-Version", async function () {
+				let { status } = await apiDelete('/users/0/tags?tag=anything', {
+					successCodes: [428],
+					responseType: 'text'
+				});
+				assert.equal(status, 428);
+			});
+		});
+
+		describe("PUT <userOrGroupPrefix>/items/<key>/fulltext", function () {
+			let parent;
+			let attachment;
+
+			beforeEach(async function () {
+				parent = await createDataObject('item');
+				attachment = await importPDFAttachment(parent);
+			});
+
+			afterEach(async function () {
+				if (attachment) await attachment.eraseTx();
+				if (parent) await parent.eraseTx();
+			});
+
+			it("should set fulltext content for an attachment", async function () {
+				let beforeVersion = Zotero.Libraries.userLibrary.clientVersion;
+				let xhr = await apiPut(
+					`/users/0/items/${attachment.key}/fulltext`,
+					{
+						body: {
+							content: 'Hello, fulltext.',
+							indexedPages: 1,
+							totalPages: 1,
+						}
+					}
+				);
+				assert.equal(xhr.status, 204);
+				let lastModified = parseInt(xhr.getResponseHeader('Last-Modified-Version'));
+				assert.isAbove(lastModified, beforeVersion);
+
+				let { response } = await apiGet(`/users/0/items/${attachment.key}/fulltext`);
+				assert.equal(response.content, 'Hello, fulltext.');
+				assert.equal(response.indexedPages, 1);
+				assert.equal(response.totalPages, 1);
+			});
+
+			it("should accept char-based stats", async function () {
+				let { status } = await apiPut(
+					`/users/0/items/${attachment.key}/fulltext`,
+					{
+						body: {
+							content: 'Char-counted content.',
+							indexedChars: 21,
+							totalChars: 21,
+						}
+					}
+				);
+				assert.equal(status, 204);
+				let { response } = await apiGet(`/users/0/items/${attachment.key}/fulltext`);
+				assert.equal(response.content, 'Char-counted content.');
+				assert.equal(response.indexedChars, 21);
+				assert.equal(response.totalChars, 21);
+			});
+
+			it("should reject a body without 'content'", async function () {
+				let { status } = await apiPut(
+					`/users/0/items/${attachment.key}/fulltext`,
+					{
+						body: { indexedPages: 1, totalPages: 1 },
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should reject non-integer stats", async function () {
+				let { status } = await apiPut(
+					`/users/0/items/${attachment.key}/fulltext`,
+					{
+						body: { content: 'x', indexedPages: '1' },
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should return 404 for unknown item key", async function () {
+				let { status } = await apiPut(
+					`/users/0/items/AAAAAAAA/fulltext`,
+					{
+						body: { content: 'x' },
+						successCodes: [404],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 404);
+			});
+
+			it("should reject a non-attachment item", async function () {
+				let regularItem = await createDataObject('item');
+				try {
+					let { status } = await apiPut(
+						`/users/0/items/${regularItem.key}/fulltext`,
+						{
+							body: { content: 'x' },
+							successCodes: [404],
+							responseType: 'text'
+						}
+					);
+					assert.equal(status, 404);
+				}
+				finally {
+					await regularItem.eraseTx();
+				}
+			});
+		});
+
+		describe("POST <userOrGroupPrefix>/fulltext", function () {
+			let parent;
+			let a1;
+			let a2;
+
+			beforeEach(async function () {
+				parent = await createDataObject('item');
+				a1 = await importPDFAttachment(parent);
+				a2 = await importPDFAttachment(parent);
+			});
+
+			afterEach(async function () {
+				for (let item of [a1, a2, parent]) {
+					if (item) await item.eraseTx();
+				}
+			});
+
+			function iusvHeader() {
+				return { 'If-Unmodified-Since-Version': String(Zotero.Libraries.userLibrary.clientVersion) };
+			}
+
+			it("should write multiple items and return a write report", async function () {
+				let { status, response } = await apiPost('/users/0/fulltext', {
+					headers: iusvHeader(),
+					body: [
+						{ key: a1.key, content: 'one', indexedPages: 1, totalPages: 1 },
+						{ key: a2.key, content: 'two', indexedPages: 1, totalPages: 1 },
+					]
+				});
+				assert.equal(status, 200);
+				assert.deepEqual(response.successful['0'], { key: a1.key });
+				assert.deepEqual(response.successful['1'], { key: a2.key });
+				assert.equal(response.success['0'], a1.key);
+				assert.equal(response.success['1'], a2.key);
+				assert.isEmpty(Object.keys(response.failed));
+
+				let { response: r1 } = await apiGet(`/users/0/items/${a1.key}/fulltext`);
+				assert.equal(r1.content, 'one');
+				let { response: r2 } = await apiGet(`/users/0/items/${a2.key}/fulltext`);
+				assert.equal(r2.content, 'two');
+			});
+
+			it("should report per-item failures while applying the rest", async function () {
+				let regularItem = await createDataObject('item');
+				try {
+					let { status, response } = await apiPost('/users/0/fulltext', {
+						headers: iusvHeader(),
+						body: [
+							{ key: a1.key, content: 'ok' },
+							{ key: 'AAAAAAAA', content: 'missing' },
+							{ key: regularItem.key, content: 'not-attach' },
+						]
+					});
+					assert.equal(status, 200);
+					assert.property(response.successful, '0');
+					assert.notProperty(response.successful, '1');
+					assert.notProperty(response.successful, '2');
+					assert.equal(response.failed['1'].code, 404);
+					assert.equal(response.failed['2'].code, 404);
+				}
+				finally {
+					await regularItem.eraseTx();
+				}
+			});
+
+			it("should require If-Unmodified-Since-Version (428)", async function () {
+				let { status } = await apiPost('/users/0/fulltext', {
+					body: [{ key: a1.key, content: 'x' }],
+					successCodes: [428],
+					responseType: 'text'
+				});
+				assert.equal(status, 428);
+			});
+
+			it("should reject non-array body with 400", async function () {
+				let { status } = await apiPost('/users/0/fulltext', {
+					headers: iusvHeader(),
+					body: { key: a1.key, content: 'x' },
+					successCodes: [400],
+					responseType: 'text'
+				});
+				assert.equal(status, 400);
+			});
+
+			it("should reject batches over 10 with 413", async function () {
+				let big = [];
+				for (let i = 0; i < 11; i++) {
+					big.push({ key: a1.key, content: 'x' });
+				}
+				let { status } = await apiPost('/users/0/fulltext', {
+					headers: iusvHeader(),
+					body: big,
+					successCodes: [413],
+					responseType: 'text'
+				});
+				assert.equal(status, 413);
+			});
+
+			it("should reject an entry missing 'key'", async function () {
+				let { status, response } = await apiPost('/users/0/fulltext', {
+					headers: iusvHeader(),
+					body: [{ content: 'x' }]
+				});
+				assert.equal(status, 200);
+				assert.equal(response.failed['0'].code, 400);
+			});
+		});
+
+		describe("File uploads", function () {
+			let attachment;
+
+			beforeEach(async function () {
+				let parent = await createDataObject('item');
+				attachment = await Zotero.Attachments.importFromFile({
+					file: OS.Path.join(getTestDataDirectory().path, 'test.pdf'),
+					parentItemID: parent.id,
+				});
+			});
+
+			afterEach(async function () {
+				if (attachment) {
+					let parent = Zotero.Items.get(attachment.parentItemID);
+					await attachment.eraseTx();
+					if (parent) await parent.eraseTx();
+				}
+			});
+
+			it("should return {exists:1} when MD5 matches local file", async function () {
+				let path = await attachment.getFilePathAsync();
+				let md5 = await Zotero.Utilities.Internal.md5Async(path);
+				let stat = await IOUtils.stat(path);
+
+				let { response } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=${encodeURIComponent(attachment.attachmentFilename)}&filesize=${stat.size}&mtime=${stat.lastModified}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				assert.equal(response.exists, 1);
+			});
+
+			it("should authorize a new upload when MD5 differs", async function () {
+				let newMD5 = 'a'.repeat(32);
+				let { response } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${newMD5}&filename=newfile.pdf&filesize=10&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				assert.isString(response.url);
+				assert.isString(response.uploadKey);
+				assert.include(response.url, '/api/local/uploads/');
+				assert.property(response, 'prefix');
+				assert.property(response, 'suffix');
+			});
+
+			it("should return params object when params=1 is in the body", async function () {
+				let { response } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${'b'.repeat(32)}&filename=x.pdf&filesize=10&mtime=${Date.now()}&params=1`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				assert.isObject(response.params);
+				assert.isString(response.uploadKey);
+			});
+
+			it("should reject mtime in seconds with 400", async function () {
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${'c'.repeat(32)}&filename=x.pdf&filesize=10&mtime=1000`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should require If-Match or If-None-Match with 428", async function () {
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${'d'.repeat(32)}&filename=x.pdf&filesize=10&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+						},
+						successCodes: [428],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 428);
+			});
+
+			it("should reject bad MD5 with 400", async function () {
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=not-a-real-md5&filename=x.pdf&filesize=10&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should reject a filename containing path separators with 400", async function () {
+				for (let filename of ['../escape.txt', 'sub/escape.txt', '..\\escape.txt', '..']) {
+					let { status } = await apiPost(
+						`/users/0/items/${attachment.key}/file`,
+						{
+							body: `md5=${'a'.repeat(32)}&filename=${encodeURIComponent(filename)}`
+								+ `&filesize=10&mtime=${Date.now()}`,
+							headers: {
+								'Content-Type': 'application/x-www-form-urlencoded',
+								'If-None-Match': '*',
+							},
+							successCodes: [400],
+							responseType: 'text'
+						}
+					);
+					assert.equal(status, 400, `expected 400 for filename '${filename}'`);
+				}
+			});
+
+			it("should perform a full upload + register flow", async function () {
+				// Generate new file content with a known MD5
+				let content = "Local API upload test content " + Date.now();
+				let encoder = new TextEncoder();
+				let bytes = encoder.encode(content);
+				// Compute the MD5 we will claim
+				let tmpDir = Zotero.getTempDirectory().path;
+				let tmpPath = PathUtils.join(tmpDir, 'localapi-upload-test.bin');
+				await IOUtils.write(tmpPath, bytes);
+				let md5 = await Zotero.Utilities.Internal.md5Async(tmpPath);
+				await IOUtils.remove(tmpPath);
+
+				let mtime = Date.now();
+
+				// Phase 1: authorize
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=uploaded.bin&filesize=${bytes.length}&mtime=${mtime}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				assert.isString(authResp.uploadKey);
+				let uploadKey = authResp.uploadKey;
+
+				// Phase 2: upload bytes to local receiver
+				let uploadXhr = await Zotero.HTTP.request(
+					'POST', authResp.url,
+					{
+						headers: {
+							'Zotero-Allowed-Request': '1',
+							'Content-Type': 'application/octet-stream',
+							'Zotero-Server-ID': serverID,
+						},
+						body: content,
+						successCodes: [201],
+						responseType: 'text'
+					}
+				);
+				assert.equal(uploadXhr.status, 201);
+
+				// Phase 3: register
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(status, 204);
+
+				// Verify attachment metadata was updated
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, attachment.key);
+				assert.equal(reloaded.attachmentSyncedHash, md5);
+				assert.equal(reloaded.attachmentSyncedModificationTime, mtime);
+				assert.equal(reloaded.attachmentFilename, 'uploaded.bin');
+			});
+
+			it("shouldn't modify the existing file until registration succeeds", async function () {
+				let path = await attachment.getFilePathAsync();
+				let originalContents = await IOUtils.read(path);
+
+				let content = "Replacement content for staged upload test";
+				let bytes = new TextEncoder().encode(content);
+				let tmpPath = PathUtils.join(Zotero.getTempDirectory().path, 'localapi-staged-test.bin');
+				await IOUtils.write(tmpPath, bytes);
+				let md5 = await Zotero.Utilities.Internal.md5Async(tmpPath);
+				await IOUtils.remove(tmpPath);
+
+				// Authorize and upload with the existing filename
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=${encodeURIComponent(attachment.attachmentFilename)}`
+							+ `&filesize=${bytes.length}&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				await Zotero.HTTP.request('POST', authResp.url, {
+					headers: {
+						'Zotero-Allowed-Request': '1',
+						'Content-Type': 'application/octet-stream',
+						'Zotero-Server-ID': serverID,
+					},
+					body: content,
+					successCodes: [201],
+					responseType: 'text'
+				});
+
+				// The bytes have been received but not registered, so the existing file
+				// must be untouched
+				assert.deepEqual(await IOUtils.read(path), originalContents);
+
+				// Register, after which the file is replaced
+				await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${authResp.uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(
+					await Zotero.Utilities.Internal.md5Async(await attachment.getFilePathAsync()),
+					md5
+				);
+			});
+
+			it("shouldn't modify the existing file when registration fails with 412", async function () {
+				let path = await attachment.getFilePathAsync();
+				let originalContents = await IOUtils.read(path);
+
+				let content = "Content that must never be registered";
+				let bytes = new TextEncoder().encode(content);
+				let tmpPath = PathUtils.join(Zotero.getTempDirectory().path, 'localapi-staged-412-test.bin');
+				await IOUtils.write(tmpPath, bytes);
+				let md5 = await Zotero.Utilities.Internal.md5Async(tmpPath);
+				await IOUtils.remove(tmpPath);
+
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=${encodeURIComponent(attachment.attachmentFilename)}`
+							+ `&filesize=${bytes.length}&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				await Zotero.HTTP.request('POST', authResp.url, {
+					headers: {
+						'Zotero-Allowed-Request': '1',
+						'Content-Type': 'application/octet-stream',
+						'Zotero-Server-ID': serverID,
+					},
+					body: content,
+					successCodes: [201],
+					responseType: 'text'
+				});
+
+				// Another client registers a file for this attachment in the meantime
+				attachment.attachmentSyncedHash = 'f'.repeat(32);
+				await attachment.saveTx();
+
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${authResp.uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [412],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 412);
+				assert.deepEqual(await IOUtils.read(path), originalContents);
+			});
+
+			// Exercises the params=1 multipart upload form: each returned param as a form
+			// field, then the file bytes in a final `file` field. Uses real binary content
+			// to confirm it survives the multipart path.
+			it("should perform a params=1 multipart upload + register flow", async function () {
+				// Binary content spanning the byte range, ending in a newline byte to
+				// confirm the multipart parser doesn't trim/corrupt the file body
+				let raw = [0x25, 0x50, 0x44, 0x46, 0x00, 0x7f, 0x80, 0xff, 0xd0, 0x0a];
+				let bytes = Uint8Array.from(raw);
+				let tmpDir = Zotero.getTempDirectory().path;
+				let tmpPath = PathUtils.join(tmpDir, 'localapi-mp-upload-test.bin');
+				await IOUtils.write(tmpPath, bytes);
+				let md5 = await Zotero.Utilities.Internal.md5Async(tmpPath);
+				await IOUtils.remove(tmpPath);
+
+				let mtime = Date.now();
+
+				// Phase 1: authorize with params=1 in the form body
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=uploaded.bin&filesize=${bytes.length}`
+							+ `&mtime=${mtime}&params=1`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				assert.isObject(authResp.params);
+				assert.isString(authResp.uploadKey);
+
+				// Phase 2: upload as multipart/form-data via FormData, with the returned
+				// params first, then the file part
+				let formData = new FormData();
+				for (let [key, val] of Object.entries(authResp.params)) {
+					formData.append(key, val);
+				}
+				formData.append('file', new Blob([bytes]), 'uploaded.bin');
+
+				let uploadXhr = await Zotero.HTTP.request('POST', authResp.url, {
+					headers: {
+						'Zotero-Allowed-Request': '1',
+						'Content-Type': 'multipart/form-data',
+						'Zotero-Server-ID': serverID,
+					},
+					body: formData,
+					successCodes: [201],
+					responseType: 'text'
+				});
+				assert.equal(uploadXhr.status, 201);
+
+				// Phase 3: register
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${authResp.uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(status, 204);
+
+				let reloaded = await Zotero.Items.getByLibraryAndKeyAsync(
+					Zotero.Libraries.userLibraryID, attachment.key);
+				assert.equal(reloaded.attachmentSyncedHash, md5);
+				assert.equal(reloaded.attachmentFilename, 'uploaded.bin');
+				// The stored file's bytes must match exactly
+				let storedPath = await reloaded.getFilePathAsync();
+				let stored = await IOUtils.read(storedPath);
+				assert.deepEqual(Array.from(stored), raw);
+			});
+
+			it("should reject registration without prior upload", async function () {
+				// Authorize but never upload, then try to register
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${'e'.repeat(32)}&filename=x.bin&filesize=5&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${authResp.uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should reject upload-receiver with mismatched MD5", async function () {
+				// Authorize with one MD5, then upload different content
+				let claimedMD5 = 'a'.repeat(32);
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${claimedMD5}&filename=mm.bin&filesize=10&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+				let { status } = await Zotero.HTTP.request(
+					'POST', authResp.url,
+					{
+						headers: {
+							'Zotero-Allowed-Request': '1',
+							'Content-Type': 'application/octet-stream',
+							'Zotero-Server-ID': serverID,
+						},
+						body: 'wrong content',
+						successCodes: [400],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 400);
+			});
+
+			it("should return 404 when upload key is unknown", async function () {
+				let { status } = await Zotero.HTTP.request(
+					'POST', apiRoot + '/local/uploads/badkey999',
+					{
+						headers: {
+							'Zotero-Allowed-Request': '1',
+							'Content-Type': 'application/octet-stream',
+							'Zotero-Server-ID': serverID,
+						},
+						body: 'whatever',
+						successCodes: [404],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 404);
+			});
+
+			it("shouldn't require a server ID on the upload request", async function () {
+				// Web API clients post the bytes to S3, not to Zotero, so they strip
+				// Zotero-specific headers from this request -- it has to work without one
+				let content = "Upload sent without a Zotero-Server-ID header";
+				let bytes = new TextEncoder().encode(content);
+				let tmpPath = PathUtils.join(Zotero.getTempDirectory().path, 'localapi-no-server-id.bin');
+				await IOUtils.write(tmpPath, bytes);
+				let md5 = await Zotero.Utilities.Internal.md5Async(tmpPath);
+				await IOUtils.remove(tmpPath);
+
+				let { response: authResp } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `md5=${md5}&filename=no-server-id.bin`
+							+ `&filesize=${bytes.length}&mtime=${Date.now()}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						}
+					}
+				);
+
+				let uploadXhr = await Zotero.HTTP.request('POST', authResp.url, {
+					headers: {
+						'Zotero-Allowed-Request': '1',
+						'Content-Type': 'application/octet-stream',
+					},
+					body: content,
+					successCodes: [201],
+					responseType: 'text'
+				});
+				assert.equal(uploadXhr.status, 201);
+
+				// And the upload is usable, so the flow completes as normal
+				let { status } = await apiPost(
+					`/users/0/items/${attachment.key}/file`,
+					{
+						body: `upload=${authResp.uploadKey}`,
+						headers: {
+							'Content-Type': 'application/x-www-form-urlencoded',
+							'If-None-Match': '*',
+						},
+						successCodes: [204]
+					}
+				);
+				assert.equal(status, 204);
+				assert.equal(
+					await Zotero.Utilities.Internal.md5Async(await attachment.getFilePathAsync()),
+					md5
+				);
+			});
+
+			it("should reject an upload with a mismatched server ID with 412", async function () {
+				let { status } = await Zotero.HTTP.request(
+					'POST', apiRoot + '/local/uploads/badkey999',
+					{
+						headers: {
+							'Zotero-Allowed-Request': '1',
+							'Content-Type': 'application/octet-stream',
+							'Zotero-Server-ID': 'wrongServerID',
+						},
+						body: 'whatever',
+						successCodes: [412],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 412);
+			});
+
+			it("should reject PATCH partial upload with 405", async function () {
+				let { status } = await apiPatch(
+					`/users/0/items/${attachment.key}/file?algorithm=xdelta&upload=foo`,
+					{
+						headers: {
+							'Content-Type': 'application/octet-stream',
+						},
+						body: 'diff',
+						successCodes: [405],
+						responseType: 'text'
+					}
+				);
+				assert.equal(status, 405);
+			});
+		});
+
+		describe("Method restrictions", function () {
+			it("should reject POST to /items/top with 400 or 405", async function () {
+				let { status } = await apiPost('/users/0/items/top', {
+					body: [{ itemType: 'book' }],
+					headers: { 'Zotero-Write-Token': newWriteToken() },
+					successCodes: [400, 405],
+					responseType: 'text'
+				});
+				assert.oneOf(status, [400, 405]);
+			});
+
+			it("should reject DELETE to /items/trash with 400 or 405", async function () {
+				let { status } = await apiDelete(
+					'/users/0/items/trash?itemKey=ABCDEFGH',
+					{
+						headers: { 'If-Unmodified-Since-Version': '0' },
+						successCodes: [400, 405],
+						responseType: 'text'
+					}
+				);
+				assert.oneOf(status, [400, 405]);
+			});
+		});
+	});
 });
diff --git a/test/tests/storageLocalTest.js b/test/tests/storageLocalTest.js
index f825bdd856..b29c16a0dd 100644
--- a/test/tests/storageLocalTest.js
+++ b/test/tests/storageLocalTest.js
@@ -31,6 +31,47 @@ describe("Zotero.Sync.Storage.Local", function () {
 			assert.equal(item.attachmentSyncState, Zotero.Sync.Storage.Local.SYNC_STATE_TO_UPLOAD);
 		});
 		
+		it("should keep checking files after an error on one attachment", async function () {
+			var item1 = await importTextAttachment();
+			var item2 = await importTextAttachment();
+			var hash = await item2.attachmentHash;
+			// Set file mtime to the past (without milliseconds, which aren't used on OS X)
+			var mtime = (Math.floor(new Date().getTime() / 1000) * 1000) - 1000;
+			await OS.File.setDates(((await item2.getFilePathAsync())), null, mtime);
+			
+			// Mark as synced, so they will be checked
+			item1.attachmentSyncState = "in_sync";
+			await item1.saveTx({ skipAll: true });
+			item2.attachmentSyncedModificationTime = mtime;
+			item2.attachmentSyncedHash = hash;
+			item2.attachmentSyncState = "in_sync";
+			await item2.saveTx({ skipAll: true });
+			
+			// Update mtime and contents of the second file
+			var path = await item2.getFilePathAsync();
+			await OS.File.setDates(path);
+			await Zotero.File.putContentsAsync(path, Zotero.Utilities.randomString());
+			
+			var local = Zotero.Sync.Storage.Local;
+			var stub = sinon.stub(local, '_checkForUpdatedFile');
+			stub.withArgs(sinon.match(item => item.id == item1.id)).throws(new Error("Test error"));
+			stub.callThrough();
+			
+			var libraryID = Zotero.Libraries.userLibraryID;
+			try {
+				var changed = await local.checkForUpdatedFiles(libraryID, [item1.id, item2.id]);
+			}
+			finally {
+				stub.restore();
+			}
+			
+			await item1.eraseTx();
+			await item2.eraseTx();
+			
+			assert.isTrue(changed);
+			assert.equal(item2.attachmentSyncState, local.SYNC_STATE_TO_UPLOAD);
+		});
+		
 		it("should skip a file if mod time hasn't changed", async function () {
 			// Create attachment
 			let item = await importTextAttachment();
@@ -146,6 +187,21 @@ describe("Zotero.Sync.Storage.Local", function () {
 			);
 			assert.strictEqual(state, local.SYNC_STATE_TO_UPLOAD);
 		});
+		
+		it("should leave an attachment with a missing file marked for download", async function () {
+			var attachment = await importFileAttachment('test.png');
+			attachment.attachmentSyncState = 'to_download';
+			await attachment.saveTx();
+			await IOUtils.remove(attachment.getFilePath());
+			
+			var local = Zotero.Sync.Storage.Local;
+			await local.resetAllSyncStates(attachment.libraryID);
+			assert.strictEqual(attachment.attachmentSyncState, local.SYNC_STATE_TO_DOWNLOAD);
+			var state = await Zotero.DB.valueQueryAsync(
+				"SELECT syncState FROM itemAttachments WHERE itemID=?", attachment.id
+			);
+			assert.strictEqual(state, local.SYNC_STATE_TO_DOWNLOAD);
+		});
 	});
 	
 	describe("#processDownload()", function () {
@@ -216,7 +272,7 @@ describe("Zotero.Sync.Storage.Local", function () {
 				var fileContents = Zotero.Utilities.randomString();
 				
 				var oldFilename = "Old File";
-				var newFilename = " ab — c \\:.txt.";
+				var newFilename = " ab — c :.txt.";
 				var filteredFilename = " ab — c .txt.";
 				var tmpDir = Zotero.getTempDirectory().path;
 				var tmpFile = OS.Path.join(tmpDir, key + '.tmp');
diff --git a/test/tests/styleTest.js b/test/tests/styleTest.js
index 3bcdc1d425..fafa930261 100644
--- a/test/tests/styleTest.js
+++ b/test/tests/styleTest.js
@@ -123,16 +123,25 @@ describe("Zotero.Styles", function () {
 			var style = new Zotero.Style(eventStyleXML);
 			var cslEngine = style.getCiteProc('en-US', 'text');
 			var text = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, [item], "text");
-			cslEngine.free();
 			assert.equal(text, 'Conference - Conference - Place\n');
 		});
 	});
 
+	describe("Zotero.Styles.resolveLocale", function () {
+		it("should return available locale unchanged", function () {
+			assert.equal(Zotero.Styles.resolveLocale('de-AT'), 'de-AT');
+		});
+
+		it("should return primary dialect for a language code", function () {
+			assert.equal(Zotero.Styles.resolveLocale('fa'), 'fa-IR');
+		});
+
+		it("should return closest available locale for locale without a CSL locale", function () {
+			assert.equal(Zotero.Styles.resolveLocale('sr-RS'), 'sr-Cyrl-RS');
+		});
+	});
+
 	describe("Cached CSL.Engine instances", function () {
-		if (Zotero.Prefs.get('cite.useCiteprocRs')) {
-			this.skip();
-		}
-		
 		it("should correctly handle disambiguation", async function () {
 			let style = Zotero.Styles.get('http://www.zotero.org/styles/apa');
 			
@@ -239,4 +248,30 @@ describe("Zotero.Styles", function () {
 			assert.equal(style.effectiveLocale, "en-US");
 		});
 	});
+
+	describe("CSL 0.8 styles", function () {
+		var csl08Style = `<?xml version="1.0" encoding="utf-8"?>
+		<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+		  <info>
+			<title>Test 0.8 Style</title>
+			<id>http://www.zotero.org/styles/test-08</id>
+			<updated>2010-01-01T00:00:00+00:00</updated>
+		  </info>
+		  <bibliography>
+			<layout>
+			  <text variable="title"/>
+			</layout>
+		  </bibliography>
+		</style>
+		`;
+		
+		it("should upgrade a style to CSL 1.0 and format a bibliography", async function () {
+			var item = await createDataObject('item', { title: 'Foo Bar' });
+			var style = new Zotero.Style(csl08Style);
+			assert.equal(style._version, "0.8");
+			var cslEngine = style.getCiteProc('en-US', 'text');
+			var text = Zotero.Cite.makeFormattedBibliographyOrCitationList(cslEngine, [item], "text");
+			assert.equal(text, 'Foo Bar\n');
+		});
+	});
 });
diff --git a/test/tests/syncEngineTest.js b/test/tests/syncEngineTest.js
index 919eb742b8..479dc69d86 100644
--- a/test/tests/syncEngineTest.js
+++ b/test/tests/syncEngineTest.js
@@ -866,6 +866,50 @@ describe("Zotero.Sync.Data.Engine", function () {
 		});
 		
 		
+		it("should save uploaded object to cache after upload on 'unchanged' response", async function () {
+			({ engine, client, caller } = await setup());
+			
+			var library = Zotero.Libraries.userLibrary;
+			var lastLibraryVersion = 5;
+			library.libraryVersion = lastLibraryVersion;
+			await library.saveTx();
+			
+			var item = await createDataObject('item', { version: 1, title: "A" });
+			
+			server.respond(function (req) {
+				if (req.method == "POST" && req.url == baseURL + "users/1/items") {
+					req.respond(
+						200,
+						{
+							"Content-Type": "application/json",
+							"Last-Modified-Version": ++lastLibraryVersion
+						},
+						JSON.stringify({
+							successful: {},
+							unchanged: {
+								"0": item.key
+							},
+							failed: {}
+						})
+					);
+					return;
+				}
+			});
+			
+			await engine.start();
+			
+			// Uploaded data should be saved to the cache with the new library version
+			var version = await Zotero.Sync.Data.Local.getLatestCacheObjectVersion(
+				'item', library.id, item.key
+			);
+			assert.equal(version, lastLibraryVersion);
+			var json = await Zotero.Sync.Data.Local.getCacheObject(
+				'item', library.id, item.key, lastLibraryVersion
+			);
+			assert.propertyVal(json.data, 'title', 'A');
+		});
+		
+		
 		it("should upload child collection after parent collection", async function () {
 			({ engine, client, caller } = await setup());
 			
diff --git a/test/tests/syncFullTextEngineTest.js b/test/tests/syncFullTextEngineTest.js
index d99c212f10..f785bee163 100644
--- a/test/tests/syncFullTextEngineTest.js
+++ b/test/tests/syncFullTextEngineTest.js
@@ -75,7 +75,7 @@ describe("Zotero.Sync.Data.FullTextEngine", function () {
 			await attachment.saveTx();
 			
 			var content = generateContent()
-			var spy = sinon.spy(Zotero.Fulltext, "registerContentProcessor")
+			var spy = sinon.spy(Zotero.Fulltext, "registerSyncContentProcessor")
 			
 			var itemFullTextVersion = 10;
 			var libraryVersion = 15;
@@ -141,7 +141,7 @@ describe("Zotero.Sync.Data.FullTextEngine", function () {
 			await attachment.saveTx();
 			
 			content = generateContent()
-			spy = sinon.spy(Zotero.Fulltext, "registerContentProcessor")
+			spy = sinon.spy(Zotero.Fulltext, "registerSyncContentProcessor")
 			
 			itemFullTextVersion = 17;
 			var lastLibraryVersion = libraryVersion;
diff --git a/test/tests/syncLocalTest.js b/test/tests/syncLocalTest.js
index 79ec9d6f17..cd7d94c893 100644
--- a/test/tests/syncLocalTest.js
+++ b/test/tests/syncLocalTest.js
@@ -1,6 +1,15 @@
 "use strict";
 
 describe("Zotero.Sync.Data.Local", function () {
+	function keyStoreError() {
+		return new Zotero.Error(
+			"Key store unavailable",
+			0,
+			{ keyStoreError: new Error("User canceled OS unlock entry") }
+		);
+	}
+	
+	
 	describe("#getAPIKey()/#setAPIKey()", function () {
 		it("should get and set an API key", async function () {
 			var apiKey1 = Zotero.Utilities.randomString(24);
@@ -18,6 +27,202 @@ describe("Zotero.Sync.Data.Local", function () {
 			await Zotero.Sync.Data.Local.setAPIKey("");
 			assert.strictEqual(await Zotero.Sync.Data.Local.getAPIKey(apiKey), "");
 		})
+		
+		
+		it("should store the key without encryption if the keystore is unusable and the user agrees", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(true);
+			try {
+				await Zotero.Sync.Data.Local.setAPIKey(apiKey);
+				assert.ok(confirmStub.called);
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+				// The read shouldn't have retried encryption against the same broken keystore
+				assert.equal(encryptStub.callCount, 1);
+			}
+			finally {
+				encryptStub.restore();
+				confirmStub.restore();
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+		
+		
+		it("shouldn't store the key if the keystore is unusable and the user declines", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(false);
+			try {
+				var e = await getPromiseError(Zotero.Sync.Data.Local.setAPIKey(apiKey));
+				assert.ok(e);
+				assert.strictEqual(await Zotero.Sync.Data.Local.getAPIKey(), "");
+			}
+			finally {
+				encryptStub.restore();
+				confirmStub.restore();
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+		
+		
+		it("should prompt before storing the key without encryption", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var promptStub = sinon.stub(Zotero.Prompt, "confirm").returns(0);
+			try {
+				await Zotero.Sync.Data.Local.setAPIKey(apiKey);
+				assert.ok(promptStub.calledOnce);
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+			}
+			finally {
+				encryptStub.restore();
+				promptStub.restore();
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+		
+		
+		it("shouldn't prompt to save the key unencrypted during an automatic sync", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var promptStub = sinon.stub(Zotero.Prompt, "confirm").returns(0);
+			var backgroundStub = sinon.stub(Zotero.Sync.Runner, "backgroundSync").get(() => true);
+			try {
+				var e = await getPromiseError(Zotero.Sync.Data.Local.setAPIKey(apiKey));
+				assert.ok(e);
+				assert.isFalse(promptStub.called);
+				assert.strictEqual(await Zotero.Sync.Data.Local.getAPIKey(), "");
+			}
+			finally {
+				encryptStub.restore();
+				promptStub.restore();
+				backgroundStub.restore();
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+		
+		
+		it("should show the login manager error if the key can't be stored", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var writeStub = sinon.stub(Zotero.Sync.Data.Local, "_writeAPIKey")
+				.rejects(new Error("User canceled primary password entry"));
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(true);
+			var promptStub = sinon.stub(Zotero.Prompt, "confirm").returns(1);
+			Zotero.Sync.Data.Local._lastLoginManagerErrorTime = null;
+			try {
+				var e = await getPromiseError(Zotero.Sync.Data.Local.setAPIKey(apiKey));
+				assert.ok(e);
+				// Storing the key unencrypted wouldn't help, so don't offer it
+				assert.isFalse(confirmStub.called);
+				assert.ok(promptStub.calledOnce);
+				assert.include(promptStub.firstCall.args[0].text, "key4.db");
+			}
+			finally {
+				writeStub.restore();
+				confirmStub.restore();
+				promptStub.restore();
+			}
+		})
+		
+		
+		it("should show the login manager error if a legacy key can't be mirrored", async function () {
+			var apiKey = Zotero.Utilities.randomString(24);
+			var nsLoginInfo = new Components.Constructor("@mozilla.org/login-manager/loginInfo;1",
+				Components.interfaces.nsILoginInfo, "init");
+			await Services.logins.addLoginAsync(new nsLoginInfo(
+				Zotero.Sync.Data.Local._loginManagerHost,
+				null,
+				Zotero.Sync.Data.Local._loginManagerRealmLegacy,
+				'API Key',
+				apiKey,
+				'',
+				''
+			));
+			var writeStub = sinon.stub(Zotero.Sync.Data.Local, "_writeAPIKey")
+				.rejects(new Error("User canceled primary password entry"));
+			var migrateAlertStub = sinon.stub(Zotero.OSKeyStore, "alertMigrateFailed");
+			var promptStub = sinon.stub(Zotero.Prompt, "confirm").returns(1);
+			Zotero.Sync.Data.Local._mirroredAPIKey = false;
+			Zotero.Sync.Data.Local._lastLoginManagerErrorTime = null;
+			try {
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+				assert.isFalse(migrateAlertStub.called);
+				assert.ok(promptStub.calledOnce);
+			}
+			finally {
+				writeStub.restore();
+				migrateAlertStub.restore();
+				promptStub.restore();
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+		
+		
+		it("should encrypt a key stored without encryption in a later session", async function () {
+			if (!Zotero.OSKeyStore.available) {
+				this.skip();
+			}
+			var apiKey = Zotero.Utilities.randomString(24);
+			// Store it with an unusable keystore
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(true);
+			try {
+				await Zotero.Sync.Data.Local.setAPIKey(apiKey);
+			}
+			finally {
+				encryptStub.restore();
+				confirmStub.restore();
+			}
+			try {
+				// Encryption is retried once per session, so stand in for a restart
+				Zotero.Sync.Data.Local._reencryptedAPIKey = false;
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+				let login = await Zotero.Sync.Data.Local._getAPIKeyLoginInfo();
+				assert.ok(Zotero.OSKeyStore.isEncrypted(login.password));
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+			}
+			finally {
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
+	})
+
+
+	describe("#repairLoginManager()", function () {
+		it("should reset a key database with a primary password set", async function () {
+			var token = Components.classes["@mozilla.org/security/internalkeytoken;1"]
+				.createInstance(Components.interfaces.nsIPKCS11Token);
+
+			// No-op if no primary password is set
+			assert.isFalse(await Zotero.Sync.Data.Local.repairLoginManager());
+
+			token.changePassword("", "repair-test");
+			try {
+				assert.isTrue(token.hasPassword);
+				assert.isTrue(await Zotero.Sync.Data.Local.repairLoginManager());
+				assert.isFalse(token.hasPassword);
+
+				// Credentials should be saveable and readable again
+				var apiKey = Zotero.Utilities.randomString(24);
+				await Zotero.Sync.Data.Local.setAPIKey(apiKey);
+				assert.equal(await Zotero.Sync.Data.Local.getAPIKey(), apiKey);
+			}
+			finally {
+				if (token.hasPassword) {
+					token.changePassword("repair-test", "");
+				}
+				await Zotero.Sync.Data.Local.setAPIKey("");
+			}
+		})
 	})
 	
 	
@@ -2289,12 +2494,19 @@ describe("Zotero.Sync.Data.Local", function () {
 						},
 						{
 							field: "conditions",
-							op: "member-add",
-							value: {
-								condition: "place",
-								operator: "is",
-								value: "Chicago"
-							}
+							op: "modify",
+							value: [
+								{
+									condition: "title",
+									operator: "contains",
+									value: "A"
+								},
+								{
+									condition: "place",
+									operator: "is",
+									value: "Chicago"
+								}
+							]
 						}
 					]
 				);
@@ -2366,21 +2578,19 @@ describe("Zotero.Sync.Data.Local", function () {
 					[
 						{
 							field: "conditions",
-							op: "member-add",
-							value: {
-								condition: "place",
-								operator: "is",
-								value: "New York"
-							}
-						},
-						{
-							field: "conditions",
-							op: "member-remove",
-							value: {
-								condition: "place",
-								operator: "is",
-								value: "Chicago"
-							}
+							op: "modify",
+							value: [
+								{
+									condition: "title",
+									operator: "contains",
+									value: "A"
+								},
+								{
+									condition: "place",
+									operator: "is",
+									value: "New York"
+								}
+							]
 						}
 					]
 				);
@@ -2533,12 +2743,19 @@ describe("Zotero.Sync.Data.Local", function () {
 						},
 						{
 							field: "conditions",
-							op: "member-add",
-							value: {
-								condition: "place",
-								operator: "is",
-								value: "Chicago"
-							}
+							op: "modify",
+							value: [
+								{
+									condition: "title",
+									operator: "contains",
+									value: "A"
+								},
+								{
+									condition: "place",
+									operator: "is",
+									value: "Chicago"
+								}
+							]
 						}
 					]
 				);
@@ -2834,5 +3051,58 @@ describe("Zotero.Sync.Data.Local", function () {
 			assert.lengthOf(result.conflicts, 0);
 			assert.isFalse(result.localChanged);
 		});
+		
+		it("should automatically use more recent remote lastRead value", function () {
+			var json1 = {
+				key: "AAAAAAAA",
+				version: 1234,
+				itemType: "attachment",
+				lastRead: 1700000100
+			};
+			var json2 = {
+				key: "AAAAAAAA",
+				version: 1235,
+				itemType: "attachment",
+				lastRead: 1700000200
+			};
+			var ignoreFields = ['dateAdded', 'dateModified'];
+			var result = Zotero.Sync.Data.Local._reconcileChangesWithoutCache(
+				'item', json1, json2, ignoreFields
+			);
+			assert.sameDeepMembers(
+				result.changes,
+				[
+					{
+						field: "lastRead",
+						op: "modify",
+						value: 1700000200
+					}
+				]
+			);
+			assert.lengthOf(result.conflicts, 0);
+			assert.isFalse(result.localChanged);
+		});
+		
+		it("should automatically use more recent local lastRead value", function () {
+			var json1 = {
+				key: "AAAAAAAA",
+				version: 1234,
+				itemType: "attachment",
+				lastRead: 1700000200
+			};
+			var json2 = {
+				key: "AAAAAAAA",
+				version: 1235,
+				itemType: "attachment",
+				lastRead: 1700000100
+			};
+			var ignoreFields = ['dateAdded', 'dateModified'];
+			var result = Zotero.Sync.Data.Local._reconcileChangesWithoutCache(
+				'item', json1, json2, ignoreFields
+			);
+			assert.lengthOf(result.changes, 0);
+			assert.lengthOf(result.conflicts, 0);
+			assert.isTrue(result.localChanged);
+		});
 	})
 })
diff --git a/test/tests/tabsTest.js b/test/tests/tabsTest.js
index b7ef45bb29..8e3a1a10b3 100644
--- a/test/tests/tabsTest.js
+++ b/test/tests/tabsTest.js
@@ -40,4 +40,68 @@ describe("Zotero_Tabs", function() {
 			assert.notOk(tab.querySelector('img'));
 		});
 	});
+
+	describe("#unload()", function () {
+		it("should not make an unloaded tab reopenable", async function () {
+			let item = await createDataObject('item');
+			let attachment = await importPDFAttachment(item);
+			let reader = await Zotero.Reader.open(attachment.id);
+			let tabs = win.Zotero_Tabs;
+			tabs.select('zotero-pane');
+			let historyLength = tabs._history.length;
+			
+			tabs.unload(reader.tabID);
+			
+			let { tab } = tabs._getTab(reader.tabID);
+			assert.equal(tab.type, 'reader-unloaded');
+			assert.lengthOf(tabs._history, historyLength);
+			tabs.close(reader.tabID);
+		});
+	});
+
+	describe("Window teardown", function () {
+		it("should not leave observers registered after a window is closed", async function () {
+			this.timeout(60000);
+			let collection = await createDataObject('collection');
+			let item = await createDataObject('item', { collections: [collection.id] });
+			let notifierBefore = new Set(Zotero.Notifier.getLeakedObserverIDs());
+			let prefsBefore = Zotero.Prefs.getLeakedObserverNames();
+			
+			// Render the library item pane in a second window
+			let win2 = await loadZoteroPane();
+			await selectCollection(win2, collection);
+			await win2.ZoteroPane.selectItem(item.id);
+			
+			// The window's observers are still registered while it tears down, and shouldn't be
+			// reported as leaked before it's actually gone
+			let leakedWhileUnloading = null;
+			win2.addEventListener('pagehide', () => {
+				leakedWhileUnloading = Zotero.Notifier.getLeakedObserverIDs()
+					.filter(id => !notifierBefore.has(id));
+			});
+			// An object that nothing unregisters, so that it starts reporting as leaked as soon
+			// as the window has finished tearing down
+			let root = win2.document.documentElement;
+			win2.close();
+			await waitForCallback(
+				() => Zotero.Utilities.Internal.isObjectLeakingWindow(root), 50, 20
+			);
+			
+			assert.deepEqual(
+				leakedWhileUnloading, [], 'no observers are reported as leaked while unloading'
+			);
+			let notifierAfter = Zotero.Notifier.getLeakedObserverIDs()
+				.filter(id => !notifierBefore.has(id));
+			assert.isEmpty(notifierAfter, 'no notifier observers belong to a closed window');
+			
+			let prefsAfter = Zotero.Prefs.getLeakedObserverNames();
+			for (let name of prefsBefore) {
+				let index = prefsAfter.indexOf(name);
+				if (index != -1) {
+					prefsAfter.splice(index, 1);
+				}
+			}
+			assert.isEmpty(prefsAfter, 'no pref observers belong to a closed window');
+		});
+	});
 });
diff --git a/test/tests/tagSelectorTest.js b/test/tests/tagSelectorTest.js
index 965de0c9e5..37bb410efe 100644
--- a/test/tests/tagSelectorTest.js
+++ b/test/tests/tagSelectorTest.js
@@ -48,7 +48,7 @@ describe("Tag Selector", function () {
 		tagSelector.selectedTags = new Set();
 		tagSelector.handleSearch('');
 		tagSelector.onItemViewChanged({
-			collectionTreeRow: win.ZoteroPane.getCollectionTreeRow(),
+			collectionTreeRows: win.ZoteroPane.getCollectionTreeRows(),
 			libraryID
 		});
 		await waitForTagSelector(win);
@@ -86,15 +86,13 @@ describe("Tag Selector", function () {
 		}]);
 		var item2 = createUnsavedDataObject('item', { collections: [collection.id] });
 		item2.setTags(["A", "B"]);	
-		var promise = waitForTagSelector(win);
 		await Zotero.DB.executeTransaction(async function () {
 			await item1.save();
 			await item2.save();
 		});
-		await promise;
+		await waitForCallback(() => getRegularTags().length == 2, 50, 5);
 		
-		var tags = getRegularTags();
-		assert.sameMembers(tags, ['A', 'B']);
+		assert.sameMembers(getRegularTags(), ['A', 'B']);
 	});
 	
 	it("should show tags from annotations for attachments in scope", async function () {
@@ -134,7 +132,29 @@ describe("Tag Selector", function () {
 
 			tagSelector.handleSearch('');
 			await Zotero.Promise.delay(500);
-			
+
+			await item.eraseTx();
+		});
+
+		it("should match accented tags from an unaccented search term", async function () {
+			var collection = await createDataObject('collection');
+			await select(win, collection);
+			var item = createUnsavedDataObject('item', { collections: [collection.id] });
+			item.setTags(['résumé', 'other']);
+			var promise = waitForTagSelector(win);
+			await item.saveTx();
+			await promise;
+
+			promise = waitForTagSelector(win);
+			tagSelector.handleSearch('resume');
+			await promise;
+
+			assert.sameMembers(getRegularTags(), ['résumé']);
+
+			promise = waitForTagSelector(win);
+			tagSelector.handleSearch('');
+			await promise;
+
 			await item.eraseTx();
 		});
 	});
@@ -197,13 +217,14 @@ describe("Tag Selector", function () {
 			item2.setTags([tag2]);
 			var item3 = createUnsavedDataObject('item', { collections: [collection.id] });
 			item3.setTags([tag3]);
-			var promise = waitForTagSelector(win);
 			await Zotero.DB.executeTransaction(async function () {
 				await item1.save();
 				await item2.save();
 				await item3.save();
 			});
-			await promise;
+			await waitForCallback(
+				() => [tag1, tag2, tag3].every(tag => getRegularTags().includes(tag)), 50, 5
+			);
 			
 			var tags = getRegularTags();
 			assert.includeMembers(tags, [tag1, tag2, tag3]);
@@ -432,14 +453,10 @@ describe("Tag Selector", function () {
 		})
 		
 		it("should show a colored tag at the top of the list even when linked to no items", async function () {
-			var tagElems = tagSelectorElem.querySelectorAll('.tag-selector-item');
-			var count = tagElems.length;
-
 			await Zotero.Tags.setColor(libraryID, "Top", '#AAAAAA');
-			await waitForTagSelector(win);
+			await waitForCallback(() => getColoredTags().includes("Top"), 50, 5);
 
-			tagElems = tagSelectorElem.querySelectorAll('.tag-selector-item');
-			assert.equal(tagElems.length, count + 1);
+			assert.equal(tagSelectorElem.querySelector('.tag-selector-item').textContent, "Top");
 		});
 		
 		it("shouldn't re-insert a new tag that matches an existing color", async function () {
@@ -783,12 +800,134 @@ describe("Tag Selector", function () {
 		});
 	});
 
+	describe("Cross-library selection", function () {
+		var group, groupLibraryID;
+		
+		before(async function () {
+			group = await createGroup();
+			groupLibraryID = group.libraryID;
+			await collectionsView.expandLibrary(groupLibraryID);
+		});
+		
+		after(async function () {
+			await group.eraseTx();
+		});
+		
+		async function selectCrossLibrary(userCollection, groupCollection) {
+			let cv = collectionsView;
+			await cv.selectByID("C" + userCollection.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + groupCollection.id));
+			await win.ZoteroPane.onCollectionSelected();
+			await win.ZoteroPane.itemsView.waitForLoad();
+			tagSelector.onItemViewChanged({
+				collectionTreeRows: win.ZoteroPane.getCollectionTreeRows(),
+				libraryID: win.ZoteroPane.getSelectedLibraryIDs()[0]
+			});
+			await waitForTagSelector(win);
+		}
+		
+		it("should show tags from all selected libraries", async function () {
+			let userTag = 'U ' + Zotero.Utilities.randomString();
+			let groupTag = 'G ' + Zotero.Utilities.randomString();
+			let userCollection = await createDataObject('collection');
+			let groupCollection = await createDataObject('collection', { libraryID: groupLibraryID });
+			let userItem = createUnsavedDataObject('item', { collections: [userCollection.id] });
+			userItem.setTags([userTag]);
+			let groupItem = createUnsavedDataObject(
+				'item', { libraryID: groupLibraryID, collections: [groupCollection.id] }
+			);
+			groupItem.setTags([groupTag]);
+			await Zotero.DB.executeTransaction(async function () {
+				await userItem.save();
+				await groupItem.save();
+			});
+			
+			await selectCrossLibrary(userCollection, groupCollection);
+
+			assert.isTrue(tagSelector.multiLibrary);
+			let tags = getRegularTags();
+			assert.includeMembers(tags, [userTag, groupTag]);
+		});
+		
+		it("shouldn't show colored tags in the selector across libraries", async function () {
+			let coloredTag = 'C ' + Zotero.Utilities.randomString();
+			let userCollection = await createDataObject('collection');
+			let groupCollection = await createDataObject('collection', { libraryID: groupLibraryID });
+			// Color the tag in the user library and apply it to an item there
+			await Zotero.Tags.setColor(libraryID, coloredTag, '#990000', 0);
+			let userItem = createUnsavedDataObject('item', { collections: [userCollection.id] });
+			userItem.setTags([coloredTag]);
+			let groupItem = createUnsavedDataObject(
+				'item', { libraryID: groupLibraryID, collections: [groupCollection.id] }
+			);
+			groupItem.setTags(['G ' + Zotero.Utilities.randomString()]);
+			await Zotero.DB.executeTransaction(async function () {
+				await userItem.save();
+				await groupItem.save();
+			});
+			
+			await selectCrossLibrary(userCollection, groupCollection);
+			
+			// The tag is still listed, just not as a colored tag
+			assert.include(getRegularTags(), coloredTag);
+			assert.notInclude(getColoredTags(), coloredTag);
+			
+			await Zotero.Tags.setColor(libraryID, coloredTag, false);
+		});
+		
+		it("should disable rename, color, and split but allow delete", async function () {
+			let userCollection = await createDataObject('collection');
+			let groupCollection = await createDataObject('collection', { libraryID: groupLibraryID });
+			await selectCrossLibrary(userCollection, groupCollection);
+			
+			let menu = doc.getElementById('tag-menu');
+			let mockEvent = { preventDefault() {}, screenX: 0, screenY: 0 };
+			try {
+				tagSelector.handleTagContext({ name: 'whatever' }, mockEvent);
+				assert.isTrue(doc.getElementById('assign-color-tag').disabled);
+				assert.isTrue(doc.getElementById('rename-tag').disabled);
+				assert.isTrue(doc.getElementById('split-tag').disabled);
+				assert.isFalse(doc.getElementById('delete-tag').disabled);
+			}
+			finally {
+				menu.hidePopup();
+			}
+		});
+		
+		it("should delete a tag from all selected libraries", async function () {
+			let sharedTag = 'shared ' + Zotero.Utilities.randomString();
+			let userCollection = await createDataObject('collection');
+			let groupCollection = await createDataObject('collection', { libraryID: groupLibraryID });
+			let userItem = createUnsavedDataObject('item', { collections: [userCollection.id] });
+			userItem.setTags([sharedTag]);
+			let groupItem = createUnsavedDataObject(
+				'item', { libraryID: groupLibraryID, collections: [groupCollection.id] }
+			);
+			groupItem.setTags([sharedTag]);
+			await Zotero.DB.executeTransaction(async function () {
+				await userItem.save();
+				await groupItem.save();
+			});
+			
+			await selectCrossLibrary(userCollection, groupCollection);
+			
+			tagSelector.contextTag = { name: sharedTag };
+			let dialogPromise = waitForDialog();
+			await tagSelector.openDeletePrompt();
+			await dialogPromise;
+			
+			assert.isFalse(userItem.hasTag(sharedTag), "Tag removed from user library item");
+			assert.isFalse(groupItem.hasTag(sharedTag), "Tag removed from group library item");
+		});
+	});
+	
 	describe("Search error handling", function () {
 		it("should degrade gracefully when getTags() throws SearchError", async function () {
 			// _safeGetTags wraps collectionTreeRow.getTags(), which calls getSearchResults().
 			// If the underlying search query fails, getSearchResults() throws SearchError.
 			// The tag selector should catch this and return [] rather than throwing upwards and breaking the UI.
-			var collectionTreeRow = win.ZoteroPane.getCollectionTreeRow();
+			var collectionTreeRow = win.ZoteroPane.getCollectionTreeRows()[0];
 			collectionTreeRow.clearCache();
 			var stub = sinon.stub(collectionTreeRow, 'getSearchObject').resolves({
 				search: () => { throw new Error('simulated search failure'); }
diff --git a/test/tests/tagsboxTest.js b/test/tests/tagsboxTest.js
index e7178f84af..ea5d49d8bd 100644
--- a/test/tests/tagsboxTest.js
+++ b/test/tests/tagsboxTest.js
@@ -341,4 +341,48 @@ describe("Item Tags Box", function () {
 			await item.eraseTx();
 		});
 	});
+
+
+	describe("Tag Autocomplete", function () {
+		function getTagSuggestions(searchString, params) {
+			let search = Components.classes["@mozilla.org/autocomplete/search;1?name=zotero"]
+				.getService(Components.interfaces.nsIAutoCompleteSearch);
+			return new Promise((resolve) => {
+				let listener = {
+					onSearchResult(_, result) {
+						let status = result.searchResult;
+						let done = status == Components.interfaces.nsIAutoCompleteResult.RESULT_SUCCESS
+							|| status == Components.interfaces.nsIAutoCompleteResult.RESULT_NOMATCH
+							|| status == Components.interfaces.nsIAutoCompleteResult.RESULT_FAILURE;
+						if (!done) {
+							return;
+						}
+						let values = [];
+						for (let i = 0; i < result.matchCount; i++) {
+							values.push(result.getValueAt(i));
+						}
+						resolve(values);
+					}
+				};
+				search.startSearch(searchString, JSON.stringify(params), null, listener);
+			});
+		}
+
+		it("should not suggest tags only on trashed items", async function () {
+			var prefix = Zotero.Utilities.randomString().toLowerCase();
+			var liveTag = prefix + 'live';
+			var trashedTag = prefix + 'trashed';
+
+			await createDataObject('item', { tags: [{ tag: liveTag }] });
+			var trashed = await createDataObject('item', { tags: [{ tag: trashedTag }] });
+			trashed.deleted = true;
+			await trashed.saveTx();
+
+			var suggestions = await getTagSuggestions(
+				prefix, { fieldName: 'tag', libraryID: Zotero.Libraries.userLibraryID }
+			);
+			assert.include(suggestions, liveTag);
+			assert.notInclude(suggestions, trashedTag);
+		});
+	});
 })
diff --git a/test/tests/templatesTest.js b/test/tests/templatesTest.js
new file mode 100644
index 0000000000..bf1d5b5cb7
--- /dev/null
+++ b/test/tests/templatesTest.js
@@ -0,0 +1,545 @@
+var {
+	generateHTMLFromTemplate,
+	parseTemplateBrackets,
+	isTemplateValid,
+} = ChromeUtils.importESModule("chrome://zotero/content/modules/templates.mjs");
+
+describe("Templates", function () {
+	describe("#generateHTMLFromTemplate()", function () {
+		it("should support variables with attributes", function () {
+			var vars = {
+				v1: '1',
+				v2: pars => `${pars.a1 ?? ''}${pars.a2 ?? ''}${pars.a3 ?? ''}`,
+				v3: () => '',
+				v5: () => 'something',
+				ar1: [],
+				ar2: [1, 2]
+			};
+			var template = `{{ v1}}{{v2 a1= "1"  a2 =' 2' a3 = "3 "}}{{v3}}{{v4}}{{if ar1}}ar1{{endif}}{{if ar2}}{{ar2}}{{endif}}{{if v5}}yes{{endif}}{{if v3}}no1{{endif}}{{if v2}}{{v2}}{{endif}}`;
+			var html = generateHTMLFromTemplate(template, vars);
+			assert.equal(html, '11 23 1,2yes');
+		});
+
+		it("should support empty string as attribute value and correctly render returned false-ish values", function () {
+			const vars = {
+				length: ({ string }) => string.length.toString(),
+			};
+			const template = `"" has a length of {{ length string="" }} and "hello" has a length of {{ length string="hello" }}`;
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, '"" has a length of 0 and "hello" has a length of 5');
+		});
+
+		it("should parse attributes using the shared string-literal semantics", function () {
+			const vars = { echo: attrs => JSON.stringify(attrs) };
+			// Both quote styles, an empty value, and a hyphenated (camelCased) name
+			assert.equal(
+				generateHTMLFromTemplate('{{ echo a="x" b=\'y\' c="" my-attr="z" }}', vars),
+				JSON.stringify({ a: 'x', b: 'y', c: '', myAttr: 'z' })
+			);
+			// A backslash is an ordinary character; a `"` always closes the value
+			assert.equal(
+				generateHTMLFromTemplate('{{ echo a="p\\q" }}', vars),
+				JSON.stringify({ a: 'p\\q' })
+			);
+			// A value may contain the opposite quote by delimiting with the other one
+			assert.equal(
+				generateHTMLFromTemplate(`{{ echo a='"' b="it's" }}`, vars),
+				JSON.stringify({ a: '"', b: "it's" })
+			);
+			// A newline inside a value is allowed
+			assert.equal(
+				generateHTMLFromTemplate('{{ echo a="p\nq" }}', vars),
+				JSON.stringify({ a: 'p\nq' })
+			);
+		});
+
+		it("should support functions in comparison statements", function () {
+			const vars = {
+				sum: ({ a, b }) => (parseInt(a) + parseInt(b)).toString(),
+				fooBar: ({ isFoo }) => (isFoo === 'true' ? 'foo' : 'bar'),
+				false: 'false',
+				twoWords: 'two words',
+				onlyOne: 'actually == 1'
+			};
+			const template = `{{if {{ sum a="1" b="2" }} == "3"}}1 + 2 = {{sum a="1" b="2"}}{{else}}no speak math{{endif}}`;
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, '1 + 2 = 3');
+
+			const template2 = '{{if false != "false"}}no{{elseif false == "false"}}yes{{else}}no{{endif}}';
+			const out2 = generateHTMLFromTemplate(template2, vars);
+			assert.equal(out2, 'yes');
+
+			const template3 = '{{ if twoWords == "two words" }}yes{{else}}no{{endif}}';
+			const out3 = generateHTMLFromTemplate(template3, vars);
+			assert.equal(out3, 'yes');
+
+			const template4 = '{{ if onlyOne == \'actually == 1\' }}yes{{else}}no{{endif}}';
+			const out4 = generateHTMLFromTemplate(template4, vars);
+			assert.equal(out4, 'yes');
+
+			const template5 = '{{ if "3" == {{ sum a="1" b="2" }} }}yes{{else}}no{{endif}}';
+			const out5 = generateHTMLFromTemplate(template5, vars);
+			assert.equal(out5, 'yes');
+
+			const template6 = '{{ if {{ sum a="1" b="2" }} }}yes{{else}}no{{endif}}';
+			const out6 = generateHTMLFromTemplate(template6, vars);
+			assert.equal(out6, 'yes');
+
+			const template7 = '{{ if {{ twoWords }} }}yes{{else}}no{{endif}}';
+			const out7 = generateHTMLFromTemplate(template7, vars);
+			assert.equal(out7, 'yes');
+
+			const template8 = '{{ if twoWords }}yes{{else}}no{{endif}}';
+			const out8 = generateHTMLFromTemplate(template8, vars);
+			assert.equal(out8, 'yes');
+
+			const template9 = '{{ if missing }}no{{else}}yes{{endif}}';
+			const out9 = generateHTMLFromTemplate(template9, vars);
+			assert.equal(out9, 'yes');
+
+			const template10 = '{{ if {{ missing foo="bar" }} }}no{{else}}yes{{endif}}';
+			const out10 = generateHTMLFromTemplate(template10, vars);
+			assert.equal(out10, 'yes');
+
+			const template11 = '{{ if {{ missing foo="bar" }} == "" }}yes{{else}}no{{endif}}';
+			const out11 = generateHTMLFromTemplate(template11, vars);
+			assert.equal(out11, 'yes');
+
+			const template12 = '{{ if fooBar == "bar" }}yes{{else}}no{{endif}}';
+			const out12 = generateHTMLFromTemplate(template12, vars);
+			assert.equal(out12, 'yes');
+
+			const template13 = '{{ if {{ fooBar }} == "bar" }}yes{{else}}no{{endif}}';
+			const out13 = generateHTMLFromTemplate(template13, vars);
+			assert.equal(out13, 'yes');
+
+			const template14 = `{{if {{ sum a="1" b="2" }}=="3"}}1 + 2 = {{sum a="1" b="2"}}{{else}}no{{endif}}`;
+			const out14 = generateHTMLFromTemplate(template14, vars);
+			assert.equal(out14, '1 + 2 = 3');
+			
+			const template15 = `{{if "two words"==twoWords}}yes{{else}}no{{endif}}`;
+			const out15 = generateHTMLFromTemplate(template15, vars);
+			assert.equal(out15, 'yes');
+		});
+
+		it("should support relational operators", function () {
+			const vars = {
+				sum: ({ a, b }) => (parseInt(a) + parseInt(b)).toString(),
+				v1: '1',
+				v2: 'foo',
+				v3: '100',
+				v4: '99',
+				π: '3.14',
+			};
+
+			const template1 = `{{if v1 > π}}more than π{{elseif v1 <= π}}less or equal to π{{endif}}`;
+			const out1 = generateHTMLFromTemplate(template1, vars);
+			assert.equal(out1, 'less or equal to π');
+
+			const template2 = `{{if {{ sum a="2" b="3" }} > π}}more than π{{else}}less or equal to π{{endif}}`;
+			const out2 = generateHTMLFromTemplate(template2, vars);
+			assert.equal(out2, 'more than π');
+
+			const template3 = `{{if 3.14 >= π}}more than or equal to π{{else}}less than π{{endif}}`;
+			const out3 = generateHTMLFromTemplate(template3, vars);
+			assert.equal(out3, 'more than or equal to π');
+
+			const template4 = `{{if v3 > v4}}100 is more than 99{{else}}string "100" would be sorted before "99"{{endif}}`;
+			const out4 = generateHTMLFromTemplate(template4, vars);
+			assert.equal(out4, '100 is more than 99');
+
+			// This is undocumented and unsupported behavior, but comparing strings should work
+			const template5 = `{{if "test" > v2}}"test" > "foo"{{else}}no{{endif}}`;
+			const out5 = generateHTMLFromTemplate(template5, vars);
+			assert.equal(out5, '"test" > "foo"');
+
+			const template6 = `{{if "bar" < v2 }}"bar" < "foo"{{else}}no{{endif}}`;
+			const out6 = generateHTMLFromTemplate(template6, vars);
+			assert.equal(out6, '"bar" < "foo"');
+		});
+
+		it("should compare as strings when a bare number is compared with a non-numeric value", function () {
+			const vars = {
+				edition: '2nd ed.',
+				year: '2020',
+			};
+
+			const template1 = '{{if edition == 2}}second{{else}}other{{endif}}';
+			const out1 = generateHTMLFromTemplate(template1, vars);
+			assert.equal(out1, 'other');
+
+			const template2 = '{{if edition != 2}}other{{else}}second{{endif}}';
+			const out2 = generateHTMLFromTemplate(template2, vars);
+			assert.equal(out2, 'other');
+
+			const template3 = '{{if 2 == edition}}second{{else}}other{{endif}}';
+			const out3 = generateHTMLFromTemplate(template3, vars);
+			assert.equal(out3, 'other');
+
+			const template4 = '{{if edition < 5}}less{{else}}more{{endif}}';
+			const out4 = generateHTMLFromTemplate(template4, vars);
+			assert.equal(out4, 'less');
+
+			// The same comparison still evaluates numerically when the value is numeric
+			const template5 = '{{if year == 2020}}yes{{else}}no{{endif}}';
+			const out5 = generateHTMLFromTemplate(template5, vars);
+			assert.equal(out5, 'yes');
+		});
+
+		it("should accept hyphen-case variables and attributes", function () {
+			const vars = {
+				fooBar: ({ isFoo }) => (isFoo === 'true' ? 'foo' : 'bar'),
+			};
+			const template = '{{ foo-bar is-foo="true" }}{{ if {{ foo-bar is-foo="false" }} == "bar" }}{{ foo-bar is-foo="false" }}{{ endif }}';
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, 'foobar');
+		});
+
+		it("should not throw on an unbalanced {{endif}}", function () {
+			const vars = {
+				v1: '1',
+			};
+			// An {{endif}} without a matching {{if}} shouldn't pop the base level and crash
+			const template = 'foo{{endif}}bar{{if v1 == "1"}}baz{{endif}}';
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, 'foobarbaz');
+		});
+
+		it("should work with a condition in the middle", function () {
+			const vars = {
+				v1: '1',
+			};
+			const template = 'test {{ if v1 == "1" }}yes{{ else }}no{{ endif }} foobar';
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, 'test yes foobar');
+		});
+
+		it("missing identifiers are evaluted as empty string", function () {
+			const vars = {
+				foo: 'foo',
+			};
+			const template = '{{bar}}{{ if foo == "" }}no{{elseif foo}}{{foo}}{{else}}no{{endif}}';
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, 'foo');
+
+			const template2 = 'test: {{ if bar == "" }}yes{{else}}no{{endif}}';
+			const out2 = generateHTMLFromTemplate(template2, vars);
+			assert.equal(out2, 'test: yes');
+		});
+
+		it("should preserve whitespace outside of brackets", function () {
+			const template = ' starts }} with {{ whitespace  	{"test"}  ==  \'foobar\'   ';
+			const out = generateHTMLFromTemplate(template, {});
+			assert.equal(out, template);
+			const vars = {
+				space: ' ',
+				spaceFn: () => ' ',
+			};
+
+			const whitespace = ' {{if spaceFn}}{{else}}  {{endif}}{{space}} {{space-fn}}';
+			const out2 = generateHTMLFromTemplate(whitespace, vars);
+			assert.equal(out2, '    ');
+		});
+
+		it("should accept array values in logic statements", function () {
+			let someTags = ['foo', 'bar'];
+			const vars = {
+				tags: ({ join }) => (join ? someTags.join(join) : someTags),
+			};
+			const template = '{{ if tags }}#{{ tags join=" #" }}{{else}}no tags{{endif}}';
+			const out = generateHTMLFromTemplate(template, vars);
+			assert.equal(out, '#foo #bar');
+
+			someTags = [];
+			const out2 = generateHTMLFromTemplate(template, vars);
+			assert.equal(out2, 'no tags');
+		});
+
+
+		it("should throw if function returns anything else than a string (or an array which is always joined into string)", function () {
+			const vars = {
+				number: () => 1,
+				logic: () => true,
+				array: () => [],
+				fn: () => 1,
+			};
+			assert.throws(() => generateHTMLFromTemplate('{{ number }}', vars), /Identifier "number" does not evaluate to a string/);
+			assert.throws(() => generateHTMLFromTemplate('{{ logic }}', vars), /Identifier "logic" does not evaluate to a string/);
+			assert.throws(() => generateHTMLFromTemplate('{{ if fn }}no{{endif}}', vars), /Identifier "fn" does not evaluate to a string/);
+			assert.throws(() => generateHTMLFromTemplate('{{ if {{ fn foo="bar" }} }}no{{endif}}', vars), /Identifier "fn" does not evaluate to a string/);
+		});
+
+		it("should support nested 'if' statements", function () {
+			var vars = {
+				v1: '1',
+				v2: 'H',
+			};
+			var template = `{{if v1 == '1'}}yes1{{if x}}no{{elseif v2  == "h" }}yes2{{endif}}{{elseif v2 == "2"}}no{{else}}no{{endif}} {{if v2 == "1"}}not{{elseif x}}not{{else}}yes3{{ endif}}`;
+			var html = generateHTMLFromTemplate(template, vars);
+			assert.equal(html, 'yes1yes2 yes3');
+		});
+
+		it("should render a string literal", function () {
+			assert.equal(generateHTMLFromTemplate('{{ "literal" }}', {}), 'literal');
+			assert.equal(generateHTMLFromTemplate("{{ 'literal' }}", {}), 'literal');
+		});
+
+		it("should render brace characters via string literals", function () {
+			assert.equal(generateHTMLFromTemplate('{{ "{" }}', {}), '{');
+			assert.equal(generateHTMLFromTemplate('{{ "{{" }}', {}), '{{');
+			assert.equal(generateHTMLFromTemplate('{{ "}}" }}', {}), '}}');
+			assert.equal(generateHTMLFromTemplate('{{ "}" }}', {}), '}');
+		});
+
+		it("should render string literals alongside text and variables", function () {
+			const vars = { v1: 'X' };
+			assert.equal(generateHTMLFromTemplate('a{{ "{{" }}{{v1}}{{ "}}" }}c', vars), 'a{{X}}c');
+		});
+
+		it("should render a string literal that spans multiple lines", function () {
+			assert.equal(generateHTMLFromTemplate('{{ "a\nb" }}', {}), 'a\nb');
+			assert.equal(generateHTMLFromTemplate("{{ 'a\nb' }}", {}), 'a\nb');
+		});
+
+		it("should not treat a quoted keyword as a control statement", function () {
+			assert.equal(generateHTMLFromTemplate('{{ "if" }}', {}), 'if');
+			assert.equal(generateHTMLFromTemplate('{{ "endif" }}', {}), 'endif');
+		});
+
+		it("should not treat a malformed quoted statement as a string literal", function () {
+			assert.equal(generateHTMLFromTemplate('{{ "x" y="z" }}', {}), '');
+			assert.equal(generateHTMLFromTemplate('{{ "a" "b" }}', {}), '');
+			// A `"` inside a value closes the string, so an embedded quote makes the statement malformed
+			assert.equal(generateHTMLFromTemplate('{{ "a\\"b" }}', {}), '');
+		});
+
+		it("should treat an empty or bare string-literal condition as false, forcing {{else}}", function () {
+			assert.equal(generateHTMLFromTemplate('{{if}}Y{{else}}N{{endif}}', {}), 'N');
+			assert.equal(generateHTMLFromTemplate('{{if "foo"}}Y{{else}}N{{endif}}', {}), 'N');
+		});
+
+		it("should treat any whitespace after a control keyword as a separator", function () {
+			// split(' ') only splits on an ASCII space; a tab/NBSP/newline after `if` must still
+			// parse as the `if` keyword rather than a mangled `if\ttitle` identifier
+			for (let ws of ['\t', ' ', '\n']) {
+				let tmpl = `{{if${ws}v}}KEEP{{endif}}`;
+				assert.equal(generateHTMLFromTemplate(tmpl, { v: '1' }), 'KEEP', JSON.stringify(ws));
+				assert.equal(generateHTMLFromTemplate(tmpl, {}), '', JSON.stringify(ws));
+			}
+		});
+
+		it("should treat an empty {{}} comparison operand as an empty value instead of throwing", function () {
+			const vars = { color: 'red', empty: '' };
+			// Empty operand on either side of any comparator must not crash the engine
+			assert.equal(generateHTMLFromTemplate('{{if {{}} == color}}Y{{else}}N{{endif}}', vars), 'N');
+			assert.equal(generateHTMLFromTemplate('{{if color == {{}}}}Y{{else}}N{{endif}}', vars), 'N');
+			assert.equal(generateHTMLFromTemplate('{{if {{}} != color}}Y{{else}}N{{endif}}', vars), 'Y');
+			// An empty operand compares equal to an empty variable
+			assert.equal(generateHTMLFromTemplate('{{if {{}} == empty}}Y{{else}}N{{endif}}', vars), 'Y');
+		});
+
+		it("should not treat a }} or comparator inside a nested operand's quoted argument as structure", function () {
+			const vars = { echo: attrs => attrs.x ?? '' };
+			// The `}}` and `==` inside x="…" must not be read as the operand end or the comparator
+			assert.equal(
+				generateHTMLFromTemplate('{{if {{ echo x="}} ==" }} == "}} =="}}Y{{else}}N{{endif}}', vars),
+				'Y'
+			);
+			// The same nested call compared with a non-matching literal takes the else branch
+			assert.equal(
+				generateHTMLFromTemplate('{{if {{ echo x="}} ==" }} == "other"}}Y{{else}}N{{endif}}', vars),
+				'N'
+			);
+		});
+
+		it("should evaluate a nested {{ }} string literal to its contents, like at the top level", function () {
+			// `{{ "x" }}` renders `x` at the top level, so as a nested operand it must evaluate to `x`
+			// (not be treated as a missing identifier), so the comparison behaves consistently
+			assert.equal(generateHTMLFromTemplate('{{if {{ "x" }} == "x"}}Y{{else}}N{{endif}}', {}), 'Y');
+			assert.equal(generateHTMLFromTemplate("{{if {{ 'x' }} == 'x'}}Y{{else}}N{{endif}}", {}), 'Y');
+			// ...on either side of the comparator
+			assert.equal(generateHTMLFromTemplate('{{if "x" == {{ "x" }}}}Y{{else}}N{{endif}}', {}), 'Y');
+			// A nested literal used directly as a condition is evaluated too: non-empty is truthy,
+			// empty is falsy (a bare, unbracketed literal remains an identifier ref -- see the
+			// "bare string-literal condition as false" test above)
+			assert.equal(generateHTMLFromTemplate('{{if {{ "foo" }}}}Y{{else}}N{{endif}}', {}), 'Y');
+			assert.equal(generateHTMLFromTemplate('{{if {{ "" }}}}Y{{else}}N{{endif}}', {}), 'N');
+		});
+	});
+
+	describe("#parseTemplateBrackets()", function () {
+		it("should split text and bracketed statements", function () {
+			assert.deepEqual(parseTemplateBrackets('a{{b}}c'), ['a', '{{b}}', 'c']);
+		});
+
+		it("should return a single part for text without brackets", function () {
+			assert.deepEqual(parseTemplateBrackets('abc'), ['abc']);
+		});
+
+		it("should keep nested brackets within a single outer part", function () {
+			assert.deepEqual(
+				parseTemplateBrackets('{{ if {{ x }} }}'),
+				['', '{{ if {{ x }} }}']
+			);
+		});
+
+		it("should treat braces inside string literals as literal characters", function () {
+			assert.deepEqual(parseTemplateBrackets('{{ "{{" }}'), ['', '{{ "{{" }}']);
+			assert.deepEqual(parseTemplateBrackets('{{ "}}" }}'), ['', '{{ "}}" }}']);
+		});
+
+		it("should not close a statement early when a nested {{}} is adjacent to the outer }}", function () {
+			// The trailing `}}}}` must be read as the inner `}}` then the outer `}}`, not overlapping
+			assert.deepEqual(
+				parseTemplateBrackets('{{if color == {{}}}}'),
+				['', '{{if color == {{}}}}']
+			);
+			assert.deepEqual(
+				parseTemplateBrackets('{{if {{}}}}X{{endif}}'),
+				['', '{{if {{}}}}', 'X', '{{endif}}']
+			);
+		});
+
+		it("should treat `}}` inside a string literal as an ordinary character, not a delimiter", function () {
+			assert.deepEqual(
+				parseTemplateBrackets('{{ "a}}b" }}X'),
+				['', '{{ "a}}b" }}', 'X']
+			);
+			assert.deepEqual(
+				parseTemplateBrackets('{{ title x="}}" }}TAIL'),
+				['', '{{ title x="}}" }}', 'TAIL']
+			);
+		});
+
+		it("should not let a trailing backslash before a closing quote swallow a later statement", function () {
+			// A literal-backslash suffix followed by another quoted statement must stay two
+			// statements; the `\` before the closing quote must not pair with the later quote
+			assert.deepEqual(
+				parseTemplateBrackets('{{ title suffix="\\" }}{{ title prefix="x" }}'),
+				['', '{{ title suffix="\\" }}', '', '{{ title prefix="x" }}']
+			);
+			assert.isTrue(isTemplateValid('{{ title suffix="\\" }}{{ title prefix="x" }}'));
+		});
+	});
+
+	describe("#isTemplateValid()", function () {
+		it("should return false for a template with mismatched if/endif", function () {
+			// The stray {{endif}} that used to crash the engine (see #generateHTMLFromTemplate() tests)
+			const template = 'foo{{endif}}bar{{if v1 == "1"}}baz{{endif}}';
+			assert.isFalse(isTemplateValid(template));
+		});
+
+		it("should return false for an {{if}} without a matching {{endif}}", function () {
+			assert.isFalse(isTemplateValid('{{if v1 == "1"}}baz'));
+		});
+
+		it("should return true for balanced if/endif", function () {
+			assert.isTrue(isTemplateValid('foo{{if v1 == "1"}}baz{{endif}}'));
+		});
+
+		it("should treat any whitespace after a control keyword as a separator", function () {
+			// Must agree with the engine: a tab/newline after `if` still parses as the `if` keyword,
+			// so the block is balanced rather than being read as a mangled `if\ttitle` identifier
+			for (let ws of ['\t', ' ', '\n']) {
+				assert.isTrue(isTemplateValid(`{{if${ws}v}}KEEP{{endif}}`), JSON.stringify(ws));
+			}
+		});
+
+		it("should return false for a non-string template", function () {
+			assert.isFalse(isTemplateValid(null));
+			assert.isFalse(isTemplateValid(undefined));
+			assert.isFalse(isTemplateValid(42));
+		});
+
+		it("should return false for an unmatched opening {{", function () {
+			assert.isFalse(isTemplateValid('{{ title'));
+			assert.isFalse(isTemplateValid('foo {{ title }} bar {{ baz'));
+		});
+
+		it("should return false for a stray, non-literal }}", function () {
+			assert.isFalse(isTemplateValid('title }}'));
+			assert.isFalse(isTemplateValid('foo }} bar'));
+		});
+
+		it("should treat braces inside string literals as valid", function () {
+			assert.isTrue(isTemplateValid('{{ "{{" }}'));
+			assert.isTrue(isTemplateValid('{{ "}}" }}'));
+			assert.isTrue(isTemplateValid('a{{ "{{" }}b{{ "}}" }}c'));
+		});
+
+		it("should return false for a malformed quoted statement", function () {
+			assert.isFalse(isTemplateValid('{{ "x" y="z" }}'));
+			assert.isFalse(isTemplateValid('{{ "a" "b" }}'));
+		});
+
+		it("should return false for a statement with an unterminated quote", function () {
+			assert.isFalse(isTemplateValid('{{ title truncate="50 }}'));
+			assert.isFalse(isTemplateValid("{{ title truncate='50 }}"));
+			assert.isFalse(isTemplateValid('{{if title == "x }}a{{endif}}'));
+		});
+
+		it("should reject an unclosed {{ that a nested }} makes look closed", function () {
+			// parseTemplateBrackets folds an unclosed outer `{{` and its nested `}}` into one part
+			// that ends in `}}`; without a balance check the engine would keep it and silently
+			// drop `year` at render time
+			assert.isFalse(isTemplateValid('{{ firstCreator {{ year }}'));
+			assert.isFalse(isTemplateValid('foo {{ bar {{ baz }}'));
+		});
+
+		it("should accept a balanced nested {{ }} operand", function () {
+			assert.isTrue(isTemplateValid('{{if {{ authorsCount }} == "2"}}a{{endif}}'));
+		});
+
+		it("should return false when an unterminated quote swallows a following statement", function () {
+			// The unterminated quote makes the tokenizer fold `{{ year }}` into one part, which
+			// would otherwise validate as a lone statement and silently drop `year` at render time
+			assert.isFalse(isTemplateValid('{{ title x="a }}{{ year }}'));
+		});
+
+		it("should return true for a well-formed string literal statement", function () {
+			assert.isTrue(isTemplateValid('{{ "literal" }}'));
+			assert.isTrue(isTemplateValid('{{ "a}}b" }}'));
+		});
+
+		it("should accept a string literal that spans multiple lines", function () {
+			assert.isTrue(isTemplateValid('{{ "a\nb" }}'));
+			assert.isTrue(isTemplateValid("{{ 'a\nb' }}"));
+		});
+
+		it("should reject an attribute value with an unescaped closing quote", function () {
+			// Backslashes are literal, so a `"` always closes the value; `x="a\""` leaves a stray
+			// quote that never closes the statement
+			assert.isFalse(isTemplateValid('{{ title x="a\\"" }}TAIL'));
+		});
+
+		it("should allow single brace characters in text", function () {
+			assert.isTrue(isTemplateValid('a { b } c'));
+		});
+
+		it("should return false for an {{elseif}} after an {{else}}", function () {
+			// Renders two branches in the engine (e.g. "ac"), so reject it
+			assert.isFalse(isTemplateValid('{{if title}}a{{else}}b{{elseif year}}c{{endif}}'));
+		});
+
+		it("should return false for a second {{else}} in the same block", function () {
+			assert.isFalse(isTemplateValid('{{if title}}a{{else}}b{{else}}c{{endif}}'));
+		});
+
+		it("should accept an {{if}} with an empty condition", function () {
+			// An empty condition renders as false (forcing the {{else}} branch), which the engine
+			// has always handled; keep it valid so existing templates don't fall back to the default
+			assert.isTrue(isTemplateValid('{{if}}a{{endif}}'));
+			assert.isTrue(isTemplateValid('{{if }}a{{endif}}'));
+			assert.isTrue(isTemplateValid('{{if}}a{{else}}b{{endif}}'));
+		});
+
+		it("should accept an {{elseif}} with an empty condition", function () {
+			assert.isTrue(isTemplateValid('{{if title}}a{{elseif}}b{{endif}}'));
+		});
+
+		it("should return true for a valid if/elseif/else chain", function () {
+			assert.isTrue(isTemplateValid('{{if a}}1{{elseif b}}2{{else}}3{{endif}}'));
+			assert.isTrue(isTemplateValid('{{if a}}1{{if b}}2{{else}}3{{endif}}{{else}}4{{endif}}'));
+		});
+	});
+});
diff --git a/test/tests/translateTest.js b/test/tests/translateTest.js
index 865072a3a8..ab5faad726 100644
--- a/test/tests/translateTest.js
+++ b/test/tests/translateTest.js
@@ -1311,12 +1311,6 @@ describe("Zotero.Translate", function () {
 					collections: [importCollection.id]
 				});
 				
-				// When exporting a library, the top-most collection should be included. When
-				// exporting a collection, the selected collection isn't included, so remove it.
-				if (mode == 'collection') {
-					collectionNames.shift();
-				}
-				
 				var collections = importCollection.getChildCollections();
 				assert.lengthOf(collections, 1, mode);
 				assert.equal(collections[0].name, collectionNames.shift(), mode)
@@ -1590,6 +1584,26 @@ describe("Zotero.Translate", function () {
 			});
 
 		});
+		describe("#_getURLObjectsFromResolvers()", function () {
+			it("should run function resolvers and pass through plain objects", async function () {
+				var itemSaver = new Zotero.Translate.ItemSaver({
+					libraryID: Zotero.Libraries.userLibraryID,
+					attachmentMode: Zotero.Translate.ItemSaver.ATTACHMENT_MODE_IGNORE
+				});
+				var fromFunction = { url: 'https://example.com/a.pdf', accessMethod: 'oa' };
+				var fromObject = {
+					pageURL: 'https://pmc.ncbi.nlm.nih.gov/articles/PMC1234/',
+					accessMethod: 'oa'
+				};
+
+				var urlObjects = await itemSaver._getURLObjectsFromResolvers([
+					async () => [fromFunction],
+					fromObject
+				]);
+
+				assert.deepEqual(urlObjects, [fromFunction, fromObject]);
+			});
+		});
 		describe('#saveItems', function () {
 			it("should deproxify item and attachment urls when proxy provided", async function () {
 				var itemID;
@@ -2411,6 +2425,28 @@ describe("Zotero.Translate.ItemGetter", function () {
 		});
 	});
 	
+	describe("#setCollections()", function () {
+		it("should not export a collection separately from a given ancestor", async function () {
+			var collection = await createDataObject('collection');
+			var subcollection = await createDataObject('collection', { parentID: collection.id });
+			await createDataObject('item', { collections: [collection.id] });
+			await createDataObject('item', { collections: [subcollection.id] });
+			
+			let getter = new Zotero.Translate.ItemGetter();
+			getter.setCollections([collection, subcollection], true);
+			
+			assert.equal(getter.numItems, 2);
+			
+			var collections = [];
+			var returnedCollection;
+			while (returnedCollection = getter.nextCollection()) {
+				collections.push(returnedCollection);
+			}
+			assert.lengthOf(collections, 1);
+			assert.equal(collections[0].id, collection.id);
+		});
+	});
+	
 	describe("#setAll()", function () {
 		it("should exclude annotations", async function () {
 			var attachment = await importFileAttachment('test.pdf');
diff --git a/test/tests/translatorsTest.js b/test/tests/translatorsTest.js
index 94e9832739..0335cde997 100644
--- a/test/tests/translatorsTest.js
+++ b/test/tests/translatorsTest.js
@@ -1,6 +1,10 @@
 "use strict";
 
 describe("Zotero.Translators", function () {
+	before(async function () {
+		await Zotero.Translators.init();
+	});
+
 	describe("#init()", function () {
 		async function testUpdateCache({ translatorID, label1, label2, lastUpdated1, lastUpdated2, expect }) {
 			var translator1 = buildDummyTranslator('web', `function doDetect() {}; function doSearch(); {}`, {
diff --git a/test/tests/undoHistoryTest.js b/test/tests/undoHistoryTest.js
new file mode 100644
index 0000000000..bac0cedfb5
--- /dev/null
+++ b/test/tests/undoHistoryTest.js
@@ -0,0 +1,1616 @@
+describe("Zotero.UndoHistory", function () {
+	beforeEach(function () {
+		Zotero.UndoHistory.clear();
+	});
+
+	describe("collection name edit", function () {
+		it("should undo and redo a collection name change", async function () {
+			let collection = await createDataObject('collection', { name: 'Original' });
+
+			collection.name = 'Modified';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.equal(collection.name, 'Modified');
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(collection.name, 'Original');
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(collection.name, 'Modified');
+		});
+	});
+
+	describe("trashing a collection", function () {
+		it("should undo and redo trashing a collection", async function () {
+			let collection = await createDataObject('collection');
+
+			collection.deleted = true;
+			await collection.saveTx({
+				undoAction: 'undo-action-trash-collection',
+				undoActionArgs: { count: 1 }
+			});
+			assert.isTrue(collection.deleted);
+
+			await Zotero.UndoHistory.undo();
+			assert.isFalse(collection.deleted);
+
+			await Zotero.UndoHistory.redo();
+			assert.isTrue(collection.deleted);
+		});
+
+		it("should undo and redo trashing a collection with descendent sub-collections", async function () {
+			let parent = await createDataObject('collection', { name: 'Parent' });
+			let child = await createDataObject('collection', { name: 'Child', parentID: parent.id });
+			Zotero.UndoHistory.clear();
+
+			parent.deleted = true;
+			await parent.saveTx({
+				undoAction: 'undo-action-trash-collection',
+				undoActionArgs: { count: 1 }
+			});
+			assert.isTrue(parent.deleted);
+			assert.isTrue(child.deleted);
+
+			await Zotero.UndoHistory.undo();
+			assert.isFalse(parent.deleted);
+			assert.isFalse(child.deleted);
+
+			await Zotero.UndoHistory.redo();
+			assert.isTrue(parent.deleted);
+			assert.isTrue(child.deleted);
+		});
+	});
+
+	describe("trashing items via Items.trashTx", function () {
+		it("should undo and redo trashing an item", async function () {
+			let item = await createDataObject('item', { title: 'Trash Me' });
+
+			await Zotero.Items.trashTx(item.id);
+			assert.isTrue(item.deleted);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.isFalse(item.deleted);
+
+			await Zotero.UndoHistory.redo();
+			assert.isTrue(item.deleted);
+		});
+
+		it("should undo trashing multiple items as a single step", async function () {
+			let item1 = await createDataObject('item', { title: 'Item 1' });
+			let item2 = await createDataObject('item', { title: 'Item 2' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.Items.trashTx([item1.id, item2.id]);
+			assert.isTrue(item1.deleted);
+			assert.isTrue(item2.deleted);
+
+			// Should be a single undo step
+			await Zotero.UndoHistory.undo();
+			assert.isFalse(item1.deleted);
+			assert.isFalse(item2.deleted);
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+	});
+
+	describe("item metadata field edit", function () {
+		it("should undo and redo a single item field change", async function () {
+			let item = await createDataObject('item', { title: 'Original Title' });
+
+			item.setField('title', 'New Title');
+			await item.saveTx({
+				undoAction: 'undo-action-edit-metadata',
+				undoActionArgs: { count: 1 }
+			});
+			assert.equal(item.getField('title'), 'New Title');
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getField('title'), 'Original Title');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getField('title'), 'New Title');
+		});
+	});
+
+	describe("batch metadata edit", function () {
+		it("should undo a batch edit as a single step", async function () {
+			let item1 = await createDataObject('item', { title: 'Title A' });
+			let item2 = await createDataObject('item', { title: 'Title B' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.DB.executeTransaction(async function () {
+				item1.setField('title', 'Batch Title');
+				await item1.save();
+				item2.setField('title', 'Batch Title');
+				await item2.save();
+				Zotero.UndoHistory.stageAction(
+					'undo-action-edit-metadata', { count: 2 }
+				);
+			});
+
+			assert.equal(item1.getField('title'), 'Batch Title');
+			assert.equal(item2.getField('title'), 'Batch Title');
+
+			// Single undo should revert both
+			await Zotero.UndoHistory.undo();
+			assert.equal(item1.getField('title'), 'Title A');
+			assert.equal(item2.getField('title'), 'Title B');
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+	});
+
+	describe("opt-in capture", function () {
+		it("should not record a save without an undoAction", async function () {
+			let collection = await createDataObject('collection', { name: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			collection.name = 'Modified';
+			await collection.saveTx();
+			assert.equal(collection.name, 'Modified');
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+
+		it("should not record a save with skipAll", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			item.setField('title', 'Modified');
+			await item.saveTx({ skipAll: true });
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+
+		it("should drop staged changes if stageAction is never called", async function () {
+			let item1 = await createDataObject('item', { title: 'A' });
+			let item2 = await createDataObject('item', { title: 'B' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.DB.executeTransaction(async function () {
+				item1.setField('title', 'X');
+				await item1.save();
+				item2.setField('title', 'Y');
+				await item2.save();
+				// no stageAction call
+			});
+
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+	});
+
+	describe("redo stack", function () {
+		it("should clear redo stack on new change", async function () {
+			let collection = await createDataObject('collection', { name: 'V1' });
+
+			collection.name = 'V2';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+
+			await Zotero.UndoHistory.undo();
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			// New change should clear the redo stack
+			collection.name = 'V3';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+	});
+
+	describe("deleted object handling", function () {
+		it("should handle a deleted object gracefully during undo", async function () {
+			let collection = await createDataObject('collection', { name: 'Original' });
+
+			collection.name = 'Modified';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+
+			// Permanently delete the collection
+			await collection.eraseTx();
+
+			// Undo should not throw
+			let result = await Zotero.UndoHistory.undo();
+			assert.isTrue(result);
+		});
+	});
+
+	describe("apply failure", function () {
+		it("should clear both stacks if applying an undo entry fails", async function () {
+			let collection = await createDataObject('collection', { name: 'Original' });
+
+			collection.name = 'Modified';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Force the save during undo to fail
+			let stub = sinon.stub(collection, 'save').rejects(new Error('save failed'));
+			let result;
+			try {
+				result = await Zotero.UndoHistory.undo();
+			}
+			finally {
+				stub.restore();
+			}
+
+			// Nothing was applied, so undo() should report failure
+			assert.isFalse(result);
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+
+		it("should clear both stacks if applying a redo entry fails", async function () {
+			let collection = await createDataObject('collection', { name: 'Original' });
+
+			collection.name = 'Modified';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			await Zotero.UndoHistory.undo();
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			// Force the save during redo to fail
+			let stub = sinon.stub(collection, 'save').rejects(new Error('save failed'));
+			let result;
+			try {
+				result = await Zotero.UndoHistory.redo();
+			}
+			finally {
+				stub.restore();
+			}
+
+			// Nothing was applied, so redo() should report failure
+			assert.isFalse(result);
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+
+		it("should not leave an object unsaveable after an undo apply failure", async function () {
+			// A (move target), P (original parent), B (child being moved)
+			let collectionA = await createDataObject('collection', { name: 'A' });
+			let collectionP = await createDataObject('collection', { name: 'P' });
+			let collectionB = await createDataObject('collection', { name: 'B', parentID: collectionP.id });
+
+			// Move B from P onto A, recording an undo entry for the parent change
+			Zotero.UndoHistory.clear();
+			collectionB.parentID = collectionA.id;
+			await collectionB.saveTx({ undoAction: 'undo-action-move-collection' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Permanently erase P so its key no longer resolves to a collection
+			await collectionP.eraseTx();
+
+			// Undoing tries to set B's parent back to the now-erased P, which makes
+			// Collection._initSave throw. The apply fails and history is cleared, but
+			// B must not be left pinned to the vanished parent.
+			await Zotero.UndoHistory.undo();
+
+			// B should have been rolled back to its last valid parent (A) and remain
+			// editable
+			assert.equal(collectionB.parentID, collectionA.id);
+			collectionB.name = 'B renamed';
+			await collectionB.saveTx();
+			assert.equal(collectionB.name, 'B renamed');
+		});
+
+		it("should not leave an earlier object's memory diverged from the DB when a later save fails", async function () {
+			// Two items edited together as a single batch (one undo entry)
+			let item1 = await createDataObject('item', { title: 'Title A' });
+			let item2 = await createDataObject('item', { title: 'Title B' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.DB.executeTransaction(async function () {
+				item1.setField('title', 'Batch Title');
+				await item1.save();
+				item2.setField('title', 'Batch Title');
+				await item2.save();
+				Zotero.UndoHistory.stageAction('undo-action-edit-metadata', { count: 2 });
+			});
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// item1 is applied and saved first; force the *second* object's save to
+			// fail so the transaction rolls back only after item1 has already been
+			// written and reloaded into memory with its undone value.
+			let stub = sinon.stub(item2, 'save').rejects(new Error('save failed'));
+			try {
+				await Zotero.UndoHistory.undo();
+			}
+			finally {
+				stub.restore();
+			}
+
+			// The transaction rolled back, so the DB still holds the committed batch
+			// value. item1's in-memory state must match the DB rather than retaining
+			// the rolled-back undo value.
+			let dbTitle = await Zotero.DB.valueQueryAsync(
+				"SELECT value FROM itemData JOIN itemDataValues USING (valueID) "
+					+ "WHERE itemID=? AND fieldID=?",
+				[item1.id, Zotero.ItemFields.getID('title')]
+			);
+			assert.equal(dbTitle, 'Batch Title', "sanity: rollback kept the batch value in the DB");
+			assert.equal(item1.getField('title'), 'Batch Title',
+				"earlier object's memory should match the rolled-back DB, not the undone value");
+			assert.isFalse(item1.hasChanged(),
+				"earlier object should not be left with phantom uncommitted changes");
+		});
+	});
+
+	describe("library erasure", function () {
+		it("should clear undo history when a related library is erased", async function () {
+			let group = await createGroup();
+			let collection = await createDataObject(
+				'collection', { libraryID: group.libraryID, name: 'Group Collection' }
+			);
+			Zotero.UndoHistory.clear();
+
+			collection.name = 'Renamed';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// The group's objects are cascade-deleted without per-object events, so
+			// the related undo entry must be discarded
+			await group.eraseTx();
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+
+		it("should clear undo history when the erased library is referenced only in the redo stack", async function () {
+			let group = await createGroup();
+			let collection = await createDataObject(
+				'collection', { libraryID: group.libraryID, name: 'Group Collection' }
+			);
+			Zotero.UndoHistory.clear();
+
+			collection.name = 'Renamed';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			// Move the entry onto the redo stack
+			await Zotero.UndoHistory.undo();
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			await group.eraseTx();
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+		});
+
+		it("should preserve undo history when an unrelated library is erased", async function () {
+			// Record an undo entry in the user library
+			let collection = await createDataObject('collection', { name: 'My Library Collection' });
+			Zotero.UndoHistory.clear();
+			collection.name = 'Renamed';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Erasing an unrelated group must not touch the user-library history
+			let group = await createGroup();
+			await group.eraseTx();
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+		});
+	});
+
+	describe("canUndo/canRedo", function () {
+		it("should return false when stacks are empty", function () {
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+
+		it("should return false after undo with no redo available when nothing undone", async function () {
+			let result = await Zotero.UndoHistory.undo();
+			assert.isFalse(result);
+		});
+
+		it("should return false after redo with nothing to redo", async function () {
+			let result = await Zotero.UndoHistory.redo();
+			assert.isFalse(result);
+		});
+	});
+
+	describe("collection membership changes", function () {
+		it("should undo and redo adding an item to a collection", async function () {
+			let collection = await createDataObject('collection');
+			let item = await createDataObject('item', { title: 'Test Item' });
+			Zotero.UndoHistory.clear();
+
+			item.setCollections([collection.id]);
+			await item.saveTx({
+				undoAction: 'undo-action-add-to-collection',
+				undoActionArgs: { count: 1 }
+			});
+			assert.include(item.getCollections(), collection.id);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.notInclude(item.getCollections(), collection.id);
+			assert.lengthOf(item.getCollections(), 0);
+
+			await Zotero.UndoHistory.redo();
+			assert.include(item.getCollections(), collection.id);
+		});
+
+		it("should undo and redo removing an item from a collection", async function () {
+			let collection = await createDataObject('collection');
+			let item = await createDataObject('item', {
+				title: 'Test Item',
+				collections: [collection.id]
+			});
+			assert.include(item.getCollections(), collection.id);
+			Zotero.UndoHistory.clear();
+
+			item.setCollections([]);
+			await item.saveTx({
+				undoAction: 'undo-action-remove-from-collection',
+				undoActionArgs: { count: 1 }
+			});
+			assert.lengthOf(item.getCollections(), 0);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.include(item.getCollections(), collection.id);
+
+			await Zotero.UndoHistory.redo();
+			assert.lengthOf(item.getCollections(), 0);
+		});
+	});
+
+	describe("parent change", function () {
+		it("should undo and redo unparenting a child item", async function () {
+			let parent = await createDataObject('item', { title: 'Parent' });
+			let child = new Zotero.Item('note');
+			child.parentID = parent.id;
+			child.setNote('Child note');
+			await child.saveTx();
+			assert.equal(child.parentID, parent.id);
+			Zotero.UndoHistory.clear();
+
+			child.parentID = false;
+			await child.saveTx({
+				undoAction: 'undo-action-convert-to-standalone-attachment',
+				undoActionArgs: { count: 1 }
+			});
+			assert.isFalse(!!child.parentID);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(child.parentID, parent.id);
+
+			await Zotero.UndoHistory.redo();
+			assert.isFalse(!!child.parentID);
+		});
+	});
+
+	describe("note edit", function () {
+		it("should undo and redo a note text change", async function () {
+			let item = new Zotero.Item('note');
+			item.setNote('Original note');
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.setNote('Modified note');
+			await item.saveTx({ undoAction: 'undo-action-edit-note' });
+			assert.equal(item.getNote(), 'Modified note');
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			let action = Zotero.UndoHistory.getUndoAction();
+			assert.equal(action.action, 'undo-action-edit-note');
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getNote(), 'Original note');
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getNote(), 'Modified note');
+		});
+	});
+
+	describe("action tracking", function () {
+		describe("explicit action", function () {
+			it("should use undoAction option from saveTx", async function () {
+				let item = await createDataObject('item', { title: 'Original' });
+				Zotero.UndoHistory.clear();
+
+				item.setField('title', 'Changed');
+				await item.saveTx({ undoAction: 'undo-action-change-type' });
+
+				let action = Zotero.UndoHistory.getUndoAction();
+				assert.isNotNull(action);
+				assert.equal(action.action, 'undo-action-change-type');
+			});
+
+			it("should use stageAction called inside a transaction", async function () {
+				let item = await createDataObject('item', { title: 'Original' });
+				Zotero.UndoHistory.clear();
+
+				await Zotero.DB.executeTransaction(async function () {
+					item.setField('title', 'Changed');
+					await item.save();
+					Zotero.UndoHistory.stageAction(
+						'undo-action-edit-metadata', { count: 1 }
+					);
+				});
+
+				let action = Zotero.UndoHistory.getUndoAction();
+				assert.isNotNull(action);
+				assert.equal(action.action, 'undo-action-edit-metadata');
+				assert.deepEqual(action.actionArgs, { count: 1 });
+			});
+
+			it("should let the last stageAction call win", async function () {
+				let item = await createDataObject('item', { title: 'Original' });
+				Zotero.UndoHistory.clear();
+
+				await Zotero.DB.executeTransaction(async function () {
+					item.setField('title', 'Changed');
+					await item.save();
+					Zotero.UndoHistory.stageAction('undo-action-edit-metadata');
+					Zotero.UndoHistory.stageAction('undo-action-change-type');
+				});
+
+				let action = Zotero.UndoHistory.getUndoAction();
+				assert.equal(action.action, 'undo-action-change-type');
+			});
+		});
+
+		describe("redo preservation", function () {
+			it("should preserve action through undo/redo cycle", async function () {
+				let item = await createDataObject('item', { title: 'Original' });
+				Zotero.UndoHistory.clear();
+
+				item.setField('title', 'Changed');
+				await item.saveTx({
+					undoAction: 'undo-action-edit-metadata',
+					undoActionArgs: { count: 1 }
+				});
+
+				let undoAction = Zotero.UndoHistory.getUndoAction();
+				assert.equal(undoAction.action, 'undo-action-edit-metadata');
+
+				await Zotero.UndoHistory.undo();
+
+				let redoAction = Zotero.UndoHistory.getRedoAction();
+				assert.isNotNull(redoAction);
+				assert.equal(redoAction.action, 'undo-action-edit-metadata');
+				assert.deepEqual(redoAction.actionArgs, { count: 1 });
+
+				await Zotero.UndoHistory.redo();
+
+				undoAction = Zotero.UndoHistory.getUndoAction();
+				assert.isNotNull(undoAction);
+				assert.equal(undoAction.action, 'undo-action-edit-metadata');
+			});
+		});
+
+		describe("getUndoAction/getRedoAction", function () {
+			it("should return null when stacks are empty", function () {
+				assert.isNull(Zotero.UndoHistory.getUndoAction());
+				assert.isNull(Zotero.UndoHistory.getRedoAction());
+			});
+
+			it("should return null for redo when nothing has been undone", async function () {
+				let item = await createDataObject('item', { title: 'Original' });
+				Zotero.UndoHistory.clear();
+
+				item.setField('title', 'Changed');
+				await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+
+				assert.isNotNull(Zotero.UndoHistory.getUndoAction());
+				assert.isNull(Zotero.UndoHistory.getRedoAction());
+			});
+		});
+	});
+
+	describe("creator changes", function () {
+		it("should undo and redo editing a creator name", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'John',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'John',
+				lastName: 'Smith',
+				fieldMode: 0
+			});
+			await item.saveTx({ undoAction: 'undo-action-edit-creator' });
+			assert.equal(item.getCreator(0).lastName, 'Smith');
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getCreator(0).lastName, 'Doe');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getCreator(0).lastName, 'Smith');
+		});
+
+		it("should undo and redo adding a new creator", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'Jane',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.setCreator(1, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'Bob',
+				lastName: 'Jones',
+				fieldMode: 0
+			});
+			await item.saveTx({ undoAction: 'undo-action-add-creator' });
+			assert.equal(item.numCreators(), 2);
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.numCreators(), 1);
+			assert.equal(item.getCreator(0).lastName, 'Doe');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.numCreators(), 2);
+			assert.equal(item.getCreator(1).lastName, 'Jones');
+		});
+
+		it("should undo and redo removing a creator", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'Jane',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			item.setCreator(1, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'Bob',
+				lastName: 'Jones',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.removeCreator(1);
+			await item.saveTx({ undoAction: 'undo-action-remove-creator' });
+			assert.equal(item.numCreators(), 1);
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.numCreators(), 2);
+			assert.equal(item.getCreator(1).lastName, 'Jones');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.numCreators(), 1);
+		});
+
+		it("should undo and redo changing creator type", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'John',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('editor'),
+				firstName: 'John',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			await item.saveTx({ undoAction: 'undo-action-edit-creator' });
+			assert.equal(item.getCreator(0).creatorTypeID, Zotero.CreatorTypes.getID('editor'));
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getCreator(0).creatorTypeID, Zotero.CreatorTypes.getID('author'));
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getCreator(0).creatorTypeID, Zotero.CreatorTypes.getID('editor'));
+		});
+
+		it("should undo and redo switching field mode", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'John',
+				lastName: 'Doe',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: '',
+				lastName: 'John Doe',
+				fieldMode: 1
+			});
+			await item.saveTx({ undoAction: 'undo-action-edit-creator' });
+			assert.equal(item.getCreator(0).fieldMode, 1);
+			assert.equal(item.getCreator(0).lastName, 'John Doe');
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getCreator(0).fieldMode, 0);
+			assert.equal(item.getCreator(0).firstName, 'John');
+			assert.equal(item.getCreator(0).lastName, 'Doe');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getCreator(0).fieldMode, 1);
+		});
+
+		it("should undo and redo reordering creators", async function () {
+			let item = await createDataObject('item');
+			item.setCreator(0, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'First',
+				lastName: 'Author',
+				fieldMode: 0
+			});
+			item.setCreator(1, {
+				creatorTypeID: Zotero.CreatorTypes.getID('author'),
+				firstName: 'Second',
+				lastName: 'Author',
+				fieldMode: 0
+			});
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			// Swap order -- move second to first position
+			let creators = item.getCreators();
+			item.setCreator(0, creators[1]);
+			item.setCreator(1, creators[0]);
+			await item.saveTx({ undoAction: 'undo-action-reorder-creator' });
+			assert.equal(item.getCreator(0).firstName, 'Second');
+			assert.equal(item.getCreator(1).firstName, 'First');
+
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getCreator(0).firstName, 'First');
+			assert.equal(item.getCreator(1).firstName, 'Second');
+
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.getCreator(0).firstName, 'Second');
+			assert.equal(item.getCreator(1).firstName, 'First');
+		});
+	});
+
+	describe("item type change", function () {
+		it("should undo and redo a type change that loses fields", async function () {
+			let caseTypeID = Zotero.ItemTypes.getID('case');
+			let filmTypeID = Zotero.ItemTypes.getID('film');
+
+			let item = await createDataObject('item', { itemType: 'case' });
+			item.setField('court', 'Supreme Court');
+			await item.saveTx();
+			Zotero.UndoHistory.clear();
+
+			// Change type: Case -> Film (court is lost)
+			item.setType(filmTypeID);
+			await item.saveTx({ undoAction: 'undo-action-change-type' });
+
+			assert.equal(item.itemTypeID, filmTypeID);
+			assert.equal(item.getField('court'), '');
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Undo: Film -> Case, court restored
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.itemTypeID, caseTypeID);
+			assert.equal(item.getField('court'), 'Supreme Court');
+			assert.isFalse(Zotero.UndoHistory.canUndo(), "only one undo entry should exist");
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			// Redo: Case -> Film (no dialog -- goes through UndoHistory.redo())
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.itemTypeID, filmTypeID);
+			assert.equal(item.getField('court'), '');
+		});
+	});
+
+	describe("related items", function () {
+		it("should undo and redo adding a related item", async function () {
+			let itemA = await createDataObject('item', { title: 'Item A' });
+			let itemB = await createDataObject('item', { title: 'Item B' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.DB.executeTransaction(async () => {
+				itemA.addRelatedItem(itemB);
+				await itemA.save({ skipDateModifiedUpdate: true });
+				itemB.addRelatedItem(itemA);
+				await itemB.save({ skipDateModifiedUpdate: true });
+				Zotero.UndoHistory.stageAction('undo-action-add-related');
+			});
+
+			assert.include(itemA.relatedItems, itemB.key);
+			assert.include(itemB.relatedItems, itemA.key);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+			assert.notInclude(itemA.relatedItems, itemB.key);
+			assert.notInclude(itemB.relatedItems, itemA.key);
+
+			await Zotero.UndoHistory.redo();
+			assert.include(itemA.relatedItems, itemB.key);
+			assert.include(itemB.relatedItems, itemA.key);
+		});
+
+		it("should undo and redo removing a related item", async function () {
+			let itemA = await createDataObject('item', { title: 'Item A' });
+			let itemB = await createDataObject('item', { title: 'Item B' });
+			// Establish the relation
+			await Zotero.DB.executeTransaction(async () => {
+				itemA.addRelatedItem(itemB);
+				await itemA.save({ skipDateModifiedUpdate: true });
+				itemB.addRelatedItem(itemA);
+				await itemB.save({ skipDateModifiedUpdate: true });
+			});
+			Zotero.UndoHistory.clear();
+
+			// Remove the relation
+			await Zotero.DB.executeTransaction(async () => {
+				itemA.removeRelatedItem(itemB);
+				await itemA.save({ skipDateModifiedUpdate: true });
+				itemB.removeRelatedItem(itemA);
+				await itemB.save({ skipDateModifiedUpdate: true });
+				Zotero.UndoHistory.stageAction('undo-action-remove-related');
+			});
+
+			assert.notInclude(itemA.relatedItems, itemB.key);
+			assert.notInclude(itemB.relatedItems, itemA.key);
+
+			await Zotero.UndoHistory.undo();
+			assert.include(itemA.relatedItems, itemB.key);
+			assert.include(itemB.relatedItems, itemA.key);
+
+			await Zotero.UndoHistory.redo();
+			assert.notInclude(itemA.relatedItems, itemB.key);
+			assert.notInclude(itemB.relatedItems, itemA.key);
+		});
+
+		it("should undo adding several related items in one transaction", async function () {
+			let subject = await createDataObject('item', { title: 'Subject' });
+			let relA = await createDataObject('item', { title: 'Rel A' });
+			let relB = await createDataObject('item', { title: 'Rel B' });
+			let relC = await createDataObject('item', { title: 'Rel C' });
+			Zotero.UndoHistory.clear();
+
+			await Zotero.DB.executeTransaction(async () => {
+				Zotero.UndoHistory.stageAction('undo-action-add-related');
+				for (let rel of [relA, relB, relC]) {
+					subject.addRelatedItem(rel);
+					await subject.save({ skipDateModifiedUpdate: true });
+					rel.addRelatedItem(subject);
+					await rel.save({ skipDateModifiedUpdate: true });
+				}
+			});
+
+			assert.include(subject.relatedItems, relA.key);
+			assert.include(subject.relatedItems, relB.key);
+			assert.include(subject.relatedItems, relC.key);
+
+			await Zotero.UndoHistory.undo();
+			assert.notInclude(subject.relatedItems, relA.key);
+			assert.notInclude(subject.relatedItems, relB.key);
+			assert.notInclude(subject.relatedItems, relC.key);
+			assert.notInclude(relA.relatedItems, subject.key);
+			assert.notInclude(relB.relatedItems, subject.key);
+			assert.notInclude(relC.relatedItems, subject.key);
+
+			await Zotero.UndoHistory.redo();
+			assert.include(subject.relatedItems, relA.key);
+			assert.include(subject.relatedItems, relB.key);
+			assert.include(subject.relatedItems, relC.key);
+		});
+
+		it("should not bump Date Modified when undoing or redoing Relate Items", async function () {
+			let itemA = await createDataObject('item', { title: 'Item A' });
+			let itemB = await createDataObject('item', { title: 'Item B' });
+
+			// Pin both items to a known, old Date Modified so a bump is detectable
+			let dateModified = '2020-01-01 00:00:00';
+			itemA.dateModified = dateModified;
+			await itemA.saveTx();
+			itemB.dateModified = dateModified;
+			await itemB.saveTx();
+			Zotero.UndoHistory.clear();
+
+			// Relate the items, suppressing Date Modified updates (mirrors relatedBox.js)
+			await Zotero.DB.executeTransaction(async () => {
+				Zotero.UndoHistory.stageAction('undo-action-add-related');
+				itemA.addRelatedItem(itemB);
+				await itemA.save({ skipDateModifiedUpdate: true });
+				itemB.addRelatedItem(itemA);
+				await itemB.save({ skipDateModifiedUpdate: true });
+			});
+
+			assert.equal(itemA.dateModified, dateModified);
+			assert.equal(itemB.dateModified, dateModified);
+
+			await Zotero.UndoHistory.undo();
+			assert.notInclude(itemA.relatedItems, itemB.key);
+			assert.notInclude(itemB.relatedItems, itemA.key);
+			assert.equal(itemA.dateModified, dateModified, 'undo should not bump Item A Date Modified');
+			assert.equal(itemB.dateModified, dateModified, 'undo should not bump Item B Date Modified');
+
+			await Zotero.UndoHistory.redo();
+			assert.include(itemA.relatedItems, itemB.key);
+			assert.include(itemB.relatedItems, itemA.key);
+			assert.equal(itemA.dateModified, dateModified, 'redo should not bump Item A Date Modified');
+			assert.equal(itemB.dateModified, dateModified, 'redo should not bump Item B Date Modified');
+		});
+	});
+
+	describe("staging guards", function () {
+		it("should throw if stageChange is called outside a transaction", function () {
+			assert.throws(
+				() => Zotero.UndoHistory.stageChange({
+					objectType: 'item',
+					id: 1,
+					libraryID: 1,
+					key: 'AAAAAAAA',
+					fields: {}
+				}),
+				/transaction/i
+			);
+		});
+
+		it("should throw if stageAction is called outside a transaction", function () {
+			assert.throws(
+				() => Zotero.UndoHistory.stageAction('undo-action-edit-metadata'),
+				/transaction/i
+			);
+		});
+	});
+
+	it("should not drop undo history when undo is requested during an undo", async function () {
+		let item = await createDataObject('item', { title: 'Original' });
+		Zotero.UndoHistory.clear();
+
+		item.setField('title', 'Second');
+		await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+		item.setField('title', 'Third');
+		await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+		assert.equal(item.getField('title'), 'Third');
+
+		let unblockFirstUndo = Zotero.Promise.defer();
+		let firstUndoReachedTransaction = Zotero.Promise.defer();
+		let executeTransaction = Zotero.DB.executeTransaction;
+		let firstCall = true;
+		let stub = sinon.stub(Zotero.DB, 'executeTransaction').callsFake(async function (func, options) {
+			if (firstCall) {
+				firstCall = false;
+				firstUndoReachedTransaction.resolve();
+				await unblockFirstUndo.promise;
+			}
+			return executeTransaction.call(this, func, options);
+		});
+
+		try {
+			let firstUndo = Zotero.UndoHistory.undo();
+			await firstUndoReachedTransaction.promise;
+			let secondUndo = Zotero.UndoHistory.undo();
+			unblockFirstUndo.resolve();
+			await firstUndo;
+			await secondUndo;
+		}
+		finally {
+			stub.restore();
+		}
+
+		// Both undos should apply in turn (Third -> Second -> Original). Today the
+		// second undo's synchronous staleness check runs while the first undo is
+		// still parked in its transaction, so the still-current 'Third' makes the
+		// second entry look stale and the whole history is cleared -- leaving the
+		// title at 'Second'. Undo/redo need to be serialized so each step applies.
+		assert.equal(item.getField('title'), 'Original',
+			"a second undo issued mid-transaction should apply in turn, not be discarded as stale");
+	});
+
+	describe("stale snapshot application", function () {
+		it("should not apply an undo snapshot over a concurrent committed edit", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			item.setField('title', 'User Edit');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			let activeTransactionStarted = Zotero.Promise.defer();
+			let allowActiveTransactionToChangeItem = Zotero.Promise.defer();
+			let activeTransaction = Zotero.DB.executeTransaction(async () => {
+				activeTransactionStarted.resolve();
+				await allowActiveTransactionToChangeItem.promise;
+				item.setField('title', 'Concurrent Edit');
+				await item.save();
+			});
+
+			await activeTransactionStarted.promise;
+			let undo = Zotero.UndoHistory.undo();
+			await Zotero.Promise.delay(1);
+			allowActiveTransactionToChangeItem.resolve();
+			await activeTransaction;
+			await undo;
+
+			assert.equal(item.getField('title'), 'Concurrent Edit',
+				"undo should not clobber a change committed while it was waiting for the DB transaction");
+		});
+
+		it("should not clobber a later third-party change to the same field", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			// User edit, recorded on the undo stack as Original -> User Edit
+			item.setField('title', 'User Edit');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// A plugin (or any non-UI writer) then changes the same field. No
+			// undoAction, so no new entry is created -- but the existing entry's
+			// snapshot (new: 'User Edit') no longer matches the object
+			item.setField('title', 'Plugin Edit');
+			await item.saveTx();
+
+			await Zotero.UndoHistory.undo();
+
+			// Undo should detect that the field drifted from the recorded value
+			// and decline (or clear), not silently revert the plugin's change
+			assert.equal(item.getField('title'), 'Plugin Edit',
+				"undo should not apply a stale snapshot over a later change");
+		});
+
+		it("should not clobber a later third-party change when redoing", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			// User edit, recorded on the undo stack as Original -> User Edit
+			item.setField('title', 'User Edit');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+
+			// Undo it, moving the entry onto the redo stack. The redo entry now
+			// expects the field to still read its recorded 'old' value (Original)
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.getField('title'), 'Original');
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			// A plugin then changes the same field. No undoAction, so no new entry
+			// is created, and the redo stack is preserved -- but the object no
+			// longer holds the value the redo entry expects
+			item.setField('title', 'Plugin Edit');
+			await item.saveTx();
+
+			await Zotero.UndoHistory.redo();
+
+			// Redo should detect that the field drifted from the recorded value and
+			// decline, not silently replay 'User Edit' over the plugin's change
+			assert.equal(item.getField('title'), 'Plugin Edit',
+				"redo should not apply a stale snapshot over a later change");
+		});
+
+		it("should not clobber a later third-party tag change", async function () {
+			let item = await createDataObject('item', { title: 'Tagged' });
+			Zotero.UndoHistory.clear();
+
+			// User edit, recorded on the undo stack as [] -> ['user-tag']
+			item.addTag('user-tag');
+			await item.saveTx({ undoAction: 'undo-action-add-tag', undoActionArgs: { count: 1 } });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// A plugin then swaps that tag for a different one with no undoAction:
+			// the tag count is unchanged, so detection relies on comparing tag
+			// identities rather than just the set size
+			item.removeTag('user-tag');
+			item.addTag('plugin-tag');
+			await item.saveTx();
+
+			await Zotero.UndoHistory.undo();
+
+			// Undoing would reapply the recorded pre-edit tags (none), wiping the
+			// plugin's tag. Detection should see the tags drifted and decline.
+			assert.isTrue(item.hasTag('plugin-tag'),
+				"undo should not clobber the later third-party tag");
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"a detected stale entry should be cleared");
+		});
+
+		it("should still apply undo when a third party only reordered the tags", async function () {
+			let item = await createDataObject('item', { title: 'Tagged' });
+			Zotero.UndoHistory.clear();
+
+			// User edit recorded on the undo stack: [] -> ['alpha', 'beta', 'gamma']
+			// (the recorded snapshot is sorted by setTags)
+			item.addTag('alpha');
+			item.addTag('beta');
+			item.addTag('gamma');
+			await item.saveTx({ undoAction: 'undo-action-add-tag', undoActionArgs: { count: 3 } });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Simulate a third party that persisted the same three tags in a
+			// different order. `_tags` is loaded in DB order while the snapshot is
+			// sorted, so a reordered current state is a real possibility; the
+			// staleness check compares the in-memory tags, so the simulated order
+			// is what gets compared.
+			let cached = Zotero.Items.get(item.id);
+			cached._tags = [{ tag: 'gamma' }, { tag: 'alpha' }, { tag: 'beta' }];
+			await Zotero.UndoHistory.undo();
+
+			// Same set of tags, only reordered -> not a drift -> undo proceeds and
+			// reverts to the recorded pre-edit state (no tags)
+			assert.isFalse(item.hasTag('alpha'));
+			assert.isFalse(item.hasTag('beta'));
+			assert.isFalse(item.hasTag('gamma'));
+			assert.isTrue(Zotero.UndoHistory.canRedo(),
+				"undo should have applied, leaving the entry on the redo stack");
+		});
+
+		it("should still undo an accessDate edit recorded as the CURRENT_TIMESTAMP sentinel", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			// Setting accessDate to the CURRENT_TIMESTAMP sentinel resolves to a
+			// real SQL timestamp at save time, which the save records as the
+			// entry's 'new' value and reloads into memory. Nothing external
+			// changed the field, so the staleness check sees the recorded
+			// timestamp still in place and lets the undo proceed.
+			item.setField('accessDate', 'CURRENT_TIMESTAMP');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			await Zotero.UndoHistory.undo();
+
+			// Undo should apply and revert accessDate, not decline as stale and
+			// throw away the history
+			assert.isTrue(Zotero.UndoHistory.canRedo(),
+				"undo should apply, not be declined as stale");
+			assert.equal(item.getField('accessDate'), '',
+				"undo should have reverted accessDate to its pre-edit (empty) value");
+		});
+
+		it("should decline a stale undo when a third party changed accessDate after a sentinel edit", async function () {
+			let item = await createDataObject('item', { title: 'Original' });
+			Zotero.UndoHistory.clear();
+
+			// User edit: accessDate set via the CURRENT_TIMESTAMP sentinel, which
+			// the save resolves to a real timestamp and records as the entry's
+			// 'new' value so it can be compared later
+			item.setField('accessDate', 'CURRENT_TIMESTAMP');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// A third party then changes accessDate to a different timestamp with
+			// no undoAction, so no new entry is recorded -- but the existing
+			// snapshot's resolved 'new' value no longer matches the field
+			item.setField('accessDate', '2020-01-01 00:00:00');
+			await item.saveTx();
+
+			await Zotero.UndoHistory.undo();
+
+			// The field drifted from the recorded (resolved) value, so undo should
+			// decline rather than clobber the third party's accessDate
+			assert.equal(item.getField('accessDate'), '2020-01-01 00:00:00',
+				"undo should not clobber a third-party accessDate change made after a sentinel edit");
+		});
+
+		it("should still redo a type change whose gained field recorded a null old value", async function () {
+			let caseTypeID = Zotero.ItemTypes.getID('case');
+			let filmTypeID = Zotero.ItemTypes.getID('film');
+
+			let item = await createDataObject('item', { itemType: 'case' });
+			Zotero.UndoHistory.clear();
+
+			// Change type Case -> Film and set a field that exists only on film.
+			// setType() initializes the newly-valid film fields to null, so the
+			// edit's recorded 'old' for `distributor` is null (not a real prior
+			// value).
+			item.setType(filmTypeID);
+			item.setField('distributor', 'Acme Pictures');
+			await item.saveTx({ undoAction: 'undo-action-change-type' });
+			assert.equal(item.itemTypeID, filmTypeID);
+			assert.equal(item.getField('distributor'), 'Acme Pictures');
+
+			// Undo: Film -> Case, distributor dropped
+			await Zotero.UndoHistory.undo();
+			assert.equal(item.itemTypeID, caseTypeID);
+			assert.isTrue(Zotero.UndoHistory.canRedo());
+
+			// Nothing changed the item since the undo, so the entry is not stale
+			// and the type change should replay. After the undo, distributor is
+			// invalid on a case item and reads back as `false`, while the entry
+			// recorded its 'old' as null -- a null-vs-false mismatch that must
+			// not be mistaken for an external change.
+			await Zotero.UndoHistory.redo();
+			assert.equal(item.itemTypeID, filmTypeID,
+				"redo should re-apply the type change, not decline as stale");
+			assert.equal(item.getField('distributor'), 'Acme Pictures',
+				"redo should restore the film-only field");
+		});
+	});
+
+	describe("sync interaction", function () {
+		var apiKey = Zotero.Utilities.randomString(24);
+		var baseURL = "http://local.zotero/";
+		var server;
+
+		beforeEach(async function () {
+			await resetData();
+			Zotero.HTTP.mock = sinon.FakeXMLHttpRequest;
+			server = sinon.fakeServer.create();
+			server.autoRespond = true;
+			await Zotero.Users.setCurrentUserID(1);
+			await Zotero.Users.setCurrentUsername("A");
+			Zotero.UndoHistory.clear();
+
+			// Minimal pre-engine stubs (mirrors syncRunnerTest.js)
+			server.respondWith("GET", baseURL + "keys/current", [200,
+				{ "Content-Type": "application/json" },
+				JSON.stringify({
+					key: apiKey,
+					userID: 1,
+					username: "A",
+					access: {
+						user: { library: true, files: true, notes: true, write: true },
+						groups: { all: { library: true, write: true } }
+					}
+				})]);
+			server.respondWith("GET", baseURL + "users/1/groups?format=versions",
+				[200, { "Content-Type": "application/json" }, "{}"]);
+		});
+
+		afterEach(function () {
+			Zotero.HTTP.mock = null;
+		});
+
+		function setNoRemoteChangesResponses(lastLibraryVersion) {
+			// Server reports library unmodified for every endpoint sync hits.
+			let headers = { "Last-Modified-Version": lastLibraryVersion };
+			let target = "users/1";
+			let endpoints = [
+				`${target}/settings?since=${lastLibraryVersion}`,
+				`${target}/collections?format=versions&since=${lastLibraryVersion}`,
+				`${target}/searches?format=versions&since=${lastLibraryVersion}`,
+				`${target}/items/top?format=versions&since=${lastLibraryVersion}&includeTrashed=1`,
+				`${target}/items?format=versions&since=${lastLibraryVersion}&includeTrashed=1`,
+				`${target}/deleted?since=${lastLibraryVersion}`
+			];
+			for (let url of endpoints) {
+				server.respondWith("GET", baseURL + url, [
+					304, headers, ""
+				]);
+			}
+			// Full-text sync probes this regardless of the data-sync result
+			server.respondWith("GET", baseURL + `${target}/fulltext?format=versions`,
+				[200, headers, "{}"]);
+		}
+
+		it("preserves the undo stack when sync has no remote changes to apply", async function () {
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			let item = await createDataObject('item', { title: 'Before' });
+			Zotero.UndoHistory.clear();
+			item.setField('title', 'After');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			assert.isTrue(Zotero.UndoHistory.canUndo(),
+				"sanity: an undo entry exists before sync");
+
+			// Re-mark synced so the upload phase is a no-op
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			assert.isTrue(Zotero.UndoHistory.canUndo(),
+				"sanity: markObjectAsSynced did not clear the undo stack");
+
+			setNoRemoteChangesResponses(lastLibraryVersion);
+
+			let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+			await runner._sync({
+				libraries: [library.libraryID],
+				onError: e => { throw e; }
+			});
+
+			assert.isTrue(Zotero.UndoHistory.canUndo(),
+				"undo stack should survive a sync with no remote changes");
+		});
+
+		it("clears the undo stack when _saveObjectFromJSON applies a remote object", async function () {
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			let newLibraryVersion = 6;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			let item = await createDataObject('item', { title: 'Before' });
+			item.version = lastLibraryVersion;
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			let itemKey = item.key;
+
+			let other = await createDataObject('item', { title: 'Other-before' });
+			Zotero.UndoHistory.clear();
+			other.setField('title', 'Other-after');
+			await other.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			await Zotero.Sync.Data.Local.markObjectAsSynced(other);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			setNoRemoteChangesResponses(lastLibraryVersion);
+
+			let libraryID = library.libraryID;
+			let remoteJSON = [{
+				key: itemKey,
+				version: newLibraryVersion,
+				data: Object.assign({}, item.toJSON(), {
+					key: itemKey,
+					version: newLibraryVersion,
+					title: 'Remote-applied title'
+				})
+			}];
+			let engineStub = sinon.stub(Zotero.Sync.Data.Engine.prototype, 'start')
+				.callsFake(async function () {
+					await Zotero.Sync.Data.Local.processObjectsFromJSON(
+						'item', libraryID, remoteJSON, {}
+					);
+				});
+
+			try {
+				let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+				await runner._sync({
+					libraries: [libraryID],
+					onError: e => { throw e; }
+				});
+			}
+			finally {
+				engineStub.restore();
+			}
+
+			assert.equal(item.getField('title'), 'Remote-applied title',
+				"sanity: remote data was applied via _saveObjectFromJSON");
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"undo stack should be cleared once _saveObjectFromJSON marks the sync");
+		});
+
+		it("clears the undo stack when sync applies a remote deletion", async function () {
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			let newLibraryVersion = 6;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			// An item that the server has deleted. Mark synced so the engine
+			// treats it as a clean deletion rather than a deletion conflict.
+			let item = await createDataObject('item', { title: 'Remote-deleted' });
+			item.version = lastLibraryVersion;
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			let itemKey = item.key;
+
+			// Separate undoable edit on a different item so the stack is
+			// non-empty and unrelated to the deleted object.
+			let other = await createDataObject('item', { title: 'Other-before' });
+			Zotero.UndoHistory.clear();
+			other.setField('title', 'Other-after');
+			await other.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			await Zotero.Sync.Data.Local.markObjectAsSynced(other);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			let newHeaders = { "Last-Modified-Version": newLibraryVersion };
+			let url = u => server.respondWith("GET", baseURL + u, [200, newHeaders, "{}"]);
+			url(`users/1/settings?since=${lastLibraryVersion}`);
+			url(`users/1/collections?format=versions&since=${lastLibraryVersion}`);
+			url(`users/1/searches?format=versions&since=${lastLibraryVersion}`);
+			url(`users/1/items/top?format=versions&since=${lastLibraryVersion}&includeTrashed=1`);
+			url(`users/1/items?format=versions&since=${lastLibraryVersion}&includeTrashed=1`);
+			url(`users/1/fulltext?format=versions`);
+
+			// The deletion endpoint reports our item as remotely deleted
+			server.respondWith("GET",
+				baseURL + `users/1/deleted?since=${lastLibraryVersion}`,
+				[200, newHeaders, JSON.stringify({
+					items: [itemKey], collections: [], searches: [], tags: [], settings: []
+				})]);
+
+			let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+			await runner._sync({
+				libraries: [library.libraryID],
+				onError: e => { throw e; }
+			});
+
+			assert.isFalse(Zotero.Items.exists(item.id),
+				"sanity: remote deletion was applied locally");
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"undo stack should be cleared when sync applies a remote deletion");
+		});
+
+		it("clears the undo stack when _restoreRestoredCollectionItems applies remote changes", async function () {
+			// When a collection is deleted locally but modified remotely, sync re-creates
+			// the collection (covered by _saveObjectFromJSON) and then separately un-trashes
+			// items that were trashed with the collection and re-adds them to it. Both are
+			// remote-driven mutations to user-visible item state and must clear the stack.
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			let collection = await createDataObject('collection', { name: 'Restored' });
+			await Zotero.Sync.Data.Local.markObjectAsSynced(collection);
+			let collectionKey = collection.key;
+
+			let item = await createDataObject('item', { title: 'Restored item' });
+			item.deleted = true;
+			await item.saveTx();
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			let itemKey = item.key;
+
+			let other = await createDataObject('item', { title: 'Other-before' });
+			Zotero.UndoHistory.clear();
+			other.setField('title', 'Other-after');
+			await other.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			await Zotero.Sync.Data.Local.markObjectAsSynced(other);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			setNoRemoteChangesResponses(lastLibraryVersion);
+
+			// _restoreRestoredCollectionItems queries top items in the restored collection
+			server.respondWith("GET",
+				baseURL + `users/1/collections/${collectionKey}/items/top?format=keys`,
+				[200, { "Last-Modified-Version": lastLibraryVersion }, itemKey]);
+
+			let libraryID = library.libraryID;
+			let engineStub = sinon.stub(Zotero.Sync.Data.Engine.prototype, 'start')
+				.callsFake(async function () {
+					await this._restoreRestoredCollectionItems([collectionKey]);
+				});
+
+			try {
+				let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+				await runner._sync({
+					libraries: [libraryID],
+					onError: e => { throw e; }
+				});
+			}
+			finally {
+				engineStub.restore();
+			}
+
+			let restored = Zotero.Items.get(item.id);
+			assert.isFalse(restored.deleted,
+				"sanity: trashed item was un-trashed by the restoration");
+			assert.isTrue(restored.inCollection(collection.id),
+				"sanity: item was re-added to the restored collection");
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"undo stack should be cleared when _restoreRestoredCollectionItems mutates items");
+		});
+
+		it("clears the undo stack across a restartSync recursion", async function () {
+			// Regression: the recursive _sync() call resets the flag at its
+			// start, so the conditional clear must happen before the restart
+			// branch, not after.
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			let item = await createDataObject('item', { title: 'Before' });
+			Zotero.UndoHistory.clear();
+			item.setField('title', 'After');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			setNoRemoteChangesResponses(lastLibraryVersion);
+
+			// First engine iteration applies a remote change; the second is a no-op
+			let callCount = 0;
+			let engineStub = sinon.stub(Zotero.Sync.Data.Engine.prototype, 'start')
+				.callsFake(async function () {
+					if (callCount === 0) {
+						Zotero.Sync.Data.Local.markRemoteChangesApplied();
+					}
+					callCount++;
+				});
+
+			try {
+				let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+				await runner._sync({
+					libraries: [library.libraryID],
+					onError: e => { throw e; },
+					restartSync: true
+				});
+			}
+			finally {
+				engineStub.restore();
+			}
+
+			assert.equal(callCount, 2,
+				"sanity: engine.start ran twice (initial run + restart)");
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"undo stack should be cleared even when restartSync recurses");
+		});
+
+		it("should not apply a stale snapshot via undo while a sync is still running", async function () {
+			// The undo stack is only cleared at the end of _sync(), so after a
+			// remote change has been applied but before the sync finishes,
+			// undo is still enabled and applies a snapshot that predates the
+			// remote change, silently reverting it
+			let library = Zotero.Libraries.userLibrary;
+			let lastLibraryVersion = 5;
+			let newLibraryVersion = 6;
+			library.libraryVersion = library.storageVersion = lastLibraryVersion;
+			await library.saveTx();
+
+			// Undoable user edit: Before -> After
+			let item = await createDataObject('item', { title: 'Before' });
+			Zotero.UndoHistory.clear();
+			item.setField('title', 'After');
+			await item.saveTx({ undoAction: 'undo-action-edit-metadata' });
+			item.version = lastLibraryVersion;
+			await Zotero.Sync.Data.Local.markObjectAsSynced(item);
+			let itemKey = item.key;
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			setNoRemoteChangesResponses(lastLibraryVersion);
+
+			let libraryID = library.libraryID;
+			let remoteJSON = [{
+				key: itemKey,
+				version: newLibraryVersion,
+				data: Object.assign({}, item.toJSON(), {
+					key: itemKey,
+					version: newLibraryVersion,
+					title: 'Remote Edit'
+				})
+			}];
+			let engineStub = sinon.stub(Zotero.Sync.Data.Engine.prototype, 'start')
+				.callsFake(async function () {
+					// Remote change lands on the same item the undo entry covers
+					await Zotero.Sync.Data.Local.processObjectsFromJSON(
+						'item', libraryID, remoteJSON, {}
+					);
+					assert.equal(item.getField('title'), 'Remote Edit',
+						"sanity: remote data was applied");
+					// User presses Cmd+Z while the sync is still in progress
+					await Zotero.UndoHistory.undo();
+				});
+
+			try {
+				let runner = new Zotero.Sync.Runner_Module({ baseURL, apiKey });
+				await runner._sync({
+					libraries: [libraryID],
+					onError: e => { throw e; }
+				});
+			}
+			finally {
+				engineStub.restore();
+			}
+
+			assert.equal(item.getField('title'), 'Remote Edit',
+				"mid-sync undo should not revert a remote change that was already applied");
+		});
+	});
+
+	describe("step limit pref", function () {
+		afterEach(function () {
+			Zotero.Prefs.clear('undoHistory.steps');
+			Zotero.UndoHistory.init();
+		});
+
+		it("should disable capture when undoHistory.steps is 0", async function () {
+			Zotero.Prefs.set('undoHistory.steps', 0);
+			Zotero.UndoHistory.init();
+
+			let collection = await createDataObject('collection', { name: 'Original' });
+			collection.name = 'Modified';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+
+			assert.equal(collection.name, 'Modified');
+			assert.isFalse(Zotero.UndoHistory.canUndo(),
+				"a configured step limit of 0 should disable undo/redo, not fall back to the default");
+		});
+
+		it("should cap the undo stack at undoHistory.steps entries", async function () {
+			Zotero.Prefs.set('undoHistory.steps', 2);
+			Zotero.UndoHistory.init();
+
+			let collection = await createDataObject('collection', { name: 'Original' });
+			for (let name of ['First', 'Second', 'Third']) {
+				collection.name = name;
+				await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			}
+
+			// Three edits, limit of 2: only the two most recent are undoable
+			assert.isTrue(await Zotero.UndoHistory.undo());
+			assert.isTrue(await Zotero.UndoHistory.undo());
+			assert.isFalse(await Zotero.UndoHistory.undo());
+			assert.equal(collection.name, 'First');
+		});
+	});
+});
diff --git a/test/tests/usersTest.js b/test/tests/usersTest.js
new file mode 100644
index 0000000000..e5828097e9
--- /dev/null
+++ b/test/tests/usersTest.js
@@ -0,0 +1,20 @@
+describe("Zotero.Users", function () {
+	describe("#setName()", function () {
+		it("should restore the cached name if the transaction is rolled back", async function () {
+			var userID = 24631244;
+			await Zotero.Users.setName(userID, 'A');
+			await executeTransactionWithForcedRollback(async function () {
+				await Zotero.Users.setName(userID, 'B');
+				assert.equal(Zotero.Users.getName(userID), 'B');
+			});
+			assert.equal(Zotero.Users.getName(userID), 'A');
+			
+			// A later save should write the new name to the database
+			await Zotero.Users.setName(userID, 'B');
+			assert.equal(
+				await Zotero.DB.valueQueryAsync("SELECT name FROM users WHERE userID=?", userID),
+				'B'
+			);
+		});
+	});
+});
diff --git a/test/tests/utilitiesSubmoduleTest.js b/test/tests/utilitiesSubmoduleTest.js
index 95e2b029ad..17ace81a69 100644
--- a/test/tests/utilitiesSubmoduleTest.js
+++ b/test/tests/utilitiesSubmoduleTest.js
@@ -29,5 +29,23 @@ describe("Zotero.Utilities.Item", function () {
 	
 			assert.deepEqual(fromZoteroItem, fromExportItem, 'conversion from Zotero Item and from export item are the same');
 		});
+
+		it("should preserve EDTF ranges and circa dates from CSL JSON", function () {
+			let item = new Zotero.Item('book');
+			Zotero.Utilities.Item.itemFromCSLJSON(item, { type: 'book', issued: { "date-parts": [[2021], [2026]] } });
+			assert.equal(item.getField('date'), '2021/2026');
+
+			item = new Zotero.Item('book');
+			Zotero.Utilities.Item.itemFromCSLJSON(item, { type: 'book', issued: { "date-parts": [[-429]], circa: true } });
+			assert.equal(item.getField('date'), '-0429~');
+		});
+
+		it("should convert an EDTF date stored on an item", async function () {
+			let item = new Zotero.Item('book');
+			item.setField('date', '-429?');
+			await item.saveTx();
+			let cslItem = Zotero.Utilities.Item.itemToCSLJSON(item);
+			assert.deepEqual(cslItem.issued, { "date-parts": [[-429]], circa: true });
+		});
 	});
 });
diff --git a/test/tests/utilities_internalTest.js b/test/tests/utilities_internalTest.js
index b9b7ddb22b..50b7fe8cf5 100644
--- a/test/tests/utilities_internalTest.js
+++ b/test/tests/utilities_internalTest.js
@@ -581,219 +581,6 @@ describe("Zotero.Utilities.Internal", function () {
 		});
 	});
 
-	describe("#generateHTMLFromTemplate()", function () {
-		it("should support variables with attributes", function () {
-			var vars = {
-				v1: '1',
-				v2: pars => `${pars.a1 ?? ''}${pars.a2 ?? ''}${pars.a3 ?? ''}`,
-				v3: () => '',
-				v5: () => 'something',
-				ar1: [],
-				ar2: [1, 2]
-			};
-			var template = `{{ v1}}{{v2 a1= "1"  a2 =' 2' a3 = "3 "}}{{v3}}{{v4}}{{if ar1}}ar1{{endif}}{{if ar2}}{{ar2}}{{endif}}{{if v5}}yes{{endif}}{{if v3}}no1{{endif}}{{if v2}}{{v2}}{{endif}}`;
-			var html = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(html, '11 23 1,2yes');
-		});
-
-		it("should support empty string as attribute value and correctly render returned false-ish values", function () {
-			const vars = {
-				length: ({ string }) => string.length.toString(),
-			};
-			const template = `"" has a length of {{ length string="" }} and "hello" has a length of {{ length string="hello" }}`;
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, '"" has a length of 0 and "hello" has a length of 5');
-		});
-
-		it("should support functions in comparison statements", function () {
-			const vars = {
-				sum: ({ a, b }) => (parseInt(a) + parseInt(b)).toString(),
-				fooBar: ({ isFoo }) => (isFoo === 'true' ? 'foo' : 'bar'),
-				false: 'false',
-				twoWords: 'two words',
-				onlyOne: 'actually == 1'
-			};
-			const template = `{{if {{ sum a="1" b="2" }} == "3"}}1 + 2 = {{sum a="1" b="2"}}{{else}}no speak math{{endif}}`;
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, '1 + 2 = 3');
-
-			const template2 = '{{if false != "false"}}no{{elseif false == "false"}}yes{{else}}no{{endif}}';
-			const out2 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template2, vars);
-			assert.equal(out2, 'yes');
-
-			const template3 = '{{ if twoWords == "two words" }}yes{{else}}no{{endif}}';
-			const out3 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template3, vars);
-			assert.equal(out3, 'yes');
-
-			const template4 = '{{ if onlyOne == \'actually == 1\' }}yes{{else}}no{{endif}}';
-			const out4 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template4, vars);
-			assert.equal(out4, 'yes');
-
-			const template5 = '{{ if "3" == {{ sum a="1" b="2" }} }}yes{{else}}no{{endif}}';
-			const out5 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template5, vars);
-			assert.equal(out5, 'yes');
-
-			const template6 = '{{ if {{ sum a="1" b="2" }} }}yes{{else}}no{{endif}}';
-			const out6 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template6, vars);
-			assert.equal(out6, 'yes');
-
-			const template7 = '{{ if {{ twoWords }} }}yes{{else}}no{{endif}}';
-			const out7 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template7, vars);
-			assert.equal(out7, 'yes');
-
-			const template8 = '{{ if twoWords }}yes{{else}}no{{endif}}';
-			const out8 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template8, vars);
-			assert.equal(out8, 'yes');
-
-			const template9 = '{{ if missing }}no{{else}}yes{{endif}}';
-			const out9 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template9, vars);
-			assert.equal(out9, 'yes');
-
-			const template10 = '{{ if {{ missing foo="bar" }} }}no{{else}}yes{{endif}}';
-			const out10 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template10, vars);
-			assert.equal(out10, 'yes');
-
-			const template11 = '{{ if {{ missing foo="bar" }} == "" }}yes{{else}}no{{endif}}';
-			const out11 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template11, vars);
-			assert.equal(out11, 'yes');
-
-			const template12 = '{{ if fooBar == "bar" }}yes{{else}}no{{endif}}';
-			const out12 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template12, vars);
-			assert.equal(out12, 'yes');
-
-			const template13 = '{{ if {{ fooBar }} == "bar" }}yes{{else}}no{{endif}}';
-			const out13 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template13, vars);
-			assert.equal(out13, 'yes');
-
-			const template14 = `{{if {{ sum a="1" b="2" }}=="3"}}1 + 2 = {{sum a="1" b="2"}}{{else}}no{{endif}}`;
-			const out14 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template14, vars);
-			assert.equal(out14, '1 + 2 = 3');
-			
-			const template15 = `{{if "two words"==twoWords}}yes{{else}}no{{endif}}`;
-			const out15 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template15, vars);
-			assert.equal(out15, 'yes');
-		});
-
-		it("should support relational operators", function () {
-			const vars = {
-				sum: ({ a, b }) => (parseInt(a) + parseInt(b)).toString(),
-				v1: '1',
-				v2: 'foo',
-				v3: '100',
-				v4: '99',
-				π: '3.14',
-			};
-
-			const template1 = `{{if v1 > π}}more than π{{elseif v1 <= π}}less or equal to π{{endif}}`;
-			const out1 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template1, vars);
-			assert.equal(out1, 'less or equal to π');
-
-			const template2 = `{{if {{ sum a="2" b="3" }} > π}}more than π{{else}}less or equal to π{{endif}}`;
-			const out2 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template2, vars);
-			assert.equal(out2, 'more than π');
-
-			const template3 = `{{if 3.14 >= π}}more than or equal to π{{else}}less than π{{endif}}`;
-			const out3 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template3, vars);
-			assert.equal(out3, 'more than or equal to π');
-
-			const template4 = `{{if v3 > v4}}100 is more than 99{{else}}string "100" would be sorted before "99"{{endif}}`;
-			const out4 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template4, vars);
-			assert.equal(out4, '100 is more than 99');
-
-			// This is undocumented and unsupported behavior, but comparing strings should work
-			const template5 = `{{if "test" > v2}}"test" > "foo"{{else}}no{{endif}}`;
-			const out5 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template5, vars);
-			assert.equal(out5, '"test" > "foo"');
-
-			const template6 = `{{if "bar" < v2 }}"bar" < "foo"{{else}}no{{endif}}`;
-			const out6 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template6, vars);
-			assert.equal(out6, '"bar" < "foo"');
-		});
-
-		it("should accept hyphen-case variables and attributes", function () {
-			const vars = {
-				fooBar: ({ isFoo }) => (isFoo === 'true' ? 'foo' : 'bar'),
-			};
-			const template = '{{ foo-bar is-foo="true" }}{{ if {{ foo-bar is-foo="false" }} == "bar" }}{{ foo-bar is-foo="false" }}{{ endif }}';
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, 'foobar');
-		});
-
-		it("should work with a condition in the middle", function () {
-			const vars = {
-				v1: '1',
-			};
-			const template = 'test {{ if v1 == "1" }}yes{{ else }}no{{ endif }} foobar';
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, 'test yes foobar');
-		});
-
-		it("missing identifiers are evaluted as empty string", function () {
-			const vars = {
-				foo: 'foo',
-			};
-			const template = '{{bar}}{{ if foo == "" }}no{{elseif foo}}{{foo}}{{else}}no{{endif}}';
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, 'foo');
-
-			const template2 = 'test: {{ if bar == "" }}yes{{else}}no{{endif}}';
-			const out2 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template2, vars);
-			assert.equal(out2, 'test: yes');
-		});
-
-		it("should preserve whitespace outside of brackets", function () {
-			const template = ' starts }} with {{ whitespace  	{"test"}  ==  \'foobar\'   ';
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, {});
-			assert.equal(out, template);
-			const vars = {
-				space: ' ',
-				spaceFn: () => ' ',
-			};
-
-			const whitespace = ' {{if spaceFn}}{{else}}  {{endif}}{{space}} {{space-fn}}';
-			const out2 = Zotero.Utilities.Internal.generateHTMLFromTemplate(whitespace, vars);
-			assert.equal(out2, '    ');
-		});
-
-		it("should accept array values in logic statements", function () {
-			let someTags = ['foo', 'bar'];
-			const vars = {
-				tags: ({ join }) => (join ? someTags.join(join) : someTags),
-			};
-			const template = '{{ if tags }}#{{ tags join=" #" }}{{else}}no tags{{endif}}';
-			const out = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out, '#foo #bar');
-
-			someTags = [];
-			const out2 = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(out2, 'no tags');
-		});
-
-
-		it("should throw if function returns anything else than a string (or an array which is always joined into string)", function () {
-			const vars = {
-				number: () => 1,
-				logic: () => true,
-				array: () => [],
-				fn: () => 1,
-			};
-			assert.throws(() => Zotero.Utilities.Internal.generateHTMLFromTemplate('{{ number }}', vars), /Identifier "number" does not evaluate to a string/);
-			assert.throws(() => Zotero.Utilities.Internal.generateHTMLFromTemplate('{{ logic }}', vars), /Identifier "logic" does not evaluate to a string/);
-			assert.throws(() => Zotero.Utilities.Internal.generateHTMLFromTemplate('{{ if fn }}no{{endif}}', vars), /Identifier "fn" does not evaluate to a string/);
-			assert.throws(() => Zotero.Utilities.Internal.generateHTMLFromTemplate('{{ if {{ fn foo="bar" }} }}no{{endif}}', vars), /Identifier "fn" does not evaluate to a string/);
-		});
-
-		it("should support nested 'if' statements", function () {
-			var vars = {
-				v1: '1',
-				v2: 'H',
-			};
-			var template = `{{if v1 == '1'}}yes1{{if x}}no{{elseif v2  == "h" }}yes2{{endif}}{{elseif v2 == "2"}}no{{else}}no{{endif}} {{if v2 == "1"}}not{{elseif x}}not{{else}}yes3{{ endif}}`;
-			var html = Zotero.Utilities.Internal.generateHTMLFromTemplate(template, vars);
-			assert.equal(html, 'yes1yes2 yes3');
-		});
-	});
-	
 	describe("OpenURL", function () {
 		var item;
 		
diff --git a/test/tests/webdavTest.js b/test/tests/webdavTest.js
index b400dc458a..2116cf60ff 100644
--- a/test/tests/webdavTest.js
+++ b/test/tests/webdavTest.js
@@ -250,6 +250,97 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
 	//
 	// Tests
 	//
+	describe("#getPassword()", function () {
+		it("should return a stored password with non-ASCII characters", async function () {
+			if (!Zotero.OSKeyStore.available) {
+				this.skip();
+			}
+			var password = "p\u00e4ssw\u20acrd";
+			await controller.setPassword(password);
+			assert.equal(await controller.getPassword(), password);
+		})
+		
+		
+		it("should report a keystore read failure with a usable message", async function () {
+			if (!Zotero.OSKeyStore.available) {
+				this.skip();
+			}
+			await controller.setPassword("password");
+			var decryptStub = sinon.stub(Zotero.OSKeyStore._module, "decrypt")
+				.rejects(keyStoreError());
+			var encryptStub = sinon.stub(Zotero.OSKeyStore._module, "encrypt")
+				.rejects(keyStoreError());
+			try {
+				let e = await getPromiseError(controller.getPassword());
+				assert.equal(e.message, Zotero.getString('os-keystore-read-failed'));
+			}
+			finally {
+				decryptStub.restore();
+				encryptStub.restore();
+			}
+		})
+		
+		
+		it("should tell the user to reenter a password the keystore can't decrypt", async function () {
+			if (!Zotero.OSKeyStore.available) {
+				this.skip();
+			}
+			await controller.setPassword("password");
+			var stub = sinon.stub(Zotero.OSKeyStore._module, "decrypt")
+				.rejects(keyStoreError());
+			try {
+				let e = await getPromiseError(controller.getPassword());
+				assert.equal(e.message, Zotero.getString('os-keystore-read-unrecoverable'));
+			}
+			finally {
+				stub.restore();
+			}
+		})
+		
+		
+		function keyStoreError() {
+			return new Zotero.Error(
+				"Key store unavailable",
+				0,
+				{ keyStoreError: new Error("User canceled OS unlock entry") }
+			);
+		}
+		
+		
+		it("shouldn't store a password that would read back as encrypted", async function () {
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(true);
+			try {
+				var e = await getPromiseError(controller.setPassword("oskv1:example"));
+				assert.ok(e);
+			}
+			finally {
+				encryptStub.restore();
+				confirmStub.restore();
+			}
+		})
+		
+		
+		it("should return a password stored without encryption after a keystore failure", async function () {
+			var password = "p\u00e4ssw\u20acrd";
+			var encryptStub = sinon.stub(Zotero.OSKeyStore, "encrypt")
+				.rejects(keyStoreError());
+			var confirmStub = sinon.stub(Zotero.OSKeyStore, "confirmUnencryptedFallback")
+				.returns(true);
+			try {
+				await controller.setPassword(password);
+				assert.ok(confirmStub.called);
+				assert.equal(await controller.getPassword(), password);
+			}
+			finally {
+				encryptStub.restore();
+				confirmStub.restore();
+			}
+		})
+	})
+	
 	describe("Syncing", function () {
 		it("should skip downloads if not marked as needed", async function () {
 			var engine = await setup();
diff --git a/test/tests/zfsTest.js b/test/tests/zfsTest.js
index 9cc17ade6f..f51b21ca5f 100644
--- a/test/tests/zfsTest.js
+++ b/test/tests/zfsTest.js
@@ -278,6 +278,149 @@ describe("Zotero.Sync.Storage.Mode.ZFS", function () {
 			assert.equal(library.storageVersion, library.libraryVersion);
 		})
 		
+		it("should download a file marked for download even with no remote storage changes", async function () {
+			var { engine, client, caller } = await setup();
+			
+			// A file that went missing locally is marked for download without any remote
+			// storage change, so the storage version matching the library version isn't a
+			// reason to skip the download
+			var library = Zotero.Libraries.userLibrary;
+			library.libraryVersion = 5;
+			library.storageVersion = 5;
+			await library.saveTx();
+			
+			var item = new Zotero.Item("attachment");
+			item.attachmentLinkMode = 'imported_file';
+			item.attachmentPath = 'storage:test.txt';
+			var text = Zotero.Utilities.randomString();
+			item.attachmentSyncState = "to_download";
+			await item.saveTx();
+			
+			var mtime = "1441252524905";
+			var md5 = Zotero.Utilities.Internal.md5(text)
+			
+			var s3Path = `pretend-s3/${item.key}`;
+			server.respondWith(function (req) {
+				if (req.method == "GET"
+						&& req.url == baseURL + `users/1/items/${item.key}/file`) {
+					req.respond(302, {
+						"Zotero-File-Modification-Time": mtime,
+						"Zotero-File-MD5": md5,
+						"Zotero-File-Compressed": "No",
+						"Location": baseURL + s3Path,
+					}, "");
+				}
+			});
+			httpd.registerPathHandler(
+				"/" + s3Path,
+				{
+					handle: function (request, response) {
+						response.setStatusLine(null, 200, "OK");
+						response.write(text);
+					}
+				}
+			);
+			var result = await engine.start();
+			
+			assert.isTrue(result.localChanges);
+			var contents = await Zotero.File.getContentsAsync(await item.getFilePathAsync());
+			assert.equal(contents, text);
+		})
+		
+		it("should download a file marked for upload that's missing locally", async function () {
+			var { engine, client, caller } = await setup();
+			
+			// Model a platform with a live file-change watcher that has already scanned the
+			// library, where the local file scan that marks missing files for download is skipped
+			var watcher = Zotero.Sync.Storage.FileChangeWatcher;
+			var available = watcher.available;
+			watcher.available = true;
+			var stub = sinon.stub(watcher, 'needsFullScan').returns(false);
+			
+			try {
+				var library = Zotero.Libraries.userLibrary;
+				library.libraryVersion = 5;
+				library.storageVersion = 5;
+				await library.saveTx();
+				
+				var item = new Zotero.Item("attachment");
+				item.attachmentLinkMode = 'imported_file';
+				item.attachmentPath = 'storage:test.txt';
+				var text = Zotero.Utilities.randomString();
+				item.attachmentSyncState = "to_upload";
+				await item.saveTx();
+				
+				var mtime = "1441252524905";
+				var md5 = Zotero.Utilities.Internal.md5(text)
+				
+				var s3Path = `pretend-s3/${item.key}`;
+				server.respondWith(function (req) {
+					if (req.method == "GET"
+							&& req.url == baseURL + `users/1/items/${item.key}/file`) {
+						req.respond(302, {
+							"Zotero-File-Modification-Time": mtime,
+							"Zotero-File-MD5": md5,
+							"Zotero-File-Compressed": "No",
+							"Location": baseURL + s3Path,
+						}, "");
+					}
+				});
+				httpd.registerPathHandler(
+					"/" + s3Path,
+					{
+						handle: function (request, response) {
+							response.setStatusLine(null, 200, "OK");
+							response.write(text);
+						}
+					}
+				);
+				
+				await engine.start();
+			}
+			finally {
+				stub.restore();
+				watcher.available = available;
+			}
+			
+			var contents = await Zotero.File.getContentsAsync(await item.getFilePathAsync());
+			assert.equal(contents, text);
+		})
+		
+		it("should only mark a file marked for upload that's missing locally in as-needed mode", async function () {
+			var { engine, client, caller } = await setup();
+			
+			var watcher = Zotero.Sync.Storage.FileChangeWatcher;
+			var available = watcher.available;
+			watcher.available = true;
+			var stub = sinon.stub(watcher, 'needsFullScan').returns(false);
+			Zotero.Sync.Storage.Local.downloadAsNeeded(Zotero.Libraries.userLibraryID, true);
+			
+			try {
+				var library = Zotero.Libraries.userLibrary;
+				library.libraryVersion = 5;
+				await library.saveTx();
+				
+				var item = new Zotero.Item("attachment");
+				item.attachmentLinkMode = 'imported_file';
+				item.attachmentPath = 'storage:test.txt';
+				item.attachmentSyncState = "to_upload";
+				await item.saveTx();
+				
+				await engine.start();
+			}
+			finally {
+				Zotero.Sync.Storage.Local.downloadOnSync(Zotero.Libraries.userLibraryID, true);
+				stub.restore();
+				watcher.available = available;
+			}
+			
+			assert.isFalse(await item.fileExists());
+			assert.equal(
+				item.attachmentSyncState,
+				Zotero.Sync.Storage.Local.SYNC_STATE_TO_DOWNLOAD
+			);
+		})
+		
 		it("should notify when file is downloaded", async function () {
 			var { engine, client, caller } = await setup();
 			
diff --git a/test/tests/zoteroPaneTest.js b/test/tests/zoteroPaneTest.js
index b4fe9b147e..1b5a379f05 100644
--- a/test/tests/zoteroPaneTest.js
+++ b/test/tests/zoteroPaneTest.js
@@ -96,7 +96,7 @@ describe("ZoteroPane", function () {
 			var collection = await createDataObject('collection');
 			await select(win, collection);
 			var noteID = await zp.newNote(false, false, "Test");
-			assert.equal(zp.collectionsView.getSelectedCollection(), collection);
+			assert.equal(zp.collectionsView.getSelectedCollections()[0], collection);
 			var selected = zp.itemsView.getSelectedItems(true);
 			assert.lengthOf(selected, 1);
 			assert.equal(selected, noteID);
@@ -117,30 +117,30 @@ describe("ZoteroPane", function () {
 		});
 	});
 	
-	describe("#newSearch()", function () {
+	describe("Advanced Search", function () {
 		it("should create a saved search", async function () {
-			var promise = waitForDialog(
-				// TODO: Test changing a condition
-				function (dialog) {},
-				'accept',
-				'chrome://zotero/content/searchDialog.xhtml'
-			);
-			var id = await zp.newSearch();
-			await promise;
-			var search = Zotero.Searches.get(id);
-			assert.ok(search);
-			assert.isTrue(search.name.startsWith(Zotero.getString('pane.collections.untitled')));
-		});
-		
-		it("should handle clicking Cancel in the search window", async function () {
-			var promise = waitForDialog(
-				function (dialog) {},
-				'cancel',
-				'chrome://zotero/content/searchDialog.xhtml'
-			);
-			var id = await zp.newSearch();
-			await promise;
-			assert.isFalse(id);
+			await selectLibrary(win);
+			await zp.toggleAdvancedSearchState('open');
+			var deck = doc.getElementById('zotero-advanced-search-pane-deck');
+			
+			var searchIDs = (await Zotero.Searches.getAll(userLibraryID)).map(s => s.id);
+			// Saving prompts for a name; accept the default
+			var promptService = Services.prompt;
+			Services.prompt = { prompt: () => true };
+			try {
+				await deck.pane.save();
+			}
+			finally {
+				Services.prompt = promptService;
+			}
+
+			var newSearches = (await Zotero.Searches.getAll(userLibraryID))
+				.filter(s => !searchIDs.includes(s.id));
+			assert.lengthOf(newSearches, 1);
+			assert.isTrue(newSearches[0].name.startsWith(Zotero.getString('pane.collections.untitled')));
+			assert.equal(deck.state, 'closed');
+			
+			await newSearches[0].eraseTx();
 		});
 	});
 	
@@ -188,8 +188,32 @@ describe("ZoteroPane", function () {
 				Zotero.getString('pane.item.selected.multiple', 2)
 			);
 		})
+
+		it("should update the item count when filtering with nothing selected", async function () {
+			var collection = await createDataObject('collection');
+			await createDataObject('item', { collections: [collection.id], title: 'Perez study' });
+			await createDataObject('item', { collections: [collection.id], title: 'Unrelated paper' });
+
+			await zp.collectionsView.selectByID("C" + collection.id);
+			await waitForItemsLoad(win);
+
+			var messageBox = doc.getElementById('zotero-item-pane-message-box');
+			var twoInView = await doc.l10n.formatValue('item-pane-message-unselected', { count: 2 });
+			var oneInView = await doc.l10n.formatValue('item-pane-message-unselected', { count: 1 });
+
+			// Nothing selected, both items shown
+			await waitForCallback(() => messageBox.textContent == twoInView, 100, 5);
+
+			// Quick search filters to one item; the count should update even though the
+			// selection (nothing) hasn't changed
+			await zp.itemsView.setFilter('search', 'perez');
+			await waitForCallback(() => messageBox.textContent == oneInView, 100, 5);
+
+			await zp.itemsView.setFilter('search', '');
+			await collection.eraseTx();
+		})
 	})
-	
+
 	describe("#viewAttachment", function () {
 		var apiKey = Zotero.Utilities.randomString(24);
 		var baseURL;
@@ -862,8 +886,31 @@ describe("ZoteroPane", function () {
 			assert.isTrue(item.deleted);
 		});
 	});
-	
-	
+
+
+	describe("#emptyTrash()", function () {
+		it("should clear the undo/redo history", async function () {
+			// Record an undo entry
+			Zotero.UndoHistory.clear();
+			var collection = await createDataObject('collection', { name: 'Original' });
+			collection.name = 'Renamed';
+			await collection.saveTx({ undoAction: 'undo-action-rename-collection' });
+			assert.isTrue(Zotero.UndoHistory.canUndo());
+
+			// Put something in the trash to empty
+			await createDataObject('item', { deleted: true });
+
+			await selectTrash(win);
+			var promise = waitForDialog();
+			await zp.emptyTrash();
+			await promise;
+
+			assert.isFalse(Zotero.UndoHistory.canUndo());
+			assert.isFalse(Zotero.UndoHistory.canRedo());
+		});
+	});
+
+
 	describe("#setVirtual()", function () {
 		var cv;
 		
@@ -892,7 +939,7 @@ describe("ZoteroPane", function () {
 			assert.isFalse(cv.getRowIndexByID(id));
 			await zp.setVirtual(userLibraryID, 'duplicates', true, true);
 			// Duplicate Items should be selected
-			assert.equal(zp.getCollectionTreeRow().id, id);
+			assert.equal(zp.getCollectionTreeRows()[0].id, id);
 			// Should be missing from pref
 			assert.isUndefined(JSON.parse(Zotero.Prefs.get('duplicateLibraries'))[userLibraryID])
 			
@@ -914,7 +961,7 @@ describe("ZoteroPane", function () {
 			assert.isFalse(cv.getRowIndexByID(id));
 			await zp.setVirtual(userLibraryID, 'unfiled', true, true);
 			// Unfiled Items should be selected
-			assert.equal(zp.getCollectionTreeRow().id, id);
+			assert.equal(zp.getCollectionTreeRows()[0].id, id);
 			// Should be missing from pref
 			assert.isUndefined(JSON.parse(Zotero.Prefs.get('unfiledLibraries'))[userLibraryID])
 		});
@@ -936,7 +983,7 @@ describe("ZoteroPane", function () {
 			
 			// Library should have been expanded and Duplicate Items selected
 			assert.ok(cv.getRowIndexByID(id));
-			assert.equal(zp.getCollectionTreeRow().id, id);
+			assert.equal(zp.getCollectionTreeRows()[0].id, id);
 		});
 		
 		it("should hide a virtual collection in My Library", async function () {
@@ -1007,19 +1054,26 @@ describe("ZoteroPane", function () {
 	});
 	
 	describe("#editSelectedCollection()", function () {
+		async function editSearchAddCondition(search) {
+			await select(win, search);
+			await zp.editSelectedCollection();
+			
+			var deck = doc.getElementById('zotero-advanced-search-pane-deck');
+			assert.equal(deck.state, 'open');
+			assert.equal(deck.selectedSearchType, 'saved');
+			
+			var pane = deck.pane;
+			var searchBox = pane.querySelector('zoterosearch');
+			var c = searchBox.search.getCondition(
+				searchBox.search.addCondition("title", "contains", "foo")
+			);
+			searchBox.rootGroup.addCondition(c);
+			await pane.save();
+		}
+		
 		it("should edit a saved search", async function () {
 			var search = await createDataObject('search');
-			await select(win, search);
-			var promise = waitForWindow('chrome://zotero/content/searchDialog.xhtml', function (win) {
-				let searchBox = win.document.getElementById('search-box');
-				var c = searchBox.search.getCondition(
-					searchBox.search.addCondition("title", "contains", "foo")
-				);
-				searchBox.addCondition(c);
-				win.document.querySelector('dialog').acceptDialog();
-			});
-			await zp.editSelectedCollection();
-			await promise;
+			await editSearchAddCondition(search);
 			var conditions = search.getConditions();
 			assert.lengthOf(Object.keys(conditions), 3);
 		});
@@ -1027,22 +1081,123 @@ describe("ZoteroPane", function () {
 		it("should edit a saved search in a group", async function () {
 			var group = await getGroup();
 			var search = await createDataObject('search', { libraryID: group.libraryID });
-			await select(win, search);
-			var promise = waitForWindow('chrome://zotero/content/searchDialog.xhtml', function (win) {
-				let searchBox = win.document.getElementById('search-box');
-				var c = searchBox.search.getCondition(
-					searchBox.search.addCondition("title", "contains", "foo")
-				);
-				searchBox.addCondition(c);
-				win.document.querySelector('dialog').acceptDialog();
-			});
-			await zp.editSelectedCollection();
-			await promise;
+			await editSearchAddCondition(search);
 			var conditions = search.getConditions();
 			assert.lengthOf(Object.keys(conditions), 3);
 		});
 	});
 	
+	describe("#buildCollectionContextMenu()", function () {
+		async function selectCollectionRows(ids) {
+			let cv = zp.collectionsView;
+			await cv.selectByID(ids[0]);
+			await waitForItemsLoad(win);
+			for (let id of ids.slice(1)) {
+				cv.selection.toggleSelect(cv.getRowIndexByID(id));
+			}
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+		}
+
+		afterEach(async function () {
+			await selectLibrary(win);
+		});
+
+		it("should hide New Subcollection and Rename for a multiple-collection selection", async function () {
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection');
+
+			// A single collection shows both single-target actions
+			await selectCollectionRows(["C" + c1.id]);
+			await zp.buildCollectionContextMenu();
+			assert.isFalse(win.document.getElementById('newSubcollection').hidden);
+			assert.isFalse(win.document.getElementById('editSelectedCollection').hidden);
+
+			// Two collections hides them
+			await selectCollectionRows(["C" + c1.id, "C" + c2.id]);
+			await zp.buildCollectionContextMenu();
+			assert.isTrue(win.document.getElementById('newSubcollection').hidden);
+			assert.isTrue(win.document.getElementById('editSelectedCollection').hidden);
+		});
+
+		it("should disable the report for a cross-library collection selection", async function () {
+			let group = await createGroup();
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection', { libraryID: group.libraryID });
+			await createDataObject('item', { collections: [c1.id] });
+			await createDataObject('item', { libraryID: group.libraryID, collections: [c2.id] });
+
+			await zp.collectionsView.expandLibrary(group.libraryID);
+			await selectCollectionRows(["C" + c1.id, "C" + c2.id]);
+			await zp.buildCollectionContextMenu();
+			assert.isTrue(win.document.getElementById('loadReport').disabled);
+
+			await group.eraseTx();
+		});
+	});
+
+	describe("#buildAddItemToCollectionMenu()", function () {
+		var popup;
+		
+		before(function () {
+			popup = doc.getElementById('zotero-add-to-collection-popup');
+		});
+		
+		beforeEach(async function () {
+			// Leave the tree on the library root, so that a collection created later in a test
+			// can't be recorded by the reselection that follows adding a row
+			await selectLibrary(win);
+		});
+		
+		after(async function () {
+			// Don't leave a multiple selection behind for later tests
+			await selectLibrary(win);
+		});
+		
+		it("should record the selected collection as recently used", async function () {
+			var collection = await createDataObject('collection');
+			await zp.collectionsView.selectByID("C" + collection.id);
+			await waitForItemsLoad(win);
+			
+			assert.equal(Zotero.Collections.getRecent()[0], collection);
+		});
+		
+		it("should record the collection added to a multiple selection", async function () {
+			var c1 = await createDataObject('collection', { name: 'AAA recent' });
+			var c2 = await createDataObject('collection', { name: 'ZZZ recent' });
+			var cv = zp.collectionsView;
+			await cv.selectByID("C" + c1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			
+			assert.equal(Zotero.Collections.getRecent()[0], c2);
+		});
+		
+		it("should offer recently used collections above the full list", async function () {
+			var parent = await createDataObject('collection', { name: 'Parent' });
+			var child = await createDataObject('collection', { name: 'Child', parentID: parent.id });
+			var item = await createDataObject('item', { collections: [parent.id] });
+			
+			Zotero.Collections.addToRecent(parent);
+			Zotero.Collections.addToRecent(child);
+			
+			zp.buildAddItemToCollectionMenu({ target: popup, currentTarget: popup }, [item]);
+			
+			// Recent collections follow New Collection and a separator, by full path
+			var nodes = [...popup.children];
+			var recent = [];
+			for (let node of nodes.slice(nodes.findIndex(n => n.tagName == 'menuseparator') + 1)) {
+				if (node.tagName == 'menuseparator') break;
+				recent.push(node.getAttribute('label'));
+			}
+			assert.include(recent, 'Parent \u203A Child');
+			// The parent already contains the item, so it isn't offered
+			assert.notInclude(recent, 'Parent');
+		});
+	});
+	
 	describe("#buildItemContextMenu()", function () {
 		it("shouldn't show export or bib options for multiple standalone file attachments without notes", async function () {
 			var item1 = await importFileAttachment('test.png');
@@ -1055,7 +1210,137 @@ describe("ZoteroPane", function () {
 			assert.isTrue(menu.querySelector('.zotero-menuitem-export').hidden);
 			assert.isTrue(menu.querySelector('.zotero-menuitem-create-bibliography').hidden);
 		});
-		
+
+		it("should disable the report when selected items span libraries", async function () {
+			let group = await createGroup();
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection', { libraryID: group.libraryID });
+			let item1 = await createDataObject('item', { collections: [c1.id] });
+			let item2 = await createDataObject('item', { libraryID: group.libraryID, collections: [c2.id] });
+
+			// Cross-library multiple-collection selection -> grouped items view
+			await zp.collectionsView.expandLibrary(group.libraryID);
+			let cv = zp.collectionsView;
+			await cv.selectByID("C" + c1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+
+			let menu = win.document.getElementById('zotero-itemmenu');
+			let report = menu.querySelector('.zotero-menuitem-create-report');
+
+			// Select within the current (grouped) view rather than ZoteroPane.selectItems(),
+			// which would navigate the collection tree and drop the multi-selection
+
+			// Items from a single library: report enabled
+			await zp.itemsView.selectItems([item1.id]);
+			await zp.buildItemContextMenu();
+			assert.isFalse(report.disabled);
+
+			// Items spanning libraries: report disabled
+			await zp.itemsView.selectItems([item1.id, item2.id]);
+			await zp.buildItemContextMenu();
+			assert.isTrue(report.disabled);
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("shouldn't offer Remove from Collection when a saved search is also selected", async function () {
+			let collection = await createDataObject('collection');
+			let search = await createDataObject('search');
+			let item = await createDataObject('item', { collections: [collection.id] });
+
+			let cv = zp.collectionsView;
+			let menu = win.document.getElementById('zotero-itemmenu');
+			let removeItems = menu.querySelector('.zotero-menuitem-remove-items');
+			let moveToTrash = menu.querySelector('.zotero-menuitem-move-to-trash');
+
+			await cv.selectByID("C" + collection.id);
+			await waitForItemsLoad(win);
+			await zp.itemsView.selectItems([item.id]);
+			await zp.buildItemContextMenu();
+			assert.isFalse(removeItems.hidden, "Offered for a collection on its own");
+
+			// Items in the saved search needn't be in the collection, so removing
+			// from the collection isn't meaningful
+			cv.selection.toggleSelect(cv.getRowIndexByID("S" + search.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+			await zp.itemsView.selectItems([item.id]);
+			await zp.buildItemContextMenu();
+			assert.isTrue(removeItems.hidden, "Not offered alongside a saved search");
+			assert.isFalse(moveToTrash.hidden, "Move to Trash is still offered");
+
+			await selectLibrary(win);
+		});
+
+		it("shouldn't open the item context menu on a library header row", async function () {
+			let group = await createGroup();
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection', { libraryID: group.libraryID });
+			await createDataObject('item', { collections: [c1.id] });
+			await createDataObject('item', { libraryID: group.libraryID, collections: [c2.id] });
+
+			// Cross-library multiple-collection selection -> grouped view with headers
+			await zp.collectionsView.expandLibrary(group.libraryID);
+			let cv = zp.collectionsView;
+			await cv.selectByID("C" + c1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+
+			let headerRow = zp.itemsView.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			let headerNode = win.document.getElementById(`${zp.itemsView.id}-row-${headerRow}`);
+			assert.isTrue(headerNode.classList.contains('library-header-row'));
+
+			let spy = sinon.spy(zp, 'buildItemContextMenu');
+			try {
+				await zp.onItemsContextMenuOpen({ target: headerNode, screenX: 0, screenY: 0 });
+				assert.isFalse(spy.called, "Context menu shouldn't be built for a header row");
+			}
+			finally {
+				spy.restore();
+			}
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
+		it("shouldn't activate a library header row on double-click", async function () {
+			let group = await createGroup();
+			let c1 = await createDataObject('collection');
+			let c2 = await createDataObject('collection', { libraryID: group.libraryID });
+			await createDataObject('item', { collections: [c1.id] });
+			await createDataObject('item', { libraryID: group.libraryID, collections: [c2.id] });
+
+			// Cross-library multiple-collection selection -> grouped view with headers
+			await zp.collectionsView.expandLibrary(group.libraryID);
+			let cv = zp.collectionsView;
+			await cv.selectByID("C" + c1.id);
+			await waitForItemsLoad(win);
+			cv.selection.toggleSelect(cv.getRowIndexByID("C" + c2.id));
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+
+			let headerRow = zp.itemsView.getRowIndexByID("L" + Zotero.Libraries.userLibraryID);
+			assert.equal(zp.itemsView.getRow(headerRow).type, 'library-header');
+
+			let spy = sinon.spy(zp, 'onItemTreeActivate');
+			try {
+				zp.itemsView.handleActivate(new MouseEvent('dblclick'), [headerRow]);
+				assert.isFalse(spy.called, "Header row shouldn't be activated");
+			}
+			finally {
+				spy.restore();
+			}
+
+			await selectLibrary(win);
+			await group.eraseTx();
+		});
+
 		it("should show “Export Note…” for standalone file attachment with note", async function () {
 			var item1 = await importFileAttachment('test.png');
 			item1.setNote('<p>Foo</p>');
@@ -1467,6 +1752,7 @@ describe("ZoteroPane", function () {
 
 		// Focus sequence for Zotero Pane
 		let sequence = [
+			"zotero-tb-search-textbox",
 			"zotero-tb-search-dropmarker",
 			"zotero-tb-add",
 			"tag-selector-actions",
@@ -1478,7 +1764,19 @@ describe("ZoteroPane", function () {
 			"zotero-tb-sync",
 			"zotero-tb-tabs-menu"
 		];
-		beforeEach(function () {
+		// The focus traversal relies on focus/blur events, which only fire when the
+		// window is active. It's normally active, but can lose activation --
+		// intermittently in CI, or when another app is focused during a local run --
+		// so restore it if necessary and report whether that worked.
+		async function activatePaneWindow() {
+			if (Services.focus.activeWindow !== win) {
+				win.focus();
+				await Zotero.Promise.delay(100);
+			}
+			return Services.focus.activeWindow === win;
+		}
+
+		beforeEach(async function () {
 			// Reset collection search field state
 			let collectionSearchField = doc.getElementById("zotero-collections-search");
 			let collectionSearchButton = doc.getElementById("zotero-tb-collections-search");
@@ -1491,8 +1789,16 @@ describe("ZoteroPane", function () {
 		});
 
 		it("should shift-tab across the zotero pane", async function () {
-			let searchBox = doc.getElementById('zotero-tb-search-textbox');
-			searchBox.focus();
+			// Without an active window, the traversal waits for events that never come
+			if (!await activatePaneWindow()) {
+				Zotero.debug("Skipping test -- pane window isn't active");
+				this.skip();
+			}
+
+			// Start from the Advanced Search button (the last focusable element in the
+			// search field) so the first shift-tab exercises advanced button -> search field
+			let advancedButton = doc.getElementById('zotero-tb-search-advanced-button');
+			advancedButton.focus();
 
 			for (let id of sequence) {
 				// Set up focus listener before dispatching the event
@@ -1539,6 +1845,12 @@ describe("ZoteroPane", function () {
 		});
 
 		it("should tab across the zotero pane", async function () {
+			// Without an active window, the traversal waits for events that never come
+			if (!await activatePaneWindow()) {
+				Zotero.debug("Skipping test -- pane window isn't active");
+				this.skip();
+			}
+
 			win.Zotero_Tabs.moveFocus("current");
 			let reversed = [...sequence].reverse();
 			for (let id of reversed) {
@@ -1563,6 +1875,9 @@ describe("ZoteroPane", function () {
 					assert.include(clases, id);
 				}
 			}
+			// Tab from the search field to the Advanced Search button at the end of the field
+			doc.activeElement.dispatchEvent(tab);
+			assert.equal(doc.activeElement.id, "zotero-tb-search-advanced-button");
 		});
 
 		it("should navigate toolbarbuttons with arrows", async function () {
@@ -1967,4 +2282,408 @@ describe("ZoteroPane", function () {
 			assert.includeMembers(topLevelCollections, [collectionChild]);
 		});
 	});
+
+
+	describe("Multi-Collection Selection", function () {
+		afterEach(async function () {
+			Zotero.Prefs.clear('recursiveCollections');
+			await selectLibrary(win);
+		});
+
+		async function selectMultipleCollections(collections) {
+			let cv = zp.collectionsView;
+			// Select the first collection
+			await cv.selectByID("C" + collections[0].id);
+			await waitForItemsLoad(win);
+			// Toggle-select additional collections
+			for (let i = 1; i < collections.length; i++) {
+				let row = cv.getRowIndexByID("C" + collections[i].id);
+				cv.selection.toggleSelect(row);
+			}
+			// Wait for the items view to reload with the combined set. The
+			// selection-triggered call is queued ahead of this one in Zotero.serial,
+			// and this one no-ops once the view matches the selection.
+			await zp.onCollectionSelected();
+			await zp.itemsView.waitForLoad();
+		}
+
+		describe("Uncombinable selections", function () {
+			it("should keep only the focused row when Recently Read and a collection are selected together", async function () {
+				let collection = await createDataObject('collection');
+				let cv = zp.collectionsView;
+				// Show and select Recently Read
+				await zp.setVirtual(Zotero.Libraries.userLibraryID, 'recentlyRead', true, true);
+				await waitForItemsLoad(win);
+				// Toggle-select the collection, forming an uncombinable two-row selection
+				cv.selection.toggleSelect(cv.getRowIndexByID("C" + collection.id));
+				await zp.onCollectionSelected();
+
+				// The selection should have been reduced to the focused (collection) row
+				assert.equal(cv.selection.count, 1);
+				let rows = zp.getCollectionTreeRows();
+				assert.lengthOf(rows, 1);
+				assert.isTrue(rows[0].isCollection());
+
+				await zp.setVirtual(Zotero.Libraries.userLibraryID, 'recentlyRead', false);
+			});
+
+			it("should keep only the focused row when a library and a collection are selected together", async function () {
+				let collection = await createDataObject('collection');
+				let cv = zp.collectionsView;
+				// Select the library root, then toggle-select a collection within it
+				await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+				await waitForItemsLoad(win);
+				cv.selection.toggleSelect(cv.getRowIndexByID("C" + collection.id));
+				await zp.onCollectionSelected();
+
+				// The selection should have been reduced to the focused (collection) row
+				assert.equal(cv.selection.count, 1);
+				let rows = zp.getCollectionTreeRows();
+				assert.lengthOf(rows, 1);
+				assert.isTrue(rows[0].isCollection());
+			});
+		});
+
+		describe("Combinable special views", function () {
+			it("should combine Recently Read across libraries without reducing the selection", async function () {
+				let userLibraryID = Zotero.Libraries.userLibraryID;
+				let groupLibraryID = (await createGroup()).libraryID;
+				let cv = zp.collectionsView;
+
+				// Seed a recently-read item in each library
+				let userItem = await createDataObject('item', { libraryID: userLibraryID });
+				let userAttachment = await importPDFAttachment(userItem);
+				userAttachment.attachmentLastRead = Math.round(Date.now() / 1000);
+				await userAttachment.saveTx();
+				let groupItem = await createDataObject('item', { libraryID: groupLibraryID });
+				let groupAttachment = await importPDFAttachment(groupItem);
+				groupAttachment.attachmentLastRead = Math.round(Date.now() / 1000);
+				await groupAttachment.saveTx();
+
+				// Show Recently Read in both libraries, then select both rows
+				await zp.setVirtual(userLibraryID, 'recentlyRead', true, false);
+				await zp.setVirtual(groupLibraryID, 'recentlyRead', true, false);
+				await cv.selectByID('Y' + userLibraryID);
+				await waitForItemsLoad(win);
+				cv.selection.toggleSelect(cv.getRowIndexByID('Y' + groupLibraryID));
+				await zp.onCollectionSelected();
+				await zp.itemsView.waitForLoad();
+
+				// Both Recently Read rows should remain selected
+				assert.equal(cv.selection.count, 2);
+				let rows = zp.getCollectionTreeRows();
+				assert.lengthOf(rows, 2);
+				assert.isTrue(rows.every(r => r.isRecentlyRead()));
+
+				// The items list should show the recently-read item from each library
+				assert.isNumber(zp.itemsView.getRowIndexByID(userItem.id));
+				assert.isNumber(zp.itemsView.getRowIndexByID(groupItem.id));
+
+				await zp.setVirtual(userLibraryID, 'recentlyRead', false);
+				await zp.setVirtual(groupLibraryID, 'recentlyRead', false);
+				Zotero.Items._lastReadCutoffs.clear();
+			});
+		});
+
+		describe("Select All (Cmd/Ctrl-A)", function () {
+			// Cmd/Ctrl-A is wired to _handleSelectAll() in the tree's keydown handler;
+			// the tests call it directly so they can await its (sometimes async) work.
+
+			it("should select all library roots when a library is selected", async function () {
+				let group = await createGroup();
+				let cv = zp.collectionsView;
+				await cv.selectByID("L" + Zotero.Libraries.userLibraryID);
+				await waitForItemsLoad(win);
+
+				await cv._handleSelectAll();
+				await zp.onCollectionSelected();
+				await zp.itemsView.waitForLoad();
+
+				let rows = zp.getCollectionTreeRows();
+				assert.isAbove(rows.length, 1, "More than one row should be selected");
+				assert.isTrue(rows.every(r => r.isLibrary(true)), "Every selected row should be a library root");
+				let libraryIDs = rows.map(r => r.ref.libraryID);
+				assert.include(libraryIDs, Zotero.Libraries.userLibraryID);
+				assert.include(libraryIDs, group.libraryID);
+
+				await group.eraseTx();
+			});
+
+			it("should select collections sharing a parent with any selected collection", async function () {
+				let cv = zp.collectionsView;
+				// Two parents with their own children. Selecting one child from each
+				// should expand to all children of both parents -- but not deeper
+				// (a subcollection) and not other libraries.
+				let parentA = await createDataObject('collection');
+				let a1 = await createDataObject('collection', { parentID: parentA.id });
+				let a2 = await createDataObject('collection', { parentID: parentA.id });
+				let parentB = await createDataObject('collection');
+				let b1 = await createDataObject('collection', { parentID: parentB.id });
+				let b2 = await createDataObject('collection', { parentID: parentB.id });
+				let sub = await createDataObject('collection', { parentID: a1.id });
+				let group = await createGroup();
+				let other = await createDataObject('collection', { libraryID: group.libraryID });
+
+				// Make the subcollection and the other library's collection visible rows
+				// so their exclusion is actually exercised, not just an absence of rows
+				await cv.expandToCollection(sub.id);
+				await cv.expandToCollection(b1.id);
+				await cv.expandLibrary(group.libraryID);
+				await cv.selectByID("C" + a1.id);
+				await waitForItemsLoad(win);
+				cv.selection.toggleSelect(cv.getRowIndexByID("C" + b1.id));
+				await zp.onCollectionSelected();
+
+				await cv._handleSelectAll();
+				await zp.onCollectionSelected();
+				await zp.itemsView.waitForLoad();
+
+				let rows = zp.getCollectionTreeRows();
+				assert.isTrue(rows.every(r => r.isCollection()), "Every selected row should be a collection");
+				assert.sameMembers(rows.map(r => r.ref), [a1, a2, b1, b2]);
+
+				await group.eraseTx();
+			});
+
+			it("should select Recently Read in all libraries", async function () {
+				let userLibraryID = Zotero.Libraries.userLibraryID;
+				let groupLibraryID = (await createGroup()).libraryID;
+				let cv = zp.collectionsView;
+
+				await zp.setVirtual(userLibraryID, 'recentlyRead', true, false);
+				await zp.setVirtual(groupLibraryID, 'recentlyRead', true, false);
+				// Collapse the group so its Recently Read row isn't in the tree -- Select
+				// All must expand it to reach Recently Read in every library. Do this
+				// before selecting, since collapseLibrary() selects the collapsed library.
+				cv.collapseLibrary(groupLibraryID);
+				assert.isFalse(cv.getRowIndexByID('Y' + groupLibraryID),
+					"Group Recently Read should be hidden before Select All");
+				await cv.selectByID('Y' + userLibraryID);
+				await waitForItemsLoad(win);
+
+				await cv._handleSelectAll();
+				await zp.onCollectionSelected();
+				await zp.itemsView.waitForLoad();
+
+				let rows = zp.getCollectionTreeRows();
+				assert.isTrue(rows.every(r => r.isRecentlyRead()), "Every selected row should be Recently Read");
+				let libraryIDs = rows.map(r => r.ref.libraryID);
+				assert.include(libraryIDs, userLibraryID);
+				assert.include(libraryIDs, groupLibraryID);
+
+				await zp.setVirtual(userLibraryID, 'recentlyRead', false);
+				await zp.setVirtual(groupLibraryID, 'recentlyRead', false);
+			});
+
+			it("should leave a saved-search selection untouched", async function () {
+				let cv = zp.collectionsView;
+				// Saved searches combine fine, so this is a valid manual multi-selection,
+				// but Select All has no useful expansion for them and must not change it
+				let s1 = await createDataObject('search');
+				let s2 = await createDataObject('search');
+				let s3 = await createDataObject('search');
+				await createDataObject('search');
+				await cv.selectByID("S" + s1.id);
+				await waitForItemsLoad(win);
+				cv.selection.toggleSelect(cv.getRowIndexByID("S" + s2.id));
+				cv.selection.toggleSelect(cv.getRowIndexByID("S" + s3.id));
+				await zp.onCollectionSelected();
+				assert.equal(cv.selection.count, 3);
+
+				await cv._handleSelectAll();
+				await zp.onCollectionSelected();
+
+				assert.equal(cv.selection.count, 3, "Select All should not add the fourth search");
+				let rows = zp.getCollectionTreeRows();
+				assert.sameMembers(rows.map(r => r.ref), [s1, s2, s3]);
+			});
+		});
+
+		describe("Items display", function () {
+			it("should show items from multiple selected collections", async function () {
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection');
+				let item1 = await createDataObject('item', { collections: [collection1.id] });
+				let item2 = await createDataObject('item', { collections: [collection2.id] });
+
+				await selectMultipleCollections([collection1, collection2]);
+
+				let itemsView = zp.itemsView;
+				assert.ok(itemsView.getRowIndexByID(item1.id) !== false, "Item from first collection should be shown");
+				assert.ok(itemsView.getRowIndexByID(item2.id) !== false, "Item from second collection should be shown");
+			});
+
+			it("should show items from subcollections with recursiveCollections", async function () {
+				Zotero.Prefs.set('recursiveCollections', true);
+
+				let collection1 = await createDataObject('collection');
+				let subCollection1 = await createDataObject('collection', { parentID: collection1.id });
+				let collection2 = await createDataObject('collection');
+				let subCollection2 = await createDataObject('collection', { parentID: collection2.id });
+
+				let item1 = await createDataObject('item', { collections: [subCollection1.id] });
+				let item2 = await createDataObject('item', { collections: [subCollection2.id] });
+				let item3 = await createDataObject('item', { collections: [collection1.id] });
+
+				await selectMultipleCollections([collection1, collection2]);
+
+				let itemsView = zp.itemsView;
+				assert.ok(itemsView.getRowIndexByID(item1.id) !== false,
+					"Item from subcollection of first collection should be shown");
+				assert.ok(itemsView.getRowIndexByID(item2.id) !== false,
+					"Item from subcollection of second collection should be shown");
+				assert.ok(itemsView.getRowIndexByID(item3.id) !== false,
+					"Item directly in first collection should be shown");
+			});
+
+			it("should not duplicate items that exist in both selected collections", async function () {
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection');
+				let item = await createDataObject('item', { collections: [collection1.id, collection2.id] });
+
+				await selectMultipleCollections([collection1, collection2]);
+
+				let itemsView = zp.itemsView;
+				// Count how many times the item appears. Compare the row's ref object
+				// rather than its id: a section header's ref is the library, whose id can
+				// collide with an item id in a fresh database.
+				let count = 0;
+				for (let i = 0; i < itemsView.rowCount; i++) {
+					if (itemsView.getRow(i).ref === item) {
+						count++;
+					}
+				}
+				assert.equal(count, 1, "Item in both collections should appear only once");
+			});
+			
+			it("should group items by library for a cross-library selection", async function () {
+				let group = await createGroup();
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection', { libraryID: group.libraryID });
+				await createDataObject('item', { collections: [collection1.id] });
+				await createDataObject('item', { libraryID: group.libraryID, collections: [collection2.id] });
+
+				await zp.collectionsView.expandLibrary(group.libraryID);
+				await selectMultipleCollections([collection1, collection2]);
+
+				// The detailed grouping behavior (ordering, header heights, gating) is
+				// covered in collectionViewItemTreeTest; here just confirm that a
+				// cross-library selection produces a library-grouped view
+				assert.isNumber(zp.itemsView.getRowIndexByID("L" + Zotero.Libraries.userLibraryID),
+					"Cross-library selection should show a library header");
+
+				await selectLibrary(win);
+				await group.eraseTx();
+			});
+		});
+
+		describe("#newItem()", function () {
+			it("should add a new item to all selected collections", async function () {
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection');
+
+				await selectMultipleCollections([collection1, collection2]);
+
+				let item = await zp.newItem(Zotero.ItemTypes.getID('book'), {}, null, true);
+
+				assert.isTrue(item.inCollection(collection1.id),
+					"New item should be in first selected collection");
+				assert.isTrue(item.inCollection(collection2.id),
+					"New item should be in second selected collection");
+			});
+		});
+
+		describe("#duplicateSelectedItem()", function () {
+			it("should add duplicate to the subset of selected collections the original belongs to", async function () {
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection');
+				let collection3 = await createDataObject('collection');
+				// Item is in collections 1 and 3, not 2
+				let item = await createDataObject('item', { collections: [collection1.id, collection3.id] });
+
+				// Select collection1, which contains the item
+				await select(win, collection1);
+				await zp.itemsView.selectItem(item.id);
+
+				// Temporarily override getCollectionTreeRows to simulate multi-collection selection
+				let cv = zp.collectionsView;
+				let origGetRows = zp.getCollectionTreeRows;
+				let row1 = cv.getRowIndexByID("C" + collection1.id);
+				let row2 = cv.getRowIndexByID("C" + collection2.id);
+				let row3 = cv.getRowIndexByID("C" + collection3.id);
+				zp.getCollectionTreeRows = function () {
+					return [row1, row2, row3].map(index => cv.getRow(index));
+				};
+
+				try {
+					let duplicate = await zp.duplicateSelectedItem();
+
+					// Duplicate should be in collections 1 and 3 (selected + original is there)
+					// but not in collection 2 (selected but original isn't there)
+					assert.isTrue(duplicate.inCollection(collection1.id),
+						"Duplicate should be in collection 1 (selected and original exists)");
+					assert.isFalse(duplicate.inCollection(collection2.id),
+						"Duplicate should not be in collection 2 (selected but original doesn't exist)");
+					assert.isTrue(duplicate.inCollection(collection3.id),
+						"Duplicate should be in collection 3 (selected and original exists)");
+				}
+				finally {
+					zp.getCollectionTreeRows = origGetRows;
+				}
+			});
+		});
+
+		describe("#deleteSelectedCollection()", function () {
+			it("should move all selected collections to trash", async function () {
+				let collection1 = await createDataObject('collection');
+				let collection2 = await createDataObject('collection');
+
+				await selectMultipleCollections([collection1, collection2]);
+
+				let promise = waitForDialog();
+				await zp.deleteSelectedCollection();
+				await promise;
+
+				assert.isTrue(collection1.deleted,
+					"First collection should be in trash");
+				assert.isTrue(collection2.deleted,
+					"Second collection should be in trash");
+			});
+		});
+	});
+
+	describe("Quick search", function () {
+		var origWidth, origHeight;
+
+		before(function () {
+			origWidth = win.outerWidth;
+			origHeight = win.outerHeight;
+		});
+
+		after(function () {
+			win.resizeTo(origWidth, origHeight);
+		});
+
+		it("should keep the Advanced Search button within the items pane when the items pane is squeezed", async function () {
+			await selectLibrary(win);
+			// Narrow enough that the items pane (and its toolbar) is squeezed, but still wide
+			// enough to stay in standard (non-stacked) layout. With the collections pane and a
+			// wide item pane, this leaves the search field too narrow to reach its full width.
+			win.resizeTo(1000, 800);
+			await waitForCallback(() => win.innerWidth <= 1010, 10, 20);
+
+			let container = doc.getElementById('zotero-items-pane-container');
+			let search = doc.getElementById('zotero-tb-search');
+			let advButton = search.querySelector('#zotero-tb-search-advanced-button');
+			assert.ok(advButton, "Advanced Search button exists");
+
+			// Precondition: the field is squeezed below its max width, so the wrapper would
+			// overflow and push the trailing button out if it weren't allowed to shrink
+			assert.isBelow(search.getBoundingClientRect().width, 300,
+				"search field is squeezed below its full width");
+			// The button must stay within the items pane rather than overflowing under the item pane
+			assert.isAtMost(advButton.getBoundingClientRect().right, container.getBoundingClientRect().right,
+				"Advanced Search button's right edge is within the items pane");
+		});
+	});
 })
diff --git a/test/tests/zoteroTest.js b/test/tests/zoteroTest.js
index 38b02f7e88..d4d0a27ea2 100644
--- a/test/tests/zoteroTest.js
+++ b/test/tests/zoteroTest.js
@@ -1,6 +1,79 @@
 "use strict";
 
 describe("Zotero", function() {
+	describe("#restoreZoteroPaneProgressMeter()", function () {
+		// A token captures the current display state, so taking one and immediately
+		// restoring it reads the state without changing it
+		function getProgressState() {
+			let token = Zotero.showZoteroPaneProgressMeter(undefined);
+			Zotero.restoreZoteroPaneProgressMeter(token);
+			return token;
+		}
+		
+		afterEach(function () {
+			Zotero.hideZoteroPaneOverlays();
+		});
+		
+		it("should restore nested progress displays to their previous owners", function () {
+			let token1 = Zotero.showZoteroPaneProgressMeter("One", true);
+			Zotero.updateZoteroPaneProgressMeter(30);
+			let token2 = Zotero.showZoteroPaneProgressMeter("Two");
+			
+			// The new display should start with no percentage, so that a first update
+			// matching the previous meter's position isn't suppressed
+			assert.isNull(getProgressState().percentage);
+			
+			// Restoring an outer token while an inner display is up should do nothing
+			Zotero.restoreZoteroPaneProgressMeter(token1);
+			assert.isTrue(Zotero.locked);
+			
+			// Restoring the inner token should re-show the outer display, including its
+			// meter position, which is stored scaled by 10
+			Zotero.restoreZoteroPaneProgressMeter(token2);
+			let state = getProgressState();
+			assert.equal(state.message, "One");
+			assert.isTrue(state.determinate);
+			assert.equal(state.percentage, 300);
+			
+			// Now the outer token can restore, unlocking the pane
+			Zotero.restoreZoteroPaneProgressMeter(token1);
+			assert.isFalse(Zotero.locked);
+		});
+		
+		it("should capture a meter switched to indeterminate by updateZoteroPaneProgressMeter()", function () {
+			let token1 = Zotero.showZoteroPaneProgressMeter("One", true);
+			Zotero.updateZoteroPaneProgressMeter(null);
+			let token2 = Zotero.showZoteroPaneProgressMeter("Two");
+			assert.isFalse(token2.determinate);
+			assert.isNull(token2.percentage);
+			
+			Zotero.restoreZoteroPaneProgressMeter(token2);
+			let state = getProgressState();
+			assert.isFalse(state.determinate);
+			assert.isNull(state.percentage);
+			
+			Zotero.restoreZoteroPaneProgressMeter(token1);
+			assert.isFalse(Zotero.locked);
+		});
+		
+		it("should capture a meter switched to determinate by updateZoteroPaneProgressMeter()", function () {
+			let token1 = Zotero.showZoteroPaneProgressMeter("One");
+			Zotero.updateZoteroPaneProgressMeter(40);
+			let token2 = Zotero.showZoteroPaneProgressMeter("Two");
+			assert.isTrue(token2.determinate);
+			assert.equal(token2.percentage, 400);
+			
+			Zotero.restoreZoteroPaneProgressMeter(token2);
+			let state = getProgressState();
+			assert.isTrue(state.determinate);
+			assert.equal(state.percentage, 400);
+			
+			Zotero.restoreZoteroPaneProgressMeter(token1);
+			assert.isFalse(Zotero.locked);
+		});
+	});
+	
+	
 	describe("VersionHeader", function () {
 		describe("#update()", function () {
 			var majorMinorVersion;
diff --git a/translators b/translators
index cfc69de47e..60f2d542ff 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit cfc69de47e1e1fb88122cbbba6c30f56d6ed63fe
+Subproject commit 60f2d542ffcd3bb1208b0d991e9c8e8fc849a1f7
diff --git a/version b/version
index 697a1131b7..e2825a7ff7 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-10.0.SOURCE
+11.0.SOURCE