Release 4.6.0

Created by ./build_tools/release.sh 4.6.0

.editorconfig

@@ -21,7 +21,7 @@ indent_size = 4
 [build_tools/release.sh]
 max_line_length = 72
 
-[{Dockerfile,Vagrantfile}]
+[Vagrantfile]
 indent_size = 2
 
 [share/{completions,functions}/**.fish]

.github/workflows/autolabel_prs.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - name: Set label and milestone
       id: set-label-milestone
-      uses: actions/github-script@v7
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8, build_tools/update-dependencies.sh
       with:
         script: |
           const completionsLabel = 'completions';

.github/workflows/build_docker_images.yml

@@ -37,10 +37,10 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
       -
         name: Login to Container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0, build_tools/update-dependencies.sh
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -48,14 +48,14 @@ jobs:
       -
         name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0, build_tools/update-dependencies.sh
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.NAMESPACE }}/${{ matrix.target }}
           flavor: |
             latest=true
       -
         name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0, build_tools/update-dependencies.sh
         with:
           context: docker/context
           push: true

.github/workflows/lint-dependencies.yml

@@ -16,8 +16,8 @@ jobs:
   cargo-deny:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
-    - uses: EmbarkStudios/cargo-deny-action@v2
+    - uses: EmbarkStudios/cargo-deny-action@44db170f6a7d12a6e90340e9e0fca1f650d34b14 # v2.0.15, build_tools/update-dependencies.sh
       with:
         command: check licenses
         arguments: --all-features --locked --exclude-dev

.github/workflows/lint.yml

@@ -9,16 +9,16 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain@stable
       with:
         components: rustfmt
     - name: install dependencies
       run: pip install ruff
     - name: build fish
-      run: cargo build
+      run: cargo build --bin fish_indent
     - name: check format
-      run: PATH="target/debug:$PATH" build_tools/style.fish --all --check
+      run: PATH="target/debug:$PATH" cargo xtask format --all --check
     - name: check rustfmt
       run: find build.rs crates src -type f -name '*.rs' | xargs rustfmt --check
 
@@ -35,22 +35,31 @@ jobs:
           - rust_version: "msrv"
             features: ""
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain
       with:
         toolchain_channel: ${{ matrix.rust_version }}
         components: clippy
+    - name: Update package database
+      run: sudo apt-get update
     - name: Install deps
       run: |
         sudo apt install gettext
+    - name: Patch Cargo.toml to deny unknown lints
+      run: |
+        if [ "${{ matrix.rust_version }}" = stable ]; then
+          sed -i /^rust.unknown_lints/d Cargo.toml
+        fi
     - name: cargo clippy
       run: cargo clippy --workspace --all-targets ${{ matrix.features }} -- --deny=warnings
 
   rustdoc:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain@stable
+    - name: Update package database
+      run: sudo apt-get update
     - name: Install deps
       run: |
         sudo apt install gettext

.github/workflows/lockthreads.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write  # for dessant/lock-threads to lock PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@f5f995c727ac99a91dec92781a8e34e7c839a65e # v6.0.0, build_tools/update-dependencies.sh
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '365'

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     name: Pre-release checks
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
         with:
           # Workaround for https://github.com/actions/checkout/issues/882
           ref: ${{ inputs.version }}
@@ -36,10 +36,12 @@ jobs:
       version: ${{ steps.version.outputs.version }}
       tarball-name: ${{ steps.version.outputs.tarball-name }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
         with:
           # Workaround for https://github.com/actions/checkout/issues/882
           ref: ${{ inputs.version }}
+      - name: Update package database
+        run: sudo apt-get update
       - name: Install dependencies
         run: sudo apt install cmake gettext ninja-build python3-pip
       - uses: ./.github/actions/install-sphinx
@@ -61,7 +63,7 @@ jobs:
           sed -n 2p "$relnotes" | grep -q '^$'
           sed -i 1,2d "$relnotes"
       - name: Upload tarball artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0, build_tools/update-dependencies.sh
         with:
           name: source-tarball
           path: |
@@ -74,7 +76,7 @@ jobs:
     name: Build single-file fish for Linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
         with:
           # Workaround for https://github.com/actions/checkout/issues/882
           ref: ${{ inputs.version }}
@@ -82,6 +84,8 @@ jobs:
         uses: ./.github/actions/rust-toolchain@stable
         with:
           targets: x86_64-unknown-linux-musl,aarch64-unknown-linux-musl
+      - name: Update package database
+        run: sudo apt-get update
       - name: Install dependencies
         run: sudo apt install crossbuild-essential-arm64 gettext musl-tools
       - uses: ./.github/actions/install-sphinx
@@ -100,7 +104,7 @@ jobs:
             tar -cazf fish-$(git describe)-linux-$arch.tar.xz \
               -C target/$arch-unknown-linux-musl/release fish
           done
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0, build_tools/update-dependencies.sh
         with:
           name: Static builds for Linux
           path: fish-${{ inputs.version }}-linux-*.tar.xz
@@ -114,19 +118,19 @@ jobs:
     name: Create release draft
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
         with:
           # Workaround for https://github.com/actions/checkout/issues/882
           ref: ${{ inputs.version }}
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0, build_tools/update-dependencies.sh
         with:
           merge-multiple: true
           path: /tmp/artifacts
       - name: List artifacts
         run: find /tmp/artifacts -type f
       - name: Create draft release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0, build_tools/update-dependencies.sh
         with:
           tag_name: ${{ inputs.version }}
           name: fish ${{ inputs.version }}
@@ -142,7 +146,7 @@ jobs:
     runs-on: macos-latest
     environment: macos-codesign
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
         with:
           # Workaround for https://github.com/actions/checkout/issues/882
           ref: ${{ inputs.version }}

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
   ubuntu:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain@oldest-supported
     - name: Install deps
       uses: ./.github/actions/install-dependencies
@@ -44,18 +44,19 @@ jobs:
   ubuntu-32bit-static-pcre2:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain@oldest-supported
       with:
         targets: "i586-unknown-linux-gnu"
+    - name: Update package database
+      run: sudo apt-get update
     - name: Install deps
       uses: ./.github/actions/install-dependencies
       with:
         include_pcre: false
         include_sphinx: false
     - name: Install g++-multilib
-      run: |
+      run: sudo apt install g++-multilib
-        sudo apt install g++-multilib
     - name: cmake
       env:
           CFLAGS: "-m32"
@@ -80,13 +81,15 @@ jobs:
         RUSTFLAGS: "-Zsanitizer=address"
         # RUSTFLAGS: "-Zsanitizer=memory -Zsanitizer-memory-track-origins"
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     # All -Z options require running nightly
     - uses: dtolnay/rust-toolchain@nightly
       with:
         # ASAN uses `cargo build -Zbuild-std` which requires the rust-src component
         # this is comma-separated
         components: rust-src
+    - name: Update package database
+      run: sudo apt-get update
     - name: Install deps
       uses: ./.github/actions/install-dependencies
       with:
@@ -128,7 +131,7 @@ jobs:
       # of crates.io, so give this a try. It's also sometimes significantly faster on all platforms.
       CARGO_NET_GIT_FETCH_WITH_CLI: true
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
     - uses: ./.github/actions/rust-toolchain@oldest-supported
     - name: Install deps
       run: |
@@ -155,15 +158,22 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2, build_tools/update-dependencies.sh
-    - uses: msys2/setup-msys2@v2
+    - uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2.30.0, build_tools/update-dependencies.sh
       with:
         update: true
         msystem: MSYS
+      id: msys2
     - name: Install deps
       # Not using setup-msys2 `install` option to make it easier to copy/paste
       run: |
         pacman --noconfirm -S --needed git rust
+    - name: rebase
+      env:
+        MSYS2_LOCATION: ${{ steps.msys2.outputs.msys2-location }}
+      shell: cmd
+      run: |
+        "%MSYS2_LOCATION%\usr\bin\dash" /usr/bin/rebaseall -p -v
     - name: cargo build
       run: |
         cargo build

CHANGELOG.rst

@@ -1,3 +1,67 @@
+fish 4.6.0 (released March 28, 2026)
+====================================
+
+Notable improvements and fixes
+------------------------------
+- New Spanish translations (:issue:`12489`).
+- New Japanese translations (:issue:`12499`).
+
+Deprecations and removed features
+---------------------------------
+- The default width for emoji is switched from 1 to 2, improving the experience for users connecting to old systems from modern desktops. Users of old desktops who notice that lines containing emoji are misaligned can set ``$fish_emoji_width`` back to 1 (:issue:`12562`).
+
+Interactive improvements
+------------------------
+- The tab completion pager now left-justifies the description of each column (:issue:`12546`).
+- fish now supports the ``SHELL_PROMPT_PREFIX``, ``SHELL_PROMPT_SUFFIX``, and ``SHELL_WELCOME`` environment variables. The prefix and suffix are automatically prepended and appended to the left prompt, and the welcome message is displayed on startup after the greeting.
+  These variables are set by systemd's ``run0`` for example (:issue:`10924`).
+
+Improved terminal support
+-------------------------
+- ``set_color`` is able to turn off italics, reverse mode, strikethrough and underline individually (e.g. ``--italics=off``).
+- ``set_color`` learned the foreground (``--foreground`` or ``-f``) and reset (``--reset``) options.
+- An error caused by slow terminal responses at macOS startup has been addressed (:issue:`12571`).
+
+Other improvements
+------------------
+- Signals like ``SIGWINCH`` (as sent on terminal resize) no longer interrupt builtin output (:issue:`12496`).
+- For compatibility with Bash, fish now accepts ``|&`` as alternate spelling of ``&|``, for piping both standard output and standard error (:issue:`11516`).
+- ``fish_indent`` now preserves comments and newlines immediately preceding a brace block (``{ }``) (:issue:`12505`).
+- A crash when suspending certain pipelines with :kbd:`ctrl-z` has been fixed (:issue:`12301`).
+
+For distributors and developers
+-------------------------------
+- ``cargo xtask`` subcommands no longer panic on test failures.
+
+Regression fixes:
+-----------------
+- (from 4.5.0) Intermediate ``⏎`` artifact when redrawing prompt (:issue:`12476`).
+- (from 4.4.0) ``history`` honors explicitly specified ``--color=`` again (:issue:`12512`).
+- (from 4.4.0) Vi mode ``dl`` and ``dh`` (:issue:`12461`).
+- (from 4.3.0) Error completing of commands starting with ``-`` (:issue:`12522`).
+
+fish 4.5.0 (released February 17, 2026)
+=======================================
+
+This is mostly a patch release for Vi mode regressions in 4.4.0 but other minor behavior changes are included as well.
+
+Interactive improvements
+------------------------
+- :kbd:`ctrl-l` no longer cancels history search (:issue:`12436`).
+- History search cursor positioning now works correctly with characters of arbitrary width.
+
+Deprecations and removed features
+---------------------------------
+- fish no longer reads the terminfo database to alter behaviour based on the :envvar:`TERM` environment variable, and does not depend on ncurses or terminfo. The ``ignore-terminfo`` feature flag, introduced and enabled by default in fish 4.1, is now permanently enabled. fish may no longer work correctly on Data General Dasher D220 and Wyse WY-350 terminals, but should continue to work on all known terminal emulators released in the 21st century.
+
+Regression fixes:
+-----------------
+- (from 4.4.0) Vi mode ``d,f`` key binding did not work (:issue:`12417`).
+- (from 4.4.0) Vi mode ``c,w`` key binding wrongly deleted trailing spaces (:issue:`12443`).
+- (from 4.4.0) Vi mode crash on ``c,i,w`` after accepting autosuggestion (:issue:`12430`).
+- (from 4.4.0) ``fish_vi_key_bindings`` called with a mode argument produced an error (:issue:`12413`).
+- (from 4.0.0) Build on Illumos (:issue:`12410`).
+
 fish 4.4.0 (released February 03, 2026)
 =======================================
 
@@ -15,9 +79,9 @@ Interactive improvements
 New or improved bindings
 ------------------------
 - Vi mode word movements (``w``, ``W``, ``e``, and ``E``) are now largely in line with Vim. The only exception is that underscores are treated as word separators (:issue:`12269`).
-- New special input functions to support these movements: ``forward-word-vi``, ``kill-word-vi``, ``forward-bigword-vi``, ``kill-bigword-vi``, ````forward-word-end``, ``backward-word-end``, ``forward-bigword-end``, ``backward-bigword-end``, ````kill-a-word``, ``kill-inner-word``, ``kill-a-bigword``, and ``kill-inner-bigword``.
+- New special input functions to support these movements: ``forward-word-vi``, ``kill-word-vi``, ``forward-bigword-vi``, ``kill-bigword-vi``, ``forward-word-end``, ``backward-word-end``, ``forward-bigword-end``, ``backward-bigword-end``, ``kill-a-word``, ``kill-inner-word``, ``kill-a-bigword``, and ``kill-inner-bigword``.
 - Vi mode key bindings now support counts for movement and deletion commands (e.g. `d3w` or `3l`), via a new operator mode (:issue:`2192`).
-- New ``catpuccin-*`` color themes.
+- New ``catppuccin-*`` color themes.
 
 Improved terminal support
 -------------------------

CMakeLists.txt

@@ -53,36 +53,36 @@ add_definitions(-DCMAKE_SOURCE_DIR="${REAL_CMAKE_SOURCE_DIR}")
 
 set(build_types Release RelWithDebInfo Debug "")
 if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
-  message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this doesn't build, try one of Release, RelWithDebInfo or Debug")
+    message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this doesn't build, try one of Release, RelWithDebInfo or Debug")
 endif()
 
 add_custom_target(
-  fish ALL
+    fish ALL
-  COMMAND
+    COMMAND
-    "${CMAKE_COMMAND}" -E
+        "${CMAKE_COMMAND}" -E
-      env ${VARS_FOR_CARGO}
+            env ${VARS_FOR_CARGO}
-        ${Rust_CARGO}
+                ${Rust_CARGO}
-          build --bin fish
+                    build --bin fish
-          $<$<CONFIG:Release>:--release>
+                    $<$<CONFIG:Release>:--release>
-          $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
+                    $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-          --target ${Rust_CARGO_TARGET}
+                    --target ${Rust_CARGO_TARGET}
-          --no-default-features
+                    --no-default-features
-          --features=${FISH_CARGO_FEATURES}
+                    --features=${FISH_CARGO_FEATURES}
-          ${CARGO_FLAGS}
+                    ${CARGO_FLAGS}
-    &&
+        &&
-    "${CMAKE_COMMAND}" -E
+        "${CMAKE_COMMAND}" -E
-      copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
+            copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-  USES_TERMINAL
+    USES_TERMINAL
 )
 
 function(CREATE_LINK target)
-  add_custom_target(
+    add_custom_target(
-    ${target} ALL
+        ${target} ALL
-    DEPENDS fish
+        DEPENDS fish
-    COMMAND ln -f fish ${target}
+        COMMAND ln -f fish ${target}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-  )
+    )
 endfunction(CREATE_LINK)
 
 # Define fish_indent.

CONTRIBUTING.rst

@@ -133,12 +133,12 @@ For formatting, we use:
 - ``fish_indent`` (shipped with fish) for fish script
 - ``ruff format`` for Python
 
-To reformat files, there is a script
+To reformat files, there is an xtask
 
 ::
 
-   build_tools/style.fish --all
+   cargo xtask format --all
-   build_tools/style.fish somefile.rs some.fish
+   cargo xtask format somefile.rs some.fish
 
 Fish Script Style Guide
 -----------------------

Cargo.lock

@@ -260,7 +260,7 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
 
 [[package]]
 name = "fish"
-version = "4.4.0"
+version = "4.6.0"
 dependencies = [
  "assert_matches",
  "bitflags",
@@ -290,13 +290,12 @@ dependencies = [
  "num-traits",
  "once_cell",
  "pcre2",
- "phf_codegen 0.13.1",
+ "phf_codegen",
  "portable-atomic",
- "rand 0.9.2",
+ "rand",
  "rsconf",
  "rust-embed",
  "serial_test",
- "terminfo",
  "unix_path",
  "xterm-color",
 ]
@@ -329,9 +328,11 @@ name = "fish-common"
 version = "0.0.0"
 dependencies = [
  "bitflags",
+ "fish-build-helper",
  "fish-widestring",
  "libc",
  "nix",
+ "rsconf",
 ]
 
 [[package]]
@@ -352,7 +353,7 @@ name = "fish-gettext"
 version = "0.0.0"
 dependencies = [
  "fish-gettext-maps",
- "phf 0.13.1",
+ "phf",
 ]
 
 [[package]]
@@ -370,8 +371,8 @@ version = "0.0.0"
 dependencies = [
  "fish-build-helper",
  "fish-gettext-mo-file-parser",
- "phf 0.13.1",
+ "phf",
- "phf_codegen 0.13.1",
+ "phf_codegen",
  "rsconf",
 ]
 
@@ -395,15 +396,18 @@ name = "fish-tempfile"
 version = "0.0.0"
 dependencies = [
  "nix",
- "rand 0.9.2",
+ "rand",
 ]
 
 [[package]]
 name = "fish-util"
 version = "0.0.0"
 dependencies = [
+ "errno",
  "fish-widestring",
- "rand 0.9.2",
+ "libc",
+ "nix",
+ "rand",
 ]
 
 [[package]]
@@ -411,7 +415,6 @@ name = "fish-wcstringutil"
 version = "0.0.0"
 dependencies = [
  "fish-build-helper",
- "fish-common",
  "fish-fallback",
  "fish-widestring",
  "rsconf",
@@ -434,15 +437,10 @@ version = "0.0.0"
 name = "fish-widestring"
 version = "0.0.0"
 dependencies = [
+ "unicode-width",
  "widestring",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "foldhash"
 version = "0.2.0"
@@ -599,12 +597,6 @@ version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "nix"
 version = "0.31.1"
@@ -617,16 +609,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -703,32 +685,13 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_shared 0.11.3",
-]
-
 [[package]]
 name = "phf"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 dependencies = [
- "phf_shared 0.13.1",
+ "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
 ]
 
 [[package]]
@@ -737,18 +700,8 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
 dependencies = [
- "phf_generator 0.13.1",
+ "phf_generator",
- "phf_shared 0.13.1",
+ "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared 0.11.3",
- "rand 0.8.5",
 ]
 
 [[package]]
@@ -758,16 +711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
 dependencies = [
  "fastrand",
- "phf_shared 0.13.1",
+ "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
 ]
 
 [[package]]
@@ -824,15 +768,6 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "rand"
 version = "0.9.2"
@@ -840,7 +775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha",
- "rand_core 0.9.5",
+ "rand_core",
 ]
 
 [[package]]
@@ -850,15 +785,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.9.5",
+ "rand_core",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-
 [[package]]
 name = "rand_core"
 version = "0.9.5"
@@ -1045,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "shellexpand"
-version = "3.1.1"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb"
+checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8"
 dependencies = [
  "dirs",
 ]
@@ -1087,18 +1016,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "terminfo"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4ea810f0692f9f51b382fff5893887bb4580f5fa246fde546e0b13e7fcee662"
-dependencies = [
- "fnv",
- "nom",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
-]
-
 [[package]]
 name = "thiserror"
 version = "2.0.18"
@@ -1235,9 +1152,11 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 name = "xtask"
 version = "0.0.0"
 dependencies = [
+ "anstyle",
  "clap",
  "fish-build-helper",
  "fish-tempfile",
+ "walkdir",
 ]
 
 [[package]]

Cargo.toml

@@ -11,6 +11,7 @@ repository = "https://github.com/fish-shell/fish-shell"
 license = "GPL-2.0-only AND LGPL-2.0-or-later AND MIT AND PSF-2.0"
 
 [workspace.dependencies]
+anstyle = "1.0.13"
 assert_matches = "1.5.0"
 bitflags = "2.5.0"
 cc = "1.0.94"
@@ -39,7 +40,17 @@ libc = "0.2.177"
 # disabling default features uses the stdlib instead, but it doubles the time to rewrite the history
 # files as of 22 April 2024.
 lru = "0.16.2"
-nix = { version = "0.31.1", default-features = false, features = ["event", "fs", "inotify", "hostname", "resource", "process", "signal", "term", "user"] }
+nix = { version = "0.31.1", default-features = false, features = [
+    "event",
+    "fs",
+    "inotify",
+    "hostname",
+    "resource",
+    "process",
+    "signal",
+    "term",
+    "user",
+] }
 num-traits = "0.2.19"
 once_cell = "1.19.0"
 pcre2 = { git = "https://github.com/fish-shell/rust-pcre2", tag = "0.2.9-utf32", default-features = false, features = [
@@ -62,12 +73,11 @@ rust-embed = { version = "8.11.0", features = [
     "interpolate-folder-path",
 ] }
 serial_test = { version = "3", default-features = false }
-# We need 0.9.0 specifically for some crash fixes.
-terminfo = "0.9.0"
 widestring = "1.2.0"
 unicode-segmentation = "1.12.0"
 unicode-width = "0.2.0"
 unix_path = "1.0.1"
+walkdir = "2.5.0"
 xterm-color = "1.0.1"
 
 [profile.release]
@@ -80,7 +90,7 @@ debug = true
 
 [package]
 name = "fish"
-version = "4.4.0"
+version = "4.6.0"
 edition.workspace = true
 rust-version.workspace = true
 default-run = "fish"
@@ -116,7 +126,6 @@ num-traits.workspace = true
 once_cell.workspace = true
 pcre2.workspace = true
 rand.workspace = true
-terminfo.workspace = true
 xterm-color.workspace = true
 
 [target.'cfg(not(target_has_atomic = "64"))'.dependencies]
@@ -184,7 +193,7 @@ tsan = []
 [workspace.lints]
 rust.non_camel_case_types = "allow"
 rust.non_upper_case_globals = "allow"
-rust.unknown_lints = "allow"
+rust.unknown_lints = { level = "allow", priority = -1 }
 rust.unstable_name_collisions = "allow"
 rustdoc.private_intra_doc_links = "allow"
 
@@ -194,7 +203,7 @@ cloned_instead_of_copied = "warn"
 explicit_into_iter_loop = "warn"
 format_push_string = "warn"
 implicit_clone = "warn"
-len_without_is_empty = "allow"    # we're not a library crate
+len_without_is_empty = "allow"         # we're not a library crate
 let_and_return = "allow"
 manual_assert = "warn"
 manual_range_contains = "allow"
@@ -207,7 +216,9 @@ ptr_offset_by_literal = "warn"
 ref_option = "warn"
 semicolon_if_nothing_returned = "warn"
 stable_sort_primitive = "warn"
+str_to_string = "warn"
 unnecessary_semicolon = "warn"
+unused_trait_names = "warn"
 
 # We do not want to use the e?print(ln)?! macros.
 # These lints flag their use.

Dockerfile

@@ -1,18 +0,0 @@
-FROM centos:latest
-
-# Build dependency
-RUN yum update -y &&\
-  yum install -y epel-release &&\
-  yum install -y clang cmake3 gcc-c++ make &&\
-  yum clean all
-
-# Test dependency
-RUN yum install -y expect vim-common
-
-ADD . /src
-WORKDIR /src
-
-# Build fish
-RUN cmake3 . &&\
-  make &&\
-  make install

build.rs

@@ -159,16 +159,14 @@ fn join_if_relative(parent_if_relative: &Path, path: String) -> PathBuf {
     }
 
     let prefix = overridable_path("PREFIX", |env_prefix| {
-        Some(PathBuf::from(
+        Some(PathBuf::from(env_prefix.unwrap_or("/usr/local".to_owned())))
-            env_prefix.unwrap_or("/usr/local".to_string()),
-        ))
     })
     .unwrap();
 
     overridable_path("SYSCONFDIR", |env_sysconfdir| {
         Some(join_if_relative(
             &prefix,
-            env_sysconfdir.unwrap_or("/etc/".to_string()),
+            env_sysconfdir.unwrap_or("/etc/".to_owned()),
         ))
     });
 
@@ -199,5 +197,5 @@ fn get_version() -> String {
     )
     .unwrap()
     .trim_ascii_end()
-    .to_string()
+    .to_owned()
 }

build_tools/check.sh

@@ -78,7 +78,7 @@ if $lint; then
     if command -v cargo-deny >/dev/null; then
         cargo deny --all-features --locked --exclude-dev check licenses
     fi
-    PATH="$build_dir:$PATH" "$workspace_root/build_tools/style.fish" --all --check
+    PATH="$build_dir:$PATH" cargo xtask format --all --check
     for features in "" --no-default-features; do
         cargo clippy --workspace --all-targets $features
     done

build_tools/dput_cf_gen.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Script to generate the dput.cf for a set of Ubuntu series, prints the filename
+# Arguments are the PPA followed by the series names
+
+set -e
+
+outfile=$(mktemp --tmpdir dput.XXXXX.cf)
+
+[ $# -lt 2 ] &&
+    echo "$0: at least two arguments (a PPA and at least one series) are required" >&2 &&
+    exit 1
+
+ppa=$1
+shift
+
+for series in "$@"; do
+    cat >> "$outfile" <<EOF
+[fish-$ppa-$series]
+fqdn = ppa.launchpad.net
+method = ftp
+login = anonymous
+incoming = ~fish-shell/$ppa/ubuntu/$series
+
+EOF
+done
+
+echo "$outfile"

build_tools/fish_xgettext.fish

@@ -12,12 +12,8 @@ begin
     # Note that this results in the file being overwritten.
     # This is desired behavior, to get rid of the results of prior invocations
     # of this script.
-    begin
+    set -l header 'msgid ""\nmsgstr "Content-Type: text/plain; charset=UTF-8\\\\n"\n\n'
-        echo 'msgid ""'
+    printf $header
-        echo 'msgstr ""'
-        echo '"Content-Type: text/plain; charset=UTF-8\n"'
-        echo ""
-    end
 
     set -g workspace_root (path resolve (status dirname)/..)
 
@@ -41,8 +37,15 @@ begin
     mark_section tier1-from-rust
 
     # Get rid of duplicates and sort.
-    find $rust_extraction_dir -type f -exec cat {} + | msguniq --no-wrap --sort-output
+    begin
-    or exit 1
+        # Without providing this header, msguniq complains when a msgid is non-ASCII.
+        printf $header
+        find $rust_extraction_dir -type f -exec cat {} +
+    end |
+        msguniq --no-wrap --sort-output |
+        # Remove the header again. Otherwise it would appear twice, breaking the msguniq at the end
+        # of this file.
+        sed '/^msgid ""$/ {N; /\nmsgstr "Content-Type: text\/plain; charset=UTF-8\\\\n"$/ {N; d}}'
 
     if not set -l --query _flag_use_existing_template
         rm -r $rust_extraction_dir

build_tools/make_tarball.sh

@@ -15,8 +15,7 @@ tmpdir=$(mktemp -d)
 manifest=$tmpdir/Cargo.toml
 lockfile=$tmpdir/Cargo.lock
 
-sed "s/^version = \".*\"\$/version = \"$VERSION\"/g" Cargo.toml \
+sed "s/^version = \".*\"\$/version = \"$VERSION\"/g" Cargo.toml >"$manifest"
- >"$manifest"
 awk -v version=$VERSION '
     /^name = "fish"$/ { ok=1 }
     ok == 1 && /^version = ".*"$/ {

build_tools/osx_package_resources/welcome.html

@@ -23,6 +23,6 @@
     <p>
     <code>chsh -s /usr/local/bin/fish</code>
     </p>
-    <p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
+    <p>Enjoy! Bugs can be reported on <a href="https://github.com/fish-shell/fish-shell/">GitHub</a>.</p>
     </body>
 </html>

build_tools/osx_package_scripts/add-shell

@@ -10,8 +10,8 @@ fi
 
 scriptname=$(basename "$0")
 if [ "$(id -u)" -ne 0 ]; then
-     echo "${scriptname} must be run as root"
+    echo "${scriptname} must be run as root"
-     exit 1
+    exit 1
 fi
 
 file=/etc/shells

build_tools/osx_package_scripts/preinstall

@@ -2,6 +2,6 @@
 
 echo "Removing any previous installation"
 pkgutil --pkg-info "${INSTALL_PKG_SESSION_ID}" && pkgutil --only-files --files "${INSTALL_PKG_SESSION_ID}" | while read -r installed
-     do rm -v "${DSTVOLUME}${installed}"
+    do rm -v "${DSTVOLUME}${installed}"
 done
 echo "... removed"

build_tools/release-notes.sh

@@ -47,7 +47,7 @@ if test -z "$CI" || [ "$(git -C "$workspace_root" tag | wc -l)" -gt 1 ]; then {
             num_authors=$(wc -l <"$relnotes_tmp/committers-now")
             num_new_authors=$(wc -l <"$relnotes_tmp/committers-new")
             printf %s \
-                "This release comprises $num_commits commits since $previous_version," \
+                "This release brings $num_commits new commits since $previous_version," \
                 " contributed by $num_authors authors, $num_new_authors of which are new committers."
             echo
             echo

build_tools/release.sh

@@ -90,7 +90,7 @@ Created by ./build_tools/release.sh $version"
 }
 
 sed -i "s/^version = \".*\"/version = \"$1\"/g" Cargo.toml
-cargo fetch --offline
+cargo fetch --offline # bumps the version in Cargo.lock
 if [ "$1" = "$version" ]; then
     # debchange is a Debian script to manage the Debian changelog, but
     # it's too annoying to install everywhere. Just do it by hand.
@@ -110,6 +110,8 @@ fi
 git add CHANGELOG.rst Cargo.toml Cargo.lock
 CreateCommit "Release $version"
 
+# Tags must be full objects, not lightweight tags, for
+# git_version-gen.sh to work.
 git -c "user.signingKey=$committer" \
     tag --sign --message="Release $version" $version
 

build_tools/style.fish

@@ -1,123 +0,0 @@
-#!/usr/bin/env fish
-#
-# This runs Python files, fish scripts (*.fish), and Rust files
-# through their respective code formatting programs.
-#
-# `--all`: Format all eligible files instead of the ones specified as arguments.
-# `--check`: Instead of reformatting, fail if a file is not formatted correctly.
-# `--force`: Proceed without asking if uncommitted changes are detected.
-#            Only relevant if `--all` is specified but `--check` is not specified.
-
-set -l fish_files
-set -l python_files
-set -l rust_files
-set -l all no
-
-argparse all check force -- $argv
-or exit $status
-
-if set -l -q _flag_all
-    set all yes
-    if set -q argv[1]
-        echo "Unexpected arguments: '$argv'"
-        exit 1
-    end
-end
-
-set -l workspace_root (realpath (status dirname)/..)
-
-if test $all = yes
-    if not set -l -q _flag_force; and not set -l -q _flag_check
-        # Potential for false positives: Not all fish files are formatted, see the `fish_files`
-        # definition below.
-        set -l relevant_uncommitted_changes (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//' | grep -E '.*\.(fish|py|rs)$')
-        if set -q relevant_uncommitted_changes[1]
-            for changed_file in $relevant_uncommitted_changes
-                echo $changed_file
-            end
-            echo
-            echo 'You have uncommitted changes (listed above). Are you sure you want to restyle?'
-            read -P 'y/N? ' -n1 -l ans
-            if not string match -qi y -- $ans
-                exit 1
-            end
-        end
-    end
-    set fish_files $workspace_root/{benchmarks,build_tools,etc,share}/**.fish
-    set python_files $workspace_root
-else
-    # Format the files specified as arguments.
-    set -l files $argv
-    set fish_files (string match -r '^.*\.fish$' -- $files)
-    set python_files (string match -r '^.*\.py$' -- $files)
-    set rust_files (string match -r '^.*\.rs$' -- $files)
-end
-
-set -l red (set_color red)
-set -l green (set_color green)
-set -l yellow (set_color yellow)
-set -l normal (set_color normal)
-
-function die -V red -V normal
-    echo $red$argv[1]$normal
-    exit 1
-end
-
-if set -q fish_files[1]
-    if not type -q fish_indent
-        echo
-        echo $yellow'Could not find `fish_indent` in `$PATH`.'$normal
-        exit 127
-    end
-    echo === Running "$green"fish_indent"$normal"
-    if set -l -q _flag_check
-        fish_indent --check -- $fish_files
-        or die "Fish files are not formatted correctly."
-    else
-        fish_indent -w -- $fish_files
-    end
-end
-
-if set -q python_files[1]
-    if not type -q ruff
-        echo
-        echo $yellow'Please install `ruff` to style python'$normal
-        exit 127
-    end
-    echo === Running "$green"ruff format"$normal"
-    if set -l -q _flag_check
-        ruff format --check $python_files
-        or die "Python files are not formatted correctly."
-    else
-        ruff format $python_files
-    end
-end
-
-if test $all = yes; or set -q rust_files[1]
-    if not cargo fmt --version >/dev/null
-        echo
-        echo $yellow'Please install "rustfmt" to style Rust, e.g. via:'
-        echo "rustup component add rustfmt"$normal
-        exit 127
-    end
-
-    set -l edition_spec string match -r '^edition\s*=.*'
-    test "$($edition_spec <Cargo.toml)" = "$($edition_spec <.rustfmt.toml)"
-    or die "Cargo.toml and .rustfmt.toml use different editions"
-
-    echo === Running "$green"rustfmt"$normal"
-    if set -l -q _flag_check
-        if test $all = yes
-            cargo fmt --all --check
-        else
-            rustfmt --check --files-with-diff $rust_files
-        end
-        or die "Rust files are not formatted correctly."
-    else
-        if test $all = yes
-            cargo fmt --all
-        else
-            rustfmt $rust_files
-        end
-    end
-end

build_tools/update-dependencies.sh

@@ -13,9 +13,31 @@ sort --version-sort </dev/null
 # TODO This is copied from .github/actions/install-sphinx/action.yml
 uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
 
+update_gh_action() {
+    repo=$1
+    version=$(curl -fsS "https://api.github.com/repos/$repo/releases/latest" | jq -r .tag_name)
+    [ -n "$version" ]
+    tag_oid=$(git ls-remote "https://github.com/$repo.git" "refs/tags/$version" | cut -f1)
+    [ -n "$tag_oid" ]
+    find .github/workflows -name '*.yml' -type f -exec \
+        sed -i "s|uses: $repo@\S\+\( \+#.*\)\?|\
+uses: $repo@$tag_oid # $version, build_tools/update-dependencies.sh|g" {} +
+}
+update_gh_action actions/checkout
+update_gh_action actions/github-script
+update_gh_action actions/upload-artifact
+update_gh_action actions/download-artifact
+update_gh_action docker/login-action
+update_gh_action docker/build-push-action
+update_gh_action docker/metadata-action
+update_gh_action EmbarkStudios/cargo-deny-action
+update_gh_action dessant/lock-threads
+update_gh_action softprops/action-gh-release
+update_gh_action msys2/setup-msys2
+
 updatecli "${@:-apply}"
 
-uv lock # Python version constraints may have changed.
+# Python version constraints may have changed.
 uv lock --upgrade --exclude-newer="$(date --date='7 days ago' --iso-8601)"
 
 from_gh() {
@@ -23,14 +45,14 @@ from_gh() {
     path=$2
     destination=$3
     contents=$(curl -fsS https://raw.githubusercontent.com/"${repo}"/refs/heads/master/"${path}")
-    printf '%s\n' >"$destination" "$contents"
+    printf '%s\n' "$contents" >"$destination"
 }
 
 from_gh ridiculousfish/widecharwidth widechar_width.rs crates/widecharwidth/src/widechar_width.rs
 from_gh ridiculousfish/littlecheck littlecheck/littlecheck.py tests/littlecheck.py
-from_gh catppuccin/fish 'themes/Catppuccin Frappe.theme' share/themes/catppuccin-frappe.theme
+from_gh catppuccin/fish themes/catppuccin-frappe.theme share/themes/catppuccin-frappe.theme
-from_gh catppuccin/fish 'themes/Catppuccin Macchiato.theme' share/themes/catppuccin-macchiato.theme
+from_gh catppuccin/fish themes/catppuccin-macchiato.theme share/themes/catppuccin-macchiato.theme
-from_gh catppuccin/fish 'themes/Catppuccin Mocha.theme' share/themes/catppuccin-mocha.theme
+from_gh catppuccin/fish themes/catppuccin-mocha.theme share/themes/catppuccin-mocha.theme
 
 # Update Cargo.lock
 cargo update

cmake/Docs.cmake

@@ -18,14 +18,14 @@ set(VARS_FOR_CARGO_SPHINX_WRAPPER
 
 add_custom_target(sphinx-docs
     COMMAND env ${VARS_FOR_CARGO_SPHINX_WRAPPER}
-        cargo xtask html-docs --fish-indent=${FISH_INDENT_FOR_BUILDING_DOCS}
+        ${Rust_CARGO} xtask html-docs --fish-indent=${FISH_INDENT_FOR_BUILDING_DOCS}
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     DEPENDS ${SPHINX_HTML_FISH_INDENT_DEP}
     COMMENT "Building HTML documentation with Sphinx")
 
 add_custom_target(sphinx-manpages
     COMMAND env ${VARS_FOR_CARGO_SPHINX_WRAPPER}
-        cargo xtask man-pages
+        ${Rust_CARGO} xtask man-pages
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     COMMENT "Building man pages with Sphinx")
 
@@ -51,9 +51,10 @@ endif()
 add_feature_info(Documentation WITH_DOCS "user manual and documentation")
 
 if(WITH_DOCS)
-    add_custom_target(doc ALL
+    add_custom_target(doc ALL DEPENDS sphinx-docs sphinx-manpages)
-                      DEPENDS sphinx-docs sphinx-manpages)
     # Group docs targets into a DocsTargets folder
-    set_property(TARGET doc sphinx-docs sphinx-manpages
+    set_property(
-                 PROPERTY FOLDER cmake/DocTargets)
+        TARGET doc sphinx-docs sphinx-manpages
+        PROPERTY FOLDER cmake/DocTargets
+    )
 endif()

cmake/FindRust.cmake

@@ -22,17 +22,17 @@ foreach(_VAR ${_Rust_USER_VARS})
 endforeach()
 
 if (NOT DEFINED Rust_CARGO_CACHED)
-  find_program(Rust_CARGO_CACHED cargo PATHS "$ENV{HOME}/.cargo/bin")
+    find_program(Rust_CARGO_CACHED cargo PATHS "$ENV{HOME}/.cargo/bin")
 endif()
 
 if (NOT EXISTS "${Rust_CARGO_CACHED}")
-  message(FATAL_ERROR "The cargo executable ${Rust_CARGO_CACHED} was not found. "
+    message(FATAL_ERROR "The cargo executable ${Rust_CARGO_CACHED} was not found. "
-    "Consider setting `Rust_CARGO_CACHED` to the absolute path of `cargo`."
+        "Consider setting `Rust_CARGO_CACHED` to the absolute path of `cargo`."
-  )
+    )
 endif()
 
 if (NOT DEFINED Rust_COMPILER_CACHED)
-  find_program(Rust_COMPILER_CACHED rustc PATHS "$ENV{HOME}/.cargo/bin")
+    find_program(Rust_COMPILER_CACHED rustc PATHS "$ENV{HOME}/.cargo/bin")
 endif()
 
 
@@ -45,31 +45,31 @@ endif()
 # Figure out the target by just using the host target.
 # If you want to cross-compile, you'll have to set Rust_CARGO_TARGET
 if(NOT Rust_CARGO_TARGET_CACHED)
-  execute_process(
+    execute_process(
-    COMMAND "${Rust_COMPILER_CACHED}" --version --verbose
+        COMMAND "${Rust_COMPILER_CACHED}" --version --verbose
-    OUTPUT_VARIABLE _RUSTC_VERSION_RAW
+        OUTPUT_VARIABLE _RUSTC_VERSION_RAW
-    RESULT_VARIABLE _RUSTC_VERSION_RESULT
+        RESULT_VARIABLE _RUSTC_VERSION_RESULT
-  )
-
-  if(NOT ( "${_RUSTC_VERSION_RESULT}" EQUAL "0" ))
-    message(FATAL_ERROR "Failed to get rustc version.\n"
-      "${Rust_COMPILER} --version failed with error: `${_RUSTC_VERSION_RESULT}`")
-  endif()
-
-  if (_RUSTC_VERSION_RAW MATCHES "host: ([a-zA-Z0-9_\\-]*)\n")
-    set(Rust_DEFAULT_HOST_TARGET "${CMAKE_MATCH_1}")
-  else()
-    message(FATAL_ERROR
-      "Failed to parse rustc host target. `rustc --version --verbose` evaluated to:\n${_RUSTC_VERSION_RAW}"
     )
-  endif()
 
-  if(CMAKE_CROSSCOMPILING)
+    if(NOT ( "${_RUSTC_VERSION_RESULT}" EQUAL "0" ))
-    message(FATAL_ERROR "CMake is in cross-compiling mode."
+        message(FATAL_ERROR "Failed to get rustc version.\n"
-      "Manually set `Rust_CARGO_TARGET`."
+            "${Rust_COMPILER} --version failed with error: `${_RUSTC_VERSION_RESULT}`")
-    )
+    endif()
-  endif()
+
-  set(Rust_CARGO_TARGET_CACHED "${Rust_DEFAULT_HOST_TARGET}" CACHE STRING "Target triple")
+    if (_RUSTC_VERSION_RAW MATCHES "host: ([a-zA-Z0-9_\\-]*)\n")
+        set(Rust_DEFAULT_HOST_TARGET "${CMAKE_MATCH_1}")
+    else()
+        message(FATAL_ERROR
+            "Failed to parse rustc host target. `rustc --version --verbose` evaluated to:\n${_RUSTC_VERSION_RAW}"
+        )
+    endif()
+
+    if(CMAKE_CROSSCOMPILING)
+        message(FATAL_ERROR "CMake is in cross-compiling mode."
+            "Manually set `Rust_CARGO_TARGET`."
+        )
+    endif()
+    set(Rust_CARGO_TARGET_CACHED "${Rust_DEFAULT_HOST_TARGET}" CACHE STRING "Target triple")
 endif()
 
 # Set the input variables as non-cache variables so that the variables are available after

cmake/Install.cmake

@@ -14,32 +14,36 @@ set(rel_completionsdir "fish/vendor_completions.d")
 set(rel_functionsdir "fish/vendor_functions.d")
 set(rel_confdir "fish/vendor_conf.d")
 
-set(extra_completionsdir
+set(
-    "${datadir}/${rel_completionsdir}"
+    extra_completionsdir "${datadir}/${rel_completionsdir}"
-    CACHE STRING "Path for extra completions")
+    CACHE STRING "Path for extra completions"
+)
 
-set(extra_functionsdir
+set(
-    "${datadir}/${rel_functionsdir}"
+    extra_functionsdir "${datadir}/${rel_functionsdir}"
-    CACHE STRING "Path for extra functions")
+    CACHE STRING "Path for extra functions"
+)
 
-set(extra_confdir
+set(
-    "${datadir}/${rel_confdir}"
+    extra_confdir "${datadir}/${rel_confdir}"
-    CACHE STRING "Path for extra configuration")
+    CACHE STRING "Path for extra configuration"
+)
 
 
 # These are the man pages that go in system manpath; all manpages go in the fish-specific manpath.
-set(MANUALS ${SPHINX_OUTPUT_DIR}/man/man1/fish.1
+set(MANUALS
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish_indent.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish_key_reader.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish_indent.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-doc.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish_key_reader.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-tutorial.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-doc.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-language.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-tutorial.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-interactive.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-language.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-terminal-compatibility.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-interactive.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-completions.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-terminal-compatibility.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-prompt-tutorial.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-completions.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-for-bash-users.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-prompt-tutorial.1
-            ${SPHINX_OUTPUT_DIR}/man/man1/fish-faq.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-for-bash-users.1
+    ${SPHINX_OUTPUT_DIR}/man/man1/fish-faq.1
 )
 
 # Determine which man page we don't want to install.
@@ -48,40 +52,49 @@ set(MANUALS ${SPHINX_OUTPUT_DIR}/man/man1/fish.1
 # On other operating systems, don't install a realpath man page, as they almost all have a realpath
 # command, while macOS does not.
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CONDEMNED_PAGE "open.1")
+    set(CONDEMNED_PAGE "open.1")
 else()
-  set(CONDEMNED_PAGE "realpath.1")
+    set(CONDEMNED_PAGE "realpath.1")
 endif()
 
 # Define a function to help us create directories.
 function(FISH_CREATE_DIRS)
-  foreach(dir ${ARGV})
+    foreach(dir ${ARGV})
-    install(DIRECTORY DESTINATION ${dir})
+        install(DIRECTORY DESTINATION ${dir})
-  endforeach(dir)
+    endforeach(dir)
 endfunction(FISH_CREATE_DIRS)
 
 function(FISH_TRY_CREATE_DIRS)
-  foreach(dir ${ARGV})
+    foreach(dir ${ARGV})
-    if(NOT IS_ABSOLUTE ${dir})
+        if(NOT IS_ABSOLUTE ${dir})
-      set(abs_dir "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${dir}")
+            set(abs_dir "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${dir}")
-    else()
+        else()
-      set(abs_dir "\$ENV{DESTDIR}${dir}")
+            set(abs_dir "\$ENV{DESTDIR}${dir}")
-    endif()
+        endif()
-    install(SCRIPT CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${abs_dir} OUTPUT_QUIET ERROR_QUIET)
+        install(SCRIPT CODE "
-                         execute_process(COMMAND chmod 755 ${abs_dir} OUTPUT_QUIET ERROR_QUIET)
+            EXECUTE_PROCESS(COMMAND mkdir -p ${abs_dir} OUTPUT_QUIET ERROR_QUIET)
-                        ")
+            execute_process(COMMAND chmod 755 ${abs_dir} OUTPUT_QUIET ERROR_QUIET)
-  endforeach()
+        ")
+    endforeach()
 endfunction(FISH_TRY_CREATE_DIRS)
 
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish
+install(
-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+    PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/fish
-                    GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    PERMISSIONS
-        DESTINATION ${bindir})
+        OWNER_READ
+        OWNER_WRITE
+        OWNER_EXECUTE
+        GROUP_READ
+        GROUP_EXECUTE
+        WORLD_READ
+        WORLD_EXECUTE
+    DESTINATION ${bindir}
+)
 
 if(NOT IS_ABSOLUTE ${bindir})
-  set(abs_bindir "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${bindir}")
+    set(abs_bindir "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${bindir}")
 else()
-  set(abs_bindir "\$ENV{DESTDIR}${bindir}")
+    set(abs_bindir "\$ENV{DESTDIR}${bindir}")
 endif()
 install(CODE "file(CREATE_LINK ${abs_bindir}/fish ${abs_bindir}/fish_indent)")
 install(CODE "file(CREATE_LINK ${abs_bindir}/fish ${abs_bindir}/fish_key_reader)")
@@ -90,87 +103,116 @@ fish_create_dirs(${sysconfdir}/fish/conf.d ${sysconfdir}/fish/completions
     ${sysconfdir}/fish/functions)
 install(FILES etc/config.fish DESTINATION ${sysconfdir}/fish/)
 
-fish_create_dirs(${rel_datadir}/fish ${rel_datadir}/fish/completions
+fish_create_dirs(
-                 ${rel_datadir}/fish/functions
+    ${rel_datadir}/fish ${rel_datadir}/fish/completions
-                 ${rel_datadir}/fish/man/man1 ${rel_datadir}/fish/tools
+    ${rel_datadir}/fish/functions
-                 ${rel_datadir}/fish/tools/web_config
+    ${rel_datadir}/fish/man/man1 ${rel_datadir}/fish/tools
-                 ${rel_datadir}/fish/tools/web_config/js
+    ${rel_datadir}/fish/tools/web_config
-                 ${rel_datadir}/fish/prompts
+    ${rel_datadir}/fish/tools/web_config/js
-                 ${rel_datadir}/fish/themes
+    ${rel_datadir}/fish/prompts
-                 )
+    ${rel_datadir}/fish/themes
+)
 
 configure_file(share/__fish_build_paths.fish.in share/__fish_build_paths.fish)
 install(FILES share/config.fish
-              ${CMAKE_CURRENT_BINARY_DIR}/share/__fish_build_paths.fish
+    ${CMAKE_CURRENT_BINARY_DIR}/share/__fish_build_paths.fish
-        DESTINATION ${rel_datadir}/fish)
+    DESTINATION ${rel_datadir}/fish
+)
 
 # Create only the vendor directories inside the prefix (#5029 / #6508)
-fish_create_dirs(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
+fish_create_dirs(
-    ${rel_datadir}/fish/vendor_conf.d)
+    ${rel_datadir}/fish/vendor_completions.d
+    ${rel_datadir}/fish/vendor_functions.d
+    ${rel_datadir}/fish/vendor_conf.d
+)
 
 fish_try_create_dirs(${rel_datadir}/pkgconfig)
 configure_file(fish.pc.in fish.pc.noversion @ONLY)
 
-add_custom_command(OUTPUT fish.pc
+add_custom_command(
+    OUTPUT fish.pc
     COMMAND sed '/Version/d' fish.pc.noversion > fish.pc
     COMMAND printf "Version: " >> fish.pc
     COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/git_version_gen.sh >> fish.pc
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion)
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fish.pc.noversion
+)
 
 add_custom_target(build_fish_pc ALL DEPENDS fish.pc)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
+install(
-        DESTINATION ${rel_datadir}/pkgconfig)
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc
+    DESTINATION ${rel_datadir}/pkgconfig
+)
 
-install(DIRECTORY share/completions/
+install(
-        DESTINATION ${rel_datadir}/fish/completions
+    DIRECTORY share/completions/
-        FILES_MATCHING PATTERN "*.fish")
+    DESTINATION ${rel_datadir}/fish/completions
+    FILES_MATCHING PATTERN "*.fish"
+)
 
-install(DIRECTORY share/functions/
+install(
-        DESTINATION ${rel_datadir}/fish/functions
+    DIRECTORY share/functions/
-        FILES_MATCHING PATTERN "*.fish")
+    DESTINATION ${rel_datadir}/fish/functions
+    FILES_MATCHING PATTERN "*.fish"
+)
 
-install(DIRECTORY share/prompts/
+install(
-        DESTINATION ${rel_datadir}/fish/prompts
+    DIRECTORY share/prompts/
-        FILES_MATCHING PATTERN "*.fish")
+    DESTINATION ${rel_datadir}/fish/prompts
+    FILES_MATCHING PATTERN "*.fish"
+)
 
-install(DIRECTORY share/themes/
+install(
-        DESTINATION ${rel_datadir}/fish/themes
+    DIRECTORY share/themes/
-        FILES_MATCHING PATTERN "*.theme")
+    DESTINATION ${rel_datadir}/fish/themes
+    FILES_MATCHING PATTERN "*.theme"
+)
 
 # CONDEMNED_PAGE is managed by the conditional above
 # Building the man pages is optional: if sphinx isn't installed, they're not built
-install(DIRECTORY ${SPHINX_OUTPUT_DIR}/man/man1/
+install(
-        DESTINATION ${rel_datadir}/fish/man/man1
+    DIRECTORY ${SPHINX_OUTPUT_DIR}/man/man1/
-        FILES_MATCHING
+    DESTINATION ${rel_datadir}/fish/man/man1
-        PATTERN "*.1"
+    FILES_MATCHING
-        PATTERN ${CONDEMNED_PAGE} EXCLUDE)
+    PATTERN "*.1"
+    PATTERN ${CONDEMNED_PAGE} EXCLUDE
+)
 
-install(PROGRAMS share/tools/create_manpage_completions.py
+install(
-        DESTINATION ${rel_datadir}/fish/tools/)
+    PROGRAMS share/tools/create_manpage_completions.py
+    DESTINATION ${rel_datadir}/fish/tools/
+)
 
-install(DIRECTORY share/tools/web_config
+install(
-        DESTINATION ${rel_datadir}/fish/tools/
+    DIRECTORY share/tools/web_config
-        FILES_MATCHING
+    DESTINATION ${rel_datadir}/fish/tools/
-        PATTERN "*.png"
+    FILES_MATCHING
-        PATTERN "*.css"
+    PATTERN "*.png"
-        PATTERN "*.html"
+    PATTERN "*.css"
-        PATTERN "*.py"
+    PATTERN "*.html"
-        PATTERN "*.js")
+    PATTERN "*.py"
+    PATTERN "*.js"
+)
 
 # Building the man pages is optional: if Sphinx isn't installed, they're not built
 install(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL)
-install(DIRECTORY ${SPHINX_OUTPUT_DIR}/html/ # Trailing slash is important!
+install(
-        DESTINATION ${docdir} OPTIONAL)
+    DIRECTORY ${SPHINX_OUTPUT_DIR}/html/ # Trailing slash is important!
+    DESTINATION ${docdir} OPTIONAL
+)
 install(FILES CHANGELOG.rst DESTINATION ${docdir})
 
 # Group install targets into a InstallTargets folder
-set_property(TARGET build_fish_pc
+set_property(
-             PROPERTY FOLDER cmake/InstallTargets)
+    TARGET build_fish_pc
+    PROPERTY FOLDER cmake/InstallTargets
+)
 
 # Make a target build_root that installs into the buildroot directory, for testing.
 set(BUILDROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}/buildroot)
-add_custom_target(build_root
+add_custom_target(
-                  COMMAND DESTDIR=${BUILDROOT_DIR} ${CMAKE_COMMAND}
+    build_root
-                          --build ${CMAKE_CURRENT_BINARY_DIR} --target install)
+    COMMAND DESTDIR=${BUILDROOT_DIR} ${CMAKE_COMMAND}
+        --build ${CMAKE_CURRENT_BINARY_DIR} --target install
+)

cmake/PCRE2.cmake

@@ -1,9 +1,10 @@
 set(FISH_USE_SYSTEM_PCRE2 ON CACHE BOOL
-  "Try to use PCRE2 from the system, instead of the pcre2-sys version")
+    "Try to use PCRE2 from the system, instead of the pcre2-sys version"
+)
 
 if(FISH_USE_SYSTEM_PCRE2)
-  message(STATUS "Trying to use PCRE2 from the system")
+    message(STATUS "Trying to use PCRE2 from the system")
 else()
-  message(STATUS "Forcing static build of PCRE2")
+    message(STATUS "Forcing static build of PCRE2")
-  set(FISH_PCRE2_BUILDFLAG "PCRE2_SYS_STATIC=1")
+    set(FISH_PCRE2_BUILDFLAG "PCRE2_SYS_STATIC=1")
 endif(FISH_USE_SYSTEM_PCRE2)

cmake/Tests.cmake

@@ -1,27 +1,27 @@
 FILE(GLOB FISH_CHECKS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/checks/*.fish)
 foreach(CHECK ${FISH_CHECKS})
-  get_filename_component(CHECK_NAME ${CHECK} NAME)
+    get_filename_component(CHECK_NAME ${CHECK} NAME)
-  add_custom_target(
+    add_custom_target(
-    test_${CHECK_NAME}
+        test_${CHECK_NAME}
-    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
-                checks/${CHECK_NAME}
+            checks/${CHECK_NAME}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader
+        DEPENDS fish fish_indent fish_key_reader
-    USES_TERMINAL
+        USES_TERMINAL
-  )
+    )
 endforeach(CHECK)
 
 FILE(GLOB PEXPECTS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/tests/pexpects/*.py)
 foreach(PEXPECT ${PEXPECTS})
-  get_filename_component(PEXPECT ${PEXPECT} NAME)
+    get_filename_component(PEXPECT ${PEXPECT} NAME)
-  add_custom_target(
+    add_custom_target(
-    test_${PEXPECT}
+        test_${PEXPECT}
-    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
+        COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${CMAKE_CURRENT_BINARY_DIR}
-                pexpects/${PEXPECT}
+            pexpects/${PEXPECT}
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests
-    DEPENDS fish fish_indent fish_key_reader
+        DEPENDS fish fish_indent fish_key_reader
-    USES_TERMINAL
+        USES_TERMINAL
-  )
+    )
 endforeach(PEXPECT)
 
 # Rust stuff.
@@ -30,14 +30,20 @@ if(DEFINED ASAN)
     # Rust w/ -Zsanitizer=address requires explicitly specifying the --target triple or else linker
     # errors pertaining to asan symbols will ensue.
     if(NOT DEFINED Rust_CARGO_TARGET)
-        message(FATAL_ERROR "ASAN requires defining the CMake variable Rust_CARGO_TARGET to the
+        message(
-            intended target triple")
+            FATAL_ERROR
+            "ASAN requires defining the CMake variable Rust_CARGO_TARGET to the
+            intended target triple"
+        )
     endif()
 endif()
 if(DEFINED TSAN)
     if(NOT DEFINED Rust_CARGO_TARGET)
-        message(FATAL_ERROR "TSAN requires defining the CMake variable Rust_CARGO_TARGET to the
+        message(
-            intended target triple")
+            FATAL_ERROR
+            "TSAN requires defining the CMake variable Rust_CARGO_TARGET to the
+            intended target triple"
+        )
     endif()
 endif()
 
@@ -53,10 +59,10 @@ endif()
 
 # The top-level test target is "fish_run_tests".
 add_custom_target(fish_run_tests
-  # TODO: This should be replaced with a unified solution, possibly build_tools/check.sh.
+    # TODO: This should be replaced with a unified solution, possibly build_tools/check.sh.
-  COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${max_concurrency_flag} ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${CMAKE_SOURCE_DIR}/tests/test_driver.py ${max_concurrency_flag} ${CMAKE_CURRENT_BINARY_DIR}
-  COMMAND env ${VARS_FOR_CARGO}
+    COMMAND
-            ${Rust_CARGO}
+        env ${VARS_FOR_CARGO} ${Rust_CARGO}
             test
             --no-default-features
             --features=${FISH_CARGO_FEATURES}
@@ -64,7 +70,7 @@ add_custom_target(fish_run_tests
             --workspace
             --target-dir ${rust_target_dir}
             ${cargo_test_flags}
-  WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-  DEPENDS fish fish_indent fish_key_reader
+    DEPENDS fish fish_indent fish_key_reader
-  USES_TERMINAL
+    USES_TERMINAL
 )

contrib/debian/changelog

@@ -1,3 +1,19 @@
+fish (4.6.0-1) stable; urgency=medium
+
+  * Release of new version 4.6.0.
+
+  See https://github.com/fish-shell/fish-shell/releases/tag/4.6.0 for details.
+
+ -- Johannes Altmanninger <aclopte@gmail.com>  Sat, 28 Mar 2026 12:56:37 +0800
+
+fish (4.5.0-1) stable; urgency=medium
+
+  * Release of new version 4.5.0.
+
+  See https://github.com/fish-shell/fish-shell/releases/tag/4.5.0 for details.
+
+ -- Johannes Altmanninger <aclopte@gmail.com>  Tue, 17 Feb 2026 11:32:33 +1100
+
 fish (4.4.0-1) stable; urgency=medium
 
   * Release of new version 4.4.0.

contrib/debian/rules

@@ -16,14 +16,12 @@ export DEB_BUILD_MAINT_OPTIONS=optimize=-lto
 # Setting the build system is still required, because otherwise the GNUmakefile gets picked up
 override_dh_auto_configure:
 	ln -s cargo-vendor/vendor vendor
-	ln -s cargo-vendor/.cargo .cargo
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	  -DRust_CARGO=$$(command -v cargo-1.85 || command -v cargo) \
 	  -DRust_COMPILER=$$(command -v rustc-1.85 || command -v rustc)
 
 override_dh_clean:
 	dh_clean --exclude=Cargo.toml.orig
-	-unlink .cargo
 	-unlink vendor
 
 override_dh_auto_test:

contrib/shell.nix

@@ -0,0 +1,33 @@
+# Environment containing all dependencies needed for
+# - building fish,
+# - building documentation,
+# - running all tests,
+# - formatting and checking lints.
+#
+# enter interactive bash shell:
+#   nix-shell contrib/shell.nix
+#
+# using system nixpkgs (otherwise fetches pinned version):
+#   nix-shell contrib/shell.nix --arg pkgs 'import <nixpkgs> {}'
+#
+# run single command:
+#   nix-shell contrib/shell --run "cargo xtask check"
+{ pkgs ? (import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/nixos-25.11.tar.gz";
+  sha256 = "1ia5kjykm9xmrpwbzhbaf4cpwi3yaxr7shl6amj8dajvgbyh2yh4";
+}) { }), ... }:
+pkgs.mkShell {
+  buildInputs = [
+    (pkgs.python3.withPackages (pyPkgs: [ pyPkgs.pexpect ]))
+    pkgs.cargo
+    pkgs.clippy
+    pkgs.cmake
+    pkgs.gettext
+    pkgs.pcre2
+    pkgs.procps # tests use pgrep/pkill
+    pkgs.ruff
+    pkgs.rustc
+    pkgs.rustfmt
+    pkgs.sphinx
+  ];
+}

crates/build-helper/src/lib.rs

@@ -1,4 +1,4 @@
-use std::{borrow::Cow, env, os::unix::ffi::OsStrExt, path::Path};
+use std::{borrow::Cow, env, os::unix::ffi::OsStrExt as _, path::Path};
 
 pub fn env_var(name: &str) -> Option<String> {
     let err = match env::var(name) {
@@ -38,6 +38,14 @@ pub fn fish_doc_dir() -> Cow<'static, Path> {
     cargo_target_dir().join("fish-docs").into()
 }
 
+fn l10n_dir() -> Cow<'static, Path> {
+    workspace_root().join("localization").into()
+}
+
+pub fn po_dir() -> Cow<'static, Path> {
+    l10n_dir().join("po").into()
+}
+
 // TODO Move this to rsconf
 pub fn rebuild_if_path_changed<P: AsRef<Path>>(path: P) {
     rsconf::rebuild_if_path_changed(path.as_ref().to_str().unwrap());

crates/build-man-pages/build.rs

@@ -43,7 +43,7 @@ fn build_man(sec1_dir: &Path) {
     ];
 
     rsconf::rebuild_if_env_changed("FISH_BUILD_DOCS");
-    if env_var("FISH_BUILD_DOCS") == Some("0".to_string()) {
+    if env_var("FISH_BUILD_DOCS") == Some("0".to_owned()) {
         rsconf::warn!("Skipping man pages because $FISH_BUILD_DOCS is set to 0");
         return;
     }
@@ -62,7 +62,7 @@ fn build_man(sec1_dir: &Path) {
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
             assert_ne!(
                 env_var("FISH_BUILD_DOCS"),
-                Some("1".to_string()),
+                Some("1".to_owned()),
                 "Could not find sphinx-build required to build man pages.\n\
                  Install Sphinx or disable building the docs by setting $FISH_BUILD_DOCS=0."
             );

crates/common/Cargo.toml

@@ -12,5 +12,9 @@ fish-widestring.workspace = true
 libc.workspace = true
 nix.workspace = true
 
+[build-dependencies]
+fish-build-helper.workspace = true
+rsconf.workspace = true
+
 [lints]
 workspace = true

crates/common/build.rs

@@ -0,0 +1,5 @@
+use fish_build_helper::target_os_is_apple;
+
+fn main() {
+    rsconf::declare_cfg("apple", target_os_is_apple());
+}

crates/common/src/lib.rs

@@ -1,13 +1,13 @@
 use bitflags::bitflags;
-use fish_widestring::{L, char_offset, wstr};
+use fish_widestring::{L, WString, char_offset, wstr};
 use libc::{SIG_IGN, SIGTTOU, STDIN_FILENO};
 use std::cell::{Cell, RefCell};
 use std::io::Read;
 use std::ops::{Deref, DerefMut};
 use std::os::fd::{AsRawFd, BorrowedFd, RawFd};
-use std::os::unix::ffi::OsStrExt;
+use std::os::unix::ffi::OsStrExt as _;
-use std::sync::OnceLock;
 use std::sync::atomic::{AtomicI32, AtomicU32, Ordering};
+use std::sync::{Arc, OnceLock};
 use std::{env, mem, time};
 
 pub const PACKAGE_NAME: &str = env!("CARGO_PKG_NAME");
@@ -137,20 +137,23 @@ pub fn is_console_session() -> bool {
     static IS_CONSOLE_SESSION: OnceLock<bool> = OnceLock::new();
     // TODO(terminal-workaround)
     *IS_CONSOLE_SESSION.get_or_init(|| {
-        nix::unistd::ttyname(unsafe { std::os::fd::BorrowedFd::borrow_raw(STDIN_FILENO) })
+        // No console session on Apple, and ttyname may hang (#12506).
-            .is_ok_and(|buf| {
+        !cfg!(apple)
-                // Check if the tty matches /dev/(console|dcons|tty[uv\d])
+            && nix::unistd::ttyname(unsafe { std::os::fd::BorrowedFd::borrow_raw(STDIN_FILENO) })
-                let is_console_tty = match buf.as_os_str().as_bytes() {
+                .is_ok_and(|buf| {
-                    b"/dev/console" => true,
+                    // Check if the tty matches /dev/(console|dcons|tty[uv\d])
-                    b"/dev/dcons" => true,
+                    let is_console_tty = match buf.as_os_str().as_bytes() {
-                    bytes => bytes.strip_prefix(b"/dev/tty").is_some_and(|rest| {
+                        b"/dev/console" => true,
-                        matches!(rest.first(), Some(b'u' | b'v' | b'0'..=b'9'))
+                        b"/dev/dcons" => true,
-                    }),
+                        bytes => bytes.strip_prefix(b"/dev/tty").is_some_and(|rest| {
-                };
+                            matches!(rest.first(), Some(b'u' | b'v' | b'0'..=b'9'))
+                        }),
+                    };
 
-                // and that $TERM is simple, e.g. `xterm` or `vt100`, not `xterm-something` or `sun-color`.
+                    // and that $TERM is simple, e.g. `xterm` or `vt100`, not `xterm-something` or `sun-color`.
-                is_console_tty && env::var_os("TERM").is_none_or(|t| !t.as_bytes().contains(&b'-'))
+                    is_console_tty
-            })
+                        && env::var_os("TERM").is_none_or(|t| !t.as_bytes().contains(&b'-'))
+                })
     })
 }
 
@@ -159,17 +162,6 @@ pub fn exit_without_destructors(code: libc::c_int) -> ! {
     unsafe { libc::_exit(code) };
 }
 
-/// The character to use where the text has been truncated.
-pub fn get_ellipsis_char() -> char {
-    '\u{2026}' // ('…')
-}
-
-/// The character or string to use where text has been truncated (ellipsis if possible, otherwise
-/// ...)
-pub fn get_ellipsis_str() -> &'static wstr {
-    L!("\u{2026}")
-}
-
 // Only pub for `src/common.rs`
 pub static OBFUSCATION_READ_CHAR: AtomicU32 = AtomicU32::new(0);
 
@@ -269,6 +261,9 @@ macro_rules! help_section {
     }};
 }
 
+/// Stored in blocks to reference the file which created the block.
+pub type FilenameRef = Arc<WString>;
+
 pub type Timepoint = f64;
 
 /// Return the number of seconds from the UNIX epoch, with subsecond precision. This function uses

crates/fallback/src/lib.rs

@@ -25,36 +25,13 @@
 /// Valid values are 1, and 2. 1 is the typical emoji width used in Unicode 8 while some newer
 /// terminals use a width of 2 since Unicode 9.
 // For some reason, this is declared here and exposed here, but is set in `env_dispatch`.
-pub static FISH_EMOJI_WIDTH: AtomicIsize = AtomicIsize::new(1);
+pub static FISH_EMOJI_WIDTH: AtomicIsize = AtomicIsize::new(2);
 
 static WC_LOOKUP_TABLE: LazyLock<WcLookupTable> = LazyLock::new(WcLookupTable::new);
 
-/// A safe wrapper around the system `wcwidth()` function
-#[cfg(not(cygwin))]
-pub fn wcwidth(c: char) -> isize {
-    unsafe extern "C" {
-        pub unsafe fn wcwidth(c: libc::wchar_t) -> libc::c_int;
-    }
-
-    const {
-        assert!(size_of::<libc::wchar_t>() >= size_of::<char>());
-    }
-
-    let width = unsafe { wcwidth(c as libc::wchar_t) };
-    isize::try_from(width).unwrap()
-}
-
 // Big hack to use our versions of wcswidth where we know them to be broken, which is
 // EVERYWHERE (https://github.com/fish-shell/fish-shell/issues/2199)
 pub fn fish_wcwidth(c: char) -> isize {
-    // The system version of wcwidth should accurately reflect the ability to represent characters
-    // in the console session, but knows nothing about the capabilities of other terminal emulators
-    // or ttys. Use it from the start only if we are logged in to the physical console.
-    #[cfg(not(cygwin))]
-    if fish_common::is_console_session() {
-        return wcwidth(c);
-    }
-
     // Check for VS16 which selects emoji presentation. This "promotes" a character like U+2764
     // (width 1) to an emoji (probably width 2). So treat it as width 1 so the sums work. See #2652.
     // VS15 selects text presentation.
@@ -75,18 +52,7 @@ pub fn fish_wcwidth(c: char) -> isize {
 
     let width = WC_LOOKUP_TABLE.classify(c);
     match width {
-        WcWidth::NonCharacter | WcWidth::NonPrint | WcWidth::Combining | WcWidth::Unassigned => {
+        WcWidth::NonCharacter | WcWidth::NonPrint | WcWidth::Combining | WcWidth::Unassigned => 0,
-            #[cfg(not(cygwin))]
-            {
-                // Fall back to system wcwidth in this case.
-                wcwidth(c)
-            }
-            #[cfg(cygwin)]
-            {
-                // No system wcwidth for UTF-32 on cygwin.
-                0
-            }
-        }
         WcWidth::Ambiguous | WcWidth::PrivateUse => {
             // TR11: "All private-use characters are by default classified as Ambiguous".
             FISH_AMBIGUOUS_WIDTH.load(Ordering::Relaxed)
@@ -97,8 +63,7 @@ pub fn fish_wcwidth(c: char) -> isize {
     }
 }
 
-/// fish's internal versions of wcwidth and wcswidth, which can use an internal implementation if
+/// fish's internal versions of wcwidth and wcswidth
-/// the system one is busted.
 pub fn fish_wcswidth(s: &wstr) -> isize {
     // ascii fast path; empty iterator returns true for .all()
     if s.chars().all(|c| c.is_ascii() && !c.is_ascii_control()) {

crates/gettext-extraction/src/lib.rs

@@ -1,7 +1,7 @@
 extern crate proc_macro;
 use fish_tempfile::random_filename;
 use proc_macro::TokenStream;
-use std::{ffi::OsString, io::Write, path::PathBuf};
+use std::{ffi::OsString, io::Write as _, path::PathBuf};
 
 fn unescape_multiline_rust_string(s: String) -> String {
     if !s.contains('\n') {

crates/gettext-maps/build.rs

@@ -11,24 +11,16 @@ fn main() {
         PathBuf::from(fish_build_helper::fish_build_dir()).join("fish-localization-map-cache");
     embed_localizations(&cache_dir);
 
-    fish_build_helper::rebuild_if_path_changed(
+    fish_build_helper::rebuild_if_path_changed(fish_build_helper::po_dir());
-        fish_build_helper::workspace_root()
-            .join("localization")
-            .join("po"),
-    );
 }
 
 fn embed_localizations(cache_dir: &Path) {
     use fish_gettext_mo_file_parser::parse_mo_file;
     use std::{
         fs::File,
-        io::{BufWriter, Write},
+        io::{BufWriter, Write as _},
     };
 
-    let po_dir = fish_build_helper::workspace_root()
-        .join("localization")
-        .join("po");
-
     // Ensure that the directory is created, because clippy cannot compile the code if the
     // directory does not exist.
     std::fs::create_dir_all(cache_dir).unwrap();
@@ -56,7 +48,7 @@ fn embed_localizations(cache_dir: &Path) {
         Ok(output) => {
             let has_check_format =
                 String::from_utf8_lossy(&output.stdout).contains("--check-format");
-            for dir_entry_result in po_dir.read_dir().unwrap() {
+            for dir_entry_result in fish_build_helper::po_dir().read_dir().unwrap() {
                 let dir_entry = dir_entry_result.unwrap();
                 let po_file_path = dir_entry.path();
                 if po_file_path.extension() != Some(OsStr::new("po")) {

crates/gettext/src/lib.rs

@@ -6,8 +6,7 @@
 
 type Catalog = &'static phf::Map<&'static str, &'static str>;
 
-static LANGUAGE_PRECEDENCE: LazyLock<Mutex<Vec<(&'static str, Catalog)>>> =
+static LANGUAGE_PRECEDENCE: Mutex<Vec<(&'static str, Catalog)>> = Mutex::new(Vec::new());
-    LazyLock::new(|| Mutex::new(vec![]));
 
 pub fn gettext(message_str: &'static str) -> Option<&'static str> {
     let language_precedence = LANGUAGE_PRECEDENCE.lock().unwrap();

crates/printf/src/lib.rs

@@ -51,7 +51,7 @@ macro_rules! sprintf {
         {
             // May be no args!
             #[allow(unused_imports)]
-            use $crate::ToArg;
+            use $crate::ToArg as _;
             $crate::printf_c_locale(
                 $target,
                 $fmt,

crates/printf/src/printf_impl.rs

@@ -6,8 +6,8 @@
 use std::fmt::{self, Write};
 use std::mem;
 use std::result::Result;
-use unicode_segmentation::UnicodeSegmentation;
+use unicode_segmentation::UnicodeSegmentation as _;
-use unicode_width::UnicodeWidthStr;
+use unicode_width::UnicodeWidthStr as _;
 
 #[cfg(feature = "widestring")]
 use widestring::Utf32Str as wstr;

crates/printf/src/tests.rs

@@ -1,6 +1,6 @@
 use crate::arg::ToArg;
 use crate::locale::{C_LOCALE, EN_US_LOCALE, Locale};
-use crate::{Error, FormatString, sprintf_locale};
+use crate::{Error, FormatString as _, sprintf_locale};
 use std::f64::consts::{E, PI, TAU};
 use std::ffi::CStr;
 use std::fmt;
@@ -13,7 +13,7 @@ macro_rules! sprintf_check {
         $(,)? // optional trailing comma
     ) => {
         {
-            use unicode_width::UnicodeWidthStr;
+            use unicode_width::UnicodeWidthStr as _;
             let mut target = String::new();
             let mut args = [$($arg.to_arg()),*];
             let len = $crate::printf_c_locale(
@@ -400,8 +400,10 @@ fn test_char() {
 
 #[test]
 fn test_ptr() {
-    assert_fmt!("%p", core::ptr::null::<u8>() => "0");
+    assert_fmt!("%p", core::ptr::null::<()>() => "0");
-    assert_fmt!("%p", 0xDEADBEEF_usize as *const u8 => "0xdeadbeef");
+
+    let tmp = core::ptr::without_provenance::<()>(0xDEADBEEF);
+    assert_fmt!("%p", tmp => "0xdeadbeef");
 }
 
 #[test]

crates/tempfile/src/lib.rs

@@ -5,7 +5,7 @@
     path::PathBuf,
 };
 
-use rand::distr::{Alphanumeric, Distribution};
+use rand::distr::{Alphanumeric, Distribution as _};
 
 pub struct TempFile {
     file: File,
@@ -114,7 +114,7 @@ pub fn new_dir() -> std::io::Result<TempDir> {
 mod tests {
     use std::{
         fs::File,
-        io::{Read, Seek, Write},
+        io::{Read as _, Seek as _, Write as _},
     };
 
     #[test]

crates/util/Cargo.toml

@@ -7,7 +7,10 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
+errno.workspace = true
 fish-widestring.workspace = true
+libc.workspace = true
+nix.workspace = true
 rand.workspace = true
 
 [lints]

crates/util/src/lib.rs

@@ -1,9 +1,15 @@
 //! Generic utilities library.
 
+use errno::errno;
 use fish_widestring::prelude::*;
-use rand::{SeedableRng, rngs::SmallRng};
+use rand::{SeedableRng as _, rngs::SmallRng};
-use std::cmp::Ordering;
+use std::{
-use std::time;
+    cmp::Ordering,
+    ffi::CStr,
+    io::Write as _,
+    os::fd::{BorrowedFd, RawFd},
+    time,
+};
 
 /// Compares two wide character strings with an (arguably) intuitive ordering. This function tries
 /// to order strings in a way which is intuitive to humans with regards to sorting strings
@@ -234,6 +240,26 @@ fn wcsfilecmp_leading_digits(a: &wstr, b: &wstr) -> (Ordering, usize, usize) {
     (ret, ai, bi)
 }
 
+pub fn write_to_fd(input: &[u8], fd: RawFd) -> nix::Result<usize> {
+    nix::unistd::write(unsafe { BorrowedFd::borrow_raw(fd) }, input)
+}
+
+/// Prints the provided string, followed by a colon, space, and the string representation of the
+/// current errno via [`libc::strerror`].
+pub fn perror(s: &str) {
+    let e = errno().0;
+    let mut stderr = std::io::stderr().lock();
+    if !s.is_empty() {
+        let _ = write!(stderr, "{s}: ");
+    }
+    let slice = unsafe {
+        let msg = libc::strerror(e);
+        CStr::from_ptr(msg).to_bytes()
+    };
+    let _ = stderr.write_all(slice);
+    let _ = stderr.write_all(b"\n");
+}
+
 #[cfg(test)]
 mod tests {
     use super::wcsfilecmp;

crates/wcstringutil/Cargo.toml

@@ -7,7 +7,6 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-fish-common.workspace = true
 fish-fallback.workspace = true
 fish-widestring.workspace = true
 

crates/wcstringutil/src/lib.rs

@@ -1,8 +1,12 @@
 //! Helper functions for working with wcstring.
 
-use fish_common::{get_ellipsis_char, get_ellipsis_str};
+use std::{
+    ffi::{CStr, CString, OsString},
+    os::unix::ffi::OsStringExt as _,
+};
+
 use fish_fallback::{fish_wcwidth, lowercase, lowercase_rev, wcscasecmp, wcscasecmp_fuzzy};
-use fish_widestring::{decode_byte_from_char, prelude::*};
+use fish_widestring::{ELLIPSIS_CHAR, decode_byte_from_char, prelude::*};
 
 /// Return the number of newlines in a string.
 pub fn count_newlines(s: &wstr) -> usize {
@@ -360,6 +364,121 @@ pub fn str2bytes_callback(input: impl IntoCharIter, mut func: impl FnMut(&[u8])
     true
 }
 
+/// Returns a newly allocated multibyte character string equivalent of the specified wide character
+/// string.
+///
+/// This function decodes illegal character sequences in a reversible way using the private use
+/// area.
+pub fn wcs2bytes(input: impl IntoCharIter) -> Vec<u8> {
+    let mut result = vec![];
+    wcs2bytes_appending(&mut result, input);
+    result
+}
+
+pub fn wcs2osstring(input: &wstr) -> OsString {
+    if input.is_empty() {
+        return OsString::new();
+    }
+
+    let mut result = vec![];
+    wcs2bytes_appending(&mut result, input);
+    OsString::from_vec(result)
+}
+
+/// Same as [`wcs2bytes`]. Meant to be used when we need a zero-terminated string to feed legacy APIs.
+/// Note: if `input` contains any interior NUL bytes, the result will be truncated at the first!
+pub fn wcs2zstring(input: &wstr) -> CString {
+    if input.is_empty() {
+        return CString::default();
+    }
+
+    let mut vec = Vec::with_capacity(input.len() + 1);
+    str2bytes_callback(input, |buff| {
+        vec.extend_from_slice(buff);
+        true
+    });
+    vec.push(b'\0');
+
+    match CString::from_vec_with_nul(vec) {
+        Ok(cstr) => cstr,
+        Err(err) => {
+            // `input` contained a NUL in the middle; we can retrieve `vec`, though
+            let mut vec = err.into_bytes();
+            let pos = vec.iter().position(|c| *c == b'\0').unwrap();
+            vec.truncate(pos + 1);
+            // Safety: We truncated after the first NUL
+            unsafe { CString::from_vec_with_nul_unchecked(vec) }
+        }
+    }
+}
+
+/// Like [`wcs2bytes`], but appends to `output` instead of returning a new string.
+pub fn wcs2bytes_appending(output: &mut Vec<u8>, input: impl IntoCharIter) {
+    str2bytes_callback(input, |buff| {
+        output.extend_from_slice(buff);
+        true
+    });
+}
+
+/// A trait to make it more convenient to pass ascii/Unicode strings to functions that can take
+/// non-Unicode values. The result is nul-terminated and can be passed to OS functions.
+///
+/// This is only implemented for owned types where an owned instance will skip allocations (e.g.
+/// `CString` can return `self`) but not implemented for owned instances where a new allocation is
+/// always required (e.g. implemented for `&wstr` but not `WideString`) because you might as well be
+/// left with the original item if we're going to allocate from scratch in all cases.
+pub trait ToCString {
+    /// Correctly convert to a nul-terminated [`CString`] that can be passed to OS functions.
+    fn to_cstring(self) -> CString;
+}
+
+impl ToCString for CString {
+    fn to_cstring(self) -> CString {
+        self
+    }
+}
+
+impl ToCString for &CStr {
+    fn to_cstring(self) -> CString {
+        self.to_owned()
+    }
+}
+
+/// Safely converts from `&wstr` to a `CString` to a nul-terminated `CString` that can be passed to
+/// OS functions, taking into account non-Unicode values that have been shifted into the private-use
+/// range by using [`wcs2zstring()`].
+impl ToCString for &wstr {
+    /// The wide string may contain non-Unicode bytes mapped to the private-use Unicode range, so we
+    /// have to use [`wcs2zstring()`](self::wcs2zstring) to convert it correctly.
+    fn to_cstring(self) -> CString {
+        self::wcs2zstring(self)
+    }
+}
+
+/// Safely converts from `&WString` to a nul-terminated `CString` that can be passed to OS
+/// functions, taking into account non-Unicode values that have been shifted into the private-use
+/// range by using [`wcs2zstring()`].
+impl ToCString for &WString {
+    fn to_cstring(self) -> CString {
+        self.as_utfstr().to_cstring()
+    }
+}
+
+/// Convert a (probably ascii) string to CString that can be passed to OS functions.
+impl ToCString for Vec<u8> {
+    fn to_cstring(mut self) -> CString {
+        self.push(b'\0');
+        CString::from_vec_with_nul(self).unwrap()
+    }
+}
+
+/// Convert a (probably ascii) string to nul-terminated CString that can be passed to OS functions.
+impl ToCString for &[u8] {
+    fn to_cstring(self) -> CString {
+        CString::new(self).unwrap()
+    }
+}
+
 /// Split a string by runs of any of the separator characters provided in `seps`.
 /// Note the delimiters are the characters in `seps`, not `seps` itself.
 /// `seps` may contain the NUL character.
@@ -473,32 +592,13 @@ pub fn split_about<'haystack>(
     output
 }
 
-#[derive(Eq, PartialEq)]
+// TODO: This should work on render width rather than the number of codepoints.
-pub enum EllipsisType {
+pub fn truncate(input: &wstr, max_len: usize) -> WString {
-    None,
-    // Prefer niceness over minimalness
-    Prettiest,
-    // Make every character count ($ instead of ...)
-    Shortest,
-}
-
-pub fn truncate(input: &wstr, max_len: usize, etype: Option<EllipsisType>) -> WString {
-    let etype = etype.unwrap_or(EllipsisType::Prettiest);
     if input.len() <= max_len {
         return input.to_owned();
     }
-
-    if etype == EllipsisType::None {
-        return input[..max_len].to_owned();
-    }
-    if etype == EllipsisType::Prettiest {
-        let ellipsis_str = get_ellipsis_str();
-        let mut output = input[..max_len - ellipsis_str.len()].to_owned();
-        output += ellipsis_str;
-        return output;
-    }
     let mut output = input[..max_len - 1].to_owned();
-    output.push(get_ellipsis_char());
+    output.push(ELLIPSIS_CHAR);
     output
 }
 

crates/widestring/Cargo.toml

@@ -7,6 +7,7 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
+unicode-width.workspace = true
 widestring.workspace = true
 
 [lints]

crates/widestring/src/lib.rs

@@ -13,6 +13,9 @@ pub mod prelude {
     pub use crate::{IntoCharIter, L, ToWString, WExt, WString, wstr};
 }
 
+/// The character to use where the text has been truncated.
+pub const ELLIPSIS_CHAR: char = '\u{2026}'; // ('…')
+
 // These are in the Unicode private-use range. We really shouldn't use this
 // range but have little choice in the matter given how our lexer/parser works.
 // We can't use non-characters for these two ranges because there are only 66 of
@@ -53,6 +56,219 @@ pub fn decode_byte_from_char(c: char) -> Option<u8> {
     }
 }
 
+mod decoder {
+    use crate::{ENCODE_DIRECT_BASE, ENCODE_DIRECT_END, char_offset, wstr};
+    use buffer::Buffer;
+    use std::{char::REPLACEMENT_CHARACTER, ops::Range};
+    use widestring::utfstr::CharsUtf32;
+
+    mod buffer {
+        // The size required for a PUA-encoded character from our special PUA range - 1,
+        // since that is the maximum number characters our look-ahead needs to check.
+        const MAX_SIZE: usize = 2;
+        pub(super) struct Buffer {
+            buffer: [char; MAX_SIZE],
+            length: usize,
+        }
+
+        impl Buffer {
+            pub(super) fn empty() -> Self {
+                Self {
+                    buffer: ['\0'; MAX_SIZE],
+                    length: 0,
+                }
+            }
+
+            pub(super) fn push(&mut self, c: char) {
+                self.buffer[self.length] = c;
+                self.length += 1;
+            }
+
+            pub(super) fn pop(&mut self) -> Option<char> {
+                if self.length == 0 {
+                    return None;
+                }
+                self.length -= 1;
+                Some(self.buffer[self.length])
+            }
+
+            pub(super) fn pop_front(&mut self) -> Option<char> {
+                if self.length == 0 {
+                    return None;
+                }
+                self.buffer.rotate_left(1);
+                self.length -= 1;
+                Some(self.buffer[MAX_SIZE - 1])
+            }
+        }
+    }
+
+    const PUA_ENCODE_RANGE: Range<char> = ENCODE_DIRECT_BASE..ENCODE_DIRECT_END;
+    const ENCODED_PUA_CHAR_FIRST_CHAR: char = char_offset(ENCODE_DIRECT_BASE, 0xef);
+    // The second UTF-8 byte of a character in our special PUA range is in the range
+    // 0x98..0x9c.
+    const ENCODED_PUA_CHAR_SECOND_CHAR_RANGE: Range<char> =
+        char_offset(ENCODE_DIRECT_BASE, 0x98)..char_offset(ENCODE_DIRECT_BASE, 0x9c);
+
+    /// This serves as the data container for building a double-ended iterator which decodes our
+    /// PUA-encoded chars into a char iterator where each encoded non-UTF-8 byte is replaced by the
+    /// replacement character, and each encoded PUA codepoint is turned back into a single char
+    /// whose value is the original PUA codepoint.
+    ///
+    /// The latter part makes the decoding logic somewhat complicated, because encoded PUA chars
+    /// take up 3 chars in our encoding. Therefore, in some cases, we need to take more than 1 char
+    /// from the `encoded_chars` iterator before we know whether to decode 3 chars together into a
+    /// single char, or whether the chars should be replaced by the replacement char individually.
+    /// In cases where we took more than 1 char and then notice that individual replacement is
+    /// warranted, we return a replacement char for the first char we took from the iterator, and
+    /// cache the 1 or 2 other chars we read in `buffer_front` or `buffer_back`, depending on the
+    /// reading direction. Buffers store elements in such an order that getting the next character
+    /// requires `pop` when using the buffer associated with the current reading direction, and
+    /// `pop_front` when using the other buffer. This is done to optimize the common case of
+    /// iterating in a single direction.
+    ///
+    /// The buffers have to be considered before taking more chars from `encoded_chars`.
+    /// If the iterator is only read in one direction, the buffer for the other direction will not
+    /// be used. But because it's possible that the iterator is read from both ends, it can happen
+    /// that when `encoded_chars` runs out, the buffer for the opposite reading direction is
+    /// non-empty. In the [`Self::next`] and [`Self::next_back`] implementations, this logic is
+    /// encapsulated into closures for getting the next char from the appropriate source.
+    /// At most 2 chars will ever be stored in a buffer, so they are implemented using a fixed-size
+    /// array, requiring no heap allocations.
+    ///
+    /// Note that in most cases, we can avoid using the buffers, and simply forward the char
+    /// obtained from `encoded_chars`. Only chars in [`PUA_ENCODE_RANGE`] can possibly encode PUA
+    /// chars, so if we read any other char, we know that it's not part of such an encoding and can
+    /// return it directly. If we read in the forward direction, we can also exploit knowledge about
+    /// the possible values of our PUA encoding. Specifically, the first char in such an encoding
+    /// will always be [`ENCODED_PUA_CHAR_FIRST_CHAR`], and the second char will be in the range
+    /// [`ENCODED_PUA_CHAR_SECOND_CHAR_RANGE`].
+    pub(super) struct Decoder<'a> {
+        encoded_chars: CharsUtf32<'a>,
+        buffer_front: Buffer,
+        buffer_back: Buffer,
+    }
+
+    impl<'a> Decoder<'a> {
+        pub(super) fn new(encoded_str: &'a wstr) -> Self {
+            Self {
+                encoded_chars: encoded_str.chars(),
+                buffer_front: Buffer::empty(),
+                buffer_back: Buffer::empty(),
+            }
+        }
+    }
+
+    fn try_pua_decoding(encoding: &[char; 3]) -> Option<char> {
+        let mut bytes = [0u8; 3];
+        for (index, &c) in encoding.iter().enumerate() {
+            bytes[index] = super::decode_byte_from_char(c)?;
+        }
+        let first_decoded_char =
+            std::str::from_utf8(&bytes).ok()?.chars().next().expect(
+                "Non-empty byte slice which is valid UTF-8 must result in at least one char.",
+            );
+        // For strings whose width we compute, we only expect invalid UTF-8 and codepoints from the
+        // PUA encoding range to be PUA encoded.
+        // If we reach this point, the encoded bytes are valid UTF-8, so the only remaining
+        // expected case are codepoints from the PUA encoding range.
+        // These all take 3 bytes to represent in UTF-8, so if we check that the first parsed
+        // codepoint is in the expected range, we know that exactly 3 bytes were consumed for
+        // parsing this codepoint.
+        assert!(PUA_ENCODE_RANGE.contains(&first_decoded_char));
+        Some(first_decoded_char)
+    }
+
+    fn replace_if_pua_encoded(c: char) -> char {
+        if PUA_ENCODE_RANGE.contains(&c) {
+            REPLACEMENT_CHARACTER
+        } else {
+            c
+        }
+    }
+
+    impl<'a> Iterator for Decoder<'a> {
+        type Item = char;
+
+        fn next(&mut self) -> Option<Self::Item> {
+            let mut get_next_char = || {
+                self.buffer_front
+                    .pop()
+                    .or_else(|| self.encoded_chars.next())
+                    .or_else(|| self.buffer_back.pop_front())
+            };
+            let c_0 = get_next_char()?;
+            if c_0 != ENCODED_PUA_CHAR_FIRST_CHAR {
+                return Some(replace_if_pua_encoded(c_0));
+            }
+            if let Some(c_1) = get_next_char() {
+                if ENCODED_PUA_CHAR_SECOND_CHAR_RANGE.contains(&c_1) {
+                    if let Some(c_2) = get_next_char() {
+                        if let Some(decoded_pua_char) = try_pua_decoding(&[c_0, c_1, c_2]) {
+                            return Some(decoded_pua_char);
+                        }
+                        self.buffer_front.push(c_2);
+                    }
+                }
+                self.buffer_front.push(c_1);
+            }
+            // If decoding 3 consecutive PUA chars into the encoded PUA char fails, `c_0` should be
+            // returned. `c_0` is `ENCODED_PUA_CHAR_FIRST_CHAR` if we reach this point, so return
+            // the `REPLACEMENT_CHARACTER` in these cases.
+            Some(REPLACEMENT_CHARACTER)
+        }
+    }
+
+    impl<'a> DoubleEndedIterator for Decoder<'a> {
+        fn next_back(&mut self) -> Option<Self::Item> {
+            let mut get_next_char = || {
+                self.buffer_back
+                    .pop()
+                    .or_else(|| self.encoded_chars.next_back())
+                    .or_else(|| self.buffer_front.pop_front())
+            };
+            let c_2 = get_next_char()?;
+            if !PUA_ENCODE_RANGE.contains(&c_2) {
+                return Some(c_2);
+            }
+            if let Some(c_1) = get_next_char() {
+                if PUA_ENCODE_RANGE.contains(&c_1) {
+                    if let Some(c_0) = get_next_char() {
+                        if let Some(decoded_pua_char) = try_pua_decoding(&[c_0, c_1, c_2]) {
+                            return Some(decoded_pua_char);
+                        }
+                        self.buffer_back.push(c_0);
+                    }
+                    self.buffer_back.push(c_1);
+                }
+            }
+            // If decoding 3 consecutive PUA chars into the encoded PUA char fails, `c_2` should be
+            // returned. `c_2` is in `PUA_ENCODE_RANGE` if we reach this point, so return the
+            // `REPLACEMENT_CHARACTER` in these cases.
+            Some(REPLACEMENT_CHARACTER)
+        }
+    }
+}
+
+/// Only exists for tests. Exported because the encoding functionality is not available in this
+/// crate. Do not use for non-testing purposes.
+pub fn decode_with_replacement(encoded_str: &wstr) -> impl DoubleEndedIterator<Item = char> {
+    decoder::Decoder::new(encoded_str)
+}
+
+/// Takes a PUA-encoded string, decodes it by restoring encoded PUA codepoints and replacing encoded
+/// non-UTF-8 bytes by the replacement character U+FFFD.
+/// The result is passed to the [`unicode_width`] crate, which will compute its width, which will be
+/// the return value of this function.
+pub fn decoded_width(encoded_str: &wstr) -> usize {
+    // TODO: Avoid constructing String by using `unicode_width::char_iter_width` once that is
+    // available in a released version of the crate (it's already on the crate's master branch).
+    use unicode_width::UnicodeWidthStr as _;
+    decoder::Decoder::new(encoded_str)
+        .collect::<String>()
+        .width()
+}
+
 pub const fn char_offset(base: char, offset: u32) -> char {
     match char::from_u32(base as u32 + offset) {
         Some(c) => c,

crates/xtask/Cargo.toml

@@ -6,6 +6,8 @@ edition.workspace = true
 repository.workspace = true
 
 [dependencies]
+anstyle.workspace = true
 clap.workspace = true
 fish-build-helper.workspace = true
 fish-tempfile.workspace = true
+walkdir.workspace = true

crates/xtask/src/format.rs

@@ -0,0 +1,170 @@
+use anstyle::{AnsiColor, Style};
+use clap::Args;
+use std::{
+    io::{ErrorKind, Write},
+    path::PathBuf,
+    process::{Command, Stdio},
+};
+
+use crate::files_with_extension;
+
+const GREEN: Style = AnsiColor::Green.on_default();
+const YELLOW: Style = AnsiColor::Yellow.on_default();
+
+#[derive(Args)]
+pub struct FormatArgs {
+    /// Consider all eligible files.
+    #[arg(long)]
+    all: bool,
+    /// Report files which are not formatted as expected, without modifying any files.
+    #[arg(long)]
+    check: bool,
+    /// Format files even if uncommitted changes are detected.
+    #[arg(long)]
+    force: bool,
+    paths: Vec<PathBuf>,
+}
+
+pub fn format(args: FormatArgs) {
+    if !args.all && args.paths.is_empty() {
+        println!(
+            "{YELLOW}warning: No paths specified. Nothing to do. Use the \"--all\" flag to consider all eligible files.{YELLOW:#}"
+        );
+        return;
+    }
+    if !args.force && !args.check {
+        match Command::new("git")
+            .args(["status", "--porcelain", "--short", "--untracked-files=all"])
+            .output()
+        {
+            Ok(output) => {
+                if !output.stdout.is_empty() {
+                    std::io::stdout().write_all(&output.stdout).unwrap();
+                    print!(
+                        "You have uncommitted changes (listed above). Are you sure you want to format? (y/N): "
+                    );
+                    std::io::stdout().flush().unwrap();
+                    let mut response = String::new();
+                    std::io::stdin().read_line(&mut response).unwrap();
+                    if response.trim_end() != "y" {
+                        println!("Exiting without formatting.");
+                        return;
+                    }
+                }
+            }
+            Err(e) => {
+                if e.kind() == ErrorKind::NotFound {
+                    println!(
+                        "{YELLOW}warning: Did not find git, will proceed without checking for unstaged changes.{YELLOW:#}"
+                    )
+                } else {
+                    fail!("Failed to run git status:\n{e}")
+                }
+            }
+        }
+    }
+    format_fish(&args);
+    format_python(&args);
+    format_rust(&args);
+}
+
+fn run_formatter(formatter: &mut Command, name: &str) {
+    println!("=== Running {GREEN}{name}{GREEN:#}");
+    match formatter.status() {
+        Ok(exit_status) => {
+            if !exit_status.success() {
+                fail!("{name:?}: Files are not formatted correctly.");
+            }
+        }
+        Err(e) => {
+            if e.kind() == std::io::ErrorKind::NotFound {
+                eprintln!(
+                    "{YELLOW}Formatter not found: {name:?}. Skipping associated files.{YELLOW:#}"
+                );
+            } else {
+                fail!("Error occurred while running {name:?}:\n{e}")
+            }
+        }
+    }
+}
+
+fn format_fish(args: &FormatArgs) {
+    let mut fish_paths = files_with_extension(&args.paths, "fish");
+    if args.all {
+        let workspace_root = fish_build_helper::workspace_root();
+        let fish_formatting_dirs = ["benchmarks", "build_tools", "etc", "share"];
+        fish_paths.extend(files_with_extension(
+            fish_formatting_dirs
+                .iter()
+                .map(|dir_name| workspace_root.join(dir_name)),
+            "fish",
+        ));
+    };
+    if fish_paths.is_empty() {
+        return;
+    }
+    // TODO: make `fish_indent` available as a Rust library function, to avoid needing a
+    // `fish_indent` binary in `$PATH`.
+    let mut formatter = Command::new("fish_indent");
+    if args.check {
+        formatter.arg("--check");
+    } else {
+        formatter.arg("-w");
+    }
+    formatter.arg("--");
+    formatter.args(fish_paths);
+    run_formatter(&mut formatter, "fish_indent");
+}
+
+fn format_python(args: &FormatArgs) {
+    let mut formatter = Command::new("ruff");
+    formatter.arg("format");
+    if args.check {
+        formatter.arg("--check");
+    }
+    let mut python_files = files_with_extension(&args.paths, "py");
+
+    if args.all {
+        python_files.push(fish_build_helper::workspace_root().to_owned());
+    };
+    if python_files.is_empty() {
+        return;
+    }
+    formatter.args(python_files);
+    run_formatter(&mut formatter, "ruff format");
+}
+
+fn format_rust(args: &FormatArgs) {
+    let rustfmt_status = Command::new("cargo")
+        .arg("fmt")
+        .arg("--version")
+        .stdout(Stdio::null())
+        .status()
+        .unwrap();
+    if !rustfmt_status.success() {
+        eprintln!(
+            "{YELLOW}Please install \"rustfmt\" to format Rust, e.g. via:\n\
+            rustup component add rustfmt{YELLOW:#}"
+        );
+        return;
+    }
+    if args.all {
+        let mut formatter = Command::new("cargo");
+        formatter.arg("fmt");
+        formatter.arg("--all");
+        if args.check {
+            formatter.arg("--check");
+        }
+        run_formatter(&mut formatter, "cargo fmt");
+    }
+    let rust_files = files_with_extension(&args.paths, "rs");
+    if !rust_files.is_empty() {
+        let mut formatter = Command::new("rustfmt");
+        if args.check {
+            formatter.arg("--check");
+            formatter.arg("--files-with-diff");
+        }
+        formatter.args(rust_files);
+        run_formatter(&mut formatter, "rustfmt");
+    }
+}

crates/xtask/src/lib.rs

@@ -1,19 +1,34 @@
-use std::{ffi::OsStr, process::Command};
+use std::{
+    ffi::OsStr,
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+use walkdir::WalkDir;
+
+macro_rules! fail {
+    ($($arg:tt)+) => {{
+        eprintln!($($arg)+);
+        std::process::exit(1);
+    }}
+}
+
+pub mod format;
 
 pub trait CommandExt {
-    fn run_or_panic(&mut self);
+    fn run_or_fail(&mut self);
 }
 
 impl CommandExt for Command {
-    fn run_or_panic(&mut self) {
+    fn run_or_fail(&mut self) {
         match self.status() {
             Ok(exit_status) => {
                 if !exit_status.success() {
-                    panic!("Command did not run successfully: {:?}", self.get_program())
+                    fail!("Command did not run successfully: {:?}", self.get_program())
                 }
             }
             Err(err) => {
-                panic!("Failed to run command: {err}");
+                fail!("Failed to run command: {err}")
             }
         }
     }
@@ -24,5 +39,32 @@ pub fn cargo<I, S>(cargo_args: I)
     I: IntoIterator<Item = S>,
     S: AsRef<OsStr>,
 {
-    Command::new(env!("CARGO")).args(cargo_args).run_or_panic();
+    Command::new(env!("CARGO")).args(cargo_args).run_or_fail();
+}
+
+fn get_matching_files<P: AsRef<Path>, I: IntoIterator<Item = P>, M: Fn(&Path) -> bool>(
+    all_paths: I,
+    matcher: M,
+) -> Vec<PathBuf> {
+    all_paths
+        .into_iter()
+        .flat_map(WalkDir::new)
+        .filter_map(|res| {
+            let entry = res.unwrap();
+            let path = entry.path();
+            if entry.file_type().is_file() && matcher(path) {
+                Some(path.to_owned())
+            } else {
+                None
+            }
+        })
+        .collect()
+}
+
+fn files_with_extension<P: AsRef<Path>, I: IntoIterator<Item = P>>(
+    all_paths: I,
+    extension: &str,
+) -> Vec<PathBuf> {
+    let matcher = |p: &Path| p.extension().is_some_and(|e| e == extension);
+    get_matching_files(all_paths, matcher)
 }

crates/xtask/src/main.rs

@@ -1,7 +1,7 @@
 use clap::{Parser, Subcommand};
 use fish_build_helper::as_os_strs;
 use std::{path::PathBuf, process::Command};
-use xtask::{CommandExt, cargo};
+use xtask::{CommandExt as _, cargo, format::FormatArgs};
 
 #[derive(Parser)]
 #[command(
@@ -18,6 +18,8 @@ struct Cli {
 enum Task {
     /// Run various checks on the repo.
     Check,
+    /// Format files or check if they are correctly formatted.
+    Format(FormatArgs),
     /// Build HTML docs
     HtmlDocs {
         /// Path to a fish_indent executable. If none is specified, fish_indent will be built.
@@ -32,6 +34,7 @@ fn main() {
     let cli = Cli::parse();
     match cli.task {
         Task::Check => run_checks(),
+        Task::Format(format_args) => xtask::format::format(format_args),
         Task::HtmlDocs { fish_indent } => build_html_docs(fish_indent),
         Task::ManPages => cargo(["build", "--package", "fish-build-man-pages"]),
     }
@@ -40,7 +43,7 @@ fn main() {
 fn run_checks() {
     let repo_root_dir = fish_build_helper::workspace_root();
     let check_script = repo_root_dir.join("build_tools").join("check.sh");
-    Command::new(check_script).run_or_panic();
+    Command::new(check_script).run_or_fail();
 }
 
 fn build_html_docs(fish_indent: Option<PathBuf>) {
@@ -91,5 +94,5 @@ fn build_html_docs(fish_indent: Option<PathBuf>) {
     Command::new(option_env!("FISH_SPHINX").unwrap_or("sphinx-build"))
         .env("PATH", new_path)
         .args(args)
-        .run_or_panic();
+        .run_or_fail();
 }

doc_src/cmds/argparse.rst

@@ -46,7 +46,7 @@ The following ``argparse`` options are available. They must appear before all *O
     In contrast, if the known option comes first (and does not take any arguments), the known option will be recognised (e.g. ``argparse --move-unknown h -- -ho`` *will* set ``$_flag_h`` to ``-h``)
 
 **-i** or **--ignore-unknown**
-    Deprecated. This is like **--move-unknown**, except that unknown options and their arguments are kept in ``$argv`` and not moved to ``$argv_opts``. Unlike **--move-unknown**, this option makes it impossible to distinguish between an unknown option and non-option argument that starts with a ``-`` (since any ``--`` seperator in ``$argv`` will be removed).
+    Deprecated. This is like **--move-unknown**, except that unknown options and their arguments are kept in ``$argv`` and not moved to ``$argv_opts``. Unlike **--move-unknown**, this option makes it impossible to distinguish between an unknown option and non-option argument that starts with a ``-`` (since any ``--`` separator in ``$argv`` will be removed).
 
 **-S** or **--strict-longopts**
     This makes the parsing of long options more strict. In particular, *without* this flag, if ``long`` is a known long option flag, ``--long`` and ``--long=<value>`` can be abbreviated as:

doc_src/cmds/bind.rst

@@ -102,7 +102,7 @@ The following options are available:
     **--preset** should only be used in full binding sets (like when working on ``fish_vi_key_bindings``).
 
 **-s** or **--silent**
-    Silences some of the error messages, including for unknown key names and unbound sequences.
+    Silences error message for unbound sequences.
 
 **--color** *WHEN*
     Controls when to use syntax highlighting colors when listing bindings.
@@ -401,6 +401,13 @@ The following special input functions are available:
 ``self-insert-notfirst``
     inserts the matching sequence into the command line, unless the cursor is at the beginning
 
+``get-key``
+    sets :envvar:`fish_key` to the key that was pressed to trigger this binding. Example use::
+
+        for i in (seq 0 9)
+            bind $i get-key 'commandline -i "#$fish_key"' 'set -eg fish_key'
+        end
+
 ``suppress-autosuggestion``
     remove the current autosuggestion. Returns true if there was a suggestion to remove.
 

doc_src/cmds/fish_breakpoint_prompt.rst

@@ -34,6 +34,6 @@ A simple prompt that is a simplified version of the default debugging prompt::
         set -l function (status current-function)
         set -l line (status current-line-number)
         set -l prompt "$function:$line >"
-        echo -ns (set_color $fish_color_status) "BP $prompt" (set_color normal) ' '
+        echo -ns (set_color $fish_color_status) "BP $prompt" (set_color --reset) ' '
     end
 

doc_src/cmds/fish_config.rst

@@ -85,10 +85,10 @@ The format looks like this:
     fish_color_command 5c5cff
 
     [unknown]
-    fish_color_normal normal
+    fish_color_normal --reset
     fish_color_autosuggestion brblack
     fish_color_cancel -r
-    fish_color_command normal
+    fish_color_command --reset
 
 The comments provide name and background color to the web config tool.
 

doc_src/cmds/fish_greeting.rst

@@ -22,6 +22,8 @@ When an interactive fish starts, it executes fish_greeting and displays its outp
 
 The default fish_greeting is a function that prints a variable of the same name (``$fish_greeting``), so you can also just change that if you just want to change the text.
 
+If :envvar:`SHELL_WELCOME` is set, it is displayed after the greeting. This is a standard environment variable that may be set by tools like systemd's ``run0`` to display session information.
+
 While you could also just put ``echo`` calls into config.fish, fish_greeting takes care of only being used in interactive shells, so it won't be used e.g. with ``scp`` (which executes a shell), which prevents some errors.
 
 Example
@@ -39,5 +41,5 @@ A simple greeting:
 
   function fish_greeting
       echo Hello friend!
-      echo The time is (set_color yellow)(date +%T)(set_color normal) and this machine is called $hostname
+      echo The time is (set_color yellow)(date +%T)(set_color --reset) and this machine is called $hostname
   end

doc_src/cmds/fish_mode_prompt.rst

@@ -20,7 +20,7 @@ Description
 
 The ``fish_mode_prompt`` function outputs the mode indicator for use in vi mode.
 
-The default ``fish_mode_prompt`` function will output indicators about the current vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. The ``$fish_bind_mode variable`` can be used to determine the current mode. It will be one of ``default``, ``insert``, ``replace_one``, ``replace``, ``visual``, or ``operator``.
+The default ``fish_mode_prompt`` function will output indicators about the current vi editor mode displayed to the left of the regular prompt. Define your own function to customize the appearance of the mode indicator. The ``$fish_bind_mode`` variable can be used to determine the current mode. It will be one of ``default``, ``insert``, ``replace_one``, ``replace``, ``visual``, or ``operator``.
 
 You can also define an empty ``fish_mode_prompt`` function to remove the vi mode indicators::
 
@@ -55,14 +55,14 @@ Example
         case visual
           set_color --bold brmagenta
           echo 'V'
-        case operator
+        case operator f F t T
           set_color --bold cyan
           echo 'N'
         case '*'
           set_color --bold red
           echo '?'
       end
-      set_color normal
+      set_color --reset
     end
 
 

doc_src/cmds/fish_prompt.rst

@@ -24,6 +24,8 @@ The exit status of commands within ``fish_prompt`` will not modify the value of
 
 If :envvar:`fish_transient_prompt` is set to 1, ``fish_prompt --final-rendering`` is run before executing the commandline.
 
+If :envvar:`SHELL_PROMPT_PREFIX` or :envvar:`SHELL_PROMPT_SUFFIX` are set, they are automatically prepended and appended to the left prompt. This applies to all prompts regardless of whether ``fish_prompt`` has been customized.
+
 ``fish`` ships with a number of example prompts that can be chosen with the ``fish_config`` command.
 
 
@@ -41,7 +43,7 @@ A simple prompt:
         # $USER and $hostname are set by fish, so you can just use them
         # instead of using `whoami` and `hostname`
         printf '%s@%s %s%s%s > ' $USER $hostname \
-            (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+            (set_color $fish_color_cwd) (prompt_pwd) (set_color --reset)
     end
 
 

doc_src/cmds/if.rst

@@ -16,7 +16,7 @@ Description
 
 ``if`` will execute the command ``CONDITION``. If the condition's exit status is 0, the commands ``COMMANDS_TRUE`` will execute.  If the exit status is not 0 and :doc:`else <else>` is given, ``COMMANDS_FALSE`` will be executed.
 
-You can use :doc:`and <and>` or :doc:`or <or>` in the condition. See the second example below.
+You can use :doc:`not <not>`, :doc:`and <and>` or :doc:`or <or>` in the condition. See the second example below.
 
 The exit status of the last foreground command to exit can always be accessed using the :ref:`$status <variables-status>` variable.
 

doc_src/cmds/read.rst

@@ -62,7 +62,7 @@ The following options control the interactive mode:
     Masks characters written to the terminal, replacing them with asterisks. This is useful for reading things like passwords or other sensitive information.
 
 **-p** or **--prompt** *PROMPT_CMD*
-    Uses the output of the shell command *PROMPT_CMD* as the prompt for the interactive mode. The default prompt command is ``set_color green; echo -n read; set_color normal; echo -n "> "``
+    Uses the output of the shell command *PROMPT_CMD* as the prompt for the interactive mode. The default prompt command is ``set_color green; echo -n read; set_color --reset; echo -n "> "``
 
 **-P** or **--prompt-str** *PROMPT_STR*
     Uses the literal *PROMPT_STR* as the prompt for the interactive mode.

doc_src/cmds/set.rst

@@ -89,7 +89,7 @@ Further options:
 **-q** or **--query** *NAME*\[*INDEX*\]
     Test if the specified variable names are defined.
     If an *INDEX* is provided, check for items at that slot.
-    With a given scope (like **--global**) or attribute (like **--exported** or **--path**) check only variables that match.
+    With a given scope (like **--global**) or attribute (like **--export** or **--path**) check only variables that match.
     Does not output anything, but the shell status is set to the number of variables specified that were not defined, up to a maximum of 255.
     If no variable was given, it also returns 255.
 

doc_src/cmds/set_color.rst

@@ -6,12 +6,15 @@ Synopsis
 
 .. synopsis::
 
-    set_color [OPTIONS] VALUE
+    set_color [OPTIONS] [VALUE]
 
 Description
 -----------
 
-``set_color`` is used to control the color and styling of text in the terminal. *VALUE* describes that styling. *VALUE* can be a reserved color name like **red** or an RGB color value given as 3 or 6 hexadecimal digits ("F27" or "FF2277"). A special keyword **normal** resets text formatting to terminal defaults.
+``set_color`` is used to control the color and styling of text in the terminal.
+*VALUE* describes that styling.
+*VALUE* can be a reserved color name like **red** or an RGB color value given as 3 or 6 hexadecimal digits ("F27" or "FF2277").
+A special keyword **normal** resets text formatting to terminal defaults, however it is not recommended and the **--reset** option is preferred as it is less confusing and more future-proof.
 
 Valid colors include:
 
@@ -33,6 +36,11 @@ However if :envvar:`fish_term256` is set to 0, fish prefers the first named colo
 
 The following options are available:
 
+**-f** or **--foreground** *COLOR*
+    Sets the foreground color.
+    This is equivalent to calling ``set_color COLOR`` with the exception that the keyword **normal** will only reset the foreground color to its default, instead of all colors and modes.
+    It cannot be used with *VALUE* or **--print-colors**.
+
 **-b** or **--background** *COLOR*
     Sets the background color.
 
@@ -41,6 +49,7 @@ The following options are available:
 
 **-c** or **--print-colors**
     Prints the given colors or a colored list of the 16 named colors.
+    It cannot be used with **--foreground**.
 
 **-o** or **--bold**
     Sets bold mode.
@@ -48,17 +57,21 @@ The following options are available:
 **-d** or **--dim**
     Sets dim mode.
 
-**-i** or **--italics**
+**-i** or **--italics**, or **-iSTATE** or **--italics=STATE**
-    Sets italics mode.
+    Sets italics mode. The state can be **on** (default), or **off**.
 
-**-r** or **--reverse**
+**-r** or **--reverse**, or **-iSTATE** or **--reverse=STATE**
-    Sets reverse mode.
+    Sets reverse mode. The state can be **on** (default), or **off**.
 
-**-s** or **--strikethrough**
+**-s** or **--strikethrough**, or **-sSTATE** or **--strikethrough=STATE**
-    Sets strikethrough mode.
+    Sets strikethrough mode. The state can be **on** (default), or **off**.
 
 **-u** or **--underline**, or **-uSTYLE** or **--underline=STYLE**
-    Set the underline mode; supported styles are **single** (default), **double**, **curly**, **dotted** and **dashed**.
+    Set the underline mode; supported styles are **single** (default), **double**, **curly**, **dotted**, **dashed** and **off**.
+
+**--reset**
+    Reset the text formatting to the terminal defaults before applying the new colors and modes.
+    This is equivalent to calling ``set_color normal`` except that it is possible to set the foreground color in the same call (e.g. ``set_color --reset green``)
 
 **--theme=THEME**
     Ignored.
@@ -75,10 +88,12 @@ The following options are available:
 Notes
 -----
 
-1. Using **set_color normal** will reset all colors and modes to the terminal's default.
+1. Using ``set_color normal`` will reset all colors and modes to the terminal's default.
-2. Setting the background color only affects subsequently written characters. Fish provides no way to set the background color for the entire terminal window. Configuring the window background color (and other attributes such as its opacity) has to be done using whatever mechanisms the terminal provides. Look for a config option.
+2. In contrast, ``set_color --foreground normal`` will only reset the foreground color and leave all the other colors and modes unchanged.
-3. Some terminals use the ``--bold`` escape sequence to switch to a brighter color set rather than increasing the weight of text.
+3. Because of the risk of confusion, ``set_color --reset`` is recommended over ``set_color normal``.
-4. ``set_color`` works by printing sequences of characters to standard output. If used in command substitution or a pipe, these characters will also be captured. This may or may not be desirable. Checking the exit status of ``isatty stdout`` before using ``set_color`` can be useful to decide not to colorize output in a script.
+4. Setting the background color only affects subsequently written characters. Fish provides no way to set the background color for the entire terminal window. Configuring the window background color (and other attributes such as its opacity) has to be done using whatever mechanisms the terminal provides. Look for a config option.
+5. Some terminals use the ``--bold`` escape sequence to switch to a brighter color set rather than increasing the weight of text.
+6. ``set_color`` works by printing sequences of characters to standard output. If used in command substitution or a pipe, these characters will also be captured. This may or may not be desirable. Checking the exit status of ``isatty stdout`` before using ``set_color`` can be useful to decide not to colorize output in a script.
 
 Examples
 --------

doc_src/faq.rst

@@ -91,7 +91,7 @@ The prompt is the output of the ``fish_prompt`` function. Put it in ``~/.config/
     function fish_prompt
         set_color $fish_color_cwd
         echo -n (prompt_pwd)
-        set_color normal
+        set_color --reset
         echo -n ' > '
     end
 
@@ -329,7 +329,7 @@ Sometimes, there is disagreement on the width. There are numerous causes and fix
 - It is possible the character is too new for your system to know - in this case you need to refrain from using it.
 - Fish or your terminal might not know about the character or handle it wrong - in this case fish or your terminal needs to be fixed, or you need to update to a fixed version.
 - The character has an "ambiguous" width and fish thinks that means a width of X while your terminal thinks it's Y. In this case you either need to change your terminal's configuration or set $fish_ambiguous_width to the correct value.
-- The character is an emoji and the host system only supports Unicode 8, while you are running the terminal on a system that uses Unicode >= 9. In this case set $fish_emoji_width to 2.
+- The character is an emoji and your system only supports Unicode 8. In this case set $fish_emoji_width to 1.
 
 This also means that a few things are unsupportable:
 

doc_src/fish_for_bash_users.rst

@@ -318,7 +318,7 @@ and a rough fish equivalent::
 
       echo -s (prompt_hostname) \
       (set_color blue) (prompt_pwd) \
-      (set_color yellow) $prompt_symbol (set_color normal)
+      (set_color yellow) $prompt_symbol (set_color --reset)
   end
 
 This shows a few differences:

doc_src/interactive.rst

@@ -105,6 +105,7 @@ Syntax highlighting variables
 
 The colors used by fish for syntax highlighting can be configured by changing the values of various variables. The value of these variables can be one of the colors accepted by the :doc:`set_color <cmds/set_color>` command.
 Options accepted by ``set_color`` like
+``--foreground=``,
 ``--background=``,
 ``--bold``,
 ``--dim``,

doc_src/language.rst

@@ -235,7 +235,7 @@ It is possible to pipe a different output file descriptor by prepending its FD n
 
 will attempt to build ``fish``, and any errors will be shown using the ``less`` pager. [#]_
 
-As a convenience, the pipe ``&|`` redirects both stdout and stderr to the same process. This is different from bash, which uses ``|&``.
+As a convenience, the pipe ``&|`` (as well as the ``|&`` alias which is also supported by Bash) both redirect stdout and stderr to the same process.
 
 .. [#] A "pager" here is a program that takes output and "paginates" it. ``less`` doesn't just do pages, it allows arbitrary scrolling (even back!).
 
@@ -1573,7 +1573,7 @@ You can change the settings of fish by changing the values of certain variables.
 
 .. envvar:: fish_emoji_width
 
-   controls whether fish assumes emoji render as 2 cells or 1 cell wide. This is necessary because the correct value changed from 1 to 2 in Unicode 9, and some terminals may not be aware. Set this if you see graphical glitching related to emoji (or other "special" characters). It should usually be auto-detected.
+   controls whether fish assumes emoji render as 2 cells or 1 cell wide. This is necessary because the correct value changed from 1 to 2 in Unicode 9, and some terminals may not be aware. Set this if you see graphical glitching related to emoji (or other "special" characters). It defaults to 2.
 
 .. envvar:: fish_autosuggestion_enabled
 
@@ -1646,6 +1646,18 @@ You can change the settings of fish by changing the values of certain variables.
 
    the current file creation mask. The preferred way to change the umask variable is through the :doc:`umask <cmds/umask>` function. An attempt to set umask to an invalid value will always fail.
 
+.. envvar:: SHELL_PROMPT_PREFIX
+
+   if set, this string is automatically prepended to the left prompt. This is a standard environment variable that may be set by tools like systemd's ``run0`` to indicate special shell sessions.
+
+.. envvar:: SHELL_PROMPT_SUFFIX
+
+   if set, this string is automatically appended to the left prompt. This is a standard environment variable that may be set by tools like systemd's ``run0`` to indicate special shell sessions.
+
+.. envvar:: SHELL_WELCOME
+
+   if set, this string is displayed when an interactive shell starts, after the greeting. This is a standard environment variable that may be set by tools like systemd's ``run0`` to display session information.
+
 .. envvar:: BROWSER
 
    your preferred web browser. If this variable is set, fish will use the specified browser instead of the system default browser to display the fish documentation.
@@ -2043,8 +2055,8 @@ Here is what they mean:
 - ``ampersand-nobg-in-token`` was introduced in fish 3.4 (and made the default in 3.5). It makes it so a ``&`` is no longer interpreted as the backgrounding operator in the middle of a token, so dealing with URLs becomes easier. Either put spaces or a semicolon after the ``&``. This is recommended formatting anyway, and ``fish_indent`` will have done it for you already.
 - ``remove-percent-self`` turns off the special ``%self`` expansion. It was introduced in 4.0. To get fish's pid, you can use the :envvar:`fish_pid` variable.
 - ``test-require-arg`` removes :doc:`builtin test <cmds/test>`'s one-argument form (``test "string"``. It was introduced in 4.0. To test if a string is non-empty, use ``test -n "string"``. If disabled, any call to ``test`` that would change sends a :ref:`debug message <debugging-fish>` of category "deprecated-test", so starting fish with ``fish --debug=deprecated-test`` can be used to find offending calls.
-- ``mark-prompt`` makes fish report to the terminal the beginning and and of both shell prompts and command output.
+- ``mark-prompt`` makes fish report to the terminal the beginning and end of both shell prompts and command output.
-- ``ignore-terminfo`` disables lookup of $TERM in the terminfo database. Use ``no-ignore-terminfo`` to turn it back on.
+- ``ignore-terminfo`` was introduced in fish 4.1 and cannot be turned off since fish 4.5. It can still be tested for compatibility, but a ``no-ignore-terminfo`` value will be ignored. The flag disabled lookup of $TERM in the terminfo database.
 - ``query-term`` allows fish to query the terminal by writing escape sequences and reading the terminal's response.
   This enables features such as :ref:`scrolling <term-compat-cursor-position-report>`.
   If you use an incompatible terminal, you can -- for the time being -- work around it by running (once) ``set -Ua fish_features no-query-term``.

doc_src/prompt.rst

@@ -19,6 +19,8 @@ Unlike other shells, fish's prompt is built by running a function - :doc:`fish_p
 
 These functions are run, and whatever they print is displayed as the prompt (minus one trailing newline).
 
+If the :envvar:`SHELL_PROMPT_PREFIX` or :envvar:`SHELL_PROMPT_SUFFIX` environment variables are set, they are automatically prepended and appended to the left prompt.
+
 Here, we will just be writing a simple fish_prompt.
 
 Our first prompt
@@ -67,10 +69,10 @@ Fortunately, fish offers the :doc:`set_color <cmds/set_color>` command, so you c
 So, taking our previous prompt and adding some color::
 
   function fish_prompt
-      string join '' -- (set_color green) $PWD (set_color normal) '>'
+      string join '' -- (set_color green) $PWD (set_color --reset) '>'
   end
 
-A "normal" color tells the terminal to go back to its normal formatting options.
+"--reset" tells the terminal to go back to its default formatting options.
 
 ``set_color`` works by producing an escape sequence, which is a special piece of text that terminals
 interpret as instructions - for example, to change color. So ``set_color red`` produces the same
@@ -86,13 +88,13 @@ Shortening the working directory
 This is fine, but our :envvar:`PWD` can be a bit long, and we are typically only interested in the last few directories. We can shorten this with the :doc:`prompt_pwd <cmds/prompt_pwd>` helper that will give us a shortened working directory::
 
   function fish_prompt
-      string join '' -- (set_color green) (prompt_pwd) (set_color normal) '>'
+      string join '' -- (set_color green) (prompt_pwd) (set_color --reset) '>'
   end
 
 ``prompt_pwd`` takes options to control how much to shorten. For instance, if we want to display the last two directories, we'd use ``prompt_pwd --full-length-dirs 2``::
 
   function fish_prompt
-      string join '' -- (set_color green) (prompt_pwd --full-length-dirs 2) (set_color normal) '>'
+      string join '' -- (set_color green) (prompt_pwd --full-length-dirs 2) (set_color --reset) '>'
   end
 
 With a current directory of "/home/tutorial/Music/Lena Raine/Oneknowing", this would print
@@ -119,12 +121,12 @@ And after that, you can set a string if it is not zero::
   # Prompt status only if it's not 0
   set -l stat
   if test $last_status -ne 0
-      set stat (set_color red)"[$last_status]"(set_color normal)
+      set stat (set_color red)"[$last_status]"(set_color --reset)
   end
 
 And to print it, we add it to our ``string join``::
 
-  string join '' -- (set_color green) (prompt_pwd) (set_color normal) $stat '>'
+  string join '' -- (set_color green) (prompt_pwd) (set_color --reset) $stat '>'
 
 If ``$last_status`` was 0, ``$stat`` is empty, and so it will simply disappear.
 
@@ -135,10 +137,10 @@ So our entire prompt is now::
       # Prompt status only if it's not 0
       set -l stat
       if test $last_status -ne 0
-          set stat (set_color red)"[$last_status]"(set_color normal)
+          set stat (set_color red)"[$last_status]"(set_color --reset)
       end
 
-      string join '' -- (set_color green) (prompt_pwd) (set_color normal) $stat '>'
+      string join '' -- (set_color green) (prompt_pwd) (set_color --reset) $stat '>'
   end
 
 And it looks like:
@@ -176,11 +178,11 @@ So you can use it to declutter your old prompts. For example if you want to see
           set pwd (prompt_pwd)
           # Prompt status only if it's not 0
           if test $last_status -ne 0
-              set stat (set_color red)"[$last_status]"(set_color normal)
+              set stat (set_color red)"[$last_status]"(set_color --reset)
           end
       end
 
-      string join '' -- (set_color green) $pwd (set_color normal) $stat '>'
+      string join '' -- (set_color green) $pwd (set_color --reset) $stat '>'
   end
 
 Now running two commands in the same directory could result in this screen:

doc_src/terminal-compatibility.rst

@@ -155,6 +155,9 @@ Optional Commands
    * - ``\e[48;2; Ps ; Ps ; Ps m``
      -
      - Select background color from 24-bit RGB colors.
+   * - ``\e[39m``
+     -
+     - Reset foreground color to the terminal's default.
    * - ``\e[49m``
      -
      - Reset background color to the terminal's default.

doc_src/tutorial.rst

@@ -633,7 +633,7 @@ Multiple lines are OK. Colors can be set via :doc:`set_color <cmds/set_color>` b
         set_color purple
         date "+%m/%d/%y"
         set_color FF0000
-        echo (pwd) '>' (set_color normal)
+        echo (pwd) '>' (set_color --reset)
     end
 
 

docker/alpine.Dockerfile

@@ -37,8 +37,8 @@ RUN adduser \
     fishuser
 
 RUN mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
+    && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/fedora.Dockerfile

@@ -2,24 +2,24 @@ FROM fedora:latest
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
 
 RUN dnf install --assumeyes \
-      diffutils \
+        diffutils \
-      gcc-c++ \
+        gcc-c++ \
-      git-core \
+        git-core \
-      pcre2-devel \
+        pcre2-devel \
-      python3 \
+        python3 \
-      python3-pip \
+        python3-pip \
-      openssl \
+        openssl \
-      procps \
+        procps \
-      sudo && \
+        sudo && \
     dnf clean all
 
 RUN pip3 install pexpect
 
 RUN groupadd -g 1000 fishuser \
-  && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser -G wheel \
+    && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser -G wheel \
-  && mkdir -p /home/fishuser/fish-build \
+    && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
+    && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/opensuse-tumbleweed.Dockerfile

@@ -5,28 +5,28 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN zypper --non-interactive install \
-  bash \
+    bash \
-  diffutils \
+    diffutils \
-  gcc-c++ \
+    gcc-c++ \
-  git-core \
+    git-core \
-  pcre2-devel \
+    pcre2-devel \
-  python311 \
+    python311 \
-  python311-pip \
+    python311-pip \
-  python311-pexpect \
+    python311-pexpect \
-  openssl \
+    openssl \
-  procps \
+    procps \
-  tmux \
+    tmux \
-  sudo \
+    sudo \
-  rust \
+    rust \
-  cargo
+    cargo
 
 RUN usermod -p $(openssl passwd -1 fish) root
 
 RUN groupadd -g 1000 fishuser \
-  && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+    && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-  && mkdir -p /home/fishuser/fish-build \
+    && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
+    && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/ubuntu-latest-lts.Dockerfile

@@ -6,37 +6,37 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
-  && apt-get -y install --no-install-recommends  \
+    && apt-get -y install --no-install-recommends  \
-    cmake ninja-build \
+        cmake ninja-build \
-    build-essential \
+        build-essential \
-    ca-certificates \
+        ca-certificates \
-    clang \
+        clang \
-    curl \
+        curl \
-    gettext \
+        gettext \
-    git \
+        git \
-    libpcre2-dev \
+        libpcre2-dev \
-    locales \
+        locales \
-    openssl \
+        openssl \
-    python3 \
+        python3 \
-    python3-pexpect \
+        python3-pexpect \
-    sudo \
+        sudo \
-    tmux \
+        tmux \
-  && locale-gen en_US.UTF-8 \
+    && locale-gen en_US.UTF-8 \
-  && apt-get clean
+    && apt-get clean
 
 RUN userdel ubuntu \
-  && groupadd -g 1000 fishuser \
+    && groupadd -g 1000 fishuser \
-  && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+    && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-       -G sudo \
+        -G sudo \
-  && mkdir -p /home/fishuser/fish-build \
+    && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
+    && mkdir /fish-source \
-  && chown -R fishuser:1000 /home/fishuser /fish-source
+    && chown -R fishuser:1000 /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
-  && sh /tmp/rustup.sh -y --no-modify-path
+    && sh /tmp/rustup.sh -y --no-modify-path
 ENV PATH=/home/fishuser/.cargo/bin:$PATH
 
 COPY fish_run_tests.sh /

docker/ubuntu-oldest-supported.Dockerfile

@@ -6,36 +6,36 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
-  && apt-get -y install --no-install-recommends  \
+    && apt-get -y install --no-install-recommends  \
-    cmake ninja-build \
+        cmake ninja-build \
-    build-essential \
+        build-essential \
-    ca-certificates \
+        ca-certificates \
-    clang \
+        clang \
-    curl \
+        curl \
-    gettext \
+        gettext \
-    git \
+        git \
-    libpcre2-dev \
+        libpcre2-dev \
-    locales \
+        locales \
-    openssl \
+        openssl \
-    python3 \
+        python3 \
-    python3-pexpect \
+        python3-pexpect \
-    sudo \
+        sudo \
-    tmux \
+        tmux \
-  && locale-gen en_US.UTF-8 \
+    && locale-gen en_US.UTF-8 \
-  && apt-get clean
+    && apt-get clean
 
 RUN groupadd -g 1000 fishuser \
-  && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+    && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-  && adduser fishuser sudo \
+    && adduser fishuser sudo \
-  && mkdir -p /home/fishuser/fish-build \
+    && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
+    && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser
 
 RUN curl --proto '=https' --tlsv1.2 -fsS https://sh.rustup.rs > /tmp/rustup.sh \
-  && sh /tmp/rustup.sh -y --no-modify-path
+    && sh /tmp/rustup.sh -y --no-modify-path
 ENV PATH=/home/fishuser/.cargo/bin:$PATH
 
 COPY fish_run_tests.sh /

localization/po/de.po

@@ -100,12 +100,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr ""
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (Zeile %d):"
+msgstr "%s (Zeile %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (Zeile %u):"
+msgstr "%s (Zeile %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -141,7 +141,7 @@ msgstr ""
 
 #, c-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
 #, c-format
 msgid "%s: %s %s: options cannot be used together"
@@ -199,6 +199,10 @@ msgstr ""
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr ""
@@ -211,6 +215,10 @@ msgstr "%s: %s: ungültiger Unterbefehl"
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr ""
@@ -775,10 +783,6 @@ msgstr "%s: Wert nicht vollständig konvertiert (kann '%s' nicht konvertieren)"
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%sund %u weitere Zeilen"
-
 msgid "'break' while not inside of loop"
 msgstr ""
 
@@ -1460,12 +1464,12 @@ msgid "Standard input"
 msgstr "Standardeingabe"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
-msgstr "Start (Zeile %d):"
+msgstr "Start (Zeile %d)"
 
 msgid "State"
 msgstr "Status"
@@ -1871,8 +1875,9 @@ msgstr "mit den Parametern '%s'"
 msgid "with definition"
 msgstr "mit Definition"
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, c-format
-msgstr "|& ist ungültig. In fish, nutze &| um stdout und stderr gleichzeitig zu pipen"
+msgid "…and %u more rows"
+msgstr "…und %u weitere Zeilen"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5939,6 +5944,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6098,6 +6106,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6344,9 +6355,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6392,6 +6400,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6899,6 +6910,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10505,6 +10519,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11276,6 +11293,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12248,6 +12274,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12809,6 +12838,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13175,9 +13207,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr "Harte Links mehrfach zählen"
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16301,6 +16330,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16319,6 +16351,9 @@ msgstr "Farbige Ausgabe deaktivieren"
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16625,6 +16660,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16691,6 +16729,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17429,9 +17470,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17579,6 +17617,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17714,9 +17755,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18065,6 +18103,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19214,6 +19255,9 @@ msgstr ""
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19307,9 +19351,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20480,9 +20521,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20570,6 +20608,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20636,6 +20677,9 @@ msgstr "Pakete nicht aktualisieren"
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20861,6 +20905,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21230,6 +21277,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22553,6 +22603,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23306,6 +23359,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24164,6 +24220,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24233,6 +24292,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24320,6 +24382,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24425,6 +24490,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24458,6 +24526,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26663,6 +26734,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26984,6 +27058,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29930,6 +30007,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr "Patch-Name und Kommentar in Datei angeben"
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30494,6 +30574,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30845,9 +30928,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31160,6 +31240,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr "Modulschnittstellenversion ignorieren"
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr "Fehler, die neuer sind als Aktualisierungspakete, ignorieren"
 
@@ -32720,6 +32803,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33065,6 +33151,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33194,6 +33283,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33338,6 +33430,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33482,9 +33577,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34151,9 +34243,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34313,6 +34402,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35051,6 +35143,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36932,6 +37027,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39722,9 +39820,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40553,9 +40648,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41195,6 +41296,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr "Nur Unterschiede der Dateien ausgeben"
 
@@ -42923,6 +43030,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43505,6 +43615,9 @@ msgstr "Zeichenkette vor relative Links stellen"
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43904,6 +44017,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44108,9 +44224,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44690,9 +44803,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45689,6 +45799,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49034,6 +49147,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr "Teilbaum an einer zweiten Position erneut einhängen"
 
@@ -49904,6 +50020,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50624,6 +50743,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51650,6 +51772,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52121,6 +52246,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52679,6 +52807,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53558,7 +53689,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54884,6 +55018,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55688,6 +55825,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57299,6 +57439,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57635,6 +57778,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61517,6 +61663,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61640,6 +61789,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62642,6 +62794,9 @@ msgstr "Verzeichnis für rpm-Datenbank angeben"
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64169,6 +64324,9 @@ msgstr ""
 msgid "Start interface"
 msgstr "Schnittstelle starten"
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65345,6 +65503,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65939,6 +66100,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66242,9 +66406,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66356,9 +66517,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67910,6 +68068,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68096,6 +68257,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68948,6 +69112,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68963,6 +69130,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70454,6 +70624,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70472,6 +70645,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72368,6 +72544,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72509,6 +72691,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75437,6 +75622,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76028,6 +76219,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78557,7 +78751,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/en.po

@@ -100,12 +100,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr ""
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (line %d):"
+msgstr "%s (line %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (line %u):"
+msgstr "%s (line %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -199,6 +199,10 @@ msgstr ""
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr ""
@@ -211,6 +215,10 @@ msgstr ""
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr ""
@@ -775,10 +783,6 @@ msgstr ""
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%sand %u more rows"
-
 msgid "'break' while not inside of loop"
 msgstr ""
 
@@ -1460,11 +1464,11 @@ msgid "Standard input"
 msgstr "Standard input"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
 msgstr ""
 
 msgid "State"
@@ -1871,8 +1875,9 @@ msgstr ""
 msgid "with definition"
 msgstr ""
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, c-format
-msgstr ""
+msgid "…and %u more rows"
+msgstr "…and %u more rows"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5939,6 +5944,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6098,6 +6106,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6344,9 +6355,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6392,6 +6400,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6899,6 +6910,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10505,6 +10519,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11276,6 +11293,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12248,6 +12274,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12809,6 +12838,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13175,9 +13207,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr "Count hard links multiple times"
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16301,6 +16330,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16319,6 +16351,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16625,6 +16660,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16691,6 +16729,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17429,9 +17470,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17579,6 +17617,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr "Display deduplication histogram"
 
@@ -17714,9 +17755,6 @@ msgstr "Display help about darcs and darcs commands"
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18065,6 +18103,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19214,6 +19255,9 @@ msgstr "Do not cache the verification status of key signatures"
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19307,9 +19351,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20480,9 +20521,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20570,6 +20608,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20636,6 +20677,9 @@ msgstr "Do not upgrade packages"
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20861,6 +20905,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21230,6 +21277,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22553,6 +22603,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23306,6 +23359,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24164,6 +24220,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24233,6 +24292,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24320,6 +24382,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24425,6 +24490,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24458,6 +24526,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26663,6 +26734,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26984,6 +27058,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29930,6 +30007,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr "Give patch name and comment in file"
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30494,6 +30574,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30845,9 +30928,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31160,6 +31240,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr "Ignore module interface version"
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr "Ignore newer bugs than upgrade packages"
 
@@ -32720,6 +32803,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33065,6 +33151,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33194,6 +33283,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33338,6 +33430,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33482,9 +33577,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34151,9 +34243,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34313,6 +34402,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35051,6 +35143,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36932,6 +37027,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39722,9 +39820,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40553,9 +40648,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41195,6 +41296,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr "Output only whether the files differ"
 
@@ -42923,6 +43030,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43505,6 +43615,9 @@ msgstr "Prepend string to relative links"
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43904,6 +44017,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44108,9 +44224,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44690,9 +44803,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr "Print help message and exit"
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45689,6 +45799,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49034,6 +49147,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr "Remount a subtree to a second position"
 
@@ -49904,6 +50020,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50624,6 +50743,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51650,6 +51772,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52121,6 +52246,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52679,6 +52807,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53558,7 +53689,10 @@ msgstr "Search for devices or files in specified directory"
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54884,6 +55018,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55688,6 +55825,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57299,6 +57439,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57635,6 +57778,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61517,6 +61663,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61640,6 +61789,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62642,6 +62794,9 @@ msgstr "Specify directory for rpm database"
 msgid "Specify directory with configuration files"
 msgstr "Specify directory with configuration files"
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64169,6 +64324,9 @@ msgstr ""
 msgid "Start interface"
 msgstr "Start interface"
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65345,6 +65503,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65939,6 +66100,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66242,9 +66406,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66356,9 +66517,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67910,6 +68068,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68096,6 +68257,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68948,6 +69112,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68963,6 +69130,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70454,6 +70624,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr "Use openssh if available"
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70472,6 +70645,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72368,6 +72544,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72509,6 +72691,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75437,6 +75622,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76028,6 +76219,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78557,7 +78751,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/fr.po

@@ -229,12 +229,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr "%s %s : fonctionnalité non reconnue « %s »"
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (ligne %d) :"
+msgstr "%s (ligne %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (ligne %u) :"
+msgstr "%s (ligne %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -328,6 +328,10 @@ msgstr "%s : %s : mode invalide"
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr "%s : %s : nom de mode invalide. Voir « help %s »"
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr "%s : %s : échelle invalide"
@@ -340,6 +344,10 @@ msgstr "%s : %s : sous-commande invalide"
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr "%s : %s : nom de variable invalide. Voir « help %s »"
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr "%s : %s : cette option ne prend pas d’argument"
@@ -904,10 +912,6 @@ msgstr ""
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%set %u lignes de plus"
-
 msgid "'break' while not inside of loop"
 msgstr "« break » hors d’une boucle"
 
@@ -1589,11 +1593,11 @@ msgid "Standard input"
 msgstr "Entrée standard"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
 msgstr ""
 
 msgid "State"
@@ -2000,8 +2004,9 @@ msgstr "avec les arguments « %s »"
 msgid "with definition"
 msgstr "avec la définition"
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, c-format
-msgstr ""
+msgid "…and %u more rows"
+msgstr "…et %u lignes de plus"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -6068,6 +6073,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6227,6 +6235,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6473,9 +6484,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6521,6 +6529,9 @@ msgstr "Alias pour « --coverage »"
 msgid "Alias for --env"
 msgstr "Alias pour « --env »"
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr "Alias pour -a"
 
@@ -7028,6 +7039,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10634,6 +10648,9 @@ msgstr "Vérifier si un port est installé"
 msgid "Check if all files owned by PACKAGE are present"
 msgstr "Vérifier si tous les fichiers fournis par PAQUET sont présents"
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr "Vérifier si l’un des fichiers spécifiés serait ignoré"
 
@@ -11405,6 +11422,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12377,6 +12403,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12938,6 +12967,9 @@ msgstr "(Ne pas) faire utiliser de comparaisons de virgules flottantes IEEE par
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13304,9 +13336,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr "Compter plusieurs fois les liens matériels"
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16430,6 +16459,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr "Désactiver la couleur"
 
@@ -16448,6 +16480,9 @@ msgstr "Ne pas colorier la sortie"
 msgid "Disable colorization in output"
 msgstr "Désactiver la colorisation de la sortie"
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16754,6 +16789,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr "Désactiver la redirection de port"
 
@@ -16820,6 +16858,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17558,9 +17599,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17708,6 +17746,9 @@ msgstr "Afficher les symboles réservés au débogueur"
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr "Afficher l’histogramme de déduplication"
 
@@ -17843,9 +17884,6 @@ msgstr "Afficher une aide pour darcs et ses commandes"
 msgid "Display help and debug options"
 msgstr "Afficher l’aide et les options de débogage"
 
-msgid "Display help and exit\t"
-msgstr "Afficher l’aide et quitter\t"
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18194,6 +18232,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19343,6 +19384,9 @@ msgstr "Ne pas mettre en cache l’état de la validation des signatures de clé
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr "Ne pas appeler gensync (ni les !commandes de /etc/eix-sync.conf)"
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19436,9 +19480,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20609,9 +20650,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr "Lister les fichiers dans l’ordre de l’archive"
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20699,6 +20737,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20765,6 +20806,9 @@ msgstr "Ne pas mettre à jour les paquets"
 msgid "Do not upload binaries"
 msgstr "Ne pas téléverser les binaires"
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr "Ne pas utiliser le motif « abshi2 »"
 
@@ -20990,6 +21034,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr "Ne pas écrire de fichier ~/.fehbg"
 
@@ -21359,6 +21406,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22682,6 +22732,9 @@ msgstr "Ne pas autoriser le déplacement spéculatif d’instructions non destin
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr "Ne pas changer de système de fichiers lors de la récursion"
 
@@ -23435,6 +23488,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr "Éditer le fichier contenant une étiquette"
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24293,6 +24349,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr "Activer une ou plusieurs unités"
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr "Activer l’optimisation de « && » et « || » dans les conditionnelles (par défaut)"
 
@@ -24362,6 +24421,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24449,6 +24511,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr "Activer la recherche dans l’index"
 
@@ -24554,6 +24619,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24587,6 +24655,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26792,6 +26863,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -27113,6 +27187,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -30059,6 +30136,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr "Placer le nom et commentaire de patch dans le fichier"
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr "Donner des statistiques sur les transferts individuels"
 
@@ -30623,6 +30703,9 @@ msgstr "Suspendre les travaux restants sur l’imprimante spécifiée"
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30974,9 +31057,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31289,6 +31369,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr "Ignorer la version de l’interface du module"
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr "Ignorer les nouveaux bogues et mettre à jour les paquets"
 
@@ -32849,6 +32932,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33194,6 +33280,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33323,6 +33412,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33467,6 +33559,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33611,9 +33706,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34280,9 +34372,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr "Lister toutes les versions analysées"
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34442,6 +34531,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr "Lister les sujets d’aide"
 
@@ -35180,6 +35272,9 @@ msgstr "Spécifier le format de listage"
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -37061,6 +37156,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39851,9 +39949,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40682,9 +40777,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41324,6 +41425,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr "Se contenter de dire si les fichiers diffèrent"
 
@@ -43052,6 +43159,9 @@ msgstr "Effectuer la duplication de récursion terminale pour augmenter la taill
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43634,6 +43744,9 @@ msgstr "Utiliser la chaîne spécifiée comme base pour les liens relatifs"
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr "Préfixer le nom du processeur à tous les noms de symboles publics"
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -44033,6 +44146,9 @@ msgstr "Afficher les PPID"
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44237,9 +44353,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44819,9 +44932,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr "Afficher un message d’aide et quitter"
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45818,6 +45928,9 @@ msgstr "Afficher la description d’une clé"
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49163,6 +49276,9 @@ msgstr "Chemin sur la destination"
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr "Remonter une sous-arborescence ailleurs"
 
@@ -50033,6 +50149,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr "Supprimer ceci du verrou"
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50753,6 +50872,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr "Demander l’adresse spécifiée dans les messages DHCP DISCOVER"
 
@@ -51779,6 +51901,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52250,6 +52375,9 @@ msgstr "Exécuter la commande avec le groupe spécifié"
 msgid "Run command as user"
 msgstr "Exécuter la commande en tant que l’utilisateur spécifié"
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr "Exécuter la tâche en arrière-plan"
 
@@ -52808,6 +52936,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53687,7 +53818,10 @@ msgstr "Chercher les périphériques et fichiers dans le dossier spécifié"
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -55013,6 +55147,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr "Paramétrer un emplacement de sauvegarde"
 
@@ -55817,6 +55954,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57428,6 +57568,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57764,6 +57907,9 @@ msgstr "Raccourci pour « --style=gv_spartan.dat »"
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr "Raccourci pour « --style=gv_widgetless.dat »"
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr "Raccourcir certaines références d’adresse lors de l’édition des liens, si possible ; utilise l’option « -relax » de l’éditeur de liens"
 
@@ -61646,6 +61792,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61769,6 +61918,9 @@ msgstr "Spécifier un serveur alternatif"
 msgid "Specifies an alternate username"
 msgstr "Spécifier un nom d’utilisateur alternatif"
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62771,6 +62923,9 @@ msgstr "Spécifier le dossier de la base de données de rpm"
 msgid "Specify directory with configuration files"
 msgstr "Spécifier le dossier des fichiers de configuration"
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64298,6 +64453,9 @@ msgstr ""
 msgid "Start interface"
 msgstr "Démarrer l’interface"
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr "Démarrer la machine"
 
@@ -65474,6 +65632,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr "Changer de profil"
 
@@ -66068,6 +66229,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr "Arrêter le démon logkeys"
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66371,9 +66535,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66485,9 +66646,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -68039,6 +68197,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68225,6 +68386,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -69077,6 +69241,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr "Téléverser les paquets achevés"
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -69092,6 +69259,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr "Téléverser vers le serveur"
 
@@ -70583,6 +70753,9 @@ msgstr "Utiliser seulement les 4 premiers accumulateurs de média"
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70601,6 +70774,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72497,6 +72673,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72638,6 +72820,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75566,6 +75751,12 @@ msgstr "Expliquer ce qu’atool fait"
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76157,6 +76348,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr "http-server servant le dossier actuel"
 
@@ -78686,7 +78880,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/pl.po

@@ -96,12 +96,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr ""
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (linia %d):"
+msgstr "%s (linia %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (linia %u):"
+msgstr "%s (linia %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -195,6 +195,10 @@ msgstr ""
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr ""
@@ -207,6 +211,10 @@ msgstr ""
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr ""
@@ -771,10 +779,6 @@ msgstr ""
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%sand %u więcej rzędów"
-
 msgid "'break' while not inside of loop"
 msgstr "'break' użyte poza pętlą"
 
@@ -1456,11 +1460,11 @@ msgid "Standard input"
 msgstr "Standardowe wejście"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
 msgstr ""
 
 msgid "State"
@@ -1867,8 +1871,9 @@ msgstr ""
 msgid "with definition"
 msgstr ""
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, fuzzy, c-format
-msgstr ""
+msgid "…and %u more rows"
+msgstr "…and %u więcej rzędów"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5935,6 +5940,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6094,6 +6102,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6340,9 +6351,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6388,6 +6396,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6895,6 +6906,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10501,6 +10515,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11272,6 +11289,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12244,6 +12270,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12805,6 +12834,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13171,9 +13203,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr ""
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16297,6 +16326,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16315,6 +16347,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16621,6 +16656,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16687,6 +16725,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17425,9 +17466,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17575,6 +17613,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17710,9 +17751,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18061,6 +18099,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19210,6 +19251,9 @@ msgstr ""
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19303,9 +19347,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20476,9 +20517,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20566,6 +20604,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20632,6 +20673,9 @@ msgstr ""
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20857,6 +20901,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21226,6 +21273,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22549,6 +22599,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23302,6 +23355,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24160,6 +24216,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24229,6 +24288,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24316,6 +24378,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24421,6 +24486,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24454,6 +24522,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26659,6 +26730,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26980,6 +27054,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29926,6 +30003,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr ""
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30490,6 +30570,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30841,9 +30924,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31156,6 +31236,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr ""
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr ""
 
@@ -32716,6 +32799,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33061,6 +33147,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33190,6 +33279,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33334,6 +33426,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33478,9 +33573,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34147,9 +34239,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34309,6 +34398,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35047,6 +35139,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36928,6 +37023,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39718,9 +39816,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40549,9 +40644,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41191,6 +41292,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr ""
 
@@ -42919,6 +43026,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43501,6 +43611,9 @@ msgstr ""
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43900,6 +44013,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44104,9 +44220,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44686,9 +44799,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45685,6 +45795,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49030,6 +49143,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr ""
 
@@ -49900,6 +50016,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50620,6 +50739,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51646,6 +51768,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52117,6 +52242,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52675,6 +52803,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53554,7 +53685,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54880,6 +55014,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55684,6 +55821,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57295,6 +57435,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57631,6 +57774,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61513,6 +61659,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61636,6 +61785,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62638,6 +62790,9 @@ msgstr ""
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64165,6 +64320,9 @@ msgstr ""
 msgid "Start interface"
 msgstr ""
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65341,6 +65499,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65935,6 +66096,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66238,9 +66402,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66352,9 +66513,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67906,6 +68064,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68092,6 +68253,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68944,6 +69108,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68959,6 +69126,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70450,6 +70620,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70468,6 +70641,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72364,6 +72540,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72505,6 +72687,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75433,6 +75618,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76024,6 +76215,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78553,7 +78747,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/pt_BR.po

@@ -101,12 +101,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr ""
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (linha %d):"
+msgstr "%s (linha %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (linha %u):"
+msgstr "%s (linha %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -200,6 +200,10 @@ msgstr ""
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr ""
@@ -212,6 +216,10 @@ msgstr ""
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr ""
@@ -776,10 +784,6 @@ msgstr ""
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%se mais %u linhas"
-
 msgid "'break' while not inside of loop"
 msgstr "'break' enquanto fora de um laço"
 
@@ -1461,11 +1465,11 @@ msgid "Standard input"
 msgstr "Entrada padrão"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
 msgstr ""
 
 msgid "State"
@@ -1872,8 +1876,9 @@ msgstr ""
 msgid "with definition"
 msgstr "com definição"
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, fuzzy, c-format
-msgstr ""
+msgid "…and %u more rows"
+msgstr "…e mais %u linhas"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5940,6 +5945,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6099,6 +6107,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6345,9 +6356,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6393,6 +6401,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6900,6 +6911,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10506,6 +10520,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11277,6 +11294,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12249,6 +12275,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12810,6 +12839,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13176,9 +13208,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr "Count hard links multiple times"
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16302,6 +16331,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16320,6 +16352,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16626,6 +16661,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16692,6 +16730,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17430,9 +17471,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17580,6 +17618,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17715,9 +17756,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18066,6 +18104,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19215,6 +19256,9 @@ msgstr "Do not cache the verification status of key signatures"
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19308,9 +19352,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20481,9 +20522,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20571,6 +20609,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20637,6 +20678,9 @@ msgstr ""
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20862,6 +20906,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21231,6 +21278,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22554,6 +22604,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23307,6 +23360,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24165,6 +24221,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24234,6 +24293,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24321,6 +24383,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24426,6 +24491,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24459,6 +24527,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26664,6 +26735,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26985,6 +27059,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29931,6 +30008,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr "Give patch name and comment in file"
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30495,6 +30575,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30846,9 +30929,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31161,6 +31241,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr "Ignore module interface version"
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr ""
 
@@ -32721,6 +32804,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33066,6 +33152,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33195,6 +33284,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33339,6 +33431,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33483,9 +33578,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34152,9 +34244,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34314,6 +34403,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35052,6 +35144,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36933,6 +37028,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39723,9 +39821,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40554,9 +40649,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41196,6 +41297,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr ""
 
@@ -42924,6 +43031,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43506,6 +43616,9 @@ msgstr "Prepend string to relative links"
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43905,6 +44018,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44109,9 +44225,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44691,9 +44804,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45690,6 +45800,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49035,6 +49148,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr "Remonta uma sub-árvore em outro lugar"
 
@@ -49905,6 +50021,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50625,6 +50744,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51651,6 +51773,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52122,6 +52247,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52680,6 +52808,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53559,7 +53690,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54885,6 +55019,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55689,6 +55826,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57300,6 +57440,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57636,6 +57779,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61518,6 +61664,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61641,6 +61790,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62643,6 +62795,9 @@ msgstr "Specify directory for rpm database"
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64170,6 +64325,9 @@ msgstr ""
 msgid "Start interface"
 msgstr ""
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65346,6 +65504,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65940,6 +66101,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66243,9 +66407,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66357,9 +66518,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67911,6 +68069,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68097,6 +68258,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68949,6 +69113,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68964,6 +69131,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70455,6 +70625,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70473,6 +70646,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72369,6 +72545,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72510,6 +72692,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75438,6 +75623,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76029,6 +76220,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78558,7 +78752,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/sv.po

@@ -97,11 +97,11 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr ""
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (rad %d):"
+msgstr "%s (rad %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
 msgstr ""
 
 #, c-format
@@ -196,6 +196,10 @@ msgstr ""
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr ""
@@ -208,6 +212,10 @@ msgstr ""
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr ""
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr ""
@@ -772,10 +780,6 @@ msgstr ""
 msgid "%s: variable '%s' is read-only"
 msgstr ""
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%soch %u rader till"
-
 msgid "'break' while not inside of loop"
 msgstr ""
 
@@ -1457,11 +1461,11 @@ msgid "Standard input"
 msgstr "Standard in"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
 msgstr ""
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
 msgstr ""
 
 msgid "State"
@@ -1868,8 +1872,9 @@ msgstr ""
 msgid "with definition"
 msgstr ""
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, fuzzy, c-format
-msgstr ""
+msgid "…and %u more rows"
+msgstr "…och %u rader till"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5936,6 +5941,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6095,6 +6103,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6341,9 +6352,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6389,6 +6397,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6896,6 +6907,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10502,6 +10516,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11273,6 +11290,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12245,6 +12271,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12806,6 +12835,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13172,9 +13204,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr "Räkna hårda länkar alla gånger de förekommer"
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16298,6 +16327,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16316,6 +16348,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16622,6 +16657,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16688,6 +16726,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17426,9 +17467,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17576,6 +17614,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17711,9 +17752,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr "Visa hjälp och debug-val"
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18062,6 +18100,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19211,6 +19252,9 @@ msgstr "Cache:a inte verifieringsstatus av nyckelsignaturer"
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19304,9 +19348,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20477,9 +20518,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20567,6 +20605,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20633,6 +20674,9 @@ msgstr "Upgradera inte paket"
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20858,6 +20902,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21227,6 +21274,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22550,6 +22600,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23303,6 +23356,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24161,6 +24217,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24230,6 +24289,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24317,6 +24379,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24422,6 +24487,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24455,6 +24523,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26660,6 +26731,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26981,6 +27055,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29927,6 +30004,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr "Välj fixnamn och kommentar via fil"
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30491,6 +30571,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30842,9 +30925,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31157,6 +31237,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr "Ignorera modulinterfaceversion"
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr "Ignorera nyare buggar än uppgraderade paket"
 
@@ -32717,6 +32800,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33062,6 +33148,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33191,6 +33280,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33335,6 +33427,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33479,9 +33574,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34148,9 +34240,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34310,6 +34399,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35048,6 +35140,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36929,6 +37024,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39719,9 +39817,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40550,9 +40645,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41192,6 +41293,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr "Skriv bara ut huruvida filerna skiljer sig"
 
@@ -42920,6 +43027,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43502,6 +43612,9 @@ msgstr "Lägg till sträng före relativa länkar"
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43901,6 +44014,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44105,9 +44221,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44687,9 +44800,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45686,6 +45796,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49031,6 +49144,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr "Montera om ett subträd till en andra plats"
 
@@ -49901,6 +50017,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50621,6 +50740,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51647,6 +51769,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52118,6 +52243,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52676,6 +52804,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53555,7 +53686,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54881,6 +55015,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55685,6 +55822,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57296,6 +57436,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57632,6 +57775,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61514,6 +61660,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61637,6 +61786,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62639,6 +62791,9 @@ msgstr "Välj katalog för rpm-databas"
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64166,6 +64321,9 @@ msgstr ""
 msgid "Start interface"
 msgstr "Starta gränssnitt"
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65342,6 +65500,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65936,6 +66097,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66239,9 +66403,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66353,9 +66514,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67907,6 +68065,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68093,6 +68254,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68945,6 +69109,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68960,6 +69127,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70451,6 +70621,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70469,6 +70642,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72365,6 +72541,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72506,6 +72688,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75434,6 +75619,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76025,6 +76216,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78554,7 +78748,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/zh_CN.po

@@ -121,12 +121,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr "%s %s: 未识别的特性 '%s'"
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s (行 %d):"
+msgstr "%s (行 %d)"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s (行 %u):"
+msgstr "%s (行 %u)"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -220,6 +220,10 @@ msgstr "%s: %s: 无效舍入模式"
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr "%s: %s: 无效模式名。参见 `help %s`"
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr "%s: %s: 无效位数"
@@ -232,6 +236,10 @@ msgstr "%s: %s: 无效的子命令"
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr "%s: %s: 无效的变量名。参见 `help %s`"
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr "%s: %s: 选项不接受参数"
@@ -796,10 +804,6 @@ msgstr "%s: 数值未完全转换 (无法转换 '%s')"
 msgid "%s: variable '%s' is read-only"
 msgstr "%s: 变量 '%s' 只读"
 
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%s还有 %u 行"
-
 msgid "'break' while not inside of loop"
 msgstr "'break' 不在循环内"
 
@@ -1481,12 +1485,12 @@ msgid "Standard input"
 msgstr "标准输入"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
-msgstr "标准输入 (行 %d)："
+msgstr "标准输入 (行 %d)"
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
-msgstr "启动 (行 %d)："
+msgstr "启动 (行 %d)"
 
 msgid "State"
 msgstr "状态"
@@ -1895,8 +1899,9 @@ msgstr "，参数为 '%s'"
 msgid "with definition"
 msgstr "，定义为"
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#, fuzzy, c-format
-msgstr "|& 无效。在 fish 中，用 &| 来同时管道链接 stdout 和 stderr。"
+msgid "…and %u more rows"
+msgstr "…还有 %u 行"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5963,6 +5968,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6122,6 +6130,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6368,9 +6379,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6416,6 +6424,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6923,6 +6934,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10529,6 +10543,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11300,6 +11317,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12272,6 +12298,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12833,6 +12862,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13199,9 +13231,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr ""
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16325,6 +16354,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16343,6 +16375,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16649,6 +16684,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16715,6 +16753,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr "禁用脚本 build.cj"
 
@@ -17453,9 +17494,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17603,6 +17641,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17738,9 +17779,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18089,6 +18127,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19238,6 +19279,9 @@ msgstr ""
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19331,9 +19375,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20504,9 +20545,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20594,6 +20632,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20660,6 +20701,9 @@ msgstr ""
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20885,6 +20929,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21254,6 +21301,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22577,6 +22627,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23330,6 +23383,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24188,6 +24244,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24257,6 +24316,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24344,6 +24406,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24449,6 +24514,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24482,6 +24550,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26687,6 +26758,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -27008,6 +27082,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29954,6 +30031,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr ""
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30518,6 +30598,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30869,9 +30952,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31184,6 +31264,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr ""
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr ""
 
@@ -32744,6 +32827,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33089,6 +33175,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33218,6 +33307,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33362,6 +33454,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33506,9 +33601,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34175,9 +34267,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34337,6 +34426,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35075,6 +35167,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36956,6 +37051,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39746,9 +39844,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40577,9 +40672,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41219,6 +41320,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr ""
 
@@ -42947,6 +43054,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43529,6 +43639,9 @@ msgstr ""
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43928,6 +44041,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44132,9 +44248,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44714,9 +44827,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45713,6 +45823,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49058,6 +49171,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr ""
 
@@ -49928,6 +50044,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50648,6 +50767,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51674,6 +51796,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52145,6 +52270,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52703,6 +52831,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53582,7 +53713,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54908,6 +55042,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55712,6 +55849,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57323,6 +57463,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57659,6 +57802,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61541,6 +61687,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61664,6 +61813,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62666,6 +62818,9 @@ msgstr ""
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64193,6 +64348,9 @@ msgstr ""
 msgid "Start interface"
 msgstr ""
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65369,6 +65527,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65963,6 +66124,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66266,9 +66430,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66380,9 +66541,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67934,6 +68092,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68120,6 +68281,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68972,6 +69136,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68987,6 +69154,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70478,6 +70648,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70496,6 +70669,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72392,6 +72568,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72533,6 +72715,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75461,6 +75646,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76052,6 +76243,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78581,7 +78775,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

localization/po/zh_TW.po

@@ -94,12 +94,12 @@ msgid "%s %s: unrecognized feature '%s'"
 msgstr "%s %s：不認識的功能「%s」"
 
 #, c-format
-msgid "%s (line %d):"
+msgid "%s (line %d)"
-msgstr "%s（第 %d 行）："
+msgstr "%s（第 %d 行）"
 
 #, c-format
-msgid "%s (line %u):"
+msgid "%s (line %u)"
-msgstr "%s（第 %u 行）："
+msgstr "%s（第 %u 行）"
 
 #, c-format
 msgid "%s and %s are mutually exclusive"
@@ -193,6 +193,10 @@ msgstr "%s：%s：無效的模式"
 msgid "%s: %s: invalid mode name. See `help %s`"
 msgstr "%s：%s：無效的模式名稱。參見「help %s」"
 
+#, c-format
+msgid "%s: %s: invalid option argument: %s"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: invalid scale"
 msgstr "%s：%s：無效的小數位數"
@@ -205,6 +209,10 @@ msgstr "%s：%s：無效的子命令"
 msgid "%s: %s: invalid variable name. See `help %s`"
 msgstr "%s：%s：無效的變數名稱。參見「help %s」"
 
+#, c-format
+msgid "%s: %s: option cannot be used with a non-option argument"
+msgstr ""
+
 #, c-format
 msgid "%s: %s: option does not take an argument"
 msgstr "%s：%s：選項不需要引數"
@@ -769,11 +777,6 @@ msgstr "%s：值未完全轉換（無法轉換「%s」）"
 msgid "%s: variable '%s' is read-only"
 msgstr "%s：變數「%s」是唯讀的"
 
-#  第一個 %s 是刪節號。此字串出現在按下 <Tab> 的清單太長的情況。
-#, c-format
-msgid "%sand %u more rows"
-msgstr "%s還有 %u 列"
-
 msgid "'break' while not inside of loop"
 msgstr "「break」不在迴圈裡面"
 
@@ -1456,12 +1459,12 @@ msgid "Standard input"
 msgstr "標準輸入流"
 
 #, c-format
-msgid "Standard input (line %d):"
+msgid "Standard input (line %d)"
-msgstr "標準輸入流（第 %d 行）："
+msgstr "標準輸入流（第 %d 行）"
 
 #, c-format
-msgid "Startup (line %d):"
+msgid "Startup (line %d)"
-msgstr "啟動命令稿（第 %d 行）："
+msgstr "啟動命令稿（第 %d 行）"
 
 msgid "State"
 msgstr "狀態"
@@ -1870,8 +1873,10 @@ msgstr "，引數為「%s」"
 msgid "with definition"
 msgstr "，定義為"
 
-msgid "|& is not valid. In fish, use &| to pipe both stdout and stderr."
+#  第一個 %s 是刪節號。此字串出現在按下 <Tab> 的清單太長的情況。
-msgstr "|& 無效。在 fish 中請使用 &| 來同時管道傳輸 stdout 和 stderr。"
+#, fuzzy, c-format
+msgid "…and %u more rows"
+msgstr "…還有 %u 列"
 
 msgid "fish-section-tier1-from-script-explicitly-added"
 msgstr ""
@@ -5940,6 +5945,9 @@ msgstr ""
 msgid "Add or inspect object notes"
 msgstr ""
 
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
 msgid "Add or reduce noise in an image [geometry]"
 msgstr ""
 
@@ -6099,6 +6107,9 @@ msgstr ""
 msgid "Add the specified package to the local cache"
 msgstr ""
 
+msgid "Add the specified user/group mapping to an X-mount.idmap map"
+msgstr ""
+
 msgid "Add the standard Git exclusions"
 msgstr ""
 
@@ -6345,9 +6356,6 @@ msgstr ""
 msgid "Aggregate sources for all modules in an aggregator project"
 msgstr ""
 
-msgid "Aggregate the consumed space of one or more directories or files"
-msgstr ""
-
 msgid "Aggressive scan options"
 msgstr ""
 
@@ -6393,6 +6401,9 @@ msgstr ""
 msgid "Alias for --env"
 msgstr ""
 
+msgid "Alias for --only-trailers --only-input --unfold"
+msgstr ""
+
 msgid "Alias for -a"
 msgstr ""
 
@@ -6900,6 +6911,9 @@ msgstr ""
 msgid "Allow the resize to shrink the volume"
 msgstr ""
 
+msgid "Allow to make a target directory (mountpoint) if it does not exist yet"
+msgstr ""
+
 msgid "Allow to perform \"insecure\" SSL connections"
 msgstr ""
 
@@ -10506,6 +10520,9 @@ msgstr ""
 msgid "Check if all files owned by PACKAGE are present"
 msgstr ""
 
+msgid "Check if already mounted"
+msgstr ""
+
 msgid "Check if any of the given files would be ignored"
 msgstr ""
 
@@ -11277,6 +11294,15 @@ msgstr ""
 msgid "Clear the build directory after a package is built"
 msgstr ""
 
+msgid "Clear the effect of previous use of --if-exists"
+msgstr ""
+
+msgid "Clear the effect of previous use of --if-missing"
+msgstr ""
+
+msgid "Clear the effect of previous use of --where"
+msgstr ""
+
 msgid "Clear the fact cache"
 msgstr ""
 
@@ -12249,6 +12275,9 @@ msgstr ""
 msgid "Config file (default: $HOME/.s3cfg)"
 msgstr ""
 
+msgid "Config file name"
+msgstr ""
+
 msgid "Config file name or directory with 'tox.ini' file"
 msgstr ""
 
@@ -12810,6 +12839,9 @@ msgstr ""
 msgid "Control whether to include glibc NSS data"
 msgstr ""
 
+msgid "Control whether to register a session with service manager or without"
+msgstr ""
+
 msgid "Controller information"
 msgstr ""
 
@@ -13176,9 +13208,6 @@ msgstr ""
 msgid "Count hard links multiple times"
 msgstr ""
 
-msgid "Count hard-linked files each time they are seen"
-msgstr ""
-
 msgid "Count hidden files, too"
 msgstr ""
 
@@ -16302,6 +16331,9 @@ msgstr ""
 msgid "Disable chat search background indexer"
 msgstr ""
 
+msgid "Disable check for unique upload"
+msgstr ""
+
 msgid "Disable color"
 msgstr ""
 
@@ -16320,6 +16352,9 @@ msgstr ""
 msgid "Disable colorization in output"
 msgstr ""
 
+msgid "Disable colorized output"
+msgstr ""
+
 msgid "Disable colors"
 msgstr ""
 
@@ -16626,6 +16661,9 @@ msgstr ""
 msgid "Disable peer exchange (PEX)"
 msgstr ""
 
+msgid "Disable per-runner parallelism"
+msgstr ""
+
 msgid "Disable portmapping"
 msgstr ""
 
@@ -16692,6 +16730,9 @@ msgstr ""
 msgid "Disable rewriting of the DISPLAY var"
 msgstr ""
 
+msgid "Disable rules from the command line"
+msgstr ""
+
 msgid "Disable script 'build.cj'"
 msgstr ""
 
@@ -17430,9 +17471,6 @@ msgstr ""
 msgid "Display answers as exclamation points and missing packets as dots"
 msgstr ""
 
-msgid "Display apparent size instead of disk usage"
-msgstr ""
-
 msgid "Display architecture specific information"
 msgstr ""
 
@@ -17580,6 +17618,9 @@ msgstr ""
 msgid "Display debugging information"
 msgstr ""
 
+msgid "Display debugging messages"
+msgstr ""
+
 msgid "Display deduplication histogram"
 msgstr ""
 
@@ -17715,9 +17756,6 @@ msgstr ""
 msgid "Display help and debug options"
 msgstr ""
 
-msgid "Display help and exit\t"
-msgstr ""
-
 msgid "Display help for Git Sizer"
 msgstr ""
 
@@ -18066,6 +18104,9 @@ msgstr ""
 msgid "Display hook variables"
 msgstr ""
 
+msgid "Display hosts listed in configuration"
+msgstr ""
+
 msgid "Display image centered on a backdrop"
 msgstr ""
 
@@ -19215,6 +19256,9 @@ msgstr ""
 msgid "Do not call gensync (and the !commands in /etc/eix-sync.conf)"
 msgstr ""
 
+msgid "Do not canonicalize any paths or tags during the mount process"
+msgstr ""
+
 msgid "Do not cc the From: address"
 msgstr ""
 
@@ -19308,9 +19352,6 @@ msgstr ""
 msgid "Do not compress the uid/gid table"
 msgstr ""
 
-msgid "Do not compute total column for multiple inputs"
-msgstr ""
-
 msgid "Do not configure any interfaces"
 msgstr ""
 
@@ -20481,9 +20522,6 @@ msgstr ""
 msgid "Do not sort file arguments"
 msgstr ""
 
-msgid "Do not sort paths by their size in bytes"
-msgstr ""
-
 msgid "Do not sort the result"
 msgstr ""
 
@@ -20571,6 +20609,9 @@ msgstr ""
 msgid "Do not trap on integer division by zero"
 msgstr ""
 
+msgid "Do not treat --- as the end of the commit message"
+msgstr ""
+
 msgid "Do not treat and/bitand/bitor/compl/not/or/xor as keywords"
 msgstr ""
 
@@ -20637,6 +20678,9 @@ msgstr ""
 msgid "Do not upload binaries"
 msgstr ""
 
+msgid "Do not upload the files"
+msgstr ""
+
 msgid "Do not use \"abshi2\" pattern"
 msgstr ""
 
@@ -20862,6 +20906,9 @@ msgstr ""
 msgid "Do not write FETCH_HEAD file"
 msgstr ""
 
+msgid "Do not write a log file for uploads"
+msgstr ""
+
 msgid "Do not write a ~/.fehbg file"
 msgstr ""
 
@@ -21231,6 +21278,9 @@ msgstr ""
 msgid "Don't check if travis client is up to date"
 msgstr ""
 
+msgid "Don't check the signatures or upload the files"
+msgstr ""
+
 msgid "Don't clear the playlist"
 msgstr ""
 
@@ -22554,6 +22604,9 @@ msgstr ""
 msgid "Don’t assume ID based shared libraries are being used"
 msgstr ""
 
+msgid "Don’t call the /sbin/mount.filesystem helper even if it exists"
+msgstr ""
+
 msgid "Don’t cross filesystem boundaries"
 msgstr ""
 
@@ -23307,6 +23360,9 @@ msgstr ""
 msgid "Edit the file containing a tag"
 msgstr ""
 
+msgid "Edit the files in place"
+msgstr ""
+
 msgid "Edit the flag on an object"
 msgstr ""
 
@@ -24165,6 +24221,9 @@ msgstr ""
 msgid "Enable one or more units"
 msgstr ""
 
+msgid "Enable only this rule, disabling all other defaults. Can be specified multiple times"
+msgstr ""
+
 msgid "Enable optimization of \"&&\" and \"││\" in conditional execution (default)"
 msgstr ""
 
@@ -24234,6 +24293,9 @@ msgstr ""
 msgid "Enable playground in web interface"
 msgstr ""
 
+msgid "Enable plugins from the command line"
+msgstr ""
+
 msgid "Enable portmapping via NAT-PMP or UPnP"
 msgstr ""
 
@@ -24321,6 +24383,9 @@ msgstr ""
 msgid "Enable row security (dump only content user has access to)"
 msgstr ""
 
+msgid "Enable rules from the command line"
+msgstr ""
+
 msgid "Enable search index"
 msgstr ""
 
@@ -24426,6 +24491,9 @@ msgstr ""
 msgid "Enable the JIT compiler"
 msgstr ""
 
+msgid "Enable the Lintian verification check"
+msgstr ""
+
 msgid "Enable the bitrate management engine"
 msgstr ""
 
@@ -24459,6 +24527,9 @@ msgstr ""
 msgid "Enable the live reloading in the development server, but only re-build files that have changed"
 msgstr ""
 
+msgid "Enable the local install check"
+msgstr ""
+
 msgid "Enable the necessary sparse-checkout config settings"
 msgstr ""
 
@@ -26664,6 +26735,9 @@ msgstr ""
 msgid "Filter for rewriting the tree and its contents"
 msgstr ""
 
+msgid "Filter issues by file names or globs"
+msgstr ""
+
 msgid "Filter mode. Do not start interactive finder"
 msgstr ""
 
@@ -26985,6 +27059,9 @@ msgstr ""
 msgid "Fix invalid file names in a bucket"
 msgstr ""
 
+msgid "Fix issues automatically"
+msgstr ""
+
 msgid "Fix only the specified bench target"
 msgstr ""
 
@@ -29931,6 +30008,9 @@ msgstr ""
 msgid "Give patch name and comment in file"
 msgstr ""
 
+msgid "Give privileges to selected or current user"
+msgstr ""
+
 msgid "Give some file-transfer stats"
 msgstr ""
 
@@ -30495,6 +30575,9 @@ msgstr ""
 msgid "Home URL prefix for PEPs"
 msgstr ""
 
+msgid "Home area to log into"
+msgstr ""
+
 msgid "Home directory"
 msgstr ""
 
@@ -30846,9 +30929,6 @@ msgstr ""
 msgid "If project list is specified, also build projects that depend on projects on the list"
 msgstr ""
 
-msgid "If set, we will not cross filesystems or traverse mount points"
-msgstr ""
-
 msgid "If source path is a directory, publish all its content recursively"
 msgstr ""
 
@@ -31161,6 +31241,9 @@ msgstr ""
 msgid "Ignore module interface version"
 msgstr ""
 
+msgid "Ignore module sources"
+msgstr ""
+
 msgid "Ignore newer bugs than upgrade packages"
 msgstr ""
 
@@ -32721,6 +32804,9 @@ msgstr ""
 msgid "Install pkg(8) from remote repository"
 msgstr ""
 
+msgid "Install plugins"
+msgstr ""
+
 msgid "Install plugins resolved from the Maven repository system into an Eclipse instance"
 msgstr ""
 
@@ -33066,6 +33152,9 @@ msgstr ""
 msgid "Invoke a method on a remote object"
 msgstr ""
 
+msgid "Invoke command via target user's login shell"
+msgstr ""
+
 msgid "Invoke fstrim on domain's mounted filesystems"
 msgstr ""
 
@@ -33195,6 +33284,9 @@ msgstr ""
 msgid "Just exit with status 0 when there is a match and with non-zero status when there isn't"
 msgstr ""
 
+msgid "Just like --pty, but leave TTY access to agents until unit is started up"
+msgstr ""
+
 msgid "Just report what it would remove"
 msgstr ""
 
@@ -33339,6 +33431,9 @@ msgstr ""
 msgid "Key to be used as a namespace identifier"
 msgstr ""
 
+msgid "Key-value pair to apply as a trailer"
+msgstr ""
+
 msgid "Keyboard layout mapping table for special hash-modes"
 msgstr ""
 
@@ -33483,9 +33578,6 @@ msgstr ""
 msgid "Launch the Protontricks GUI"
 msgstr ""
 
-msgid "Launch the terminal user interface"
-msgstr ""
-
 msgid "Launch utility at startup and reload on file change"
 msgstr ""
 
@@ -34152,9 +34244,6 @@ msgstr ""
 msgid "List all analyzed versions"
 msgstr ""
 
-msgid "List all apps"
-msgstr ""
-
 msgid "List all apps in the target space"
 msgstr ""
 
@@ -34314,6 +34403,9 @@ msgstr ""
 msgid "List all forward socket connections"
 msgstr ""
 
+msgid "List all games for all Steam installations"
+msgstr ""
+
 msgid "List all help topics"
 msgstr ""
 
@@ -35052,6 +35144,9 @@ msgstr ""
 msgid "List full dependencies for a given identity"
 msgstr ""
 
+msgid "List games for a single Steam installation"
+msgstr ""
+
 msgid "List generation ids for client"
 msgstr ""
 
@@ -36933,6 +37028,9 @@ msgstr ""
 msgid "Long listing format"
 msgstr ""
 
+msgid "Look at all journal files instead of local ones"
+msgstr ""
+
 msgid "Look for (non-boring) files that could be added"
 msgstr ""
 
@@ -39723,9 +39821,6 @@ msgstr ""
 msgid "One or more Kitchen Driver gems to be installed or added to a Gemfile "
 msgstr ""
 
-msgid "One or more absolute directories to ignore"
-msgstr ""
-
 msgid "Only  match  processes  whose  effective  user ID is listed"
 msgstr ""
 
@@ -40554,9 +40649,15 @@ msgstr ""
 msgid "Operate on a range"
 msgstr ""
 
+msgid "Operate on an alternate filesystem root"
+msgstr ""
+
 msgid "Operate on cached data, no network repo access"
 msgstr ""
 
+msgid "Operate on disk image as filesystem root"
+msgstr ""
+
 msgid "Operate on local CONTAINER"
 msgstr ""
 
@@ -41196,6 +41297,12 @@ msgstr ""
 msgid "Output only the last line of the --stat format containing the total"
 msgstr ""
 
+msgid "Output only trailers"
+msgstr ""
+
+msgid "Output only trailers from the input"
+msgstr ""
+
 msgid "Output only whether the files differ"
 msgstr ""
 
@@ -42924,6 +43031,9 @@ msgstr ""
 msgid "Perform temporary expression replacement during the SSA->normal phase"
 msgstr ""
 
+msgid "Perform the mount operation in the mount namespace specified by ns"
+msgstr ""
+
 msgid "Perform the necessary tests to observe the performance"
 msgstr ""
 
@@ -43506,6 +43616,9 @@ msgstr ""
 msgid "Prepend the name of the cpu to all public symbol names"
 msgstr ""
 
+msgid "Prepend the specified directory to all mount targets"
+msgstr ""
+
 msgid "Prepends a time stamp to each trace or verbose line that curl displays"
 msgstr ""
 
@@ -43905,6 +44018,9 @@ msgstr ""
 msgid "Print SRCINFO to stdout"
 msgstr ""
 
+msgid "Print TFLint version"
+msgstr ""
+
 msgid "Print TYPE form"
 msgstr ""
 
@@ -44109,9 +44225,6 @@ msgstr ""
 msgid "Print additional fields"
 msgstr ""
 
-msgid "Print additional statistics about the file traversal to stderr"
-msgstr ""
-
 msgid "Print all active monitors"
 msgstr ""
 
@@ -44691,9 +44804,6 @@ msgstr ""
 msgid "Print help message and exit"
 msgstr ""
 
-msgid "Print help message or the help of the given subcommand(s)"
-msgstr ""
-
 msgid "Print help of uncommon options"
 msgstr ""
 
@@ -45690,6 +45800,9 @@ msgstr ""
 msgid "Print the domain's hostname"
 msgstr ""
 
+msgid "Print the dput configuration"
+msgstr ""
+
 msgid "Print the drive capabilities for SCSI-3/mmc compliant drives"
 msgstr ""
 
@@ -49035,6 +49148,9 @@ msgstr ""
 msgid "Remote url used by `git push`"
 msgstr ""
 
+msgid "Remount a subtree and all possible submounts somewhere else"
+msgstr ""
+
 msgid "Remount a subtree to a second position"
 msgstr ""
 
@@ -49905,6 +50021,9 @@ msgstr ""
 msgid "Remove this from lock"
 msgstr ""
 
+msgid "Remove trailers with whitespace values"
+msgstr ""
+
 msgid "Remove trailing '/' from source args"
 msgstr ""
 
@@ -50625,6 +50744,9 @@ msgstr ""
 msgid "Request distinct server name"
 msgstr ""
 
+msgid "Request dry-run of dinstall after upload"
+msgstr ""
+
 msgid "Request given address in DHCP DISCOVER message"
 msgstr ""
 
@@ -51651,6 +51773,9 @@ msgstr ""
 msgid "Return whether zone has been added"
 msgstr ""
 
+msgid "Return zero exit status even if issues found"
+msgstr ""
+
 msgid "Returns 0 if panic mode is enabled, 1 otherwise"
 msgstr ""
 
@@ -52122,6 +52247,9 @@ msgstr ""
 msgid "Run command as user"
 msgstr ""
 
+msgid "Run command in each directory recursively"
+msgstr ""
+
 msgid "Run command in the background"
 msgstr ""
 
@@ -52680,6 +52808,9 @@ msgstr ""
 msgid "Run tracer process as tracee's grandchild in a separate session"
 msgstr ""
 
+msgid "Run under the specified unit name"
+msgstr ""
+
 msgid "Run unit tests"
 msgstr ""
 
@@ -53559,7 +53690,10 @@ msgstr ""
 msgid "Search for fonts in directory"
 msgstr ""
 
-msgid "Search for game(s) with the given name"
+msgid "Search for game(s) with the given name among all Steam installations"
+msgstr ""
+
+msgid "Search for game(s) with the given name for a single Steam installation"
 msgstr ""
 
 msgid "Search for gems under specific paths"
@@ -54885,6 +55019,9 @@ msgstr ""
 msgid "Set `verbose` shell variable"
 msgstr ""
 
+msgid "Set a Terraform variable"
+msgstr ""
+
 msgid "Set a backup destination"
 msgstr ""
 
@@ -55689,6 +55826,9 @@ msgstr ""
 msgid "Set maximum number of redirects"
 msgstr ""
 
+msgid "Set maximum number of workers in recursive inspection"
+msgstr ""
+
 msgid "Set maximum size of a single allocated block"
 msgstr ""
 
@@ -57300,6 +57440,9 @@ msgstr ""
 msgid "Sets minimum bits allowed for bitmaps"
 msgstr ""
 
+msgid "Sets minimum severity level for exiting with a non-zero error code"
+msgstr ""
+
 msgid "Sets number of rotated logs to keep, default 4"
 msgstr ""
 
@@ -57636,6 +57779,9 @@ msgstr ""
 msgid "Shortcut for --style=gv_widgetless.dat"
 msgstr ""
 
+msgid "Shortcut for --via-shell --chdir='~'"
+msgstr ""
+
 msgid "Shorten some address references at link time, when possible; uses the linker option -relax"
 msgstr ""
 
@@ -61518,6 +61664,9 @@ msgstr ""
 msgid "Source name for underlying storage"
 msgstr ""
 
+msgid "Source of default options"
+msgstr ""
+
 msgid "Source of the commit message"
 msgstr ""
 
@@ -61641,6 +61790,9 @@ msgstr ""
 msgid "Specifies an alternate username"
 msgstr ""
 
+msgid "Specifies an alternative fstab file"
+msgstr ""
+
 msgid "Specifies an alternative installroot"
 msgstr ""
 
@@ -62643,6 +62795,9 @@ msgstr ""
 msgid "Specify directory with configuration files"
 msgstr ""
 
+msgid "Specify disk image dissection policy"
+msgstr ""
+
 msgid "Specify display"
 msgstr ""
 
@@ -64170,6 +64325,9 @@ msgstr ""
 msgid "Start interface"
 msgstr ""
 
+msgid "Start language server"
+msgstr ""
+
 msgid "Start machine"
 msgstr ""
 
@@ -65346,6 +65504,9 @@ msgstr ""
 msgid "Switch to a different tree"
 msgstr ""
 
+msgid "Switch to a different working directory before executing the command"
+msgstr ""
+
 msgid "Switch to a profile"
 msgstr ""
 
@@ -65940,6 +66101,9 @@ msgstr ""
 msgid "Terminates the logkeys daemon"
 msgstr ""
 
+msgid "Terraform variable file name"
+msgstr ""
+
 msgid "Terse output for machine consumption. Implies --no-abbrev and --no-color"
 msgstr ""
 
@@ -66243,9 +66407,6 @@ msgstr ""
 msgid "The age recipient the new group should contain. Can be specified more than once"
 msgstr ""
 
-msgid "The amount of threads to use"
-msgstr ""
-
 msgid "The architecture reported by uname in the container"
 msgstr ""
 
@@ -66357,9 +66518,6 @@ msgstr ""
 msgid "The format to convert to"
 msgstr ""
 
-msgid "The format with which to print byte counts"
-msgstr ""
-
 msgid "The full cost-based query optimiser is enabled."
 msgstr ""
 
@@ -67911,6 +68069,9 @@ msgstr ""
 msgid "Type of workload to produce"
 msgstr ""
 
+msgid "Types of module to call"
+msgstr ""
+
 msgid "Typeset abstract as topic"
 msgstr ""
 
@@ -68097,6 +68258,9 @@ msgstr ""
 msgid "Unfavourite a status"
 msgstr ""
 
+msgid "Unfold multiline trailer values"
+msgstr ""
+
 msgid "Unfollow an account"
 msgstr ""
 
@@ -68949,6 +69113,9 @@ msgstr ""
 msgid "Upload finished packages"
 msgstr ""
 
+msgid "Upload host"
+msgstr ""
+
 msgid "Upload locally saved terminal session to asciinema.org"
 msgstr ""
 
@@ -68964,6 +69131,9 @@ msgstr ""
 msgid "Upload stemcell"
 msgstr ""
 
+msgid "Upload to a delayed queue"
+msgstr ""
+
 msgid "Upload to server"
 msgstr ""
 
@@ -70455,6 +70625,9 @@ msgstr ""
 msgid "Use openssh if available"
 msgstr ""
 
+msgid "Use options from fstab/mtab even if both device and dir are specified"
+msgstr ""
+
 msgid "Use original SCP protocol instead of SFTP"
 msgstr ""
 
@@ -70473,6 +70646,9 @@ msgstr ""
 msgid "Use paired-single floating-point instructions"
 msgstr ""
 
+msgid "Use passive mode for FTP"
+msgstr ""
+
 msgid "Use passive mode for data transfers"
 msgstr ""
 
@@ -72369,6 +72545,12 @@ msgstr ""
 msgid "What to do when receiving events while the command is running"
 msgstr ""
 
+msgid "What to do when there is already a trailer with the same key"
+msgstr ""
+
+msgid "What to do when there is no other trailer with the same key"
+msgstr ""
+
 msgid "Whatever to reset the module registry for every test"
 msgstr ""
 
@@ -72510,6 +72692,9 @@ msgstr ""
 msgid "When used with -s, --silent, it makes curl show an error message if it fails"
 msgstr ""
 
+msgid "Where new trailers will be added"
+msgstr ""
+
 msgid "Where to install C header files"
 msgstr ""
 
@@ -75438,6 +75623,12 @@ msgstr ""
 msgid "explain why packages or modules are needed"
 msgstr ""
 
+msgid "explicitly define the argument as the mount source"
+msgstr ""
+
+msgid "explicitly define the argument as the mount target"
+msgstr ""
+
 msgid "explicitly set BootOrder XXXX,YYYY,ZZZZ (hex)"
 msgstr ""
 
@@ -76029,6 +76220,9 @@ msgstr ""
 msgid "host tunnel on custom hostname (requires DNS CNAME)"
 msgstr ""
 
+msgid "how to combine with options from fstab/mtab"
+msgstr ""
+
 msgid "http-server serving the current directory"
 msgstr ""
 
@@ -78558,7 +78752,7 @@ msgstr ""
 msgid "reset branch name to parent branch name"
 msgstr ""
 
-msgid "reset cache (DNS\t)"
+msgid "reset cache"
 msgstr ""
 
 msgid "reset terminal state"

osx/fish_debug.entitlements

@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-         <key>com.apple.security.get-task-allow</key>
+    <key>com.apple.security.get-task-allow</key>
-         <true/>
+    <true/>
 </dict>
 </plist>

pyproject.toml

@@ -3,12 +3,12 @@ name = "fish-shell"
 version = "0.0.0"
 # NOTE: versions for Python and Sphinx are specified for reproducibility.
 # Lower versions will work too.
-requires-python = ">=3.11" # updatecli.d/python.yml
+requires-python = ">=3.12"
 dependencies = []
 
 [dependency-groups]
 dev = [
-    "sphinx>=9.0", # updatecli.d/python.yml
+    "sphinx>=9.1", # updatecli.d/python.yml
     "sphinx-markdown-builder",
 ]
 

share/completions/ansible-galaxy.fish

@@ -4,25 +4,31 @@ complete -c ansible-galaxy -s h -l help -d "Show help message"
 complete -c ansible-galaxy -n __fish_use_subcommand -s v -l verbose -d "Verbose mode (-vvv for more, -vvvv for connection debugging)"
 
 # first subcommand
-complete -c ansible-galaxy -n __fish_use_subcommand -xa "collection\t'Manage a collection'
+complete -c ansible-galaxy -n __fish_use_subcommand -xa "
-                                                         role\t'Manage a role'"
+    collection\t'Manage a collection'
+    role\t'Manage a role'
+"
 
 # second subcommand (for collection)
-complete -c ansible-galaxy -n '__fish_seen_subcommand_from collection' -a "download\t'Download collections as tarball'
+complete -c ansible-galaxy -n '__fish_seen_subcommand_from collection' -a "
-                                                                           init\t'Initialize new collection with the base structure'
+    download\t'Download collections as tarball'
-                                                                           build\t'Build collection artifact that can be published'
+    init\t'Initialize new collection with the base structure'
-                                                                           publish\t'Publish collection artifact to Ansible Galaxy'
+    build\t'Build collection artifact that can be published'
-                                                                           install\t'Install collections'
+    publish\t'Publish collection artifact to Ansible Galaxy'
-                                                                           list\t'Show collections installed'
+    install\t'Install collections'
-                                                                           verify\t'Compare checksums of local and remote collections'"
+    list\t'Show collections installed'
+    verify\t'Compare checksums of local and remote collections'
+"
 
 # second subcommand (for role)
-complete -c ansible-galaxy -n '__fish_seen_subcommand_from role' -a "init\t'Initialize new role with the base structure'
+complete -c ansible-galaxy -n '__fish_seen_subcommand_from role' -a "
-                                                                     remove\t'Delete roles from roles_path'
+    init\t'Initialize new role with the base structure'
-                                                                     delete\t'Removes the role from Galaxy'
+    remove\t'Delete roles from roles_path'
-                                                                     list\t'Show roles installed'
+    delete\t'Removes the role from Galaxy'
-                                                                     search\t'Search the Galaxy database by keywords'
+    list\t'Show roles installed'
-                                                                     import\t'Import role into a galaxy server'
+    search\t'Search the Galaxy database by keywords'
-                                                                     setup\t'Manage integration between Galaxy and the given source'
+    import\t'Import role into a galaxy server'
-                                                                     info\t'View details about a role'
+    setup\t'Manage integration between Galaxy and the given source'
-                                                                     install\t'Install roles'"
+    info\t'View details about a role'
+    install\t'Install roles'
+"

share/completions/cargo.fish

@@ -3,7 +3,7 @@
 ## --- WRITTEN MANUALLY ---
 
 function __fish_cargo
-    cargo --color=never $argv
+    RUSTUP_AUTO_INSTALL=0 cargo --color=never $argv
 end
 
 set -l __fish_cargo_subcommands (__fish_cargo --list 2>&1 | string replace -rf '^\s+([^\s]+)\s*(.*)' '$1\t$2' | string escape)

share/completions/chsh.fish

@@ -4,7 +4,7 @@
 
 # This grep tries to match nonempty lines that do not start with hash
 complete -c chsh -s s -l shell -x -a "(string match -r '^[^#].*' < /etc/shells)" -d "Specify your login shell"
-complete -c chsh -s u -l help -d "Display help and exit	"
+complete -c chsh -s u -l help -d "Display help and exit"
 complete -c chsh -s v -l version -d "Display version and exit"
 complete -x -c chsh -a "(__fish_complete_users)"
 

share/completions/composer.fish

@@ -31,7 +31,7 @@ data = json.load(json_data)
 json_data.close()
 packages = itertools.chain(data.get('require', {}).keys(), data.get('require-dev', {}).keys())
 print(\"\n\".join(packages))
-      " | $python -S
+    " | $python -S
 end
 
 function __fish_composer_installed_packages

share/completions/coredumpctl.fish

@@ -23,3 +23,7 @@ complete -c coredumpctl -s o -l output -r -d 'Write output to FILE'
 complete -c coredumpctl -l file -r -d 'Use journal FILE'
 complete -c coredumpctl -s D -l directory -r -d 'Use journal files from DIRECTORY'
 complete -c coredumpctl -s q -l quiet -d 'Do not show info messages and privilege warning'
+complete -c coredumpctl -l all -d "Look at all journal files instead of local ones"
+complete -c coredumpctl -l root -d "Operate on an alternate filesystem root" -xa "(__fish_complete_directories '' 'Root')"
+complete -c coredumpctl -l image -d "Operate on disk image as filesystem root" -x
+complete -c coredumpctl -l image-policy -d "Specify disk image dissection policy" -xa "verity signed encrypted unprotected unused absent"

share/completions/docker.fish

@@ -1 +1,4 @@
-docker completion fish 2>/dev/null | source
+# In WSL, when the docker app is not yet started, "docker" is a script printing
+# some error message on stdout instead of a sourceable script
+set -l docker_completion "$(docker completion fish 2>/dev/null)"
+and eval "$docker_completion"

share/completions/dput.fish

@@ -0,0 +1,19 @@
+complete -c dput -s c -l config -d "Configuration file" -r
+complete -c dput -s d -l debug -d "Display debugging messages"
+complete -c dput -s D -l dinstall -d "Request dry-run of dinstall after upload"
+complete -c dput -s f -l force -d "Disable check for unique upload"
+complete -c dput -s h -l help -d "Display help"
+complete -c dput -s H -l host-list -d "Display hosts listed in configuration"
+complete -c dput -s l -l lintian -d "Enable the Lintian verification check"
+complete -c dput -s U -l no-upload-log -d "Do not write a log file for uploads"
+complete -c dput -s o -l check-only -d "Don't check the signatures or upload the files"
+complete -c dput -s p -l print -d "Print the dput configuration"
+complete -c dput -s P -l passive -d "Use passive mode for FTP"
+complete -c dput -s s -l simulate -d "Do not upload the files"
+complete -c dput -s e -l delayed -d "Upload to a delayed queue" -r
+complete -c dput -s v -l version -d "Print the version"
+complete -c dput -s V -l check-version -d "Enable the local install check"
+
+complete -c dput -x -a '(dput --host-list | string match --regex --groups-only "(.+) => .*")' -d "Upload host" -n __fish_is_first_arg
+# dput validates that filenames end in .changes
+complete -c dput -x -a '(complete -C"\'\' $(commandline -ct)" | string match -re "(?:/|.changes)\$")'

share/completions/dscacheutil.fish

@@ -24,4 +24,4 @@ user\t'name or uid'
 "
 complete -c dscacheutil -o configuration -d 'print current config' -f -n '[ (commandline -xpc | count) -le 1 ]'
 complete -c dscacheutil -o statistics -d 'prints cache stats' -f -n '[ (commandline -xpc | count) -le 1 ]'
-complete -c dscacheutil -o flushcache -d 'reset cache (DNS	)' -f -k -n '[ (commandline -xpc | count) -le 1 ]'
+complete -c dscacheutil -o flushcache -d 'reset cache' -f -k -n '[ (commandline -xpc | count) -le 1 ]'