irc: fix typo on field name in /help irc.look.list_buffer_sort

core: fix crash with /eval when the current buffer is closed in a command
core: update copyright dates
2026-06-13 14:44:46 +02:00 · 2026-03-16 13:21:55 +01:00 · 2026-03-14 00:12:53 +01:00 · 2026-03-08 10:44:23 +01:00 · 2026-03-07 00:02:09 +01:00 · 2026-03-06 23:39:17 +01:00
420 changed files with 12120 additions and 14408 deletions
@@ -11,14 +11,6 @@ on:
    - cron: '22 9 * * 2'

 env:
-  CHECK_DEPS_UBUNTU: >-
-    curl
-    gettext
-    hunspell
-    hunspell-en-us
-    hunspell-fr
-    pipx
-    shellcheck
  WEECHAT_DEPS_UBUNTU: >-
    asciidoctor
    build-essential
@@ -26,6 +18,7 @@ env:
    curl
    devscripts
    equivs
+    flake8
    gem2deb
    guile-3.0-dev
    lcov
@@ -36,7 +29,7 @@ env:
    libcurl4-gnutls-dev
    libgcrypt20-dev
    libgnutls28-dev
-    liblua5.4-dev
+    liblua5.3-dev
    libncurses-dev
    libperl-dev
    libphp-embed
@@ -47,8 +40,11 @@ env:
    php-dev
    pipx
    pkgconf
+    pylint
+    python3-bandit
    python3-dev
    ruby-pygments.rb
+    shellcheck
    tcl8.6-dev
    zlib1g-dev
  WEECHAT_DEPS_ROCKYLINUX: >-
@@ -102,53 +98,10 @@ env:
    sudo
    tcl86
    zstd
-  WEECHAT_DEPS_MACOS: >-
-    asciidoctor
-    aspell
-    cjson
-    guile
-    lua
-    pkg-config
-    ruby

 jobs:

-  checks:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-24.04
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-    - uses: actions/checkout@v6
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.CHECK_DEPS_UBUNTU }}
-        pipx install msgcheck ruff
-        cargo install --version 0.0.10 poexam
-
-    - name: Check gettext files (msgcheck)
-      run: msgcheck po/*.po
-
-    - name: Check gettext files (poexam)
-      run: poexam check --file-stats --rule-stats
-
-    - name: Check shell and Python scripts
-      run: ./tools/check_scripts.sh
-
-    - name: Check Python stub file
-      run: ./tools/generate_python_stub.py | diff src/plugins/python/weechat.pyi -
-
-    - name: Check Curl symbols
-      run: curl --silent --show-error --fail --retry 10 https://raw.githubusercontent.com/curl/curl/master/docs/libcurl/symbols-in-versions | ./tools/check_curl_symbols.py
-
-  install:
+  tests_ubuntu:

    strategy:
      matrix:
@@ -192,12 +145,12 @@ jobs:
            cxx: "clang++"
            buildargs: "-DENABLE_CODE_COVERAGE=ON -DENABLE_FUZZ=ON"

-    name: "install (${{ matrix.os }}, ${{ matrix.config.name }})"
+    name: "${{ matrix.os }} (${{ matrix.config.name }})"
    runs-on: ${{ matrix.os }}

    steps:

-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4

    - name: Install dependencies
      run: |
@@ -205,7 +158,19 @@ jobs:
        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPS_UBUNTU }}
        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
        sudo apt-get --yes purge php8.3-imagick
-        pipx install schemathesis
+        pipx install msgcheck schemathesis
+
+    - name: Check gettext files
+      run: msgcheck po/*.po
+
+    - name: Check shell and Python scripts
+      run: ./tools/check_scripts.sh
+
+    - name: Check Python stub file
+      run: ./tools/generate_python_stub.py | diff src/plugins/python/weechat.pyi -
+
+    - name: Check Curl symbols
+      run: curl --silent --show-error --fail --retry 10 https://raw.githubusercontent.com/curl/curl/master/docs/libcurl/symbols-in-versions | ./tools/check_curl_symbols.py

    - name: Build and run tests
      env:
@@ -253,152 +218,6 @@ jobs:
        lcov --list coverage.info
        bash <(curl -s https://codecov.io/bash) -f coverage.info || echo 'Codecov error'

-  install_rockylinux:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-24.04
-        config:
-          - name: "gcc"
-            cc: "gcc"
-            cxx: "g++"
-            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
-          - name: "clang"
-            cc: "clang"
-            cxx: "clang++"
-            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON -DENABLE_CODE_COVERAGE=ON -DENABLE_FUZZ=ON"
-
-    name: "install (rockylinux:9, ${{ matrix.config.name }})"
-    runs-on: ${{ matrix.os }}
-    container:
-      image: rockylinux:9
-
-    steps:
-
-    - uses: actions/checkout@v6
-
-    - name: Install dependencies
-      run: |
-        dnf install -y epel-release dnf-plugins-core
-        dnf config-manager --set-enabled crb
-        # pin a working ruby stream (ruby:4.0 has broken module metadata on Rocky 9.8)
-        dnf module enable -y ruby:3.3
-        dnf install -y ${{ env.WEECHAT_DEPS_ROCKYLINUX }}
-
-    - name: Build and run tests
-      env:
-        CC: ${{ matrix.config.cc }}
-        CXX: ${{ matrix.config.cxx }}
-      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
-
-    - name: Run WeeChat
-      env:
-        TERM: xterm-256color
-      run: |
-        weechat --help
-        weechat-curses --help
-        weechat --version
-        weechat --build-info
-        weechat --colors
-        weechat --license
-        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  install_freebsd:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-24.04
-        config:
-          # - name: "gcc"
-          # cc: "gcc"
-          # cxx: "g++"
-          # buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
-          - name: "clang"
-            cc: "clang"
-            cxx: "clang++"
-            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON -DENABLE_CODE_COVERAGE=ON -DENABLE_FUZZ=ON"
-
-    name: "install (freebsd, ${{ matrix.config.name }})"
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-    - uses: actions/checkout@v6
-
-    - name: Install dependencies, build and run tests, run WeeChat
-      uses: vmactions/freebsd-vm@v1
-      env:
-        CC: ${{ matrix.config.cc }}
-        CXX: ${{ matrix.config.cxx }}
-        TERM: xterm-256color
-      with:
-        envs: "CC CXX TERM"
-        usesh: true
-        prepare: pkg install -y ${{ env.WEECHAT_DEPS_FREEBSD }}
-        run: |
-          ./tools/build_test.sh ${{ matrix.config.buildargs }}
-          weechat --help
-          weechat-curses --help
-          weechat --version
-          weechat --build-info
-          weechat --colors
-          weechat --license
-          weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  install_macos:
-
-    strategy:
-      matrix:
-        os:
-          - macos-14
-        config:
-          - name: "gcc"
-            cc: "gcc"
-            cxx: "g++"
-            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
-          - name: "clang"
-            cc: "clang"
-            cxx: "clang++"
-            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
-
-    name: "install (${{ matrix.os }}, ${{ matrix.config.name }})"
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-    - name: Setup Homebrew
-      id: setup-homebrew
-      uses: Homebrew/actions/setup-homebrew@main
-
-    - name: Install dependencies
-      run: |
-        brew update
-        brew install ${{ env.WEECHAT_DEPS_MACOS }}
-
-    - uses: actions/checkout@v6
-
-    - name: Build
-      env:
-        CC: ${{ matrix.config.cc }}
-        CXX: ${{ matrix.config.cxx }}
-        RUN_TESTS: "0"
-        JOBS: "2"
-      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
-
-    - name: Run WeeChat
-      env:
-        TERM: xterm-256color
-      run: |
-        weechat --help
-        weechat-curses --help
-        weechat --version
-        weechat --build-info
-        weechat --colors
-        weechat --license
-        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
  build_debian:

    strategy:
@@ -406,11 +225,12 @@ jobs:
        os:
          - ubuntu-24.04

+    name: "${{ matrix.os }} (build Debian)"
    runs-on: ${{ matrix.os }}

    steps:

-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4

    - name: Install dependencies
      run: |
@@ -436,13 +256,14 @@ jobs:
        weechat --build-info
        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"

-  codeql_analysis:
+  codeql-analysis:

    strategy:
      matrix:
        os:
          - ubuntu-24.04

+    name: "${{ matrix.os }} (CodeQL)"
    runs-on: ${{ matrix.os }}

    permissions:
@@ -453,7 +274,7 @@ jobs:
    steps:

    - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4

    - name: Install dependencies
      run: |
@@ -461,6 +282,7 @@ jobs:
        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_DEPS_UBUNTU }}
        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
        sudo apt-get --yes purge php8.3-imagick
+        pipx install msgcheck

    - name: Initialize CodeQL
      uses: github/codeql-action/init@v3
@@ -474,3 +296,160 @@ jobs:
      uses: github/codeql-action/analyze@v3
      with:
        category: "/language:cpp"
+
+  tests_rockylinux:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+        config:
+          - name: "gcc"
+            cc: "gcc"
+            cxx: "g++"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
+          - name: "clang"
+            cc: "clang"
+            cxx: "clang++"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON -DENABLE_CODE_COVERAGE=ON -DENABLE_FUZZ=ON"
+
+    name: "rockylinux-9 (${{ matrix.config.name }})"
+    runs-on: ${{ matrix.os }}
+    container:
+      image: rockylinux:9
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: |
+        dnf install -y epel-release
+        dnf config-manager --set-enabled crb
+        dnf install -y ${{ env.WEECHAT_DEPS_ROCKYLINUX }}
+
+    - name: Build and run tests
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --version
+        weechat --build-info
+        weechat --colors
+        weechat --license
+        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+  tests_freebsd:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-24.04
+        config:
+          # - name: "gcc"
+          # cc: "gcc"
+          # cxx: "g++"
+          # buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON"
+          - name: "clang"
+            cc: "clang"
+            cxx: "clang++"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON -DENABLE_CODE_COVERAGE=ON -DENABLE_FUZZ=ON"
+
+    name: "freebsd-14 (${{ matrix.config.name }})"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies, build and run tests, run WeeChat
+      uses: vmactions/freebsd-vm@v1
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+        TERM: xterm-256color
+      with:
+        envs: "CC CXX TERM"
+        usesh: true
+        prepare: pkg install -y ${{ env.WEECHAT_DEPS_FREEBSD }}
+        run: |
+          ./tools/build_test.sh ${{ matrix.config.buildargs }}
+          weechat --help
+          weechat-curses --help
+          weechat --version
+          weechat --build-info
+          weechat --colors
+          weechat --license
+          weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+  tests_macos:
+
+    strategy:
+      matrix:
+        os:
+          - macos-14
+        config:
+          - name: "gcc"
+            cc: "gcc"
+            cxx: "g++"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
+          - name: "clang"
+            cc: "clang"
+            cxx: "clang++"
+            buildargs: "-DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_DOC_INCOMPLETE=ON -DENABLE_PHP=OFF -DENABLE_TESTS=OFF"
+
+    name: "${{ matrix.os }} (${{ matrix.config.name }})"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - name: Setup Homebrew
+      id: setup-homebrew
+      uses: Homebrew/actions/setup-homebrew@master
+
+    - name: Install dependencies
+      run: |
+        brew update
+        # temporary fix, see: https://github.com/actions/setup-python/issues/577
+        rm -f \
+          /usr/local/bin/2to3 \
+          /usr/local/bin/idle3 \
+          /usr/local/bin/pydoc3 \
+          /usr/local/bin/python3 \
+          /usr/local/bin/python3-config \
+          /usr/local/bin/2to3-3.11 \
+          /usr/local/bin/idle3.11 \
+          /usr/local/bin/pydoc3.11 \
+          /usr/local/bin/python3.11 \
+          /usr/local/bin/python3.11-config \
+        ;
+        brew install asciidoctor aspell cjson guile lua pkg-config ruby
+
+    - uses: actions/checkout@v4
+
+    - name: Build
+      env:
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
+        RUN_TESTS: "0"
+        JOBS: "2"
+      run: ./tools/build_test.sh ${{ matrix.config.buildargs }}
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --version
+        weechat --build-info
+        weechat --colors
+        weechat --license
+        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
@@ -16,7 +16,7 @@ jobs:

    steps:

-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4

      - name: REUSE Compliance Check
        uses: fsfe/reuse-action@v4
@@ -1,281 +0,0 @@
-Atheme
-Autojoin
-Charset
-Diffie-Hellman
-Esc
-FlashCode
-GnuTLS
-Hashtable
-Helleu
-IPs
-Sébastien
-WeeChat
-Xfer
-abc
-ack
-acks
-addcompletion
-addinput
-addoff
-addraw
-addreplace
-addreplacecompletion
-addword
-algo
-allchan
-allpv
-alnum
-andrew
-ansi
-api
-args
-argsN
-aspell
-autoconnect
-autojoin
-autoload
-autoloaded
-autoreconnect
-autorejoin
-bg
-bindctxt
-bitlbee
-bkl
-blocksize
-bool
-buflist
-cJSON
-calc
-ccc
-charset
-charsets
-chghost
-chmod
-cleartext
-clientinfo
-cmd
-codepoint
-concat
-cond
-config
-crypted
-ctcp
-ctrl
-ctrl-
-ctrl-c
-ctrl-h
-ctrl-n
-ctrl-x
-ctrl-y
-cutscr
-cxx
-darkgray
-deinit
-deldict
-deloutq
-delvar
-dhkey
-dirs
-dlclose
-eg
-enum
-enums
-env
-esc
-eval
-fd
-ffff
-fg
-fifo
-flashcode
-flashtux
-freebsd
-fset
-fsync
-gcrypt
-getrlimit
-getrusage
-gnutls
-grayscale
-gui
-gzip
-halfop
-halfops
-hashtable
-hdata
-hh
-horiz
-hostname
-hostnames
-hotlist
-hsignal
-http
-https
-hup
-ident
-ie
-il
-inclose
-infolist
-infolists
-infos
-installremove
-irc
-ison
-javascript
-json
-kf
-kickban
-killall
-lengthscr
-libera
-libgcrypt
-libs
-lightblue
-lightcyan
-lightgreen
-lightmagenta
-lightred
-linux
-listdefault
-listdict
-listdiff
-listfull
-listitems
-listrelay
-listvar
-lua
-mallinfo
-malloc
-mirc
-modelist
-msg
-msgN
-msgbuffer
-multiline
-ncurses
-newbuffer
-nf
-nickbot
-nicklist
-nickserv
-nl
-noautoload
-nobg
-nocl
-noflush
-nohelp
-nojoin
-noln
-nonblock
-nooption
-norc
-nostdin
-nosw
-noswitch
-notls
-num
-oc
-oerr
-oftc
-ok
-ol
-osinfo
-outqueue
-ovh
-paramN
-params
-perl
-permessage-deflate
-pgdn
-pgup
-pid
-prev
-privmsg
-ptr
-pv
-py
-quickstart
-rc
-realname
-recv
-reinitializing
-reop
-resetall
-resetctxt
-revindex
-revscr
-rgb
-rlimit
-rusage
-rw-rw-r--
-sasl
-setauto
-setdict
-setname
-setnew
-setrlimit
-setvar
-signon
-skipempty
-sockaddr
-splith
-splitv
-stderr
-stdin
-stdout
-strcasecmp
-strftime
-strftimeval
-strlen
-sublist
-subplugin
-sw
-sys
-tThe
-tcl
-tg
-tls
-tlscertkey
-toggleautoload
-togglecmd
-toto
-totp
-truncature
-un
-unalias
-unban
-unbindctxt
-undef
-unescaped
-unhide
-unhold
-unicode
-unix
-unmark
-unmerge
-unzoom
-uptime
-url
-urlserver
-usec
-userhost-in-names
-usr
-util
-valgrind
-versiongit
-waitpid
-wcswidth
-wctype
-wcwidth
-websocket
-websockets
-weechat
-whois
-www
-xdigit
-xfer
-xyz
-yy
-zlib
-zstd
@@ -1,611 +0,0 @@
-Atheme
-Autojoin
-Curl
-Curses
-Debug
-Dec
-Diffie-Hellman
-Filter
-FlashCode
-GnuTLS
-Guile
-Helleu
-IPs
-Lag
-Ping
-Protocol
-Relay
-Remote
-Reop
-Tab
-Trigger
-Triggers
-Typing
-URLs
-Wallops
-WeeChat
-Xfer
-account
-account-
-account-notify
-account-tag
-ack
-acks
-add
-addcompletion
-addinput
-addoff
-addraw
-addreplace
-addreplacecompletion
-addresse
-addword
-align
-all
-allchan
-allow
-allowed
-allpv
-alnum
-alt
-alt-c
-alt-k
-alt-s
-alt-v
-alt-z
-andrew
-ansi
-apply
-area
-args
-argsN
-aspell
-attributes
-auth
-autoconnect
-autojoin
-autoload
-autorejoin
-away
-away-notify
-backspace
-bare
-bash
-beep
-before
-beginning
-beyond
-bg
-bin
-bind
-bindctxt
-bitlbee
-bkl
-blue
-bold
-bool
-boolean
-both
-bottom
-bracketed
-brown
-buflist
-cJSON
-calc
-callbacks
-cap-notify
-capabilities
-capability
-ccc
-cert
-certs
-changed
-channel
-charset
-charsets
-check
-chghost
-chmod
-cipher
-clear
-clientinfo
-clipboard
-cmd
-color
-colors
-command
-commands
-complete
-completion
-concat
-cond
-confirm
-connect
-connected
-connecting
-control
-copy
-core
-count
-crypt
-ctcp
-ctrl
-ctrl-
-ctrl-c
-ctrl-h
-ctrl-n
-ctrl-x
-ctrl-y
-curl
-current
-cursor
-cut
-cutscr
-cxx
-d'ignore
-d'infolist
-daemon
-darkgray
-days
-debug
-decode
-decrypt
-default
-define
-deinit
-del
-deldict
-delete
-deloutq
-delvar
-desc
-describe
-dhkey
-dict
-diff
-dim
-dir
-dirs
-disable
-discard
-disconnect
-disconnected
-display
-displayed
-dlclose
-doc-gen
-down
-download
-draft
-dummy
-dump
-eat
-echo-message
-edge
-emphasized
-empty
-enable
-enabled
-end
-enum
-error
-esc
-eval
-example
-exclude
-exec
-extended-join
-external
-exts
-fail
-failed
-fast
-fd
-ffff
-fifo
-filter
-fingerprint
-first
-flashcode
-flashtux
-foo
-formatted
-free
-freebsd
-fset
-fsync
-gcrypt
-get
-getrlimit
-getrusage
-ghost
-giga-octets
-git
-glitch
-gnutls
-grab
-group
-gzip
-halfop
-halfops
-handshake
-hash
-hashtable
-hdata
-he
-headless
-help
-here
-hexa
-hh
-hidden
-hide
-highest
-highlight
-highlights
-history
-hold
-hook
-hooks
-horiz
-host
-hotlist
-hsignal
-hup
-ident
-identify
-ids
-ignored
-inclose
-include
-indent
-infolist
-infolistes
-infolists
-init
-install
-installremove
-int
-integer
-interval
-invite-notify
-irc
-ison
-iterations
-javascript
-join
-json
-jump
-keep
-key
-keys
-kf
-kickban
-kill
-killall
-l'autojoin
-l'id
-lag
-last
-layout
-leave
-left
-legacy
-length
-lengthscr
-level
-lib
-libera
-libgcrypt
-libs
-lightblue
-lightcyan
-lightgreen
-lightmagenta
-lightred
-limit
-line
-lines
-linux
-list
-listdefault
-listdict
-listdiff
-listen
-listfull
-listitems
-listrelay
-listvar
-load
-logger
-loggers
-lower
-lowest
-ls
-lua
-mallinfo
-malloc
-marked
-mask
-memory
-merge
-merged
-meta
-meta-
-method
-mirc
-missing
-modified
-mouse
-move
-msg
-msgN
-msgbuffer
-multi-prefix
-multiline
-my
-n-
-name
-names
-ncurses
-near
-network
-newbuffer
-newline
-next
-nf
-nick
-nickbot
-nicklist
-nicks
-nickserv
-no-connect
-noautoload
-nobg
-nocl
-noflush
-nohelp
-nojoin
-noln
-nonblock
-nooption
-norc
-nosh
-nostdin
-nosw
-noswitch
-notify
-notls
-null
-num
-number
-numeric
-object
-oerr
-of
-offline
-oftc
-ok
-ol
-ops
-osinfo
-ovh
-paramN
-params
-parted
-pass
-passphrase
-password
-password-store
-paste
-path
-paused
-pct
-pending
-perl
-permessage-deflate
-pgdn
-pgup
-pid
-ping
-pong
-pos
-prefix
-prev
-previous
-print
-priority
-private
-privmsg
-property
-ptr
-py
-quit
-quoted
-rafraichie
-rafraichir
-rafraichissement
-random
-raw
-rc
-realname
-reconnect
-recreate
-recv
-red
-redirected
-redo
-refresh
-regex
-register
-relay
-reload
-remote
-remove
-rename
-renumber
-reorder
-rep
-repeat
-reply
-req
-reset
-resetall
-resetctxt
-resize
-restart
-restore
-return
-rev
-revindex
-revscr
-rgb
-right
-rlimit
-root
-ruby
-run
-run-command
-runtime
-rusage
-rw-rw-r--
-réinit
-safe
-sasl
-save
-scheme
-screen
-scroll
-search
-secure
-selected
-send
-server
-server-time
-setauto
-setdict
-setname
-setnew
-setrlimit
-setvar
-sh
-share
-shift
-shift-
-shift-Tab
-size
-skipempty
-sockaddr
-sorted
-space
-speaking
-spell
-split
-splith
-splitv
-ss
-start
-status
-stderr
-stdin
-stdout
-str
-strcasecmp
-strftime
-strftimeval
-strip
-strlen
-sucks
-suffix
-suggest
-sum
-sw
-switch
-sys
-tLe
-tab
-target
-tcl
-term
-text
-tg
-time
-timeout
-timer
-tiny
-title
-tls
-tlscertkey
-to
-toggle
-toggleautoload
-togglecmd
-topic
-totp
-trigger
-triggers
-trim
-typing
-téra-octets
-unalias
-unavailable
-unban
-unbind
-unbindctxt
-undef
-undo
-unhide
-unicode
-unix
-unload
-unmerge
-unread
-unset
-up
-update
-upper
-url
-urlserver
-usec
-userhost-in-names
-username
-users
-usr
-util
-valer
-verbose
-verify
-versiongit
-visited
-voice
-wait
-waiting
-waitpid
-wallops
-wcswidth
-wctype
-wcwidth
-websocket
-websockets
-weechat
-where
-white
-whitespace
-whois
-width
-window
-windows
-without
-word
-words
-xdigit
-xfer
-xxx
-xyz
-yellow
-yes
-yy
-zero
-zlib
-zstd
-Échap
@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: 2026 Sébastien Helleu <flashcode@flashtux.org>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[check]
-select = [
-    "checks",
-]
-ignore = [
-    "brackets",
-    "double-quotes",
-    "double-words",
-    "header",
-    "html-tags",
-    "paths",
-    "punc-space-str",
-    "unchanged",
-    "unicode-ctrl",
-    "urls",
-]
-path_words = "."
-langs = [
-    "en_US",
-    "fr",
-]
@@ -6,50 +6,11 @@ SPDX-License-Identifier: GPL-3.0-or-later

 # WeeChat ChangeLog

-## Version 4.9.2 (2026-06-07)
-
-### Fixed
-
- api: fix infinite loop in function string_replace when the search string is empty
- irc: limit size of data received from the server to prevent memory exhaustion
- irc: fix out-of-bounds read on incoming DCC command with a quoted filename ending the message ([#2322](https://github.com/weechat/weechat/issues/2322))
- relay: limit size of received websocket frame and HTTP body to prevent memory exhaustion
- relay: limit size of partial message received while reading an HTTP request to prevent memory exhaustion
- relay: fix out-of-bounds read in dump of data ([#2324](https://github.com/weechat/weechat/issues/2324))
- xfer: replace directory separator in remote nick by underscore in download filename to prevent writing the file outside the download directory ([#2321](https://github.com/weechat/weechat/issues/2321))
- xfer: fix out-of-bounds read when receiving empty line in DCC chat ([#2323](https://github.com/weechat/weechat/issues/2323))
-
-## Version 4.9.1 (2026-05-31)
-
-### Fixed
-
- core: fix option weechat.look.color_real_white not applied when color is "white" on 16+ colors terminals ([#1742](https://github.com/weechat/weechat/issues/1742))
- irc: fix tag in message with list of names when joining a channel
- relay: limit size of decompressed websocket frame with permessage-deflate to prevent memory exhaustion ([GHSA-v2v4-45wm-5cr3](https://github.com/weechat/weechat/security/advisories/GHSA-v2v4-45wm-5cr3))
- relay: fix timing attack on password authentication ([GHSA-vhv8-g2r9-cwcc](https://github.com/weechat/weechat/security/advisories/GHSA-vhv8-g2r9-cwcc))
- api, relay: fix timing attack on TOTP validation ([GHSA-vhv8-g2r9-cwcc](https://github.com/weechat/weechat/security/advisories/GHSA-vhv8-g2r9-cwcc))
-
-## Version 4.9.0 (2026-03-29)
-
-### Changed
-
- core: add option `-e` to evaluate all commands before executing them in command `/eval`
- xfer: evaluate option xfer.network.own_ip
-
-### Added
-
- typing: add option typing.look.item_text ([#2305](https://github.com/weechat/weechat/issues/2305))
+## Version 4.8.3 (under dev)

 ### Fixed

 - core: fix crash with `/eval` when the current buffer is closed in a command
- core: fix buffer size in function util_parse_time, causing buffer overflow error in unit tests
- irc: fix display of CTCP query sent multiple times to the same user when capability echo-message is enabled ([#2309](https://github.com/weechat/weechat/issues/2309))
- irc: fix unit of server option `anti_flood` from seconds to milliseconds in output of `/server listfull`
- irc: fix creation of irc.msgbuffer option without a server name
- irc: ignore self join if the channel is already joined ([#2291](https://github.com/weechat/weechat/issues/2291))
- relay/api: fix memory leaks in resources "ping" and "sync"
- relay/api: fix memory leak in receive of message from remote WeeChat

 ## Version 4.8.2 (2026-03-06)

@@ -28,7 +28,6 @@ project(weechat C)
 # CMake options
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_SKIP_RPATH ON)

 # compiler options
@@ -53,8 +52,16 @@ else()
  set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 endif()

+# license
+set(LICENSE "GPL3")
+
 # add definitions for version and license
-add_definitions(-DWEECHAT_VERSION="${VERSION}" -DWEECHAT_LICENSE="GPL3")
+if(COMMAND cmake_policy)
+  cmake_policy(SET CMP0005 NEW)
+  add_definitions(-DWEECHAT_VERSION="${VERSION}" -DWEECHAT_LICENSE="${LICENSE}")
+else()
+  add_definitions(-DWEECHAT_VERSION='"${VERSION}"' -DWEECHAT_LICENSE='"${LICENSE}"')
+endif()

 # package string
 set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -185,6 +192,15 @@ set(WEECHAT_HOME "${WEECHAT_HOME}" CACHE
  FORCE)
 mark_as_advanced(CLEAR WEECHAT_HOME)

+if(COMMAND cmake_policy)
+  if(POLICY CMP0003)
+    cmake_policy(SET CMP0003 NEW)
+  endif()
+  if(POLICY CMP0017)
+    cmake_policy(SET CMP0017 NEW)
+  endif()
+endif()
+
 add_definitions(-DHAVE_CONFIG_H)

 include(FindPkgConfig)
@@ -242,29 +258,22 @@ list(APPEND EXTRA_LIBS ${GNUTLS_LDFLAGS})

 # Check for zlib
 find_package(ZLIB REQUIRED)
-list(APPEND EXTRA_LIBS ${ZLIB_LIBRARY})

 # Check for zstd
 if(ENABLE_ZSTD)
  pkg_check_modules(LIBZSTD REQUIRED libzstd)
-  include_directories(${LIBZSTD_INCLUDE_DIRS})
-  list(APPEND EXTRA_LIBS ${LIBZSTD_LDFLAGS})
  add_definitions(-DHAVE_ZSTD)
 endif()

 # Check for cJSON
 if(ENABLE_CJSON)
  pkg_check_modules(LIBCJSON REQUIRED libcjson)
-  include_directories(${LIBCJSON_INCLUDE_DIRS})
  add_definitions(-DHAVE_CJSON)
 endif()

 # Check for iconv
 find_package(Iconv)
 if(ICONV_FOUND)
-  if(ICONV_LIBRARY)
-    list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
-  endif()
  add_definitions(-DHAVE_ICONV)
 endif()

@@ -274,15 +283,18 @@ pkg_check_modules(LIBCURL REQUIRED libcurl>=7.68.0)
 include_directories(${LIBCURL_INCLUDE_DIRS})
 list(APPEND EXTRA_LIBS ${LIBCURL_LDFLAGS})

-list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS})
+find_library(DL_LIBRARY
+  NAMES dl
+  PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec
+)
+if(DL_LIBRARY)
+  list(APPEND EXTRA_LIBS ${DL_LIBRARY})
+endif()

 add_subdirectory(icons)

 if(ENABLE_NLS)
  find_package(Gettext REQUIRED)
-  if(LIBINTL_LIBRARY)
-    list(APPEND EXTRA_LIBS ${LIBINTL_LIBRARY})
-  endif()
  find_package(Intl REQUIRED)
  include_directories(${Intl_INCLUDE_DIRS})
  list(APPEND EXTRA_LIBS "${Intl_LIBRARIES}")
@@ -291,30 +303,20 @@ else()
  add_custom_target(translations COMMAND true)
 endif()

-if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-  find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
-  check_function_exists(backtrace HAVE_BACKTRACE)
-  list(APPEND EXTRA_LIBS "execinfo")
-else()
-  check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
-endif()
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
-  list(APPEND EXTRA_LIBS "network")
-else()
-  list(APPEND EXTRA_LIBS "pthread")
-endif()
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
-  list(APPEND EXTRA_LIBS "socket" "nsl")
-endif()
-
-list(APPEND EXTRA_LIBS "m")
-
 add_subdirectory(src)
 add_subdirectory(doc)

-enable_testing()
+if(ENABLE_TESTS)
+  find_package(CppUTest)
+  if(CPPUTEST_FOUND)
+    enable_testing()
+  else()
+    message(SEND_ERROR "CppUTest not found")
+  endif()
+else()
+  enable_testing()
+  add_test(NAME notests COMMAND true)
+endif()
 add_subdirectory(tests)

 configure_file(config.h.cmake config.h @ONLY)
@@ -11,8 +11,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </p>

 [![Mastodon](https://img.shields.io/badge/mastodon-follow-blue.svg)](https://hostux.social/@weechat)
+[![Diaspora*](https://img.shields.io/badge/diaspora*-follow-blue.svg)](https://diasp.eu/u/weechat)
 [![X](https://img.shields.io/badge/x-follow-blue.svg)](https://x.com/WeeChatClient)
 [![Devel blog](https://img.shields.io/badge/devel%20blog-follow-blue.svg)](https://blog.weechat.org/)
+[![Slant](https://img.shields.io/badge/slant-recommend-28acad.svg)](https://www.slant.co/topics/1323/~best-irc-clients-for-linux)
 [![Donate](https://img.shields.io/badge/help-donate%20%E2%9D%A4-ff69b4.svg)](https://weechat.org/donate/)

 [![CI](https://github.com/weechat/weechat/workflows/CI/badge.svg)](https://github.com/weechat/weechat/actions)
@@ -19,11 +19,3 @@ path = [
 precedence = "override"
 SPDX-FileCopyrightText = "2003-2026 Sébastien Helleu <flashcode@flashtux.org>"
 SPDX-License-Identifier = "GPL-3.0-or-later"
-
-[[annotations]]
-path = [
-    ".poexam/*.dic",
-]
-precedence = "override"
-SPDX-FileCopyrightText = "2026 Sébastien Helleu <flashcode@flashtux.org>"
-SPDX-License-Identifier = "GPL-3.0-or-later"
@@ -1,5 +1,6 @@
 Source: weechat-devel
 Section: net
+Priority: optional
 Maintainer: Sébastien Helleu <flashcode@flashtux.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
@@ -12,7 +13,7 @@ Build-Depends:
    libperl-dev,
    python3-dev,
    libaspell-dev,
-    liblua5.4-dev,
+    liblua5.3-dev,
    tcl8.6-dev,
    guile-3.0-dev,
    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
@@ -23,7 +24,7 @@ Build-Depends:
    libzstd-dev,
    zlib1g-dev,
    libcjson-dev
-Standards-Version: 4.7.3
+Standards-Version: 4.7.2
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat
@@ -1,12 +1,3 @@
-weechat (4.8.1-1) unstable; urgency=medium
-
-  * New upstream release
-  * Bump Standards-Version to 4.7.3
-  * Update debian/copyright file (new year)
-  * Remove redundant priority optional field from debian/control
-
- -- Emmanuel Bouthenot <kolter@debian.org>  Fri, 23 Jan 2026 22:02:31 +0000
-
 weechat (4.7.2-1) unstable; urgency=medium

  * New upstream release (Closes: #1119787)
@@ -49,12 +40,6 @@ weechat (4.4.2-1) unstable; urgency=medium
  * New upstream release
    - fix crash where exiting (Closes: #1076532)
    - fix a minor security issue (Closes: #1081942)
-  * Fix possible privacy breach with html documentation which includes
-    stylesheets and fonts (font-awesome) hosted on remote CDN (Cloudflare)
-    by replacing them during build process by the ones provided in
-    fonts-font-awesome package (also added as dependency on weechat-doc).
-  * Refresh weechat-doc with minor changes and add some documentation in
-    Serbian and Czech.
  * Bump Standards-Version to 4.7.0

 -- Emmanuel Bouthenot <kolter@debian.org>  Sun, 22 Sep 2024 13:08:28 +0000
@@ -1,5 +1,6 @@
 Source: weechat
 Section: net
+Priority: optional
 Maintainer: Emmanuel Bouthenot <kolter@debian.org>
 Build-Depends:
    asciidoctor (>= 1.5.4),
@@ -12,7 +13,7 @@ Build-Depends:
    libperl-dev,
    python3-dev,
    libaspell-dev,
-    liblua5.4-dev,
+    liblua5.3-dev,
    tcl8.6-dev,
    guile-3.0-dev,
    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
@@ -23,7 +24,7 @@ Build-Depends:
    libzstd-dev,
    zlib1g-dev,
    libcjson-dev
-Standards-Version: 4.7.3
+Standards-Version: 4.7.2
 Homepage: https://weechat.org/
 Vcs-Git: https://salsa.debian.org/kolter/weechat.git
 Vcs-Browser: https://salsa.debian.org/kolter/weechat
@@ -458,7 +458,7 @@ für weitere Informationen die das Farbmanagement betreffen.
 [[search_text]]
 === Wie kann ich in einem Buffer nach einem Text suchen (vergleichbar /lastlog in irssi)?

-Die Standardtastenbelegung lautet kbd:[Ctrl+s]
+Die Standardtastenbelegung lautet kbd:[Ctrl+r]
 (der dazugehörige Befehl: `+/input search_text_here+`).
 Um zu Highlight-Nachrichten zu springen:
 kbd:[Alt+p] für vorherige, kbd:[Alt+n] für die nächste Nachricht.
@@ -128,7 +128,6 @@ WeeChat "core" is located in following directories:
 |===
 | Path/file                     | Description
 | core/                         | Core functions: entry point, internal structures.
-|    core-args.c                | Command-line arguments.
 |    core-arraylist.c           | Array lists.
 |    core-backtrace.c           | Display a backtrace after a crash.
 |    core-calc.c                | Calculate result of expressions.
@@ -656,9 +655,9 @@ Example:
 [source,c]
 ----
 /*
- * Check if a string with boolean value is valid.
+ * Checks if a string with boolean value is valid.
 *
- * Return:
+ * Returns:
 *   1: boolean value is valid
 *   0: boolean value is NOT valid
 */
@@ -933,9 +932,9 @@ Example: creation of a new window (from _src/gui/gui-window.c_):
 [source,c]
 ----
 /*
- * Create a new window.
+ * Creates a new window.
 *
- * Return pointer to new window, NULL if error.
+ * Returns pointer to new window, NULL if error.
 */

 struct t_gui_window *
@@ -441,7 +441,7 @@ for more information about colors management.
 [[search_text]]
 === How can I search text in buffer (like /lastlog in irssi)?

-The default key is kbd:[Ctrl+s] (command is: `+/input search_text_here+`).
+The default key is kbd:[Ctrl+r] (command is: `+/input search_text_here+`).
 And jump to highlights: kbd:[Alt+p] / kbd:[Alt+n].

 See link:weechat_user.en.html#key_bindings[User's guide / Key bindings ^↗^^]
@@ -454,7 +454,7 @@ información sobre la gestión de los colores.
 [[search_text]]
 === ¿Cómo busco texto en un buffer (como /lastlog en irssi)?

-La tecla predeterminada es kbd:[Ctrl+s] (el comando es: `+/input texto_a_buscar_aquí+`).
+La tecla predeterminada es kbd:[Ctrl+r] (el comando es: `+/input texto_a_buscar_aquí+`).
 Y para saltar a los textos resaltados: kbd:[Alt+p] / kbd:[Alt+n].

 Vea la link:weechat_user.en.html#key_bindings[Guía del usuario / Atajos de teclado ^↗^^]
@@ -9,7 +9,7 @@ https://weechat.org/doc/[guide utilisateur de WeeChat].

 Avec l'extension irc, vous pouvez vous connecter à un serveur avec une URL, comme ceci :

-    irc[6][s]://[[pseudo][:mot_de_passe]@]serveur[:port][/#canal1[,#canal2...]]
+    irc[6][s]://[[pseudo][:motdepasse]@]serveur[:port][/#canal1[,#canal2...]]

 Pour rejoindre le canal IRC de support WeeChat avec le pseudo "monpseudo" :

@@ -129,7 +129,6 @@ Le cœur de WeeChat est situé dans les répertoires suivants :
 |===
 | Chemin/fichier                | Description
 | core/                         | Fonctions du cœur : point d'entrée, structures internes.
-|    core-args.c                | Paramètres de ligne de commande.
 |    core-arraylist.c           | Listes avec tableau (« arraylists »).
 |    core-backtrace.c           | Afficher une trace après un plantage.
 |    core-calc.c                | Calcul du résultat d'expressions.
@@ -660,9 +659,9 @@ Exemple :
 [source,c]
 ----
 /*
- * Check if a string with boolean value is valid.
+ * Checks if a string with boolean value is valid.
 *
- * Return:
+ * Returns:
 *   1: boolean value is valid
 *   0: boolean value is NOT valid
 */
@@ -943,9 +942,9 @@ Exemple : création d'une nouvelle fenêtre (de _src/gui/gui-window.c_) :
 [source,c]
 ----
 /*
- * Create a new window.
+ * Creates a new window.
 *
- * Return pointer to new window, NULL if error.
+ * Returns pointer to new window, NULL if error.
 */

 struct t_gui_window *
@@ -457,7 +457,7 @@ pour plus d'information sur la gestion des couleurs.
 [[search_text]]
 === Comment puis-je chercher du texte dans le tampon (comme /lastlog dans irssi) ?

-La touche par défaut est kbd:[Ctrl+s] (la commande est : `+/input search_text_here+`).
+La touche par défaut est kbd:[Ctrl+r] (la commande est : `+/input search_text_here+`).
 Et sauter aux highlights : kbd:[Alt+p] / kbd:[Alt+n].

 Voir le link:weechat_user.fr.html#key_bindings[Guide utilisateur / Raccourcis clavier par défaut ^↗^^]
@@ -3351,7 +3351,7 @@ Pour ajouter une donnée sécurisée, utilisez la commande `/secure set`, par
 exemple un mot de passe pour le serveur IRC _libera_ :

 ----
-/secure set libera mot_de_passe
+/secure set libera motdepasse
 ----

 Pour plus de confort, les données sécurisées peuvent être affichées dans un
@@ -4712,7 +4712,7 @@ Il est fortement recommandé de définir un mot de passe pour le relai, avec ces
 commandes :

 ----
-/secure set relay mot_de_passe
+/secure set relay motdepasse
 /set relay.network.password "${sec.data.relay}"
 ----

@@ -4793,7 +4793,7 @@ le nom interne du serveur dans la commande IRC "PASS", avec le format
 (voir l'exemple ci-dessous) :

 ----
-PASS serveur:mot_de_passe
+PASS serveur:motdepasse
 ----

 Exemple : proxy IRC avec TLS pour tout serveur (le client choisira) :
@@ -4809,7 +4809,7 @@ Exemple : proxy IRC sans TLS seulement pour le serveur "libera" :
 ----

 Maintenant vous pouvez vous connecter sur le port 8000 avec n'importe quel
-client IRC en utilisant le mot de passe "mot_de_passe" (ou "libera:mot_de_passe"
+client IRC en utilisant le mot de passe "motdepasse" (ou "libera:motdepasse"
 si aucun serveur n'a été spécifié dans le relai).

 Par exemple si vous utilisez WeeChat comme client IRC du relai, avec un serveur
@@ -4822,7 +4822,7 @@ avec ces commandes :
 ----

 [[relay_api_protocol]]
-=== Protocole API
+=== API protocol

 L'extension Relay peut envoyer les données à un autre WeeChat ou une interface
 distante avec un protocol HTTP de type API REST.
@@ -4840,12 +4840,12 @@ Par exemple :
 ----

 Maintenant vous pouvez vous connecter sur le port 9000 avec une interface
-distante en utilisant le mot de passe "mot_de_passe".
+distante en utilisant le mot de passe "motdepasse".

 Pour vous connecter à un relai _api_ avec WeeChat :

 ----
-/remote add weechat http://localhost:9000 -password=mot_de_passe
+/remote add weechat http://localhost:9000 -password=motdepasse
 /remote connect weechat
 ----

@@ -4882,7 +4882,7 @@ Par exemple :
 ----

 Maintenant vous pouvez vous connecter sur le port 9500 avec une interface
-distante en utilisant le mot de passe "mot_de_passe".
+distante en utilisant le mot de passe "motdepasse".

 [[relay_websocket]]
 === WebSocket
@@ -490,7 +490,7 @@ for more information about colors management.
 [[search_text]]
 === Come posso cercare testo nel buffer (come /lastlog con irssi)?

-Il tasto predefinito è kbd:[Ctrl+s] (il comando è: `+/input search_text_here+`).
+Il tasto predefinito è kbd:[Ctrl+r] (il comando è: `+/input search_text_here+`).
 E per passare alle notifiche: kbd:[Alt+p] / kbd:[Alt+n].

 // TRANSLATION MISSING
@@ -140,8 +140,6 @@ WeeChat "core" は以下のディレクトリに配置されています:
 |===
 | パス/ファイル名               | 説明
 | core/                         | コア関数: エントリポイント、内部構造体
-// TRANSLATION MISSING
-|    core-args.c                | Command-line arguments.
 |    core-arraylist.c           | 配列リスト
 |    core-backtrace.c           | クラッシュした際にバックトレースを表示
 // TRANSLATION MISSING
@@ -810,9 +808,9 @@ C 言語のコードを書く際には以下の基本的なルールを *必ず*
 [source,c]
 ----
 /*
- * Check if a string with boolean value is valid.
+ * Checks if a string with boolean value is valid.
 *
- * Return:
+ * Returns:
 *   1: boolean value is valid
 *   0: boolean value is NOT valid
 */
@@ -1085,9 +1083,9 @@ struct t_gui_window *gui_current_window = NULL; /* current window           */
 [source,c]
 ----
 /*
- * Create a new window.
+ * Creates a new window.
 *
- * Return pointer to new window, NULL if error.
+ * Returns pointer to new window, NULL if error.
 */

 struct t_gui_window *
@@ -451,7 +451,7 @@ with command `/color`).
 [[search_text]]
 === どうすればバッファ内の文字列を検索できますか (irssi の /lastlog の様に)。

-デフォルトのキーは kbd:[Ctrl+s] です (コマンドは: `+/input search_text_here+`)。
+デフォルトのキーは kbd:[Ctrl+r] です (コマンドは: `+/input search_text_here+`)。
 ハイライト部分へのジャンプは: kbd:[Alt+p] / kbd:[Alt+n]

 この機能に関するより詳しい情報はlink:weechat_user.ja.html#key_bindings[ユーザーズガイド / デフォルトのキー割り当て ^↗^^]を参照してください
@@ -7,7 +7,8 @@
 Kompletna dokumentacja na temat opcji wtyczek dostępna jest
 w https://weechat.org/doc/[WeeChat user's guide].

-Używając wtyczki irc możesz połączyć się z serwerem używając URLa w poniższm formacie:
+// TRANSLATION MISSING
+With irc plugin, you can connect to a server with an URL like:

    irc[6][s]://[[nick][:hasło]@]serwer[:port][/#kanał1[,#kanał2...]]

@@ -436,7 +436,7 @@ link:weechat_user.pl.html#colors[Poradniku użytkownika / Kolory ^↗^^].
 [[search_text]]
 === Jak mogę wyszukać tekst w buforze (jak za pomocą /lastlog w irssi)?

-Domyślny skrót klawiszowy to kbd:[Ctrl+s] (komenda: `+/input search_text_here+`).
+Domyślny skrót klawiszowy to kbd:[Ctrl+r] (komenda: `+/input search_text_here+`).

 Poruszanie się między podświetleniami: kbd:[Alt+p] / kbd:[Alt+n].

@@ -6,7 +6,8 @@
 // tag::plugin_options[]
 За комплетну документацију у вези опција додатака, молимо вас да погледате документацију за додатке у https://weechat.org/doc/[WeeChat корисничком упутству].

-Помоћу irc додатка, са сервером се повезујете URL адресом као што је:
+// TRANSLATION MISSING
+With irc plugin, you can connect to a server with an URL like:

    irc[6][s]://[[надимак][:лозинка]@]сервер[:порт][/#канал1[,#канал2...]]

@@ -128,8 +128,6 @@ WeeChat „језгро” се налази у следећим директо
 |===
 | Путања/фајл                   | Опис
 | core/                         | Функције језгра: тачка улаза, интерне структуре.
-// TRANSLATION MISSING
-|    core-args.c                | Command-line arguments.
 |    core-arraylist.c           | Листе низова.
 |    core-backtrace.c           | Испис трага након краха.
 |    core-calc.c                | Израчунавање резултата израза.
@@ -653,9 +651,9 @@ WeeChat „језгро” се налази у следећим директо
 [source,c]
 ----
 /*
- * Check if a string with boolean value is valid.
+ * Checks if a string with boolean value is valid.
 *
- * Return:
+ * Returns:
 *   1: boolean value is valid
 *   0: boolean value is NOT valid
 */
@@ -916,9 +914,9 @@ struct t_gui_window *gui_current_window = NULL; /* current window           */
 [source,c]
 ----
 /*
- * Create a new window.
+ * Creates a new window.
 *
- * Return pointer to new window, NULL if error.
+ * Returns pointer to new window, NULL if error.
 */

 struct t_gui_window *
@@ -380,7 +380,7 @@ term screen-256color
 [[search_text]]
 === Како могу да претражујем текст у баферу (као /lastlog у програму irssi)?

-Подразумевани тастер је kbd:[Ctrl+s] (команда је: `+/input овде_текст_претраге+`). И скок на истицања: kbd:[Alt+p] / kbd:[Alt+n].
+Подразумевани тастер је kbd:[Ctrl+r] (команда је: `+/input овде_текст_претраге+`). И скок на истицања: kbd:[Alt+p] / kbd:[Alt+n].

 За више о овој могућности, погледајте link:weechat_user.sr.html#key_bindings[Корисничко упутство / Тастерске пречице ^↗^^].

@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-12 20:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:26+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: cs\n"
@@ -34,159 +34,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Poedit 2.0.1\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: nemohu se připojit k odesílateli"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "použít stejnou barvu přezdívky pro kanál a soukromý rozhovor"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "zobrazí WeeChat logo při spuštění"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "zobrazí WeeChat logo při spuštění"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr "příkaz spuštěný při startu WeeChat, po načtení pluginů"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sChyba: nemohu uložit sezení do souboru"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "zobrazí verzi WeeChat při spuštění"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "ukazatel pluginu (volitelný)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, zkompilováno %s %s\n"
-"Vyvinutý Sébastienem Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr ""
-
-#, fuzzy
-#| msgid "Usage: %s [option...] [plugin:option...]\n"
-msgid "[option...] [plugin:option...]"
-msgstr "Použití: %s [volba...] [plugin:volba...]\n"
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Chyba: chybí argument pro volbu \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Seznam polí:"

@@ -295,7 +142,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sChyba: nemohu posunout pole \"%s\""

 #, fuzzy, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr "%sChyba: bufer číslo %d je mimo rozsah (musí být mezi 1 a %d)"

 msgid "Buffers list:"
@@ -660,9 +507,9 @@ msgstr ""
 "opatření)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] "přidána %d nová klávesa (kontext: \"%s\")"
+msgstr[0] "přidána %d nová klávesa"
 msgstr[1] "přidány %d nové klávesy (kontext: \"%s\")"
 msgstr[2] "přidáno %d nových kláves (kontext: \"%s\")"

@@ -708,7 +555,7 @@ msgstr "%sChyba: rozložení \"%s\" pro příkaz \"%s\" už existuje"

 #, c-format
 msgid "Layout \"%s\" has been renamed to \"%s\""
-msgstr "Rozložení \"%s\" přejmenováno na %s"
+msgstr "Rozložení \"%s\" přejmenováno na  %s"

 msgid "Mouse enabled"
 msgstr "Myš povolena"
@@ -1276,7 +1123,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1761,7 +1608,7 @@ msgstr "vyhodnotit výraz"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr "[-n|-s] <výraz> || [-n] -c <výraz1> <operátor> <výraz2>"

@@ -1773,9 +1620,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2314,7 +2158,7 @@ msgstr "zobrazí nápovědu k příkazům a volbám"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"

 msgid ""
@@ -2377,9 +2221,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3266,7 +3110,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3543,20 +3387,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3815,7 +3659,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -4350,7 +4194,7 @@ msgid ""
 "Warning: you should now issue /save to write option "
 "weechat.look.save_config_on_exit in configuration file"
 msgstr ""
-"Upozornění: měl by jste nyní provést /save pro zapsání volby "
+"Upozornění: měl by jste nyní provést /save pro zapsání volby  "
 "weechat.look.save_config_on_exit do konfiguračního souboru"

 msgid ""
@@ -6148,7 +5992,7 @@ msgstr "%sNekorektní číslo barvy \"%s\" (musí být mezi %d a %d)"

 #, c-format
 msgid "Limit for resource \"%s\" has been set to %s"
-msgstr "Limit pro zdroj \"%s\" byl nastaven na %s"
+msgstr "Limit pro zdroj \"%s\" byl nastaven na  %s"

 #, fuzzy, c-format
 msgid "%sUnable to set resource limit \"%s\" to %s: error %d %s"
@@ -6215,8 +6059,8 @@ msgstr "zápis - proměnná"
 msgid "read - object type"
 msgstr "čtení - typ objektu"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "čtení - chybný typ objektu (očekáván \"object start\")"
+msgid "read - bad object type ('object start' expected)"
+msgstr "čtení - chybný typ objektu (očekáván 'object start')"

 msgid "read - object id"
 msgstr "čtení - id objektu"
@@ -6336,6 +6180,102 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "Konec příkazu '%s', vypršel časový limit (%.1fs)"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, zkompilováno %s %s\n"
+"Vyvinutý Sébastienem Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Použití: %s [volba...] [plugin:volba...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect\t\t\tvypne automatické připojení k serverům při startu\n"
+"  -c, --colors\t\t\t\tzobrazí výchozí barvy v terminálu\n"
+"  -d, --dir <cesta>\t  \t\tnastaví domovský adresář WeeChat (výchozí: "
+"~/.weechat)\n"
+"\t\t\t\t\t\t\t(pokud není použita,  weechat zkusí načíst promněnou prostředí "
+"WEECHAT_HOME)\n"
+"  -h, --help\t\t\t\t\ttato nápověda\n"
+"  -l, --license\t\t\t\t\tlicence WeeChatu\n"
+"  -p, --no-plugin\t\t\t\tnenačítej při startu pluginy\n"
+"  -r, --run-command <cmd>\tspusť příkaz po startu\n"
+"\t\t\t\t\t\t\t(více příkazů jde oddělit středníkem)\n"
+"  -s, --no-script\t\t\t\tnenačítej skripty při startu\n"
+"      --upgrade\t\t\t\tupgraduj WeeChat za pomocí uloženní stavu (viz /help "
+"upgrade v WeeChatu)\n"
+"  -v, --version\t\t\t\tzobraz verzi WeeChatu\n"
+"  plugin:option\t\t\t\tvolba pro plugin (viz: man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Chyba: chybí argument pro volbu \"%s\"\n"
+
 #, fuzzy
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "1 pokud se WeeChat aktualizuje (příkaz `/upgrade`)"
@@ -7076,7 +7016,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8624,7 +8564,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: nepřipojen k serveru \"%s\"!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: automatické znovupřipojené je zrušeno"

 #, c-format
@@ -8793,15 +8733,6 @@ msgstr[0] "sekunda"
 msgstr[1] "sekundy"
 msgstr[2] "sekund"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "sekunda"
-msgstr[1] "sekundy"
-msgstr[2] "sekund"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
@@ -8967,7 +8898,7 @@ msgstr "vykonat příkaz na všech kanálech všech připojených serverů"
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[-current] [-exclude=<kanál>[,<kanál>...]] <příkaz> [<argumenty>]"

 #, fuzzy
@@ -9069,8 +9000,8 @@ msgstr "vykonat příkaz na všech kanálech všech připojených serverů"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[-current] [-exclude=<kanál>[,<kanál>...]] <příkaz> [<argumenty>]"

 #, fuzzy
@@ -9123,8 +9054,8 @@ msgstr "vykonat příkaz na všech připojených serverech"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr "[-exclude=<server>[,<server>...]] <příkaz> [<argumenty>]"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -9288,7 +9219,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -11310,9 +11241,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -12781,7 +12711,7 @@ msgstr ""

 #, c-format
 msgid "%s%s: timeout"
-msgstr "%s%s: časový limit"
+msgstr "%s%s:  časový limit"

 #, c-format
 msgid "%s%s: unable to create socket"
@@ -14621,9 +14551,10 @@ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" nenalezen"
 msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: nepřipojen k serveru \"%s\"!"

-#, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: auto-reconnection is cancelled"
+msgid "remote[%s]: auto-reconnection is cancelled"
+msgstr "%s: automatické znovupřipojené je zrušeno"

 #, fuzzy, c-format
 #| msgid "%s%s: server \"%s\" already exists for \"%s\" command"
@@ -15570,7 +15501,7 @@ msgid "%s: script \"%s\" is not held anymore"
 msgstr "%s: server %s%s%s již není dočasným"

 msgid "Error: file not found"
-msgstr "Chyba: soubor nenalezen"
+msgstr "Chyba: soubor  nenalezen"

 msgid "Source code:"
 msgstr "Zdrojový kód:"
@@ -16164,7 +16095,7 @@ msgid "Spell checking is enabled"
 msgstr "Kontrola pravopisu je zapnuta"

 msgid "Spell checking is disabled"
-msgstr "Kontrola pravopisu je vypnuta"
+msgstr "Kontrola  pravopisu je vypnuta"

 #, c-format
 msgid "Default dictionary: %s"
@@ -16981,7 +16912,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: \"%s\" není validní regulární výraz (%s)"

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -17015,11 +16946,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -17171,9 +17097,8 @@ msgstr "nečekat na ACK při odesílání souboru"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "IP nebo DNS adresa použitá pro posílání souborů/rozhovorů (pokud je prázdné "
 "použije se lokální IP)"
@@ -17322,7 +17247,7 @@ msgstr "%s%s: nemohu odeslat ACK k odesílateli"

 #, c-format
 msgid "%s%s: wrong CRC32 for file %s"
-msgstr "%s%s: špatný kontrolní součet CRC32 souboru %s"
+msgstr "%s%s: špatný  kontrolní součet CRC32 souboru %s"

 #, fuzzy, c-format
 msgid "%s%s: CRC32 error while resuming"
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-21 17:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2026-03-16 13:19+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de_DE\n"
@@ -41,169 +41,6 @@ msgstr ""
 "X-Poedit-Bookmarks: -1,-1,180,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-msgid "disable auto-connect to servers at startup"
-msgstr ""
-"deaktiviert das automatische Verbinden mit den Servern beim Start von WeeChat"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr "zeigt die Standardfarben des Terminals an"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr "-d, --dir <Pfad>"
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-"legt einen Konfigurationsordner für WeeChat fest oder fünf verschiedene "
-"Verzeichnisse, die durch Doppelpunkte getrennt werden (in folgender "
-"Reihenfolge: Konfiguration, Daten, Zustand, Cache, Laufzeit) "
-"(Umgebungsvariable WEECHAT_HOME wird genutzt, falls diese Option nicht "
-"verwendet wird)"
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-"erstellt ein temporäres WeeChat Heimatverzeichnis, welches beim Beenden von "
-"WeeChat gelöscht wird (nicht nutzbar mit Option \"-d\")"
-
-#. TRANSLATORS: command line option "-h", "--help"
-msgid "display this help and exit"
-msgstr "zeigt diese Hilfe an"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr "Build-Informationen anzeigen und beenden"
-
-#. TRANSLATORS: command line option "-l", "--license"
-msgid "display WeeChat license and exit"
-msgstr "zeigt die Lizenz von WeeChat an"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-msgid "don't load any plugin at startup"
-msgstr "unterbindet beim Programmstart das Laden von Erweiterungen"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr "-P, --plugins <plugins>"
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-"beim Programmstart, werden nur die angegebenen Erweiterungen geladen (siehe /"
-"help weechat.plugin.autoload)"
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr "-r, --run-command <cmd>"
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"führt einen oder mehrere Befehle nach dem Start aus mehrere Befehle können "
-"durch ein Semikolon getrennt werden und sind evaluiert, diese Option kann "
-"mehrfach genutzt werden"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr "Skripts werden beim Programmstart nicht geladen"
-
-#. TRANSLATORS: command line option "--upgrade"
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr ""
-"führt ein WeeChat-Upgrade, mittels Sitzungsdateien durch (benutze in "
-"WeeChat /help upgrade)"
-
-#. TRANSLATORS: command line option "-v", "--version"
-msgid "display WeeChat version and exit"
-msgstr "zeigt die Version von WeeChat an"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-msgid "plugin:option"
-msgstr "plugin:option"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr "Einstellungen für Erweiterungen (siehe man weechat)"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr "--doc-gen <Pfad>"
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-"generiert Dateien, um die Dokumentation zu erstellen, danach Programm beenden"
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-"startet WeeChat im Deamon-Modus (fork, neue Prozessgruppe, Dateideskriptor "
-"geschlossen); standardmäßig blockiert WeeChat im Hintergrundmodus den "
-"Prozess und gibt das Terminal nicht frei"
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-"die Programmausgabe findet in der Standardausgabe an, anstatt sie in die "
-"Protokolldatei zu schreiben (Option wird ignoriert, falls die Option \"--"
-"daemon\" genutzt wird)"
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-"die Funktion dlclose wird nicht ausgeführt, nachdem Erweiterungen beendet "
-"wurden"
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr "deaktiviere init/deinit von gnutls"
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr "deaktiviere init/deinit von gcrypt"
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, kompiliert am %s %s\n"
-"Entwickelt von Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Aufruf:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[Option...] [Erweiterung:Option...]"
-
-msgid "Extra options in headless mode:"
-msgstr "Zusätzliche Optionen für den Hintergrundmodus:"
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-"Debug Optionen (für Tools wie valgrind, DIESE FUNKTIONEN SOLLTE NICHT IM "
-"PRODUKTIVEM EINSATZ GENUTZT WERDEN):"
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Fehler: fehlendes Argument für die Einstellung \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Liste der vorhandenen Infobars:"

@@ -310,7 +147,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sBar \"%s\" kann nicht gescrollt werden"

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""
 "%sBuffernummer %d ist außerhalb des gültigen Bereiches (es muss eine Zahl "
 "zwischen 1 und %d sein)"
@@ -663,9 +500,9 @@ msgstr ""
 "Tastenbelegung notwendig"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] "(%d) neue Taste hinzugefügt (Kontext: \"%s\")"
+msgstr[0] "(%d) neue Taste hinzugefügt"
 msgstr[1] "(%d) neue Tasten hinzugefügt (Kontext: \"%s\")"

 msgid "Stored layouts:"
@@ -1075,7 +912,7 @@ msgstr "%skeine Binärdatei angegeben"

 #, c-format
 msgid "Upgrading WeeChat with binary file: \"%s\"..."
-msgstr "Aktualisiere WeeChat mit Binärdatei \"%s\"..."
+msgstr "Aktualisiere WeeChat mit Binärdatei \"%s\"...."

 #, c-format
 msgid "%sUpgrade aborted"
@@ -1108,9 +945,10 @@ msgstr "kompiliert am"
 msgid "Windows list:"
 msgstr "Fensterliste:"

-#, c-format
+#, fuzzy, c-format
+#| msgid "%sPlugin \"%s\" not found"
 msgid "%sWindow \"%s\" not found"
-msgstr "%sFenster \"%s\" nicht gefunden"
+msgstr "%sErweiterung \"%s\" wurde nicht gefunden"

 #, c-format
 msgid "%sInvalid window number: \"%s\""
@@ -1275,13 +1113,9 @@ msgstr "Maske: Name, wobei der Platzhalter \"*\" zulässig ist"
 msgid "raw[set]: set a value for a bar property"
 msgstr "raw[set]: legt einen Wert für eine Bar-Eigenschaft fest"

-#, fuzzy
-#| msgid ""
-#| "option: option to change (for options list, look at /set weechat.bar."
-#| "<barname>.*)"
 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""
 "option: Option die geändert werden soll (eine Liste der möglichen Optionen "
 "findet man unter /set weechat.bar.<barname>.*)"
@@ -1348,8 +1182,8 @@ msgid ""
 "get <property> || jump smart|last_displayed|prev_visited|next_visited || "
 "<id>|<number>|-|+|<name>"
 msgstr ""
-"list || add [-free] [-switch] <name> || clear [<id>|<number>|<name>|-merged|-"
-"all [<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
+"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
+"[<id>|<number>|<name>...]] || move <number>|-|+ || swap <id1>|<number1>|"
 "<name1> [<id2>|<number2>|<name2>] || cycle <id>|<number>|<name>... || merge "
 "<id>|<number>|<name> || unmerge [<number>|-all] || hide [<id>|<number>|"
 "<name>|-all [<id>|<number>|<name>...]] || unhide [<id>|<number>|<name>|-all "
@@ -1846,10 +1680,10 @@ msgstr "evaluierter Ausdruck"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"

 msgid "raw[-n]: display result without sending it to buffer (debug mode)"
@@ -1864,9 +1698,6 @@ msgstr ""
 "raw[-s]: teilt Ausdrücke, bevor sie evaluiert werden (mehrere Befehle können "
 "durch Semikolon getrennt werden)"

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr "raw[-e]: Alle Befehle vor ihrer Ausführung auswerten"
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2269,7 +2100,7 @@ msgstr ""

 msgid "  =*   is matching mask, case-insensitive (wildcard \"*\" is allowed)"
 msgstr ""
-"  =*   stimmt mit der Maske überein, Groß- und Kleinschreibung wird nicht "
+"  =*    stimmt mit der Maske überein, Groß- und Kleinschreibung wird nicht "
 "beachtet (Platzhalter \"*\" ist zulässig)"

 msgid ""
@@ -2279,7 +2110,7 @@ msgstr ""
 "nicht beachtet (Platzhalter \"*\" ist zulässig)"

 msgid "  ==-  is included, case-sensitive"
-msgstr "  ==-  ist enthalten, Groß- und Kleinschreibung wird berücksichtigt"
+msgstr "  ==- ist enthalten, Groß- und Kleinschreibung wird berücksichtigt"

 msgid "  !!-  is NOT included, case-sensitive"
 msgstr ""
@@ -2517,7 +2348,7 @@ msgid "display help about commands and options"
 msgstr "Zeigt einen Hilfstext für Befehle und Einstellungen an"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin>...] || <command> || <option>"

 msgid ""
@@ -2575,9 +2406,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr "raw[clear]: lösche Hotlist"

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""
 "level: \"lowest\" um die niedrigste Benachrichtigungsstufe in der Hotlist zu "
 "löschen, \"highest\" um die höchste Benachrichtigungsstufe in der Hotlist zu "
@@ -3629,13 +3460,9 @@ msgstr "raw[del]: entfernt einen oder mehrere Proxy"
 msgid "raw[set]: set a value for a proxy property"
 msgstr "raw[set]: setzt einen Wert für Proxy-Eigenschaft"

-#, fuzzy
-#| msgid ""
-#| "option: option to change (for options list, look at /set weechat.proxy."
-#| "<proxyname>.*)"
 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""
 "Option: Option, die geändert werden soll (für eine Liste der möglichen "
 "Optionen, bitte folgenden Befehl nutzen: /set weechat.proxy.<proxyname>.*)"
@@ -3743,7 +3570,7 @@ msgid "> ${repeat_index}: current index (from 1 to \"count\")"
 msgstr "> ${repeat_index}: aktueller Index (von 1 bis \"Einheit\")"

 msgid "> ${repeat_index0}: current index (from 0 to \"count\" - 1)"
-msgstr "> ${repeat_index0}: aktueller Index (von 0 bis \"Einheit\" - 1)"
+msgstr "> ${repeat_index0}: aktueller Index (von 0  bis \"Einheit\" - 1)"

 msgid "> ${repeat_revindex}: current index from the end (from \"count\" to 1)"
 msgstr "> ${repeat_revindex}: aktueller Index vom Ende (von \"Einheit\" bis 1)"
@@ -3864,7 +3691,7 @@ msgid "Keys on secure buffer:"
 msgstr "Tastenbefehle für den secure-Buffer:"

 msgid "  alt+v  toggle values"
-msgstr "  alt+v  Werte werden in Klartext angezeigt bzw. verborgen"
+msgstr "  alt+v, Werte werden in Klartext angezeigt bzw. verborgen"

 msgid ""
 "When a passphrase is used (data encrypted), it is asked by WeeChat on "
@@ -3922,23 +3749,23 @@ msgstr "  nutze Programm \"pass\" um die Passphrase beim Start auszulesen:"
 msgid "  encrypt libera SASL password:"
 msgstr "  verschlüsselt libera SASL Passwort:"

-msgid "    /secure set libera my_password"
-msgstr "    /secure set libera Mein_Passwort"
+msgid "    /secure set libera mypassword"
+msgstr "    /secure set libera MeinPasswort"

 msgid "  encrypt oftc password for nickserv:"
 msgstr "  verschlüsselt oftc Passwort für nickserv:"

-msgid "    /secure set oftc my_password"
-msgstr "    /secure set oftc Mein_Passwort"
+msgid "    /secure set oftc mypassword"
+msgstr "    /secure set oftc MeinPasswort"

-msgid "  alias to ghost the nick \"andrew\":"
-msgstr ""
+msgid "  alias to ghost the nick \"mynick\":"
+msgstr "  Alternativbefehl um den eigenen Nick zu ghosten:"

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost MeinNick $"
 "{sec.data.libera}"

 msgid "set config options and environment variables"
@@ -3988,7 +3815,7 @@ msgid ""
 "(undefined value). This works only for some special plugin variables."
 msgstr ""
 "Hinweis: für alle Typen von Variablen kann die Zeichenkette \"null\" (ohne "
-"\"\") genutzt werden, um den Wert der Einstellung zu löschen (undefinierter "
+"\"\")  genutzt werden, um den Wert der Einstellung zu löschen (undefinierter "
 "Wert). Dies kann nur auf einige besondere Variablen (Erweiterungen) "
 "angewendet werden."

@@ -4257,8 +4084,8 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr "Nutzt man die \"-quit\" Funktion ist die Abfolge geringfügig anders:"

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
-msgstr "  1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
+msgstr "  1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...)"

 msgid "  2. save session into files (*.upgrade)"
 msgstr "  2. die Sitzung wird in Dateien gesichert (*.upgrade)"
@@ -4853,7 +4680,7 @@ msgstr "Veraltete Taste wurde entfernt: \"%s\""

 #, c-format
 msgid "Legacy key converted: \"%s\" => \"%s\""
-msgstr "Veraltete Taste konvertiert: \"%s\" => \"%s\""
+msgstr "Veraltete Taste konvertiert:  \"%s\" => \"%s\""

 #, c-format
 msgid "Command converted for key \"%s\": \"%s\" => \"%s\""
@@ -5403,7 +5230,7 @@ msgid ""
 "the highest to lowest priority)"
 msgstr ""
 "maximale Anzahl an Nachrichtenzähler in der Hotlist, für einen Buffer: 0 = "
-"der Nachrichtenzähler wird nicht dargestellt, nächst höhere Zahl = zeigt "
+"der Nachrichtenzähler wird nicht dargestellt,  nächst höhere Zahl = zeigt "
 "maximal <N> Nachrichtenzähler an (von höchster zu niedrigster Priorität)"

 msgid ""
@@ -5467,8 +5294,8 @@ msgstr ""
 "eines Buffers (\"buffer.var\"); wird das \"-\" Zeichen vor einem Feld "
 "angewendet, wird die Ausgabe umgekehrt, um bei einem Vergleich nicht "
 "zwischen Groß- und Kleinschreibung zu unterscheiden wird das Zeichen \"~\" "
-"verwendet; Beispiel: \"-priority,buffer.number\" sortiert die Hotliste nach "
-"Priorität, dann nach Buffernummern, \"-~buffer.full_name\" für Groß-/"
+"verwendet; Beispiel:  \"-priority,buffer.number\" sortiert die Hotliste nach "
+"Priorität, dann nach Buffernummern,  \"-~buffer.full_name\" für Groß-/"
 "Kleinschreibung und umgekehrte Sortierung nach vollständigem Buffernamen"

 msgid "text displayed at the end of the hotlist"
@@ -5638,9 +5465,10 @@ msgstr ""
 "Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit "
 "eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname "
 "lautet \"|nick|abwesend\" wobei das Zeichen \"|\" ignoriert werden soll. Die "
-"Farbe für den Nicknamen wird nun für \"|nick\"); diese Option hat einen "
-"Einfluss auf die Option weechat.look.nick_color_force, dort aufgeführte "
-"Nicks sollten keine Zeichen haben, die von dieser Option ignoriert werden"
+"Farbe für den Nicknamen wird nun für \"|nick\" anstelle von \"|nick|"
+"abwesend\" erstellt); diese Option hat einen Einfluss auf die Option "
+"weechat.look.nick_color_force, dort aufgeführte Nicks sollten keine Zeichen "
+"haben, die von dieser Option ignoriert werden"

 msgid "text to display before nick in prefix of message, example: \"<\""
 msgstr "Text, der vor dem Nick dargestellt werden soll, Beispiel: \"<\""
@@ -6051,7 +5879,7 @@ msgid ""
 msgstr ""
 "Textfarbe für Nicks im Chatfenster: Farbe wird für einige Server-Nachrichten "
 "verwendet und als Ersatz falls eine Farbe für einen Nick nicht gefunden "
-"wird; normalerweise wird die Farbe von der Option "
+"wird;  normalerweise wird die Farbe von der Option "
 "weechat.color.chat_nick_colors bereitgestellt"

 #. TRANSLATORS: please do not translate "lightred:blue"
@@ -7053,8 +6881,8 @@ msgstr "schreibe - Variable"
 msgid "read - object type"
 msgstr "lese - Objekt-Typ"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "lese - falscher Typ für Objekt (\"object start\" wurde erwartet)"
+msgid "read - bad object type ('object start' expected)"
+msgstr "lese - falscher Typ für Objekt ('object start' wurde erwartet)"

 msgid "read - object id"
 msgstr "lese - Objekt-ID"
@@ -7114,13 +6942,15 @@ msgstr "Übertragungsfehler"
 msgid "curl error %d (%s) (URL: \"%s\")\n"
 msgstr "curl Fehler %d (%s) (URL: \"%s\")\n"

-#, c-format
+#, fuzzy, c-format
+#| msgid "%sURL transfer error: %s (URL: \"%s\")"
 msgid "transfer stopped (URL: \"%s\")\n"
-msgstr "Übertragung abgebrochen (URL: \"%s\")\n"
+msgstr "%sURL Transferfehler: %s (URL: \"%s\")"

-#, c-format
+#, fuzzy, c-format
+#| msgid "End of URL transfer '%s', timeout reached (%.3fs)"
 msgid "transfer timeout reached (%.3fs) (URL: \"%s\")\n"
-msgstr "Übertragungszeitlimit erreicht (%.3fs) (URL: \"%s\")\n"
+msgstr "Ende der URL-Übertragung „%s“, Zeitüberschreitung erreicht (%.3fs)"

 #, c-format
 msgid "%sAnother command \"%s\" already exists for plugin \"%s\""
@@ -7168,9 +6998,136 @@ msgstr "Ende der URL-Übertragung „%s“, Zeitüberschreitung erreicht (%.3fs)
 msgid "%sError running thread in hook_url: %s (URL: \"%s\")"
 msgstr "%sFehler beim Ausführen des Threads in hook_url: %s (URL: \"%s\")"

-#, c-format
+#, fuzzy, c-format
+#| msgid "End of URL transfer '%s', timeout reached (%.3fs)"
 msgid "End of URL transfer '%s', transfer stopped"
-msgstr "Ende der URL-Übertragung '%s', Übertragung gestoppt"
+msgstr "Ende der URL-Übertragung „%s“, Zeitüberschreitung erreicht (%.3fs)"
+
+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, kompiliert am %s %s\n"
+"Entwickelt von Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Aufruf: %s [Option...] [Erweiterung:Option...]\n"
+
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         deaktiviert das automatische Verbinden mit den "
+"Servern beim Start von WeeChat\n"
+"  -c, --colors             zeigt die Standardfarben des Terminals an\n"
+"  -d, --dir <Pfad>         legt einen Konfigurationsordner für WeeChat fest\n"
+"                           oder fünf verschiedene Verzeichnisse, die durch "
+"Doppelpunkte getrennt werden (in folgender Reihenfolge: Konfiguration, "
+"Daten, Zustand, Cache, Laufzeit)\n"
+"                           (Umgebungsvariable WEECHAT_HOME wird genutzt, "
+"falls diese Option nicht verwendet wird)\n"
+"  -t, --temp-dir           erstellt ein temporäres WeeChat "
+"Heimatverzeichnis, welches beim Beenden von WeeChat gelöscht wird\n"
+"                           (nicht nutzbar mit Option \"-d\")\n"
+"  -h, --help               zeigt diese Hilfe an\n"
+"  -i, --build-info         Build-Informationen anzeigen und beenden\n"
+"  -l, --license            zeigt die Lizenz von WeeChat an\n"
+"  -p, --no-plugin          unterbindet beim Programmstart das Laden von "
+"Erweiterungen\n"
+"  -P, --plugins <plugins>  beim Programmstart, werden nur die angegebenen "
+"Erweiterungen geladen\n"
+"                           (siehe /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  führt einen oder mehrere Befehle nach dem Start "
+"aus\n"
+"                           mehrere Befehle können durch ein Semikolon "
+"getrennt werden und sind evaluiert,\n"
+"                           diese Option kann mehrfach genutzt werden\n"
+"  -s, --no-script          Skripts werden beim Programmstart nicht geladen\n"
+"      --upgrade            führt ein WeeChat-Upgrade, mittels "
+"Sitzungsdateien durch (benutze in WeeChat /help upgrade)\n"
+"  -v, --version            zeigt die Version von WeeChat an\n"
+"  plugin:option            Einstellungen für Erweiterungen (siehe man "
+"weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr "Zusätzliche Optionen für den Hintergrundmodus:\n"
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+"      --doc-gen <path>     generiert Dateien, um die Dokumentation zu "
+"erstellen, danach Programm beenden\n"
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+"      --daemon             startet WeeChat im Deamon-Modus (fork, neue "
+"Prozessgruppe, Dateideskriptor geschlossen);\n"
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+"                           (standardmäßig blockiert WeeChat im "
+"Hintergrundmodus den Prozess und gibt das Terminal nicht frei)\n"
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+"      --stdout             die Programmausgabe findet in der Standardausgabe "
+"an, anstatt sie in die Protokolldatei zu schreiben\n"
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+"                           (Option wird ignoriert, falls die Option \"--"
+"daemon\" genutzt wird)\n"
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+"Debug Optionen (für Tools wie valgrind, DIESE FUNKTIONEN SOLLTE NICHT IM "
+"PRODUKTIVEM EINSATZ GENUTZT WERDEN):\n"
+"      --no-dlclose         die Funktion dlclose wird nicht ausgeführt, "
+"nachdem Erweiterungen beendet wurden\n"
+"      --no-gnutls          deaktiviere init/deinit von gnutls\n"
+"      --no-gcrypt          deaktiviere init/deinit von gcrypt\n"
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Fehler: fehlendes Argument für die Einstellung \"%s\"\n"

 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "WeeChat läuft im Hintergrundmodus (ctrl-c zum Beenden)."
@@ -7219,7 +7176,7 @@ msgstr ""

 #, c-format
 msgid "%sYou should add this line in the file %s:  %s"
-msgstr "%sEs sollte folgende Zeile in Datei %s eingefügt werden:  %s"
+msgstr "%sEs sollte folgende Zeile in Datei %s eingefügt werden: %s"

 #, c-format
 msgid ""
@@ -7520,7 +7477,7 @@ msgstr "Neue Tastenbelegung (Kontext \"%s\"): %s%s => %s%s"
 #, c-format
 msgid "%sUnable to bind key \"%s\" in context \"%s\" (see /help key)"
 msgstr ""
-"%sTastenbelegung „%s“ kann nicht in diesem Kontext „%s“ zugeordnet werden "
+"%sTastenbelegung „%s“ kann nicht in diesem Kontext „%s“ zugeordnet werden  "
 "(siehe /help key)"

 #, c-format
@@ -7638,7 +7595,7 @@ msgstr ""

 msgid "raw[list]: list aliases (without argument, this list is displayed)"
 msgstr ""
-"raw[list]: listet Alternativbefehle auf (ohne Angabe von Argumenten wird "
+"raw[list]: listet Alternativbefehle auf (ohne Angabe von Argumenten wird  "
 "diese Liste dargestellt)"

 msgid "raw[add]: add an alias"
@@ -8008,11 +7965,8 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""
-"    - ${index_displayed}: Index der Zeile die in der Bar-Item angezeigt wird "
-"(beginnt bei 0, nur Buffer die dargestellt werden erhöhen diesen Index, "
-"siehe Option buflist.look.display_conditions)"

 msgid "buflist bar items"
 msgstr "Buflist Bar-Items"
@@ -9387,7 +9341,7 @@ msgstr ""
 "erstes von zwei Formaten um Optionen anzuzeigen, wird genutzt wenn die "
 "Option fset.look.format_number auf 1 gesetzt ist (Hinweis: der Inhalt ist "
 "evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die "
-"Standardeinstellung (\"${marked} ${name}  ${type}  ${value2}\"), dies findet "
+"Standardeinstellung (\"${marked} ${name} ${type}  ${value2}\"), dies findet "
 "ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den "
 "Formaten kann mittels ctrl-x umgeschaltet werden"

@@ -9401,7 +9355,7 @@ msgstr ""
 "zweites von zwei Formaten um Optionen anzuzeigen,wird genutzt wenn die "
 "Option fset.look.format_number auf 1 gesetzt ist (Hinweis: der Inhalt ist "
 "evaluiert, siehe /help fset); eine leere Zeichenkette nutzt die "
-"Standardeinstellung (\"${marked} ${name}  ${type}  ${value2}\"), dies findet "
+"Standardeinstellung (\"${marked} ${name} ${type}  ${value2}\"), dies findet "
 "ohne eine Evaluierung statt, was wesentlich schneller ist; zwischen den "
 "Formaten kann mittels ctrl-x umgeschaltet werden"

@@ -9838,7 +9792,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: Keine Verbindung zum Server \"%s\"!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: automatische Wiederverbindung abgebrochen"

 #, c-format
@@ -10004,11 +9958,6 @@ msgid_plural "seconds"
 msgstr[0] "Sekunde"
 msgstr[1] "Sekunden"

-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "Millisekunde"
-msgstr[1] "Millisekunden"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
@@ -10149,10 +10098,10 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"

 msgid "raw[-current]: execute command for channels of current server only"
 msgstr ""
@@ -10241,11 +10190,11 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"

 msgid ""
 "raw[-current]: execute command for private buffers of current server only"
@@ -10300,11 +10249,11 @@ msgstr "führt einen Befehl aus, der zu allen verbundenen Server gesendet wird"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
 msgstr ""
@@ -10464,7 +10413,7 @@ msgstr ""
 "mit \"-\" beginnt, zum Beispiel: \"-multi-prefix\")"

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""
 "raw[ack]: bestätigt eine Fähigkeit, die von Serverseite eine Bestätigung "
 "erfordert"
@@ -12521,15 +12470,14 @@ msgstr "links/rechts im /list Buffer scrollen (prozentual zur Breite)"
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""
 "Durch Kommas getrennte Liste von Feldern zum Sortieren von Kanälen (eine "
-"Liste von Feldern findet man in /help list); Das Zeichen \"-\" kann vor dem "
-"Feld verwendet werden, um die Reihenfolge umzukehren, Zeichen \"~\" kann "
-"verwendet werden, um einen Vergleich ohne Berücksichtigung der Groß- und "
-"Kleinschreibung durchzuführen; Beispiel: \"-users,~name2\" führt zuerst die "
+"Liste von Feldern finden Sie in /help list); Zeichen „-“ kann vor dem Feld "
+"verwendet werden, um die Reihenfolge umzukehren, Zeichen „~“ kann verwendet "
+"werden, um einen Vergleich ohne Berücksichtigung der Groß- und "
+"Kleinschreibung durchzuführen; Beispiel: „-users,~name“ führt zuerst die "
 "größten Kanäle auf, dann erfolgt die Sortierung, ohne Berücksichtigung der "
 "Groß- und Kleinschreibung, nach Namen"

@@ -15948,7 +15896,7 @@ msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: keine Verbindung zum Remote-Relay \"%s\""

 #, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "remote[%s]: automatische Wiederverbindung abgebrochen"

 #, c-format
@@ -17866,7 +17814,7 @@ msgstr "erstelle Variable"

 #, c-format
 msgid "%s%lu%s  running command %s\"%s%s%s\"%s on buffer %s%s%s"
-msgstr "%s%lu%s  führe Befehl %s\"%s%s%s\"%s für Buffer %s%s%s aus"
+msgstr "%s%lu%s führe Befehl %s\"%s%s%s\"%s für Buffer %s%s%s aus"

 #, c-format
 msgid ""
@@ -18531,8 +18479,8 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: ungültiger regulärer Ausdruck in Trigger: \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
-msgstr "Tippstatus: "
+msgid "Typing:"
+msgstr "Tippstatus:"

 msgid ""
 "number of seconds after paused status has been set: if reached, the typing "
@@ -18580,14 +18528,6 @@ msgstr ""
 "maximale Anzahl von Zeichen, die im Bar-Item \"typing\" angezeigt werden (0 "
 "= Inhalt nicht abschneiden)"

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-"Text, der vor den Nicks im Bar-Element \"typing\" angezeigt werden soll; "
-"falls festgelegt, wird dieser anstelle der standardmäßigen Übersetzung "
-"\"Tippstatus:\" verwendet"
-
 msgid "Typing status of users"
 msgstr "Tippstatus von Benutzern"

@@ -18727,14 +18667,12 @@ msgstr ""
 "beim Versenden von Daten wird nicht auf ein Bestätigungssignal (ACK) gewartet"

 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "IP- oder DNS-Adresse, die zum Senden und passiven Empfangen von Dateien/"
-"Chats verwendet wird. Falls kein Wert angegeben ist, wird die IP der lokalen "
-"Schnittstelle verwendet (Hinweis: Der Inhalt wird ausgewertet, siehe /help "
-"eval)"
+"Chats verwendet wird (falls kein Wert angegeben ist, wird die IP der lokalen "
+"Schnittstelle verwendet)"

 msgid ""
 "restricts outgoing files/chats and incoming/passive files to use only ports "
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-12 20:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:26+0100\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: es\n"
@@ -34,181 +34,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: no es posible conectarse al transmisor"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "usar el mismo color de apodo en el canal y conversaciones privadas"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "mostrar el logo de WeeChat en el arranque"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "mostrar el logo de WeeChat en el arranque"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-#| msgid ""
-#| "command executed when WeeChat starts, after loading plugins; multiple "
-#| "commands can be separated by semicolons (note: commands are evaluated, "
-#| "see /help eval)"
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"comando ejecutado cuando WeeChat inicia, después de cargar los plugins, "
-"multiples comandos pueden ser separados por puntos y comas (nota: los "
-"comandos se evaluan, ver /help eval)"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-#| msgid "%sUnable to save session in file"
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sError: no se pudo guardar la sesión"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "mostrar la versión de WeeChat en el arranque"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "puntero del plugin (opcional)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-#, fuzzy
-#| msgid ""
-#| "                           (by default in headless mode WeeChat is "
-#| "blocking and does not run in background)\n"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-"                           (por defecto en el modo de segundo plano WeeChat "
-"está bloqueado y no se ejecuta)\n"
-
-#. TRANSLATORS: command line option "--stdout"
-#, fuzzy
-#| msgid ""
-#| "      --stdout             display log messages on standard output "
-#| "instead of writing them in log file\n"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-"      --stdout             imprime los registros (logs) en salida estandar "
-"en lugar de escribirlos en un archivo\n"
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, compilado en %s %s\n"
-"Desarrollado por Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr ""
-
-#, fuzzy
-#| msgid "Usage: %s [option...] [plugin:option...]\n"
-msgid "[option...] [plugin:option...]"
-msgstr "Uso: %s [opción...] [plugin:opción...]\n"
-
-#, fuzzy
-#| msgid "Extra options in headless mode:\n"
-msgid "Extra options in headless mode:"
-msgstr "Opciones extra en el modo de segundo plano:\n"
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Error: falta un argumento para la opción \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Lista de barras:"

@@ -318,15 +143,15 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sError: no se puede desplazar la barra \"%s\""

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
-msgstr "%sNúmero de buffer %d inválido (debe ser entre 1 y %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
+msgstr "%sNúmero de buffer \"%d\" inválido (debe ser entre 1 y %d)"

 msgid "Buffers list:"
 msgstr "Lista de buffers:"

 #, c-format
 msgid "  %s[%s%d%s]%s %s%s.%s%s%s (notify: %s%s%s)%s%s"
-msgstr "  %s[%s%d%s]%s %s%s.%s%s%s (aviso: %s%s%s)%s%s)"
+msgstr "  %s[%s%d%s]%s %s%s.%s%s%s  (aviso: %s%s%s)%s%s)"

 #, c-format
 msgid "%sBuffer name \"%s\" is reserved for WeeChat"
@@ -354,7 +179,7 @@ msgstr "%sError: el buffer principal de WeeChat no puede ser cerrado"

 #, c-format
 msgid "Notify for \"%s%s%s\": \"%s%s%s\""
-msgstr "Notificar \"%s%s%s\": \"%s%s%s\""
+msgstr "Notificar \"%s%s%s\":  \"%s%s%s\""

 #, c-format
 msgid "%sUnable to set notify level \"%s\""
@@ -686,9 +511,9 @@ msgstr ""
 "atajos"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] "%d nuevo atajo agregado (contexto: \"%s\")"
+msgstr[0] "%d nuevo atajo agregado"
 msgstr[1] "%d nuevos atajos agregados (contexto: \"%s\")"

 msgid "Stored layouts:"
@@ -1326,7 +1151,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1823,12 +1648,8 @@ msgid "evaluate expression"
 msgstr "evaluar expresión"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-#, fuzzy
-#| msgid ""
-#| "[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
-#| "<expression2>"
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""
 "[-n|-s] [-d] <expresión> || [-n] [-d [-d]] -c <expresión1> <operador> "
@@ -1842,9 +1663,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2392,7 +2210,7 @@ msgstr "mostrar ayuda sobre los comandos y opciones"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <comando> || <opción>"

 msgid ""
@@ -2455,9 +2273,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3355,7 +3173,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3629,20 +3447,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3909,7 +3727,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -6372,8 +6190,8 @@ msgstr "escritura - variable"
 msgid "read - object type"
 msgstr "lectura - tipo objeto"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "lectura - tipo de objeto incorrecto (se esperaba \"object start\")"
+msgid "read - bad object type ('object start' expected)"
+msgstr "lectura - tipo de objeto incorrecto (se esperaba 'object start')"

 msgid "read - object id"
 msgstr "lectura - id objeto"
@@ -6494,6 +6312,152 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "Fin del comando '%s', tiempo de espera alcanzado (%.1fs)"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, compilado en %s %s\n"
+"Desarrollado por Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Uso: %s [opción...] [plugin:opción...]\n"
+
+#
+#, fuzzy
+#| msgid ""
+#| "  -a, --no-connect         disable auto-connect to servers at startup\n"
+#| "  -c, --colors             display default colors in terminal\n"
+#| "  -d, --dir <path>         force a single WeeChat home directory\n"
+#| "                           or 4 different directories separated by colons "
+#| "(in this order: config, data, cache, runtime)\n"
+#| "                           (environment variable WEECHAT_HOME is read if "
+#| "this option is not given)\n"
+#| "  -t, --temp-dir           create a temporary WeeChat homedirectory and "
+#| "delete it on exit\n"
+#| "                           (incompatible with option \"-d\")\n"
+#| "  -h, --help               display this help\n"
+#| "  -l, --license            display WeeChat license\n"
+#| "  -p, --no-plugin          don't load any plugin at startup\n"
+#| "  -P, --plugins <plugins>  load only these plugins at startup\n"
+#| "                           (see /help weechat.plugin.autoload)\n"
+#| "  -r, --run-command <cmd>  run command(s) after startup;\n"
+#| "                           many commands can be separated by semicolons "
+#| "and are evaluated,\n"
+#| "                           this option can be given multiple times\n"
+#| "  -s, --no-script          don't load any script at startup\n"
+#| "      --upgrade            upgrade WeeChat using session files (see /help "
+#| "upgrade in WeeChat)\n"
+#| "  -v, --version            display WeeChat version\n"
+#| "  plugin:option            option for plugin (see man weechat)\n"
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         desactivar la autoconexión de los servidores al "
+"inicio\n"
+"  -c, --colors             mostrar los colores predeterminados en la "
+"terminal\n"
+"  -d, --dir <path>         establecer el directorio raíz de WeeChat\n"
+"                           o 4 directorios diferentes separados por dos "
+"puntos (en este orden: configuración, datos, cache, ejecución)\n"
+"                           (la variable WEECHAT_HOME es usada si esta opción "
+"no es dada)\n"
+"  -t, --temp-dir           crear un directorio raíz temporal para weechat y "
+"borrarlo al salir\n"
+"                           (incompatible con la opción \"-d\")\n"
+"  -h, --help               mostrar esta ayuda\n"
+"  -l, --license            mostrar la licencia de Weechat\n"
+"  -p, --no-plugin          no cargar ningún plugin al inicio\n"
+"  -P, --plugins <plugins>  cargar solo estos plugins al inicio\n"
+"                           (ver /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  ejecutar un comando luego del inicio;\n"
+"                           varios cmoandos pueden ser separados por dos "
+"puntos y son evaluados\n"
+"                           esta opción se puede usar varias veces\n"
+"  -s, --no-script          no cargar ningún script al inicio\n"
+"      --upgrade            actualizar WeeChat usando archivos de sesión "
+"(ver /help upgrade in WeeChat)\n"
+"  -v, --version            mostrar la versión de WeeChat\n"
+"  plugin:option            opción para plugin (ver man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr "Opciones extra en el modo de segundo plano:\n"
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+"      --daemon             ejecuta WeeChat como un daemon (fork, nuevo grupo "
+"de procesos, file descriptores cerrados);\n"
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+"                           (por defecto en el modo de segundo plano WeeChat "
+"está bloqueado y no se ejecuta)\n"
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+"      --stdout             imprime los registros (logs) en salida estandar "
+"en lugar de escribirlos en un archivo\n"
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+"                           (opción ignorada si la opción \"--daemon\" es "
+"indicada)\n"
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+"Opciones de depuración (para herramientas como valgrind, NO USAR EN "
+"PRODUCCIÓN):\n"
+"      --no-dlclose         no llamar a la función dlclose luego de que los "
+"plugins estén descargados\n"
+"      --no-gnutls          desactivar init/deinit de gnutls\n"
+"      --no-gcrypt          desactivar init/deinit de gcrypt\n"
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Error: falta un argumento para la opción \"%s\"\n"
+
 #, fuzzy
 #| msgid "WeeChat is running in headless mode (Ctrl-C to quit)."
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
@@ -6542,7 +6506,7 @@ msgstr ""

 #, c-format
 msgid "%sYou should add this line in the file %s:  %s"
-msgstr "%sDeberías añadir esta línea al archivo %s:  %s"
+msgstr "%sDeberías añadir esta línea al archivo %s: %s"

 #, c-format
 msgid ""
@@ -6817,7 +6781,7 @@ msgstr ""

 #, c-format
 msgid "New key binding (context \"%s\"): %s%s => %s%s"
-msgstr "Nuevo atajo (contexto \"%s\"): %s%s => %s%s"
+msgstr "Nuevo atajo (contexto \"%s\"):  %s%s => %s%s"

 #, fuzzy, c-format
 #| msgid "%sUnable to bind key \"%s\""
@@ -7233,7 +7197,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8797,7 +8761,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: ¡no conectado al servidor \"%s\"!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: autoreconexión cancelada"

 #, c-format
@@ -8965,14 +8929,6 @@ msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -9136,7 +9092,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[-current] [-exclude=<canal>[,<canal>...]] <comando> [<argumentos>]"

 #, fuzzy
@@ -9241,8 +9197,8 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[-current] [-exclude=<canal>[,<canal>...]] <comando> [<argumentos>]"

 #, fuzzy
@@ -9297,8 +9253,8 @@ msgstr "ejecuta un comando en todos los servidores conectados"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr "[-exclude=<servidor>[,<servidor>...]] <comando> [<argumentos>]"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -9463,7 +9419,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -11554,9 +11510,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -11600,7 +11555,7 @@ msgid ""
 "channel/pv of server)"
 msgstr ""
 "fuerza la posición de nuevos privados en la lista de buffers (none = "
-"posición predeterminada (último buffer), next = buffer actual + 1, "
+"posición  predeterminada (último buffer), next = buffer actual + 1, "
 "near_server = después del último canal/privado del server)"

 msgid ""
@@ -12844,7 +12799,7 @@ msgstr "%s%s: no conectado al servidor \"%s\" para la redirección"

 #, c-format
 msgid "%s%s: missing argument \"%s\" for redirect"
-msgstr "%s%s: falta el argumento \"%s\" para la redirección"
+msgstr "%s%s: falta el argumento \"%s\"  para la redirección"

 #, c-format
 msgid "%s%s: redirect pattern \"%s\" not found"
@@ -14931,9 +14886,10 @@ msgstr "%s%s: no se encontró el servidor \"%s\" para el comando \"%s\""
 msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: ¡no conectado al servidor \"%s\"!"

-#, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: auto-reconnection is cancelled"
+msgid "remote[%s]: auto-reconnection is cancelled"
+msgstr "%s: autoreconexión cancelada"

 #, fuzzy, c-format
 #| msgid "%s%s: server \"%s\" already exists for \"%s\" command"
@@ -17277,7 +17233,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: error al compilar la expresión regular \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -17311,11 +17267,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -17468,9 +17419,8 @@ msgstr "no esperar por el ACK al enviar un archivo"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "dirección IP o DNS usado para enviar archivos/charlas (si está vacío, se "
 "utiliza la IP de interfaz local)"
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-21 17:29+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2026-03-16 13:18+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -33,164 +33,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-msgid "disable auto-connect to servers at startup"
-msgstr "désactiver l'auto-connexion aux serveurs au démarrage"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr "afficher les couleurs par défaut du terminal et quitter"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr "-d, --dir <rep>"
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-"forcer un unique répertoire de base pour WeeChat ou 5 répertoires différents "
-"séparés par \":\" (dans cet ordre : config, data, state, cache, runtime) (la "
-"variable d'environnement WEECHAT_HOME est lue si cette option n'est pas "
-"donnée)"
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-"créer un répertoire de base WeeChat temporaire et le supprimer en quittant "
-"(incompatible avec l'option \"-d\")"
-
-#. TRANSLATORS: command line option "-h", "--help"
-msgid "display this help and exit"
-msgstr "afficher cette aide et quitter"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr "afficher les informations de construction et quitter"
-
-#. TRANSLATORS: command line option "-l", "--license"
-msgid "display WeeChat license and exit"
-msgstr "afficher la licence WeeChat et quitter"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-msgid "don't load any plugin at startup"
-msgstr "ne charger aucune extension au démarrage"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr "-P, --plugins <exts>"
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-"charger uniquement ces extensions au démarrage (voir /help "
-"weechat.plugin.autoload)"
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr "-r, --run-command <cmd>"
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"lancer la/les commande(s) après le démarrage ; plusieurs commandes peuvent "
-"être séparées par des points-virgules et sont évaluées, cette option peut "
-"être donnée plusieurs fois"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr "ne charger aucun script au démarrage"
-
-#. TRANSLATORS: command line option "--upgrade"
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr ""
-"mettre à jour WeeChat en utilisant les fichiers de session (voir /help "
-"upgrade dans WeeChat)"
-
-#. TRANSLATORS: command line option "-v", "--version"
-msgid "display WeeChat version and exit"
-msgstr "afficher la version de WeeChat et quitter"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-msgid "plugin:option"
-msgstr "extension:option"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr "option pour une extension (voir man weechat)"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr "--doc-gen <rep>"
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr "générer les fichiers pour construire la documentation et quitter"
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-"lancer WeeChat comme un « daemon » (fork, nouveau groupe pour le processus, "
-"fermeture des descripteurs de fichiers) ; par défaut en mode sans interface "
-"WeeChat est bloquant et ne tourne pas en tâche de fond"
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-"afficher les messages de log sur la sortie standard plutôt que de les écrire "
-"dans le fichier de log (option ignorée si l'option \"--daemon\" est donnée)"
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-"ne pas appeler la fonction dlclose après le déchargement des extensions"
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr "désactiver init/deinit de gnutls"
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr "désactiver init/deinit de gcrypt"
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, compilé le %s %s\n"
-"Développé par Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Utilisation :"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[option...] [extension:option...]"
-
-msgid "Extra options in headless mode:"
-msgstr "Options supplémentaires en mode sans interface (« headless ») :"
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-"Options de debug (pour des outils comme Valgrind, NE PAS UTILISER EN "
-"PRODUCTION) :"
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Erreur : paramètre manquant pour l'option \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Liste des barres :"

@@ -297,7 +139,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sImpossible de faire défiler la barre \"%s\""

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""
 "%sLe numéro de tampon %d est en dehors des limites (il doit être entre 1 et "
 "%d)"
@@ -646,7 +488,7 @@ msgstr ""
 "(raison de sécurité)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nouvelle touche ajoutée (contexte : \"%s\")"
 msgstr[1] "%d nouvelles touches ajoutées (contexte : \"%s\")"
@@ -1260,10 +1102,10 @@ msgstr "raw[set] : changer la valeur d'une propriété de la barre"

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""
 "option : option à modifier (pour la liste des options, voir /set weechat.bar."
-"<nom_barre>.*)"
+"<nombarre>.*)"

 msgid "value: new value for option"
 msgstr "valeur : nouvelle valeur pour l'option"
@@ -1330,14 +1172,14 @@ msgstr ""
 "list || add [-free] [-switch] <nom> || clear [<id>|<numéro>|<nom>|-merged|-"
 "all [<id>|<numéro>|<nom>...]] || move <numéro>|-|+ || swap <id1>|<numéro1>|"
 "<nom1> [<id2>|<numéro2>|<nom2>] || cycle <id>|<numéro>|<nom>... || merge "
-"<id>|<numéro>|<nom> || unmerge [<numéro>|-all] || hide [<id>|<numéro>|<nom>|-"
-"all [<id>|<numéro>|<nom>...]] || unhide [<id>|<numéro>|<nom>|-all [<id>|"
-"<numéro>|<nom>...]] || switch [-previous] || zoom || renumber [<numéro1> "
-"[<numéro2> [<départ>]]] || close [<n1>[-<n2>]|<nom>...] || notify [<niveau>] "
-"|| listvar [<id>|<numéro>|<nom>] || setvar <nom> [<valeur>] || delvar <nom> "
-"|| set <propriété> [<valeur>] || setauto <propriété> [<valeur>] || get "
-"<propriété> || jump smart|last_displayed|prev_visited|next_visited || <id>|"
-"<numéro>|-|+|<nom>"
+"<id>|<numéro>|<nom> || unmerge [<id>|<numéro>|-all] || hide [<id>|<numéro>|"
+"<nom>|-all [<id>|<numéro>|<nom>...]] || unhide [<id>|<numéro>|<nom>|-all "
+"[<id>|<numéro>|<nom>...]] || switch [-previous] || zoom || renumber "
+"<numéro1> [<numéro2> [<départ>]] || close [<n1>[-<n2>]|<nom>...] || notify "
+"[<niveau>] || listvar [<id>|<numéro>|<nom>] || setvar <nom> [<valeur>] || "
+"delvar <nom> || set <propriété> [<valeur>] || setauto <propriété> [<valeur>] "
+"|| get <propriété> || jump smart|last_displayed|prev_visited|next_visited || "
+"<id>|<numéro>|-|+|<nom>"

 msgid "raw[list]: list buffers (without argument, this list is displayed)"
 msgstr ""
@@ -1514,7 +1356,7 @@ msgid ""
 msgstr ""
 "nom : sauter au tampon par nom (partiel) ; si le nom commence par \"(?i)\", "
 "la recherche est insensible à la casse (par exemple \"(?i)upper\" trouvera "
-"le tampon \"irc.libera.#UPPERCASE\")"
+"le tampon \"irc.libera.#UPPERCASE)"

 msgid "define color aliases and display palette of colors"
 msgstr "définir des alias de couleurs et afficher la palette des couleurs"
@@ -1822,11 +1664,11 @@ msgstr "évaluer une expression"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""
-"[-n|-s] [-e] [-d [-d]] <expression> || [-n] [-d] -c <expression1> "
-"<opérateur> <expression2>"
+"[-n|-s] [-d [-d]] <expression> || [-n] [-d] -c <expression1> <opérateur> "
+"<expression2>"

 msgid "raw[-n]: display result without sending it to buffer (debug mode)"
 msgstr "raw[-n] : afficher le résultat sans envoyer au tampon (mode debug)"
@@ -1838,9 +1680,6 @@ msgstr ""
 "raw[-s] : découper l'expression avant de l'évaluer (plusieurs commandes "
 "peuvent être séparées par des points-virgules)"

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr "raw[-e] : évaluer toutes les commandes avant de les exécuter"
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2301,7 +2140,7 @@ msgid ""
 msgstr ""
 "list || enable|disable|toggle [<nom>|<masque>|@...] || add|addreplace <nom> "
 "<tampon>[,<tampon>...] <étiquettes> <regex> || rename <nom> <nouveau_nom> || "
-"recreate <nom> || del <nom>|<masque>..."
+"recreate <nom>|<masque> || del <nom>|<masque>..."

 msgid "raw[list]: list all filters"
 msgstr "raw[list] : lister tous les filtres"
@@ -2476,7 +2315,7 @@ msgid "display help about commands and options"
 msgstr "afficher l'aide sur les commandes et les options"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<extension>...] || <commande> || <option>"

 msgid ""
@@ -2534,9 +2373,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr "raw[clear] : effacer la hotlist"

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""
 "niveau : \"lowest\" pour effacer seulement le plus petit niveau dans la "
 "hotlist, \"highest\" pour effacer seulement le niveau le plus haut dans la "
@@ -2912,14 +2751,14 @@ msgid ""
 "context \"default\")"
 msgstr ""
 "raw[bind] : associer une commande à une touche ou affiche la commande "
-"associée à la touche (pour le contexte \"default\")"
+"associée à la touche"

 msgid ""
 "raw[bindctxt]: bind a command to a key or display command bound to key, for "
 "given context"
 msgstr ""
 "raw[bindctxt] : associer une commande à une touche ou affiche la commande "
-"associée à la touche, pour le contexte donné"
+"associée à la touche pour le contexte donné"

 msgid ""
 "command: command (many commands can be separated by semicolons); quotes can "
@@ -2930,18 +2769,14 @@ msgstr ""
 "espaces au début et à la fin de la commande"

 msgid "raw[unbind]: remove a key binding (for context \"default\")"
-msgstr ""
-"raw[unbind] : supprimer l'association à une touche (pour le contexte "
-"\"default\")"
+msgstr "raw[unbind] : supprimer l'association à une touche"

 msgid "raw[unbindctxt]: remove a key binding for given context"
 msgstr ""
 "raw[unbindctxt] : supprimer l'association à une touche pour le contexte donné"

 msgid "raw[reset]: reset a key to default binding (for context \"default\")"
-msgstr ""
-"raw[reset] : réinitialiser une touche à son association par défaut (pour le "
-"contexte \"default\")"
+msgstr "raw[reset] : réinitialiser une touche à son association par défaut"

 msgid "raw[resetctxt]: reset a key to default binding, for given context"
 msgstr ""
@@ -3318,7 +3153,7 @@ msgid ""
 "|| unload [<name>]"
 msgstr ""
 "list [-o|-ol|-i|-il|<nom>] || listfull [<nom>] || load <fichier> "
-"[<paramètres>] || autoload [<paramètres>] || reload [<nom>|* [<paramètres>]] "
+"[<paramètres>] || autoload [<paramètres>] || reload [<nom>|* [<paramètres]] "
 "|| unload [<nom>]"

 msgid "raw[list]: list loaded plugins"
@@ -3573,10 +3408,10 @@ msgstr "raw[set] : changer la valeur d'une propriété d'un proxy"

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""
 "option : option à modifier (pour la liste des options, voir /set "
-"weechat.proxy.<nom_proxy>.*)"
+"weechat.proxy.<proxyname>.*)"

 msgid "  add a http proxy, running on local host, port 8888:"
 msgstr "  ajouter un proxy http, tournant en local, port 8888 :"
@@ -3768,9 +3603,7 @@ msgstr "raw[-delete] : supprimer la phrase de chiffrement"
 msgid ""
 "raw[decrypt]: decrypt data still encrypted (it happens only if passphrase "
 "was not given on startup)"
-msgstr ""
-"raw[decrypt] : déchiffrer les données toujours chiffrées (cela se produit "
-"seulement si la phrase de chiffrement n'a pas été donnée au démarrage)"
+msgstr "raw[decrypt] : déchiffrer les données toujours chiffrées"

 msgid "raw[-discard]: discard all data still encrypted"
 msgstr "raw[-discard] : jeter toutes les données encore chiffrées"
@@ -3806,12 +3639,11 @@ msgid ""
 "of an external command like a password manager (see /help "
 "sec.crypt.passphrase_command)."
 msgstr ""
-"Il est possible de définir la variable d'environnement "
-"\"WEECHAT_PASSPHRASE\" pour éviter la demande (cette même variable est "
-"utilisée par WeeChat sur le /upgrade) ou de définir l'option "
-"sec.crypt.passphrase_command pour lire la phrase de chiffrement depuis la "
-"sortie d'une commande externe comme un coffre-fort à mots de passe (voir /"
-"help sec.crypt.passphrase_command)."
+"Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE "
+"pour éviter la demande (cette même variable est utilisée par WeeChat sur le /"
+"upgrade) ou de définir l'option sec.crypt.passphrase_command pour lire la "
+"phrase de chiffrement depuis la sortie d'une commande externe comme un "
+"coffre-fort à mots de passe (voir /help sec.crypt.passphrase_command)."

 msgid "Secured data with format ${sec.data.xxx} can be used in:"
 msgstr ""
@@ -3850,23 +3682,23 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr "  chiffrer le mot de passe libera SASL :"

-msgid "    /secure set libera my_password"
-msgstr "    /secure set libera mot_de_passe"
+msgid "    /secure set libera mypassword"
+msgstr "    /secure set libera motdepasse"

 msgid "  encrypt oftc password for nickserv:"
 msgstr "  chiffrer le mot de passe oftc pour nickserv :"

-msgid "    /secure set oftc my_password"
-msgstr "    /secure set oftc mot_de_passe"
+msgid "    /secure set oftc mypassword"
+msgstr "    /secure set oftc motdepasse"

-msgid "  alias to ghost the nick \"andrew\":"
-msgstr "  alias pour ghost du pseudo \"andrew\" :"
+msgid "  alias to ghost the nick \"mynick\":"
+msgstr "  alias pour ghost du pseudo \"pseudo\" :"

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost monpseudo $"
 "{sec.data.libera}"

 msgid "set config options and environment variables"
@@ -4130,9 +3962,9 @@ msgid ""
 "the reload of TLS sessions is currently not possible with GnuTLS. There is "
 "automatic reconnection after upgrade."
 msgstr ""
-"Note : les connexions TLS sont perdues durant la mise à jour (sauf avec "
-"-save), car le rechargement de session TLS n'est pas possible actuellement "
-"avec GnuTLS. Il y a une reconnexion automatique après la mise à jour."
+"Note : les connexions TLS sont perdues durant la mise à jour, car le "
+"rechargement de session TLS n'est pas possible actuellement avec GnuTLS. Il "
+"y a une reconnexion automatique après la mise à jour."

 msgid ""
 "Important: use of option \"-save\" can be dangerous, it is recommended to "
@@ -4170,8 +4002,8 @@ msgstr "  4. exécuter le nouveau binaire WeeChat et recharger la session."
 msgid "With option \"-quit\", the process is:"
 msgstr "Avec l'option \"-quit\", le processus est le suivant :"

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
-msgstr "  1. fermer *TOUTES* les connexions (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
+msgstr "  1. fermer *TOUTES* les connexions"

 msgid "  2. save session into files (*.upgrade)"
 msgstr "  2. sauvegarder la session (fichiers *.upgrade)"
@@ -4373,9 +4205,7 @@ msgid "raw[balance]: balance the sizes of all windows"
 msgstr "raw[balance] : équilibrer la taille de toutes les fenêtres"

 msgid "raw[merge]: merge window with another (raw[all] = keep only one window)"
-msgstr ""
-"raw[merge] : fusionner la fenêtre avec une autre (raw[all] = garder une "
-"seule fenêtre)"
+msgstr "raw[merge] : fusionner la fenêtre avec une autre"

 msgid "raw[close]: close window"
 msgstr "raw[close] : fermer la fenêtre"
@@ -4932,10 +4762,9 @@ msgid ""
 "buffer has no layout number"
 msgstr ""
 "position d'un nouveau tampon : end = après la fin de la liste (numéro = "
-"dernier numéro + 1) (par défaut), first_gap = au premier numéro disponible "
-"dans la liste (après la fin de la liste si aucun numéro n'est disponible) ; "
-"cette option est utilisée seulement si le tampon n'a pas de numéro dans le "
-"\"layout\""
+"dernier numéro + 1), first_gap = au premier numéro disponible dans la liste "
+"(après la fin de la liste si aucun numéro n'est disponible) ; cette option "
+"est utilisée seulement si le tampon n'a pas de numéro dans le \"layout\""

 msgid "default text search in buffer: case-sensitive or not"
 msgstr "recherche par défaut dans le tampon : sensible à la casse ou non"
@@ -5274,12 +5103,12 @@ msgid ""
 msgstr ""
 "conditions pour ajouter un tampon dans la hotlist (si le niveau de "
 "notification est OK pour le tampon) ; vous pouvez utiliser dans ces "
-"conditions : \"window\" (pointeur de la fenêtre courante), \"buffer\" "
-"(pointeur du tampon à ajouter dans la hotlist), \"priority\" (0 = faible, 1 "
-"= message, 2 = privé, 3 = highlight) ; par défaut un tampon est ajouté dans "
-"la hotlist si vous êtes absent, ou si le tampon n'est pas visible à l'écran "
-"(pas affiché dans une fenêtre), ou si au moins un client relay est connecté "
-"via le protocole weechat"
+"conditions : \\\"window\\\" (pointeur de la fenêtre courante), \\\"buffer\\"
+"\" (pointeur du tampon à ajouter dans la hotlist), \"priority\" (0 = faible, "
+"1 = message, 2 = privé, 3 = highlight) ; par défaut un tampon est ajouté "
+"dans la hotlist si vous êtes absent, ou si le tampon n'est pas visible à "
+"l'écran (pas affiché dans une fenêtre), ou si au moins un client relay est "
+"connecté via le protocole weechat"

 msgid "string displayed between buffers in hotlist"
 msgstr "chaîne affichée entre les tampons dans la hotlist"
@@ -6460,7 +6289,7 @@ msgid ""
 "received: %d)\n"
 msgstr ""
 "Erreur : mauvais nombre de chemin pour les répertoires personnels "
-"(attendus : 1 ou 5, reçus : %d)\n"
+"(attentus : 1 ou 5, reçus : %d)\n"

 #, c-format
 msgid ""
@@ -6866,7 +6695,7 @@ msgstr ""
 "%sLimite de ressource \"%s\" inconnue (voir /help weechat.startup.sys_rlimit)"

 msgid "Resource limits (see \"man getrlimit\" for help):"
-msgstr "Limites de ressource (voir \"man getrlimit\" pour de l'aide) :"
+msgstr "Limites de ressource (voir \"man getrlimit' pour de l'aide) :"

 #, c-format
 msgid "%sUnable to get resource limit \"%s\": error %d %s"
@@ -6917,8 +6746,8 @@ msgstr "écriture - variable"
 msgid "read - object type"
 msgstr "lecture - type d'objet"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "lecture - mauvais type d'objet (\"object start\" attendu)"
+msgid "read - bad object type ('object start' expected)"
+msgstr "lecture - mauvais type d'objet ('object start' attendu)"

 msgid "read - object id"
 msgstr "lecture - id objet"
@@ -7036,6 +6865,129 @@ msgstr "%sErreur de lancement du thread dans hook_url : %s (URL : \"%s\")"
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "Fin du transfert d'URL '%s', transfert arrêté"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, compilé le %s %s\n"
+"Développé par Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Utilisation : %s [option...] [extension:option...]\n"
+
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         désactiver l'auto-connexion aux serveurs au "
+"démarrage\n"
+"  -c, --colors             afficher les couleurs par défaut du terminal et "
+"quitter\n"
+"  -d, --dir <rep>          forcer un unique répertoire de base pour WeeChat\n"
+"                           ou 5 répertoires différents séparés par \":\" "
+"(dans cet ordre : config, data, state, cache, runtime)\n"
+"                           (la variable d'environnement WEECHAT_HOME est lue "
+"si cette option n'est pas donnée)\n"
+"  -t, --temp-dir           créer un répertoire de base WeeChat temporaire et "
+"le supprimer en quittant\n"
+"                           (incompatible avec l'option \"-d\")\n"
+"  -h, --help               afficher cette aide et quitter\n"
+"  -i, --build-info         afficher les informations de construction et "
+"quitter\n"
+"  -l, --license            afficher la licence WeeChat et quitter\n"
+"  -p, --no-plugin          ne charger aucune extension au démarrage\n"
+"  -P, --plugins <exts>     charger uniquement ces extensions au démarrage\n"
+"                           (voir /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  lancer la/les commande(s) après le démarrage ;\n"
+"                           plusieurs commandes peuvent être séparées par des "
+"points-virgules et sont évaluées,\n"
+"                           cette option peut être donnée plusieurs fois\n"
+"  -s, --no-script          ne charger aucun script au démarrage\n"
+"      --upgrade            mettre à jour WeeChat en utilisant les fichiers "
+"de session (voir /help upgrade dans WeeChat)\n"
+"  -v, --version            afficher la version de WeeChat et quitter\n"
+"  extension:option         option pour une extension (voir man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr "Options supplémentaires en mode sans interface (« headless ») :\n"
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+"      --doc-gen <rep>      générer les fichiers pour construire la "
+"documentation et quitter\n"
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+"      --daemon             lancer WeeChat comme un « daemon » (fork, nouveau "
+"groupe pour le processus, fermeture des descripteurs de fichiers);\n"
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+"                           (par défaut en mode sans interface WeeChat est "
+"bloquant et ne tourne pas en tâche de fond)\n"
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+"      --stdout             afficher les messages de log sur la sortie "
+"standard plutôt que de les écrire dans le fichier de log\n"
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+"                           (option ignorée si l'option \"--daemon\" est "
+"donnée)\n"
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+"Options de debug (pour des outils comme Valgrind, NE PAS UTILISER EN "
+"PRODUCTION) :\n"
+"      --no-dlclose         ne pas appeler la fonction dlclose après le "
+"déchargement des extensions\n"
+"      --no-gnutls          désactiver init/deinit de gnutls\n"
+"      --no-gcrypt          désactiver init/deinit de gcrypt\n"
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Erreur : paramètre manquant pour l'option \"%s\"\n"
+
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "WeeChat tourne sans interface (ctrl-c pour quitter)."

@@ -7862,11 +7814,11 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""
 "    - ${index_displayed} : index de la ligne affichée dans l'objet de barre "
 "(démarre à 0, seuls les tampons affichés incrémentent cet index, voir "
-"l'option buflist.look.display_conditions)"
+"l'option buflist.look.display_conditions"

 msgid "buflist bar items"
 msgstr "objets de barre de buflist"
@@ -8277,7 +8229,7 @@ msgid ""
 "-set <id> <property> <value> || -del <id>|-all [<id>...]"
 msgstr ""
 "-list || [-sh|-nosh] [-bg|-nobg] [-stdin|-nostdin] [-buffer <nom>] [-l|-o|-"
-"oc|-n|-nf] [-oerr] [-cl|-nocl] [-sw|-nosw] [-ln|-noln] [-flush|-noflush] [-"
+"oc|-n|-nf] [-oerr] [-cl|-nocl] [-sw|-nosw] [-ln|-noln] |-flush|-noflush] [-"
 "color ansi|auto|irc|weechat|strip] [-rc|-norc] [-timeout <délai>] [-name "
 "<nom>] [-pipe <commande>] [-hsignal <nom>] <commande> || -in <id> <texte> || "
 "-inclose <id> [<texte>] || -signal <id> <signal> || -kill <id> || -killall "
@@ -8788,7 +8740,7 @@ msgid ""
 "value, append for a positive value)"
 msgstr ""
 "raw[-add] : ajouter \"valeur\" (qui peut être un nombre négatif) pour les "
-"entiers, couleurs et énumérés, définir/ajouter à la valeur pour les autres "
+"entiers, couleurs et enumérés, définir/ajouter à la valeur pour les autres "
 "types (définir pour une valeur négative, ajouter pour un nombre positif)"

 msgid "raw[-reset]: reset the value of option"
@@ -8822,7 +8774,9 @@ msgid "raw[-mark]: toggle mark"
 msgstr "raw[-mark] : marquer/démarquer"

 msgid "raw[-format]: switch to the next available format"
-msgstr "raw[-format] : basculer vers le format disponible suivant"
+msgstr ""
+"raw[-format] : exporter les options et valeurs affichées dans un fichier "
+"(chaque ligne a le format : \"/set nom valeur\" ou \"/unset nom\")"

 msgid ""
 "raw[-export]: export the options and values displayed to a file (each line "
@@ -8941,7 +8895,7 @@ msgstr "  - fset.format.option2 : second format pour une option"

 msgid "  - option data, with color and padded by spaces on the right:"
 msgstr ""
-"  - données de l'option, avec couleur et alignées avec des espaces sur la "
+"  -  données de l'option, avec couleur et alignées avec des espaces sur la "
 "droite :"

 msgid "    - ${file}: configuration file (for example \"weechat\" or \"irc\")"
@@ -9671,7 +9625,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s : non connecté au serveur \"%s\" !"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s : la reconnexion automatique est annulée"

 #, c-format
@@ -9837,11 +9791,6 @@ msgid_plural "seconds"
 msgstr[0] "seconde"
 msgstr[1] "secondes"

-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "milliseconde"
-msgstr[1] "millisecondes"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minute"
@@ -9924,7 +9873,7 @@ msgid ""
 "disconnect %s\" before."
 msgstr ""
 "%s%s : vous ne pouvez pas supprimer le serveur \"%s\" car vous êtes connecté "
-"dessus. Essayez \"/disconnect %s\" avant."
+"dessus. Essayez /disconnect %s avant."

 #, c-format
 msgid "%s: server %s%s%s has been deleted"
@@ -9979,10 +9928,10 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr ""
 "[-current] [-parted|-all] [-exclude=<canal>[,<canal>...]] <commande> || [-"
-"current] [-parted|-all] [-include=<canal>[,<canal>...]] <commande>"
+"current] [-parted|-all] -include=<canal>[,<canal>...] <commande>"

 msgid "raw[-current]: execute command for channels of current server only"
 msgstr ""
@@ -10070,8 +10019,8 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr ""
 "[-current] [-exclude=<pseudo>[,<pseudo>...]] <commande> || [-current] [-"
 "include=<pseudo>[,<pseudo>...]] <commande>"
@@ -10127,8 +10076,8 @@ msgstr "exécuter une commande sur tous les serveurs connectés"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""
 "[-exclude=<serveur>[,<serveur>...]] <commande> || [-include=<serveur>[,"
 "<serveur>...]] <commande>"
@@ -10289,7 +10238,7 @@ msgstr ""
 "commence par \"-\", par exemple : \"-multi-prefix\")"

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""
 "raw[ack] : accuser réception de capacités qui nécessitent un accusé de "
 "réception du client"
@@ -10370,7 +10319,7 @@ msgstr ""

 msgid "raw[nooption]: set boolean option to \"off\" (for example: -notls)"
 msgstr ""
-"raw[nooption] : définir l'option booléenne à \"off\" (par exemple : -notls)"
+"raw[nooption] : définir l'option booléenne à 'off' (par exemple : -notls)"

 msgid "raw[-all]: connect to all servers defined in configuration"
 msgstr ""
@@ -10422,7 +10371,7 @@ msgstr "quitter et rejoindre un canal"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid "[<channel>[,<channel>...]] [<message>]"
-msgstr "[<canal>[,<canal>...]] [<message>]"
+msgstr "[<canal>[,<canal>...]] [message]"

 msgid "message: part message (displayed to other users)"
 msgstr "message : message de fin (affiché aux autres utilisateurs)"
@@ -12293,16 +12242,14 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""
 "liste de champs séparés par des virgules pour trier les options (voir /help "
 "list pour la liste des champs) ; le caractère \"-\" peut être utilisé pour "
 "inverser l'ordre, le caractère \"~\" peut être utilisé pour effectuer une "
-"comparaison insensible à la casse ; exemple : \"-users,~name2\" pour les "
-"plus gros canaux en premier puis tri insensible à la casse sur le nom de "
-"canal sans le préfixe"
+"comparaison insensible à la casse ; exemple : \"-users,~name\" pour les plus "
+"gros canaux en premier puis tri insensible à la casse sur le nom"

 msgid "strip channel topic colors in /list buffer"
 msgstr "supprimer les couleurs des titres des canaux dans le tampon /list"
@@ -12374,8 +12321,8 @@ msgid ""
 msgstr ""
 "liste des pseudos (séparés par des virgules) pour lesquels les mots de passe "
 "seront masqués quand un message est envoyé, par exemple pour cacher le mot "
-"de passe dans le message affiché par \"/msg nickserv identify "
-"mot_de_passe\", exemple : \"nickserv,nickbot\""
+"de passe dans le message affiché par \"/msg nickserv identify motdepasse\", "
+"exemple : \"nickserv,nickbot\""

 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
@@ -14224,7 +14171,7 @@ msgid ""
 "strftime)"
 msgstr ""
 "masque de fichier par défaut pour les fichiers de log (le format est "
-"\"répertoire/vers/fichier\" ou \"fichier\", sans le premier \"/\" car "
+"\"repertoire/vers/fichier\" ou \"fichier\", sans le premier \"/\" car "
 "l'option \"path\" est utilisée pour construire le chemin complet vers le "
 "fichier) ; les variables locales du tampon sont permises (vous ne devriez "
 "utiliser que des variables qui sont définies sur tous les tampons, donc par "
@@ -14473,7 +14420,7 @@ msgid ""
 "1 if scripts are automatically loaded, 0 if the auto-load has been disabled "
 "by the user (option \"-s\" or \"--no-script\")"
 msgstr ""
-"1 si la les scripts sont automatiquement chargés, 0 si l'auto-chargement a "
+"1 si la les scripts sont automatiquement charés, 0 si l'auto-chargement a "
 "été désactivé par l'utilisateur (option \"-s\" ou \"--no-script\")"

 msgid "buffer pointer"
@@ -15646,10 +15593,10 @@ msgstr "%s%s : le relai distant \"%s\" n'existe pas pour la commande \"%s\""

 #, c-format
 msgid "%s%s: no connection to remote relay \"%s\""
-msgstr "%s%s : non connecté au relai distant \"%s\""
+msgstr "%s%s : non connecté au relai distant \"%s\" !"

 #, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "remote[%s] : la reconnexion automatique est annulée"

 #, c-format
@@ -15676,12 +15623,10 @@ msgstr ""
 "restart|stop <nom> || raw || tlscertkey"

 msgid "raw[list]: list relay clients (only active relays)"
-msgstr ""
-"raw[list] : lister les clients pour le relai (seulement les relais actifs)"
+msgstr "raw[list] : lister les clients pour le relai"

 msgid "raw[listfull]: list relay clients (verbose, all relays)"
-msgstr ""
-"raw[listfull] : lister les clients pour le relai (verbeux, tous les relais)"
+msgstr "raw[listfull] : lister les clients pour le relai (verbeux)"

 msgid "raw[listrelay]: list relays (name and port)"
 msgstr "raw[listrelay] : lister les relais (nom et port)"
@@ -15752,7 +15697,7 @@ msgid "  - unix: use UNIX domain socket"
 msgstr "  - unix : utiliser un socket de domaine UNIX"

 msgid "  - protocol.name: protocol and name to relay:"
-msgstr "  - protocole.nom : protocole et nom à relayer :"
+msgstr "  - protocol.nom : protocole et nom à relayer :"

 msgid ""
 "    - protocol \"irc\": name is the server to share (optional, if not given, "
@@ -15761,7 +15706,7 @@ msgid ""
 msgstr ""
 "    - protocole \"irc\" : le nom est le serveur à partager (optionnel, si "
 "non donné, le nom de serveur doit être envoyé par le client dans la commande "
-"\"PASS\", avec le format : \"PASS serveur:mot_de_passe\")"
+"\"PASS\", avec le format : \"PASS serveur:motdepasse\")"

 msgid "    - protocol \"api\" (name is not used)"
 msgstr "    - protocole \"api\" (le nom n'est pas utilisé)"
@@ -15811,8 +15756,8 @@ msgid ""
 "<name> <new_name> || togglecmd"
 msgstr ""
 "list|listfull [<nom>] || add|addreplace <nom> <url> [-<option>[=<valeur>]] "
-"|| connect|reconnect|disconnect|del <nom> || send <nom> <json> || rename "
-"<nom> <nouveau_nom> || togglecmd"
+"|| connect|reconnect|disconnect|del <nom> || send <nom> <json> rename <nom> "
+"<nouveau_nom> || togglecmd"

 msgid ""
 "raw[list]: list remote relay servers (without argument, this list is "
@@ -15980,7 +15925,7 @@ msgid ""
 "\"weechat\""
 msgstr ""
 "ouvrir automatiquement le tampon lorsqu'un client se connecte avec l'un de "
-"ces protocoles (liste séparée par des virgules) ; les protocoles autorisés : "
+"ces protocoles (liste séparée par des virtules) ; les protocoles autorisés : "
 "\"api\", \"irc\", \"weechat\""

 msgid ""
@@ -15989,7 +15934,7 @@ msgid ""
 "\"weechat\""
 msgstr ""
 "afficher des messages lorsque les clients se connectent/déconnectent du "
-"relai qui utilisent un de ces protocoles (liste séparée par des virgules) ; "
+"relai qui utilisent un de ces protocoles (liste séparée par des virfules) ; "
 "protocoles autorisés : \"api\", \"irc\", \"weechat\""

 msgid ""
@@ -18185,8 +18130,8 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s : expression régulière invalide dans le trigger : \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
-msgstr "Écrit : "
+msgid "Typing:"
+msgstr "Écrit :"

 msgid ""
 "number of seconds after paused status has been set: if reached, the typing "
@@ -18235,14 +18180,6 @@ msgstr ""
 "nombre maximum de caractères affichés dans l'objet de barre \"typing\" (0 = "
 "ne pas tronquer le contenu)"

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-"texte à afficher avant les pseudos dans l'objet de barre \"typing\" ; si "
-"défini, il est utilisé à la place de la chaîne traduite \"Typing: \" qui est "
-"utilisée par défaut"
-
 msgid "Typing status of users"
 msgstr "Statut d'écriture des utilisateurs"

@@ -18380,13 +18317,11 @@ msgid "does not wait for ACK when sending file"
 msgstr "n'attend pas les accusés de réception lors de l'envoi de fichier"

 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "adresse IP ou DNS utilisée pour envoyer et recevoir de manière passive les "
-"fichiers/discussions ; si non renseigné, l'interface IP locale est utilisée "
-"(note : le contenu est évalué, voir /help eval)"
+"fichiers/discussions (si non renseigné, l'interface IP locale est utilisée)"

 msgid ""
 "restricts outgoing files/chats and incoming/passive files to use only ports "
@@ -18395,7 +18330,7 @@ msgid ""
 "use ports greater than 1024, because only root can use ports below 1024)"
 msgstr ""
 "restreint les fichiers/discussions sortants et les fichiers entrants de "
-"manière passive à utiliser des ports dans l'intervalle donné (pratique pour "
+"manière passice à utiliser des ports dans l'intervalle donné (pratique pour "
 "le NAT) (syntaxe : un port simple, par exemple 5000, un intervalle de ports, "
 "par exemple 5000-5015, si non renseigné tout port peut être utilisé, il est "
 "recommandé d'utiliser des ports supérieurs à 1024, car seul root peut "
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-08 08:59+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:27+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: hu\n"
@@ -32,154 +32,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-msgid "disable auto-connect to servers at startup"
-msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-msgid "display this help and exit"
-msgstr "másik fél nevének színe privát beszélgetésben"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "WeeChat logo mutatása induláskor"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "WeeChat logo mutatása induláskor"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr "felhasználónév az IRC szerveren"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%s nem sikerült a folyamatot menteni\n"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "WeeChat verziójának mutatása induláskor"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-msgid "plugin:option"
-msgstr "  (nem található bővítőmodul)\n"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, fuzzy, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"%s Copyright (C) 2003-2010, fordítva: %s %s\n"
-"Fejlesztő: Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr ""
-
-msgid "[option...] [plugin:option...]"
-msgstr ""
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
-
 #, fuzzy
 msgid "List of bars:"
 msgstr "Aliaszok listája:\n"
@@ -290,7 +142,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%s nem sikerült a modul opciókat elmenteni\n"

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""

 msgid "Buffers list:"
@@ -641,11 +493,11 @@ msgstr ""
 "%s \"-yes\" paraméter megadása kötelező a billentyűparancsok "
 "visszaállításához (biztonsági okokból)\n"

-#, c-format
-msgid "%d new key added (context: \"%s\")"
+#, fuzzy, c-format
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nincs mellőzés megadva.\n"
+msgstr[1] "Nincs mellőzés megadva.\n"

 #, fuzzy
 msgid "Stored layouts:"
@@ -1249,7 +1101,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1702,7 +1554,7 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""

@@ -1714,9 +1566,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2236,7 +2085,7 @@ msgid "display help about commands and options"
 msgstr "segítség megjelenítése a parancsokhoz"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr ""

 msgid ""
@@ -2296,9 +2145,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3163,7 +3012,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3400,20 +3249,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3653,7 +3502,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -5897,7 +5746,7 @@ msgstr "  . típus szöveg (értékek: "
 msgid "read - object type"
 msgstr ""

-msgid "read - bad object type (\"object start\" expected)"
+msgid "read - bad object type ('object start' expected)"
 msgstr ""

 msgid "read - object id"
@@ -6012,6 +5861,98 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr ""

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, fuzzy, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"%s Copyright (C) 2003-2010, fordítva: %s %s\n"
+"Fejlesztő: Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect        automatikus csatlakozás a szerverekhez tiltása\n"
+"  -c, --config            beállítófájl opcióinak mutatása\n"
+"  -d, --dir <path>        a WeeChat saját könyvtára (alapértelmezett: "
+"~/.weechat)\n"
+"  -f, --key-functions     WeeChat billentyűparancsok mutatása\n"
+"  -h, --help              ez a segítség\n"
+"  -i, --irc-commands      IRC parancsok mutatása\n"
+"  -k, --keys              alapértelmezett WeeChat billentyűk\n"
+"  -l, --license           WeeChat licenc\n"
+"  -p, --no-plugin         nem tölt be modulokat induláskor\n"
+"  -v, --version           WeeChat verziójának mutatása\n"
+"  -w, --weechat-commands  WeeChat parancsok mutatása\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
+
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr ""

@@ -6715,7 +6656,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8242,7 +8183,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"

 #, fuzzy, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "automata újracsatlakozás megszakítva\n"

 #, fuzzy, c-format
@@ -8403,12 +8344,6 @@ msgid_plural "seconds"
 msgstr[0] "másodperc"
 msgstr[1] "másodperc"

-#, fuzzy
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "másodperc"
-msgstr[1] "másodperc"
-
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
@@ -8564,7 +8499,7 @@ msgstr "CTCP üzenet küldése az összes csatlakoztatott szerver összes szobá
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[alias_név [parancs [paraméterek]]]"

 #, fuzzy
@@ -8654,8 +8589,8 @@ msgstr "CTCP üzenet küldése az összes csatlakoztatott szerver összes szobá
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[alias_név [parancs [paraméterek]]]"

 #, fuzzy
@@ -8704,11 +8639,10 @@ msgid "execute a command on all connected servers"
 msgstr "üzenet küldése az összes csatlakoztatott szerver összes szobájába"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-#, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
-msgstr "[alias_név [parancs [paraméterek]]]"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
+msgstr ""

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
 msgstr ""
@@ -8857,7 +8791,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -10829,9 +10763,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -13965,7 +13898,7 @@ msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"

 #, fuzzy, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "automata újracsatlakozás megszakítva\n"

 #, fuzzy, c-format
@@ -16200,7 +16133,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -16234,11 +16167,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -16385,9 +16313,8 @@ msgstr "nem vár ACK válaszra fájl küldésekor"

 #, fuzzy
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr "kimenő dcc forgalom IP/DNS-címe (ha üres, a helyi interfész IP-címe)"

 #, fuzzy
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-12 20:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:27+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: it\n"
@@ -32,161 +32,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: impossibile connettersi al mittente"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "usa lo stesso colore del nick per canale e privato"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "mostra il logo di WeeChat all'avvio"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "mostra il logo di WeeChat all'avvio"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"comando eseguito all'avvio di WeeChat, dopo il caricamento dei plugin (nota: "
-"il contenuto viene valutato, consultare /help eval)"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sErrore: impossibile salvare la sessione su file"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "mostra la versione di WeeChat all'avvio"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "puntatore al plugin (opzionale)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, compilato il %s %s\n"
-"Sviluppato da Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr ""
-
-#, fuzzy
-#| msgid "Usage: %s [option...] [plugin:option...]\n"
-msgid "[option...] [plugin:option...]"
-msgstr "Uso: %s [opzione...] [plugin:opzione...]\n"
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Errore: argomento mancante per l'opzione \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Elenco delle barre:"

@@ -293,9 +138,9 @@ msgstr "%sErrore: finestra non trovata per il comando \"%s\""
 msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sErrore: impossibile scorrere la barra \"%s\""

-#, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
-msgstr ""
+#, fuzzy, c-format
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
+msgstr "%sNumero colore \"%s\" non valido (deve essere compresto tra %d e %d)"

 msgid "Buffers list:"
 msgstr "Elenco buffer:"
@@ -651,7 +496,7 @@ msgstr ""
 "sicurezza)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nuovo tasto aggiunto (contesto: \"%s\")"
 msgstr[1] "%d nuovi tasti aggiunti (contesto: \"%s\")"
@@ -1274,7 +1119,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1762,7 +1607,7 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""
 "[-n] <espressione> || [-n] -c <espressione1> <operatore> <espressione2>"
@@ -1775,9 +1620,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2323,7 +2165,7 @@ msgstr "visualizza l'aiuto su comandi e opzioni"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <comando> || <opzione>"

 msgid ""
@@ -2386,9 +2228,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3284,7 +3126,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3562,20 +3404,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3838,7 +3680,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -4966,7 +4808,7 @@ msgid ""
 "string used to show that some lines are filtered in current buffer (bar item "
 "\"buffer_filter\")"
 msgstr ""
-"stringa usata per mostrare che alcune righe sono state filtrate nel buffer "
+"stringa usata per mostrare che alcune righe sono state filtrate  nel buffer "
 "corrente (elemento barra \"buffer_filter\")"

 #, fuzzy
@@ -6340,7 +6182,7 @@ msgstr "%s    sorgente: %s, riga: %d"
 #, c-format
 msgid "%s    *** Please report above info to developers ***"
 msgstr ""
-"%s    *** Per favore inviare le precedenti informazioni agli sviluppatori ***"
+"%s *** Per favore inviare le precedenti informazioni agli sviluppatori ***"

 msgid "write - object type"
 msgstr "scrittura - tipo oggetto"
@@ -6360,8 +6202,8 @@ msgstr "scrittura - variabile"
 msgid "read - object type"
 msgstr "lettura - tipo oggetto"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "lettura - tipo oggetto errato (\"object start\" previsto)"
+msgid "read - bad object type ('object start' expected)"
+msgstr "lettura - tipo oggetto errato ('object start' previsto)"

 msgid "read - object id"
 msgstr "lettura - id oggetto"
@@ -6481,6 +6323,100 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "Fine comando '%s', timeout raggiunto (%.1fs)"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, compilato il %s %s\n"
+"Sviluppato da Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Uso: %s [opzione...] [plugin:opzione...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect\t    disabilita la connessione automatica all'avvio\n"
+"  -c, --colors             mostra i colori predefiniti nel terminale\n"
+"  -d, --dir <path>         imposta la directory principale di WeeChat "
+"(predefinita: ~/.weechat)\n"
+"  -h, --help               mostra questo aiuto\n"
+"  -l,  --license           mostra la licenza di WeeChat\n"
+"  -p, --no-plugin          non carica i plugin all'avvio\n"
+"  -s, --no-script          non carica gli script all'avvio\n"
+"  -r, --run-command        esegue uno o più comandi all'avvio\n"
+"(più comandi vanno separati da punto e virgola)\n"
+"      --upgrade            aggiorna WeeChat usando i file di sessione "
+"(consultare /help upgrade in WeeChat)\n"
+"  -v. --version            mostra la versione di WeeChat\n"
+"  plugin:opzione           opzione per il plugin (consultare man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Errore: argomento mancante per l'opzione \"%s\"\n"
+
 #, fuzzy
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "1 se si sta aggiornando WeeChat (comando `/upgrade`)"
@@ -7206,7 +7142,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8807,7 +8743,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: non connesso al server \"%s\"!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: la riconnessione automatica è annullata"

 #, c-format
@@ -8977,14 +8913,6 @@ msgid_plural "seconds"
 msgstr[0] "secondo"
 msgstr[1] "secondi"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "secondo"
-msgstr[1] "secondi"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -9147,7 +9075,7 @@ msgstr "esegue un comando su tutti i canali di tutti i server connessi"
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[-current] [-exclude=<canale>[,<canale>...]] <comando> [<argomenti>]"

 #, fuzzy
@@ -9249,8 +9177,8 @@ msgstr "esegue un comando su tutti i canali di tutti i server connessi"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[-current] [-exclude=<canale>[,<canale>...]] <comando> [<argomenti>]"

 #, fuzzy
@@ -9305,8 +9233,8 @@ msgstr "esegue un comando su tutti i server connessi"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr "[-exclude=<server>[,<server>...]] <comando> [<argomenti>]"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -9471,7 +9399,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -11580,9 +11508,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -12668,7 +12595,7 @@ msgstr "%sL'argomento per %s%s%s è \"%s%s\""
 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
 msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s"
-msgstr "%sArgomento impostato da %s%s%s%s%s%s%s%s%s il %s"
+msgstr "%sArgomento impostato da  %s%s%s%s%s%s%s%s%s il %s"

 #. TRANSLATORS: "%s" after "on" is a date
 #, c-format
@@ -12880,7 +12807,7 @@ msgstr "%s%s: nessuna connessione al server \"%s\" per la redirezione"

 #, c-format
 msgid "%s%s: missing argument \"%s\" for redirect"
-msgstr "%s%s: argomento \"%s\" mancante per la redirezione"
+msgstr "%s%s: argomento \"%s\"  mancante per la redirezione"

 #, c-format
 msgid "%s%s: redirect pattern \"%s\" not found"
@@ -14963,9 +14890,10 @@ msgstr "%s%s: server \"%s\" non trovato per il comando \"%s\""
 msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: non connesso al server \"%s\"!"

-#, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: auto-reconnection is cancelled"
+msgid "remote[%s]: auto-reconnection is cancelled"
+msgstr "%s: la riconnessione automatica è annullata"

 #, fuzzy, c-format
 #| msgid "%s%s: server \"%s\" already exists for \"%s\" command"
@@ -17368,7 +17296,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: errore nella compilazione dell'espressione regolare \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -17402,11 +17330,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -17556,9 +17479,8 @@ msgstr "non attendere ACK all'invio del file"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "Indirizzo IP o DNS per l'invio di file/chat (se vuoto, verrà usata "
 "l'interfaccia IP locale)"
@@ -17851,7 +17773,7 @@ msgstr "%s%s: tipo xfer \"%s\" sconosciuto"

 #, c-format
 msgid "%s%s: unknown xfer protocol \"%s\""
-msgstr "%s%s: protocollo xfer \"%s\" sconosciuto"
+msgstr "%s%s: protocollo xfer  \"%s\" sconosciuto"

 #, c-format
 msgid "%s%s: cannot access file \"%s\""
@@ -17886,5 +17808,6 @@ msgid ""
 "%s%s: unable to accept resume file \"%s\" (port: %d, start position: %llu): "
 "xfer not found or not ready for transfer"
 msgstr ""
-"%s%s: impossibile accettare di riprendere il file \"%s\" (porta: %d, "
-"posizione di avvio: %llu): xfer non trovato o non pronto per il trasferimento"
+"%s%s: impossibile accettare di riprendere il file  \"%s\" (porta: %d, "
+"posizione di avvio: %llu):  xfer non trovato o non pronto per il "
+"trasferimento"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-16 13:22+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2026-03-16 13:19+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
 "translation/ja_JP>\n"
@@ -33,164 +33,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: 送信者に接続できません"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "チャンネルとプライベートバッファで同じニックネーム色を利用"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "WeeChat ロゴを開始時に表示"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "WeeChat ロゴを開始時に表示"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"WeeChat が実行され、プラグインのロード後に実行されるコマンド (注意: 値は評価"
-"されます、/help eval を参照してください)"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sエラー: ファイルにセッションを保存できません"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "WeeChat バージョンを開始時に表示"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "プラグインポインタ (任意)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-"WeeChat をデーモンとして実行 (フォーク、新しいプロセスグループ、ファイルディ"
-"スクリプタを閉じる); ヘッドレスモードのデフォルトでは WeeChat はプロセスをブ"
-"ロックし、バックグラウンド動作しません"
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr "プラグインがアンロードされた後に、dlclose 関数を呼び出さない"
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr "gnutls の init/deinit を無効化"
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr "gcrypt の init/deinit を無効化"
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s 著作権 %s、%s %s にコンパイル\n"
-"開発者 Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "使い方:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[オプション...] [プラグイン:オプション...]"
-
-msgid "Extra options in headless mode:"
-msgstr "ヘッドレスモード用の追加オプション:"
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-"デバッグオプション (valgrind などのツールと組み合わせて使用してください、通常"
-"利用中には使用しないでください):"
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "エラー: \"%s\" オプションの引数がありません\n"
-
 msgid "List of bars:"
 msgstr "バーのリスト:"

@@ -298,7 +140,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sエラー: バー \"%s\" をスクロールできません"

 #, fuzzy, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""
 "%sエラー: %d は範囲外のバッファ番号です (1 から %d の間で指定してください)"

@@ -665,9 +507,9 @@ msgstr ""
 "由で)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] ""
+msgstr[0] "%d 個の新しいキーを追加しました (コンテキスト: \"%s\")"

 msgid "Stored layouts:"
 msgstr "保存されたレイアウト:"
@@ -1287,7 +1129,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1803,7 +1645,7 @@ msgstr "式を評価"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>"

@@ -1821,9 +1663,6 @@ msgstr ""
 "正規表現置換が行われた後に条件が満足された場合に実行するコマンド (多くのコマ"
 "ンドを実行するにはセミコロンで区切ってください)"

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2365,7 +2204,7 @@ msgstr "コマンドとオプションに関するヘルプを表示"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"

 msgid ""
@@ -2428,9 +2267,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3339,7 +3178,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3642,20 +3481,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3925,7 +3764,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -6536,8 +6375,8 @@ msgstr "書き込み - 変数"
 msgid "read - object type"
 msgstr "読み込み - オブジェクト型"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "書き込み - 不正なオブジェクト型 (\"object start\" が必要)"
+msgid "read - bad object type ('object start' expected)"
+msgstr "書き込み - 不正なオブジェクト型 ('object start' が必要)"

 msgid "read - object id"
 msgstr "読み込み - オブジェクト id"
@@ -6661,6 +6500,121 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "コマンド '%s' の終了、タイムアウトになりました (%.1fs)"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s 著作権 %s、%s %s にコンパイル\n"
+"開発者 Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "使い方: %s [オプション...] [プラグイン:オプション...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         起動時にサーバに自動接続しない\n"
+"  -c, --colors             端末にデフォルトの色を表示\n"
+"  -d, --dir <path>         WeeChat ホームディレクトリを設定 (デフォルト: "
+"~/.weechat)\n"
+"                           (このオプションが設定されていない場合、"
+"WEECHAT_HOME 環境変数を読みます)\n"
+"  -t, --temp-dir           一時的に WeeChat ホームディレクトリを作成し、終了"
+"時にこれを削除\n"
+"                           (オプション \"-d\" と同時利用不可)\n"
+"  -h, --help               このヘルプを表示\n"
+"  -l, --license            WeeChat ライセンスを表示\n"
+"  -p, --no-plugin          起動時にプラグインをロードしない\n"
+"  -P, --plugins <plugins>  指定したプラグインのみを起動時にロードする\n"
+"                           (/help weechat.plugin.autoload を参照してくださ"
+"い)\n"
+"  -r, --run-command <cmd>  起動後にコマンドを実行;\n"
+"                           複数のコマンドを実行するには各コマンドをセミコロン"
+"で区切って下さい\n"
+"                           このオプションは複数回使用できます\n"
+"  -s, --no-script          起動時にスクリプトをロードしない\n"
+"      --upgrade            セッションファイルを使って WeeChat をアップグレー"
+"ド (WeeChat で /help upgrade を確認してください)\n"
+"  -v, --version            WeeChat のバージョンを表示\n"
+"  plugin:option            プラグイン用オプション (man weechat を参照してくだ"
+"さい)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr "ヘッドレスモード用の追加オプション:\n"
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+"      --daemon             WeeChat をデーモンとして実行 (フォーク、新しいプロ"
+"セスグループ、ファイルディスクリプタを閉じる);\n"
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+"                           (ヘッドレスモードのデフォルトでは WeeChat はプロセ"
+"スをブロックし、バックグラウンド動作しません)\n"
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+"デバッグオプション (valgrind などのツールと組み合わせて使用してください、通常"
+"利用中には使用しないでください):\n"
+"      --no-dlclose         プラグインがアンロードされた後に、dlclose 関数を呼"
+"び出さない\n"
+"      --no-gnutls          gnutls の init/deinit を無効化\n"
+"      --no-gcrypt          gcrypt の init/deinit を無効化\n"
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "エラー: \"%s\" オプションの引数がありません\n"
+
 #, fuzzy
 #| msgid "WeeChat is running in headless mode (Ctrl-C to quit)."
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
@@ -7411,7 +7365,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -7690,7 +7644,7 @@ msgid ""
 msgstr ""
 "%s%s: 警告: buffers.pl スクリプトが読み込まれました。buffers.pl スクリプトは "
 "buflist プラグインと類似するバーリストが含まれるバーを提供しています; 必要な"
-"らば、buffers.pl スクリプトを削除 (/script remove buffers.pl) するか、"
+"らば、buffers.pl スクリプトを削除  (/script remove buffers.pl) するか、"
 "buflist プラグインを無効化/アンロードしてください; 詳しい情報は WeeChat リ"
 "リースノートを参照してください"

@@ -9106,7 +9060,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: サーバ \"%s\" に接続されていません!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: 自動再接続がキャンセルされました"

 #, c-format
@@ -9274,13 +9228,6 @@ msgid "second"
 msgid_plural "seconds"
 msgstr[0] "秒"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "秒"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
@@ -9442,7 +9389,7 @@ msgstr "全てのサーバ、全てのチャンネルに対してコマンドを
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr ""
 "[-current] [-exclude=<channel>[,<channel>...]] <command> [<arguments>] || [-"
 "current] -include=<channel>[,<channel>...] <command> [<arguments>]"
@@ -9545,8 +9492,8 @@ msgstr "全ての接続済みサーバの全てのプライベートバッファ
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr ""
 "[-current] [-exclude=<nick>[,<nick>...]] <command> [<arguments>] || [-"
 "current] -include=<nick>[,<nick>...] <command> [<arguments>]"
@@ -9603,8 +9550,8 @@ msgstr "全ての接続済みサーバでコマンドを実行"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""
 "[-exclude=<server>[,<server>...]] <command> [<arguments>] || "
 "-include=<server>[,<server>...] <command> [<arguments>]"
@@ -9785,7 +9732,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -12007,9 +11954,8 @@ msgstr "fset バッファの左右スクロール量 (横幅の割合)"
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -12807,7 +12753,7 @@ msgstr "%s%s: サーバに接続していません"

 #, c-format
 msgid "%s%s: this buffer is not a channel!"
-msgstr "%s%s: このバッファはチャンネルではありません!"
+msgstr "%s%s: このバッファはチャンネルではありません"

 #, c-format
 msgid ""
@@ -12980,7 +12926,6 @@ msgstr "%s%s%s%s%s に kill されました"
 msgid "%sMode %s%s %s[%s%s%s%s%s]%s by %s%s"
 msgstr "%1$s%11$s%12$s がモードを変更 %2$s%3$s %4$s[%5$s%6$s%7$s%8$s%9$s]%10$s"

-# noqa
 #, c-format
 msgid "%sUser mode %s[%s%s%s]%s by %s%s"
 msgstr "%1$s%7$s%8$s%6$s がユーザモードを変更 %2$s[%3$s%4$s%5$s]%6$s"
@@ -15445,9 +15390,10 @@ msgstr "%1$s%2$s: \"%4$s\" コマンドのサーバ \"%3$s\" は見つかりま
 msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: サーバ \"%s\" に接続されていません!"

-#, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: auto-reconnection is cancelled"
+msgid "remote[%s]: auto-reconnection is cancelled"
+msgstr "%s: 自動再接続がキャンセルされました"

 #, fuzzy, c-format
 #| msgid "%s%s: server \"%s\" already exists for \"%s\" command"
@@ -17955,7 +17901,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: トリガの正規表現が間違っています: \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -17989,11 +17935,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -18143,9 +18084,8 @@ msgstr "ファイル送信時に肯定応答を待たない"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "ファイル/チャットの送信に使う IP か DNS アドレス (空の場合、ローカルインター"
 "フェース IP を使う)"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-12 20:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:27+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
 "Language: pt\n"
@@ -33,159 +33,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: não foi possível conectar para enviar"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "usar a mesma cor para o nick no canal e em privado"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "mostrar o logo do WeeChat ao iniciar"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "mostrar o logo do WeeChat ao iniciar"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"comando executado ao iniciar o WeeChat, depois de recarregar os plugins "
-"(nota: o conteúdo é avaliado, ver /help eval)"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sErro: não foi possível guardar a sessão no ficheiro"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "mostrar a versão do WeeChat ao iniciar"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "ponteiro para plugin (opcional)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, compilado a %s %s\n"
-"Desenvolvido por Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Utilização:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[opção...] [plugin:opção...]"
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Erro: falta o argumento da opção \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Lista de barras:"

@@ -294,7 +141,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sErro: não foi possível deslocar a barra \"%s\""

 #, fuzzy, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""
 "%sErro: o buffer número %d está fora do intervalo (deve estar entre 1 e %d)"

@@ -662,9 +509,9 @@ msgstr ""
 "de segurança)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] "%d nova tecla adicionada (contexto: \"%s\")"
+msgstr[0] "%d nova tecla adicionada"
 msgstr[1] "%d novas teclas adicionadas (contexto: \"%s\")"

 msgid "Stored layouts:"
@@ -1293,7 +1140,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1811,7 +1658,7 @@ msgstr "avaliar uma expressão"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr "[-n|-s] <expressão> || [-n] -c <expressão1> <operador> <expressão2>"

@@ -1829,9 +1676,6 @@ msgstr ""
 "comandos a executar se as condições estiverem bem, depois de substituir as "
 "expressões regulares (pode separar vários comandos por ponto e vírgula)"

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2376,7 +2220,7 @@ msgstr "mostrar ajuda sobre comandos e opções"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <comando> || <opção>"

 msgid ""
@@ -2439,9 +2283,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3345,7 +3189,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3651,20 +3495,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3936,7 +3780,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -6591,8 +6435,8 @@ msgstr "escrita - variável"
 msgid "read - object type"
 msgstr "leitura - tipo de objeto"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "leitura - tipo de objeto incorreto (esperava-se \"object start\")"
+msgid "read - bad object type ('object start' expected)"
+msgstr "leitura - tipo de objeto incorreto (esperava-se 'object start')"

 msgid "read - object id"
 msgstr "leitura - id objeto"
@@ -6713,6 +6557,104 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr "Fim do comando '%s', tempo limite atingido (%.1fs)"

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, compilado a %s %s\n"
+"Desenvolvido por Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Utilização: %s [opção...] [plugin:opção...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         desativar conexão automática aos servidores ao "
+"iniciar\n"
+"  -c, --colors             mostrar cores predefinidas no terminal\n"
+"  -d, --dir <path>         definir o diretório do WeeChat (predefinição: "
+"~/.weechat)\n"
+"                           (a variável de ambiente WEECHAT_HOME é lida se "
+"esta opção não for fornecida)\n"
+"  -h, --help               mostrar esta ajuda\n"
+"  -l, --license            mostrar a licença do WeeChat\n"
+"  -p, --no-plugin          não carregar nenhum plugin ao iniciar\n"
+"  -r, --run-command <cmd>  executar os comandos ao iniciar\n"
+"                           (pode-se separar vários comandos por ponto e "
+"vírgula)\n"
+"  -s, --no-script          não carregar nenhum comando ao iniciar\n"
+"      --upgrade            atualizar o WeeChat usando ficheiros de sessão "
+"(ver /help upgrade no WeeChat)\n"
+"  -v, --version            mostrar a versão do WeeChat\n"
+"  plugin:opção            opção de um plugin (ver man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Erro: falta o argumento da opção \"%s\"\n"
+
 #, fuzzy
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "1 se o WeeChat está a atualizar (comando `/upgrade`)"
@@ -7468,7 +7410,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -9077,7 +9019,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: não está conectado ao servidor \"%s\"!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: a reconexão automática foi cancelada"

 #, c-format
@@ -9249,14 +9191,6 @@ msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -9421,7 +9355,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[-current] [-exclude=<canal>[,<canal>...]] <comando> [<argumentos>]"

 #, fuzzy
@@ -9525,8 +9459,8 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[-current] [-exclude=<nick>[,<nick>...]] <comando> [<argumentos>]"

 #, fuzzy
@@ -9582,8 +9516,8 @@ msgstr "executar um comando em todos os servidores conectados"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr "[-exclude=<servidor>[,<servidor>...]] <comando> [<argumentos>]"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -9754,7 +9688,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -11201,7 +11135,7 @@ msgstr ""
 msgid ""
 "%s%s: invalid priorities string, error at this position in string: \"%s\""
 msgstr ""
-"%s%s: cadeia de prioridades inválida, erro nesta posição na cadeia: \"%s\""
+"%s%s:  cadeia de prioridades inválida, erro nesta posição na cadeia: \"%s\""

 #, fuzzy, c-format
 msgid "%s%s: warning: invalid autojoin value \"%s\", see /help %s.%s.%s"
@@ -11940,9 +11874,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -15347,9 +15280,10 @@ msgstr "%s%s: o servidor \"%s\" do comando \"%s\" não foi encontrado"
 msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: não está conectado ao servidor \"%s\"!"

-#, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: auto-reconnection is cancelled"
+msgid "remote[%s]: auto-reconnection is cancelled"
+msgstr "%s: a reconexão automática foi cancelada"

 #, fuzzy, c-format
 #| msgid "%s%s: server \"%s\" already exists for \"%s\" command"
@@ -16255,7 +16189,7 @@ msgid ""
 "%s%s: too few arguments received from client %s%s%s for command \"%s\" "
 "(received: %d arguments, expected: at least %d)"
 msgstr ""
-"%s%s: argumentos insuficientes recebidos do cliente %s%s%s pelo comando "
+"%s%s: argumentos insuficientes recebidos do cliente %s%s%s  pelo comando "
 "\"%s\" (recebido: %d argumentos, esperado: pelo menos %d)"

 msgid "Support of ruby scripts"
@@ -17851,7 +17785,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: expressão regular inválida no acionador: \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -17885,11 +17819,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -18040,9 +17969,8 @@ msgstr "não aguardar por ACK ao enviar ficheiros"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "IP ou endereço DNS usado para enviar ficheiros/chats (se vazio, é usado o IP "
 "da interface local)"
@@ -19,35 +19,12 @@
 # You should have received a copy of the GNU General Public License
 # along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
 #
-# Common conventions used here:
-# hotlist -> lista de atividade
-# input -> entrada
-# scroll -> rolar
-# set -> definido
-# buffer -> buffer (don't translate it)
-# hostname -> hostname
-# nick -> apelido
-# op/voice -> don't translate irc specific terms (besides nick)
-# feature -> característica
-# don't translate weechat specific terms, like "left" when used as a option value
-# merge -> mesclar
-# layout -> disposição
-# background -> fundo (quando se referir à cores, janelas)
-# comma separated list of X -> lista de X separadas por vírgulas
-# status -> status
-# away -> ausent (when refers to a nick status)
-# cursor -> cursor (don't translate it)
-# dump -> dump (don't translate it)
-# key bindings -> atalhos de teclado
-# bind -> vincular
-# handshake -> handshake (don't translate it when related to cryptography)
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-12 20:19+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:27+0100\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: pt_BR\n"
@@ -57,159 +34,6 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.1\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-#| msgid "%s%s: unable to connect to sender"
-msgid "disable auto-connect to servers at startup"
-msgstr "%s%s: não foi possível conectar ao remetente"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-#| msgid "use same nick color for channel and private"
-msgid "display this help and exit"
-msgstr "utilizar a mesma cor de apelido para canal e privado"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "mosta o logo do WeeChat na inicialização"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "mosta o logo do WeeChat na inicialização"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"comando executado quando o WeeChat inicia, após o carregamento dos plugins "
-"(nota: o conteúdo é avaliado, veja /help eval)"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%sErro: incapaz de salvar a sessão em arquivo"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "mosta a versão do WeeChat na inicialização"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-#| msgid "plugin pointer (optional)"
-msgid "plugin:option"
-msgstr "pointeiro do plugin (opcional)"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s Copyright %s, compilado em %s %s\n"
-"Desenvolvido por Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Uso:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[opção...] [plugin:opção...]"
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Erro: faltando argumento para opção \"%s\"\n"
-
 msgid "List of bars:"
 msgstr "Lista de barras:"

@@ -317,7 +141,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sErro: não foi possível rolar a barra \"%s\""

 #, fuzzy, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr "%sNúmero de cor inválido \"%s\" (precisa ser entre %d e %d)"

 msgid "Buffers list:"
@@ -680,9 +504,9 @@ msgstr ""
 "de segurança)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] "%d nova tecla adicionada (context: \"%s\")"
+msgstr[0] "%d nova tecla adicionada"
 msgstr[1] "%d novas teclas adicionadas (context: \"%s\")"

 #, fuzzy
@@ -1302,7 +1126,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1795,7 +1619,7 @@ msgstr "avaliar expressão"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr "[-n|-s] <expression> || [-n] -c <expression1> <operator> <expression2>"

@@ -1807,9 +1631,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2353,7 +2174,7 @@ msgstr "mostra a ajuda sobre comandos e opções"
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 #| msgid "-list|-listfull [<plugin> [<plugin>...]] || <command> || <option>"
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<plugin> [<plugin>...]] || <comando> || <opção>"

 msgid ""
@@ -2416,9 +2237,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3309,7 +3130,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3580,20 +3401,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3856,7 +3677,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -6261,7 +6082,7 @@ msgstr ""
 msgid "read - object type"
 msgstr ""

-msgid "read - bad object type (\"object start\" expected)"
+msgid "read - bad object type ('object start' expected)"
 msgstr ""

 msgid "read - object id"
@@ -6376,6 +6197,133 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr ""

+# Common conventions used here:
+# hotlist -> lista de atividade
+# input -> entrada
+# scroll -> rolar
+# set -> definido
+# buffer -> buffer (don't translate it)
+# hostname -> hostname
+# nick -> apelido
+# op/voice -> don't translate irc specific terms (besides nick)
+# feature -> característica
+# don't translate weechat specific terms, like "left" when used as a option value
+# merge -> mesclar
+# layout -> disposição
+# background -> fundo (quando se referir à cores, janelas)
+# comma separated list of X -> lista de X separadas por vírgulas
+# status -> status
+# away -> ausent (when refers to a nick status)
+# cursor -> cursor (don't translate it)
+# dump -> dump (don't translate it)
+# key bindings -> atalhos de teclado
+# bind -> vincular
+# handshake -> handshake (don't translate it when related to cryptography)
+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s Copyright %s, compilado em %s %s\n"
+"Desenvolvido por Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Uso: %s [opção...] [plugin:opção...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         desabilita a auto-conexão a servidores durante a "
+"inicialização\n"
+"  -c, --colors             exibe as cores padrões no terminal\n"
+"  -d, --dir <path>         configura diretório do WeeChat (padrão: "
+"~/.weechat)\n"
+"                           (a variável de ambiente WEECHAT_HOME é lida "
+"seessa opção não for dada)\n"
+"  -t, --temp-dir           cria um diretório temporário para o WeeChat e "
+"odeleta na saída\n"
+"  -h, --help               mostra esta ajuda\n"
+"  -l, --license            mostra a licença do WeeChat\n"
+"  -p, --no-plugin          não carrega nenhum plugin durante a "
+"inicialização\n"
+"  -P, --plugins <plugins>  carregue apenas esses plugins na inicialização\n"
+"                           (veja /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  executa comandos após a inicialização;\n"
+"                           vários comandos podem ser separados por ponto-e-"
+"vírgula,\n"
+"                           essa opção pode ser utilizada mais de uma vez\n"
+"  -s, --no-script          não carrega nenhum script durante a "
+"inicialização\n"
+"      --upgrade            atualiza o WeeChat através dos arquivos de sessão "
+"(veja /help upgrade no WeeChat)\n"
+"  -v, --version            mostra a versão do WeeChat\n"
+"  plugin:option            opção para o plugin (veja o manual do WeeChat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Erro: faltando argumento para opção \"%s\"\n"
+
 #, fuzzy
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "1 se o WeeChat está sendo atualizado (comando `/upgrade`)"
@@ -7092,7 +7040,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8668,7 +8616,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr ""

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr ""

 #, c-format
@@ -8830,14 +8778,6 @@ msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"

-#, fuzzy
-#| msgid "second"
-#| msgid_plural "seconds"
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
@@ -8982,7 +8922,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "<apelido>[,<apelido>...] [<contador> [<target>]]"

 #, fuzzy
@@ -9071,8 +9011,8 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "<apelido>[,<apelido>...] [<contador> [<target>]]"

 msgid ""
@@ -9124,8 +9064,8 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -9273,7 +9213,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 msgid "raw[end]: end the capability negotiation"
@@ -11186,9 +11126,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -14424,7 +14363,7 @@ msgstr "%s%s: sem conexão com o servidor \"%s\" para redirecionamento"

 #, fuzzy, c-format
 #| msgid "%s%s: connection refused"
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "%s%s: conexão recusada"

 #, fuzzy, c-format
@@ -16756,7 +16695,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: erro ao compilar expressão regular \"%s\""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -16790,11 +16729,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -16945,9 +16879,8 @@ msgstr "não esperar por ACK quando enviar arquivo"
 #| "IP or DNS address used for sending files/chats (if empty, local interface "
 #| "IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "Endereço IP ou DNS usado para enviar arquivos/chats (se vazio, interface "
 "local IP é usada)"
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-08 08:59+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2025-10-27 08:27+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: ru\n"
@@ -35,154 +35,6 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-#, fuzzy
-msgid "disable auto-connect to servers at startup"
-msgstr "%s DCC: не могу соединиться с отправителем\n"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-#, fuzzy
-msgid "display this help and exit"
-msgstr "цвет ника собеседника в окне привата"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "display WeeChat license and exit"
-msgstr "отображать логотип WeeChat при запуске"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-#, fuzzy
-#| msgid "display WeeChat logo at startup"
-msgid "don't load any plugin at startup"
-msgstr "отображать логотип WeeChat при запуске"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-#, fuzzy
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr "ник, используемый на IRC сервере"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-#, fuzzy
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr "%s не могу сохранить сессию в файл\n"
-
-#. TRANSLATORS: command line option "-v", "--version"
-#, fuzzy
-#| msgid "display WeeChat version at startup"
-msgid "display WeeChat version and exit"
-msgstr "отображать версию WeeChat при запуске"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-#, fuzzy
-msgid "plugin:option"
-msgstr "  (нет pluginа)\n"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, fuzzy, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"%s Copyright (C) 2003-2010, собран %s %s\n"
-"Разработчик - Sébastien Helleu <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Использование:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[опция...] [расширение:опция...]"
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "%s нет аргумента для параметра \"%s\"\n"
-
 #, fuzzy
 msgid "List of bars:"
 msgstr "Список сокращений:\n"
@@ -293,7 +145,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%s не могу сохранить конфигурационный файл pluginов\n"

 #, fuzzy, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr "%sОшибочный код цвета \"%s\" (должен быть в диапазоне от %d до %d)"

 msgid "Buffers list:"
@@ -652,12 +504,12 @@ msgid "%sArgument \"-yes\" is required for keys reset (security reason)"
 msgstr ""
 "%s аргумент \"-yes\" необходим для сброса ключей (в целях безопасности)\n"

-#, c-format
-msgid "%d new key added (context: \"%s\")"
+#, fuzzy, c-format
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Игнорирования не заданы.\n"
+msgstr[1] "Игнорирования не заданы.\n"
+msgstr[2] "Игнорирования не заданы.\n"

 #, fuzzy
 msgid "Stored layouts:"
@@ -1271,7 +1123,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 #, fuzzy
@@ -1724,7 +1576,7 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""

@@ -1736,9 +1588,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2260,7 +2109,7 @@ msgid "display help about commands and options"
 msgstr "отобразить помощь по командам"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr ""

 msgid ""
@@ -2320,9 +2169,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -3187,7 +3036,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3424,20 +3273,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3677,7 +3526,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 #, fuzzy
@@ -4481,7 +4330,7 @@ msgstr ""
 "(см. /help quit)"

 msgid "display special message when day changes"
-msgstr "отображать специальное сообщение при смене дня"
+msgstr "отображать специальное сообщение  при смене дня"

 #. TRANSLATORS: string "${color:xxx}" must NOT be translated
 #, fuzzy
@@ -5934,7 +5783,7 @@ msgstr "  . строковой тип (значения: "
 msgid "read - object type"
 msgstr ""

-msgid "read - bad object type (\"object start\" expected)"
+msgid "read - bad object type ('object start' expected)"
 msgstr ""

 msgid "read - object id"
@@ -6049,6 +5898,99 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr ""

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, fuzzy, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"%s Copyright (C) 2003-2010, собран %s %s\n"
+"Разработчик - Sébastien Helleu <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Использование: %s [опция...] [расширение:опция...]\n"
+
+#, fuzzy
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect        не подключаться автоматически при запуске\n"
+"  -c, --config            отобразить параметры конфигурации\n"
+"  -d, --dir <path>        установить домашний каталог WeeChat (по умолчанию: "
+"~/.weechat)\n"
+"  -f, --key-functions     отобразить внутренние функции WeeChat для горячих "
+"клавиш\n"
+"  -h, --help              эта сравка\n"
+"  -i, --irc-commands      отобразить команды IRC\n"
+"  -k, --keys              отобразить клавиши по умолчанию\n"
+"  -l, --license           отобразить лицензию WeeChat\n"
+"  -p, --no-plugin         не загружать pluginы при запуске\n"
+"  -v, --version           отобразить версию WeeChat\n"
+"  -w, --weechat-commands  отобразить команды WeeChat\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "%s нет аргумента для параметра \"%s\"\n"
+
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr ""

@@ -6755,7 +6697,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 #, fuzzy
@@ -8283,7 +8225,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s не подключен к серверу \"%s\"!\n"

 #, fuzzy, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "Авто-переподключение отменено\n"

 #, fuzzy, c-format
@@ -8445,13 +8387,6 @@ msgstr[0] "секунда"
 msgstr[1] "секунда"
 msgstr[2] "секунда"

-#, fuzzy
-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "секунда"
-msgstr[1] "секунда"
-msgstr[2] "секунда"
-
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
@@ -8610,7 +8545,7 @@ msgstr "отправить действие на все каналы всех п
 #, fuzzy
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr "[сокращение [команда [аргументы]]]"

 #, fuzzy
@@ -8700,8 +8635,8 @@ msgstr "отправить действие на все каналы всех п
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 #, fuzzy
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr "[сокращение [команда [аргументы]]]"

 #, fuzzy
@@ -8751,8 +8686,8 @@ msgstr "отправить сообщение на все каналы всех

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -8902,7 +8837,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 #, fuzzy
@@ -10870,9 +10805,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 #, fuzzy
@@ -14017,7 +13951,7 @@ msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s не подключен к серверу \"%s\"!\n"

 #, fuzzy, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "Авто-переподключение отменено\n"

 #, fuzzy, c-format
@@ -16252,7 +16186,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -16286,11 +16220,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -16437,9 +16366,8 @@ msgstr "не ожидать ACK при отправке файла"

 #, fuzzy
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "IP адрес или домен, используемый для исходящих DCC соединений (пустое "
 "значение означает текущий IP адрес)"
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
-"PO-Revision-Date: 2026-03-21 17:26+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
+"PO-Revision-Date: 2026-03-16 13:20+0100\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: sr\n"
@@ -33,161 +33,6 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-msgid "disable auto-connect to servers at startup"
-msgstr "спречава аутоматско повезивање са серверима приликом покретања"
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr "приказује подразумеване боје у терминалу и прекида извршавање"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr "-d, --dir <путања>"
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-"поставља WeeChat почетни директоријум или 5 различита директоријума "
-"раздвојена тачка зарезима (у следећем редоследу: конфиг, подаци, стање, кеш, "
-"дир за време извршавања) (ако се ова опција не зада, чита се WEECHAT_HOME "
-"променљива окружења)"
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-"креира привремени WeeChat почетни директоријум и брише га приликом напуштања "
-"програма (није компатибилно са опцијом „-d”)"
-
-#. TRANSLATORS: command line option "-h", "--help"
-msgid "display this help and exit"
-msgstr "приказује ову помоћ и прекида извршавање"
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr "приказује информације о изградњи и прекида извршавање"
-
-#. TRANSLATORS: command line option "-l", "--license"
-msgid "display WeeChat license and exit"
-msgstr "приказује WeeChat лиценцу и прекида извршавање"
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-msgid "don't load any plugin at startup"
-msgstr "приликом покретања се не учитавају додаци"
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr "-P, --plugins <додаци>"
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-"приликом покретања се учитавају само ови додаци (погледајте /help "
-"weechat.plugin.autoload)"
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr "-r, --run-command <ком>"
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-"покреће команд(у/е) након покретања; можете да раздвојите више команди са "
-"тачка запета и оне се израчунавају, ова опција може да се зада више пута"
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr "приликом учитавања се не учитавају никакве скрипте"
-
-#. TRANSLATORS: command line option "--upgrade"
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr ""
-"ажурира WeeChat користећи фајлове сесије (погледајте /help upgrade у "
-"програму WeeChat)"
-
-#. TRANSLATORS: command line option "-v", "--version"
-msgid "display WeeChat version and exit"
-msgstr "приказује верзију програма WeeChat и прекида извршавање"
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-msgid "plugin:option"
-msgstr "додатак:опција"
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr "опција за додатак (погледајте man weechat)"
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr "--doc-gen <путања>"
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr "генерише фајлове за изградњу документације и прекида извршавање"
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-"покреће WeeChat као даемон (рачва, нова група процеса, затворени дескриптори "
-"фајла); у режиму без интерфејса, WeeChat је подразумевано блокирајући и не "
-"извршава се у позадини"
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-"уместо да се лог поруке уписују у лог фајл, исписују се на стандардни излаз "
-"(игнорише се ако се зада опција „--daemon”)"
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr "након што се додаци уклоне из меморије, не позива се функција dlclose"
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr "искључује иниц/деиниц gnutls"
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr "искључује иниц/деиниц gcrypt"
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-"WeeChat %s ауторска права %s, компајлиран %s %s\n"
-"Написао Себастијен Елеу <flashcode@flashtux.org> - %s"
-
-msgid "Usage:"
-msgstr "Употреба:"
-
-msgid "[option...] [plugin:option...]"
-msgstr "[опција...] [додатак:опција...]"
-
-msgid "Extra options in headless mode:"
-msgstr "Додатне опције у режиму без интерфејса:"
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-"Дибаг опције (за алате као што је valgrind, НЕ КОРИСТИТЕ У ПРОДУКЦИЈИ):"
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr "Грешка: недостаје аргумент за опцију „%s”\n"
-
 msgid "List of bars:"
 msgstr "Листа трака:"

@@ -293,7 +138,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr "%sТрака „%s” не може да се скролује"

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr "%sБрој бафера „%d” је ван опсега (мода бити између 1 и %d)"

 msgid "Buffers list:"
@@ -632,7 +477,7 @@ msgstr ""
 "%sЗа ресетовање тастера је неопходан аргумент „-yes” (из разлога безбедности)"

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "додат је %d нови тастер (контекст: „%s”)"
 msgstr[1] "додато је %d нова тастера (контекст: „%s”)"
@@ -1240,13 +1085,9 @@ msgstr "маска: име у којем је дозвољен џокер „*
 msgid "raw[set]: set a value for a bar property"
 msgstr "raw[set]: поставља вредност особине траке"

-#, fuzzy
-#| msgid ""
-#| "option: option to change (for options list, look at /set weechat.bar."
-#| "<barname>.*)"
 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""
 "опција: опција која се мења (за листу опција, погледајте /set weechat.bar."
 "<иметраке>.*)"
@@ -1309,8 +1150,8 @@ msgid ""
 "get <property> || jump smart|last_displayed|prev_visited|next_visited || "
 "<id>|<number>|-|+|<name>"
 msgstr ""
-"list || add [-free] [-switch] <име> || clear [<ид>|<број>|<име>|-merged|-all "
-"[<ид>|<број>|<име>...]] || move <број>|-|+ || swap <ид1>|<број1>|<име1> "
+"list || add [-free] [-switch] <име> || clear [<број>|<име>|-merged|-all "
+"[<ид><број>|<име>...]] || move <број>|-|+ || swap <ид1>|<број1>|<име1> "
 "[<ид2>|<број2>|<име2>] || cycle <ид>|<број>|<име>... || merge <ид>|<број>|"
 "<име> || unmerge [<број>|-all] || hide [<ид>|<број>|<име>|-all [<ид>|<број>|"
 "<име>...]] || unhide [<ид>|<број>|<име>|-all [<ид>|<број>|<име>...]] || "
@@ -1636,9 +1477,9 @@ msgid ""
 "|| hdata [free] || time <command> || unicode <string> || whitespace"
 msgstr ""
 "list || set <додатак> <ниво> || dump [<додатак>] || hooks [<маска_додатака> "
-"[<тип_куке>...]] || buffer|certs|color|dirs|infolists|key|libs|memory|tags|"
-"term|url|windows || callbacks <трајање>[<јединица>] || mouse|cursor "
-"[verbose] || hdata [free] || time <команда> || unicode <стринг> || whitespace"
+"[<тип_куке>...]] || buffer|certs|color|dirs|infolists|libs|memory|tags|term|"
+"url|windows || callbacks <трајање>[<јединица>] || mouse|cursor [verbose] || "
+"hdata [free] || time <команда> || unicode <стринг> || whitespace"

 msgid "raw[list]: list plugins with debug levels"
 msgstr "raw[list]: исписује додатке са дибаг нивоима"
@@ -1779,12 +1620,8 @@ msgid "evaluate expression"
 msgstr "израчунавање израза"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-#, fuzzy
-#| msgid ""
-#| "[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
-#| "<expression2>"
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr "[-n|-s] [-d] <израз> || [-n] [-d [-d]] -c <израз1> <оператор> <израз2>"

@@ -1798,9 +1635,6 @@ msgstr ""
 "raw[-s]: дели израз пре израчунавања (многе команде могу да се раздвоје са "
 "тачка запетама)"

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2412,7 +2246,7 @@ msgid "display help about commands and options"
 msgstr "приказивање помоћи за команде и опције"

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr "-list|-listfull [<додатак>...] || <команда> || <опција>"

 msgid ""
@@ -2470,9 +2304,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr "raw[clear]: брише врућу листу"

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""
 "ниво: „lowest” да се обрише само најнижи ниво у врућој листи, „highest” да "
 "се обрише само највиши ниво у врућој листи, или маска нивоа: цео број који "
@@ -3211,7 +3045,7 @@ msgid ""
 "[<arguments>] || autoload [<arguments>] || reload [<name>|* [<arguments>]] "
 "|| unload [<name>]"
 msgstr ""
-"list [-o|-ol|-i|-il|<име>] || listfull [<име>] || load <имефајла> "
+"list| [-o|-ol|-i|-il|<име>] || listfull [<име>] || load <имефајла> "
 "[<аргументи>] || autoload [<аргументи>] || reload [<име>|* [<аргументи>]] || "
 "unload [<име>]"

@@ -3457,13 +3291,9 @@ msgstr "raw[del]: брише проксије"
 msgid "raw[set]: set a value for a proxy property"
 msgstr "raw[set]: поставља вредност особине проксија"

-#, fuzzy
-#| msgid ""
-#| "option: option to change (for options list, look at /set weechat.proxy."
-#| "<proxyname>.*)"
 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""
 "опција: опција која треба да се промени (за листу опција, погледајте /set "
 "weechat.proxy.<имепроксија>.*)"
@@ -3691,7 +3521,7 @@ msgid ""
 msgstr ""
 "Можете да поставите променљиву окружења „WEECHAT_PASSPHRASE” која спречава "
 "овај одзив (то је иста променљива коју програм WeeChat користи приликом /"
-"upgrade), или да поставите опцију sec.crypt.passphrase_command тако да се "
+"upgrade), или да поставите опцију  sec.crypt.passphrase_command тако да се "
 "тајна реченица чита из излаза спољне команде као што је управљач лозинкама "
 "(погледајте /help sec.crypt.passphrase_command)."

@@ -3728,23 +3558,23 @@ msgstr "  користи програм „pass” за читање тајне
 msgid "  encrypt libera SASL password:"
 msgstr "  шифровање libera SASL лозинке:"

-msgid "    /secure set libera my_password"
-msgstr "    /secure set libera моја_лозинка"
+msgid "    /secure set libera mypassword"
+msgstr "    /secure set libera мојалозинка"

 msgid "  encrypt oftc password for nickserv:"
 msgstr "  шифровање oftc лозинке за nickserv:"

-msgid "    /secure set oftc my_password"
-msgstr "    /secure set oftc моја_лозинка"
+msgid "    /secure set oftc mypassword"
+msgstr "    /secure set oftc мојалозинка"

-msgid "  alias to ghost the nick \"andrew\":"
-msgstr "  алијас за ghost надимка „andrew”:"
+msgid "  alias to ghost the nick \"mynick\":"
+msgstr "  алијас за ghost надимка „mynick”:"

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"

 msgid "set config options and environment variables"
@@ -4048,9 +3878,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr "Процес са опцијом „-quit” је следећи:"

-#, fuzzy
-#| msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr "  1. затварање *СВИХ* конекција (irc, xfer, relay, ...)"

 msgid "  2. save session into files (*.upgrade)"
@@ -5658,7 +5486,7 @@ msgid ""
 msgstr ""
 "листа карактера раздвојених зарезима (или опсега карактера) који се сматрају "
 "за део речи које се истичу; свака ставка може бити један карактер, опсег "
-"карактера (формат је: a-z), класа широких карактера (на пример „alnum”, "
+"карактера (формат је: a-z), класа  широких карактера (на пример „alnum”, "
 "погледајте man wctype); „!” испред ставке је чини негативном (тј. карактер "
 "се НЕ сматра као део речи); вредност „*” се подудара са било којим "
 "карактером; дозвољени су уникод карактери у формату \\u1234, на пример "
@@ -6698,8 +6526,8 @@ msgstr "упис -променљива"
 msgid "read - object type"
 msgstr "читање - тип објекта"

-msgid "read - bad object type (\"object start\" expected)"
-msgstr "читање - лош тип објекта (очекује се \"object start\")"
+msgid "read - bad object type ('object start' expected)"
+msgstr "читање - лош тип објекта (очекује се 'object start')"

 msgid "read - object id"
 msgstr "читање - ид објекта"
@@ -6758,13 +6586,15 @@ msgstr "грешка преноса"
 msgid "curl error %d (%s) (URL: \"%s\")\n"
 msgstr "curl грешка %d (%s) (URL: „%s”)\n"

-#, c-format
+#, fuzzy, c-format
+#| msgid "%sURL transfer error: %s (URL: \"%s\")"
 msgid "transfer stopped (URL: \"%s\")\n"
-msgstr "трансфер је заустављен (URL: „%s”)\n"
+msgstr "%sГрешка URL трансфера: %s (URL: „%s”)"

-#, c-format
+#, fuzzy, c-format
+#| msgid "End of URL transfer '%s', timeout reached (%.3fs)"
 msgid "transfer timeout reached (%.3fs) (URL: \"%s\")\n"
-msgstr "достигнут је тајмаут трансфера (%.3fs) (URL: „%s”)\n"
+msgstr "Крај URL трансфера ’%s’, достигнут је тајмаут (%.3fs)"

 #, c-format
 msgid "%sAnother command \"%s\" already exists for plugin \"%s\""
@@ -6812,9 +6642,134 @@ msgstr "Крај URL трансфера ’%s’, достигнут је тај
 msgid "%sError running thread in hook_url: %s (URL: \"%s\")"
 msgstr "%sГрешка покретања нити у hook_url: %s (URL: „%s”)"

-#, c-format
+#, fuzzy, c-format
+#| msgid "End of URL transfer '%s', timeout reached (%.3fs)"
 msgid "End of URL transfer '%s', transfer stopped"
-msgstr "Крај URL трансфера ’%s’, трансфер је заустављен"
+msgstr "Крај URL трансфера ’%s’, достигнут је тајмаут (%.3fs)"
+
+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+"WeeChat %s ауторска права %s, компајлиран %s %s\n"
+"Написао Себастијен Елеу <flashcode@flashtux.org> - %s"
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr "Употреба: %s [опција...] [додатак:опција...]\n"
+
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+"  -a, --no-connect         спречава аутоматско повезивање са серверима "
+"приликом покретања\n"
+"  -c, --colors             приказује подразумеване боје у терминалу и "
+"прекида извршавање\n"
+"  -d, --dir <путања>       поставља WeeChat почетни директоријум\n"
+"                           или 5 различита директоријума раздвојена тачка "
+"зарезима (у следећем редоследу: конфиг, подаци, стање, кеш, дир за време "
+"извршавања)\n"
+"                           (ако се ова опција не зада, чита се WEECHAT_HOME "
+"променљива окружења)\n"
+"  -t, --temp-dir           креира привремени WeeChat почетни директоријум и "
+"брише га приликом напуштања програма\n"
+"                           (није компатибилно са опцијом „-d”)\n"
+"  -h, --help               приказује ову помоћ и прекида извршавање\n"
+"  -i, --build-info         приказује информације о изградњи и прекида "
+"извршавање\n"
+"  -l, --license            приказује WeeChat лиценцу и прекида извршавање\n"
+"  -p, --no-plugin          приликом покретања се не учитавају додаци\n"
+"  -P, --plugins <додаци>   приликом покретања се учитавају само ови додаци\n"
+"                           (погледајте /help weechat.plugin.autoload)\n"
+"  -r, --run-command <ком>  покреће команд(у/е) након покретања;\n"
+"                           можете да раздвојите више команди са тачка запета "
+"и оне се израчунавају,\n"
+"                           ова опција може да се зада више пута\n"
+"  -s, --no-script          приликом учитавања се не учитавају никакве "
+"скрипте\n"
+"      --upgrade            ажурира WeeChat користећи фајлове сесије "
+"(погледајте /help upgrade у програму WeeChat)\n"
+"  -v, --version            приказује верзију програма WeeChat и прекида "
+"извршавање\n"
+"  додатак:опција           опција за додатак (погледајте man weechat)\n"
+
+msgid "Extra options in headless mode:\n"
+msgstr "Додатне опције у режиму без интерфејса:\n"
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+"      --doc-gen <путања>   генерише фајлове за изградњу документације и "
+"прекида извршавање\n"
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+"      --daemon             покреће WeeChat као даемон (рачва, нова група "
+"процеса, затворени дескриптори фајла);\n"
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+"                           (у режиму без интерфејса, WeeChat је "
+"подразумевано блокирајући и не извршава се у позадини)\n"
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+"      --stdout             уместо да се лог поруке уписују у лог фајл, "
+"исписују се на стандардни излаз\n"
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+"                           (игнорише се ако се зада опција „--daemon”)\n"
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+"Дибаг опције (за алате као што је valgrind, НЕ КОРИСТИТЕ У ПРОДУКЦИЈИ):\n"
+"      --no-dlclose         након што се додаци уклоне из меморије, не позива "
+"се функција dlclose\n"
+"      --no-gnutls          искључује иниц/деиниц gnutls\n"
+"      --no-gcrypt          искључује иниц/деиниц gcrypt\n"
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr "Грешка: недостаје аргумент за опцију „%s”\n"

 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr "WeeChat се извршава у режиму без интерфејса (ctrl-c за излаз)."
@@ -7434,9 +7389,9 @@ msgid ""
 "  - window data, where the bar item is displayed (there's no window in root "
 "bars, see hdata \"window\" in API doc for a complete list), for example:"
 msgstr ""
-"  - подаци о прозору у коме се приказује ставка траке (не постоји прозор у "
-"кореним тракама, погледајте hdata „window” у документацији API за комплетну "
-"листу), на пример:"
+"  - подаци о прозору, у коме се трака приказује (не постоји прозор у кореним "
+"тракама, погледајте hdata „window” у документацији API за комплетну листу), "
+"на пример:"

 msgid ""
 "  - buffer data (see hdata \"buffer\" in API doc for a complete list), for "
@@ -7610,11 +7565,8 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""
-"    - ${index_displayed}: индекс линије која се приказује у ставци траке "
-"(почиње од 0, овај индекс увећавају само приказани бафери, погледајте опцију "
-"buflist.look.display_conditions)"

 msgid "buflist bar items"
 msgstr "ставке buflist траке"
@@ -9361,7 +9313,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s%s: не постоји веза са сервером „%s”!"

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "%s: отказано је аутоматско поновно успостављање везе"

 #, c-format
@@ -9522,12 +9474,6 @@ msgstr[0] "секунда"
 msgstr[1] "секунде"
 msgstr[2] "секунди"

-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] "милисекунда"
-msgstr[1] "милисекунде"
-msgstr[2] "милисекунди"
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -9667,10 +9613,10 @@ msgstr "извршавање команде на свим каналима св
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr ""
 "[-current] [-parted|-all] [-exclude=<канал>[,<канал>...]] <команда> || [-"
-"current] [-parted|-all] [-include=<канал>[,<канал>...]] <команда>"
+"current] [-parted|-all] -include=<канал>[,<канал>...] <команда>"

 msgid "raw[-current]: execute command for channels of current server only"
 msgstr "raw[-current]: команда се извршава само за канале текућег сервера"
@@ -9750,11 +9696,11 @@ msgstr "извршавање команде у свим приватним ба

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr ""
-"[-current] [-exclude=<надимак>[,<надимак>...]] <команда> || [-current] [-"
-"include=<надимак>[,<надимак>...]] <команда>"
+"[-current] [-exclude=<надимак>[,<надимак>...]] <команда> || [-current] "
+"-include=<надимак>[,<надимак>...] <команда>"

 msgid ""
 "raw[-current]: execute command for private buffers of current server only"
@@ -9802,11 +9748,11 @@ msgstr "извршавање команде на свим повезаним с

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""
-"[-exclude=<сервер>[,<сервер>...]] <команда> || [-include=<сервер>[,"
-"<сервер>...]] <команда>"
+"[-exclude=<сервер>[,<сервер>...]] <команда> || -include=<сервер>[,"
+"<сервер>...] <команда>"

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
 msgstr ""
@@ -9953,7 +9899,7 @@ msgstr ""
 "пример: „-multi-prefix”)"

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""
 "raw[ack]: прихвата могућности које захтевају потврду са клијентске стране"

@@ -10320,7 +10266,7 @@ msgid ""
 "[<percent>] || -go <line>|end || -join || -export <filename>"
 msgstr ""
 "[-server <сервер>] [<канал>[,<канал>...]] [<циљ>] || [-server <сервер>] [-"
-"raw *|<рег_изр>] || -up|-down [<број>] || -left|-right [<проценат>] || -go "
+"raw *|<рег_изр>] -up|-down [<број>] || -left|-right [<проценат>] || -go "
 "<линија>|end || -join || -export <имефајла>"

 msgid ""
@@ -10860,7 +10806,7 @@ msgstr ""
 "„xxx”, користећи следеће променљиве: излаз функције irc_message_parse (као "
 "nick, command, channel, text, итд., погледајте функцију info_get_hashtable у "
 "референтном приручнику API додатака да видите комплетну листу променљивих), "
-"date (формат: \"%FT%T.%f\", погледајте функцију util_strftimeval у "
+"date (формат:  \"%FT%T.%f\", погледајте функцију util_strftimeval у "
 "референтном приручнику API додатака), server, recv, sent, modified, "
 "redirected"

@@ -11906,19 +11852,17 @@ msgstr ""
 msgid "left/right scroll in /list buffer (percent of width)"
 msgstr "скроловање у лево/десно у /list баферу (проценат ширине)"

-#, fuzzy
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""
 "листа поља за сортирање канала раздвојених запетама (погледајте /help list "
 "за листу поља); карактер „-” може да се користи испред поља чиме се обрће "
 "редослед, карактер „~” може да се употреби за поређење које не прави разлику "
-"у величини слова; пример: „-users,~name2” за поређење које не прави разлику "
-"у величини слова и обрнуто сортирање по имену опције"
+"у величини слова; пример: „-users,~name” за поређење које не прави разлику у "
+"величини слова и обрнуто сортирање по имену опције"

 msgid "strip channel topic colors in /list buffer"
 msgstr "уклањање боја теме канала у /list баферу"
@@ -15198,7 +15142,7 @@ msgid "%s%s: no connection to remote relay \"%s\""
 msgstr "%s%s: не постоји веза са релејем удаљених „%s”"

 #, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr "удаљени[%s]: отказано је аутоматско поновно успостављање везе"

 #, c-format
@@ -16804,7 +16748,7 @@ msgid ""
 "enable|disable|toggle || listdict || setdict -|<dict>[,<dict>...] || deldict "
 "|| addword [<dict>] <word>"
 msgstr ""
-"enable|disable|toggle || listdict || setdict -|<речн>[,<речн>...] || deldict "
+"enable|disable|toggle || listdict || setdict <речн>[,<речн>...] || deldict "
 "|| addword [<речн>] <реч>"

 msgid "raw[enable]: enable spell checker"
@@ -17651,8 +17595,8 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr "%s%s: неважећи регуларни израз у окидачу: „%s”"

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
-msgstr "Куцање: "
+msgid "Typing:"
+msgstr "Куцање:"

 msgid ""
 "number of seconds after paused status has been set: if reached, the typing "
@@ -17697,11 +17641,6 @@ msgstr ""
 "макс број карактера који се приказује у ставци траке \"typing\" (0 = садржај "
 "се не одсеца)"

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr "Статус куцања корисника"

@@ -17834,14 +17773,9 @@ msgstr "величина блока за слање пакета, у бајто
 msgid "does not wait for ACK when sending file"
 msgstr "не чека се на ACK када се шаље фајл"

-#, fuzzy
-#| msgid ""
-#| "IP or DNS address used for sending and passively receiving files/chats "
-#| "(if empty, local interface IP is used)"
 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""
 "IP или DNS адреса која се користи за слање и пасивно примање фајлова/"
 "разговора (ако је празно, користи се IP локалног интерфејса)"
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2026-03-21 17:24+0100\n"
+"POT-Creation-Date: 2026-03-16 13:17+0100\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -32,141 +32,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#. TRANSLATORS: command line option "-a", "--no-connect"
-msgid "disable auto-connect to servers at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "-c", "--colors"
-msgid "display default colors in terminal and exit"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "-d, --dir <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-d", "--dir <path>"
-msgid ""
-"force a single WeeChat home directory or 5 different directories separated "
-"by colons (in this order: config, data, state, cache, runtime) (environment "
-"variable WEECHAT_HOME is read if this option is not given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-t", "--temp-dir"
-msgid ""
-"create a temporary WeeChat home directory and delete it on exit "
-"(incompatible with option \"-d\")"
-msgstr ""
-
-#. TRANSLATORS: command line option "-h", "--help"
-msgid "display this help and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-i", "--build-info"
-msgid "display build information and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-l", "--license"
-msgid "display WeeChat license and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "-p", "--no-plugin"
-msgid "don't load any plugin at startup"
-msgstr ""
-
-#. TRANSLATORS: only "<plugins>" may be translated
-msgid "-P, --plugins <plugins>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-P", "--plugins <plugins>"
-msgid "load only these plugins at startup (see /help weechat.plugin.autoload)"
-msgstr ""
-
-#. TRANSLATORS: only "<cmd>" may be translated (please keep it short)
-msgid "-r, --run-command <cmd>"
-msgstr ""
-
-#. TRANSLATORS: command line option "-r", "--run-command <cmd>"
-msgid ""
-"run command(s) after startup; many commands can be separated by semicolons "
-"and are evaluated, this option can be given multiple times"
-msgstr ""
-
-#. TRANSLATORS: command line option "-s", "--no-script"
-msgid "don't load any script at startup"
-msgstr ""
-
-#. TRANSLATORS: command line option "--upgrade"
-msgid "upgrade WeeChat using session files (see /help upgrade in WeeChat)"
-msgstr ""
-
-#. TRANSLATORS: command line option "-v", "--version"
-msgid "display WeeChat version and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option: "plugin" and "option" may be translated
-msgid "plugin:option"
-msgstr ""
-
-#. TRANSLATORS: command line option "plugin:option"
-msgid "option for plugin (see man weechat)"
-msgstr ""
-
-#. TRANSLATORS: only "<path>" may be translated
-msgid "--doc-gen <path>"
-msgstr ""
-
-#. TRANSLATORS: command line option "--doc-gen <path>"
-msgid "generate files to build documentation and exit"
-msgstr ""
-
-#. TRANSLATORS: command line option "--daemon"
-msgid ""
-"run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-"by default in headless mode WeeChat is blocking and does not run in "
-"background"
-msgstr ""
-
-#. TRANSLATORS: command line option "--stdout"
-msgid ""
-"display log messages on standard output instead of writing them in log file "
-"(option ignored if option \"--daemon\" is given)"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-dlclose"
-msgid "do not call function dlclose after plugins are unloaded"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gnutls"
-msgid "disable init/deinit of gnutls"
-msgstr ""
-
-#. TRANSLATORS: command line option "--no-gcrypt"
-msgid "disable init/deinit of gcrypt"
-msgstr ""
-
-#. TRANSLATORS: "%s %s" after "compiled on" is date and time
-#, c-format
-msgid ""
-"WeeChat %s Copyright %s, compiled on %s %s\n"
-"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
-msgstr ""
-
-msgid "Usage:"
-msgstr ""
-
-msgid "[option...] [plugin:option...]"
-msgstr ""
-
-msgid "Extra options in headless mode:"
-msgstr ""
-
-msgid "Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):"
-msgstr ""
-
-#, c-format
-msgid "Error: missing argument for \"%s\" option\n"
-msgstr ""
-
 msgid "List of bars:"
 msgstr ""

@@ -271,7 +136,7 @@ msgid "%sUnable to scroll bar \"%s\""
 msgstr ""

 #, c-format
-msgid "%sBuffer number %d is out of range (it must be between 1 and %d)"
+msgid "%sBuffer number \"%d\" is out of range (it must be between 1 and %d)"
 msgstr ""

 msgid "Buffers list:"
@@ -600,7 +465,7 @@ msgid "%sArgument \"-yes\" is required for keys reset (security reason)"
 msgstr ""

 #, c-format
-msgid "%d new key added (context: \"%s\")"
+msgid "%d new key added"
 msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] ""
 msgstr[1] ""
@@ -1161,7 +1026,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.bar."
-"<bar_name>.*)"
+"<barname>.*)"
 msgstr ""

 msgid "value: new value for option"
@@ -1599,7 +1464,7 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-n|-s] [-e] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
+"[-n|-s] [-d] <expression> || [-n] [-d [-d]] -c <expression1> <operator> "
 "<expression2>"
 msgstr ""

@@ -1611,9 +1476,6 @@ msgid ""
 "separated by semicolons)"
 msgstr ""

-msgid "raw[-e]: evaluate all commands before executing them"
-msgstr ""
-
 msgid ""
 "raw[-d]: display debug output after evaluation (with two -d: more verbose "
 "debug)"
@@ -2106,7 +1968,7 @@ msgid "display help about commands and options"
 msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
-msgid "-list|-listfull [<plugin>...] || <command> || <option>"
+msgid "-list|-listfull [<plugin>...]] || <command> || <option>"
 msgstr ""

 msgid ""
@@ -2157,9 +2019,9 @@ msgid "raw[clear]: clear hotlist"
 msgstr ""

 msgid ""
-"level: \"lowest\" to clear only lowest level in hotlist, \"highest\" to "
-"clear only highest level in hotlist, or level mask: integer which is a "
-"combination of 1=join/part, 2=message, 4=private, 8=highlight"
+"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear "
+"only highest level in hotlist, or level mask: integer which is a combination "
+"of 1=join/part, 2=message, 4=private, 8=highlight"
 msgstr ""

 msgid "raw[remove]: remove current buffer from hotlist"
@@ -2971,7 +2833,7 @@ msgstr ""

 msgid ""
 "option: option to change (for options list, look at /set weechat.proxy."
-"<proxy_name>.*)"
+"<proxyname>.*)"
 msgstr ""

 msgid "  add a http proxy, running on local host, port 8888:"
@@ -3197,20 +3059,20 @@ msgstr ""
 msgid "  encrypt libera SASL password:"
 msgstr ""

-msgid "    /secure set libera my_password"
+msgid "    /secure set libera mypassword"
 msgstr ""

 msgid "  encrypt oftc password for nickserv:"
 msgstr ""

-msgid "    /secure set oftc my_password"
+msgid "    /secure set oftc mypassword"
 msgstr ""

-msgid "  alias to ghost the nick \"andrew\":"
+msgid "  alias to ghost the nick \"mynick\":"
 msgstr ""

 msgid ""
-"    /alias add ghost /eval /msg -server libera nickserv ghost andrew $"
+"    /alias add ghost /eval /msg -server libera nickserv ghost mynick $"
 "{sec.data.libera}"
 msgstr ""

@@ -3441,7 +3303,7 @@ msgstr ""
 msgid "With option \"-quit\", the process is:"
 msgstr ""

-msgid "  1. close *ALL* connections (irc, xfer, relay, etc.)"
+msgid "  1. close *ALL* connections (irc, xfer, relay, ...)"
 msgstr ""

 msgid "  2. save session into files (*.upgrade)"
@@ -5495,7 +5357,7 @@ msgstr ""
 msgid "read - object type"
 msgstr ""

-msgid "read - bad object type (\"object start\" expected)"
+msgid "read - bad object type ('object start' expected)"
 msgstr ""

 msgid "read - object id"
@@ -5606,6 +5468,83 @@ msgstr ""
 msgid "End of URL transfer '%s', transfer stopped"
 msgstr ""

+#. TRANSLATORS: "%s %s" after "compiled on" is date and time
+#, c-format
+msgid ""
+"WeeChat %s Copyright %s, compiled on %s %s\n"
+"Developed by Sébastien Helleu <flashcode@flashtux.org> - %s"
+msgstr ""
+
+#, c-format
+msgid "Usage: %s [option...] [plugin:option...]\n"
+msgstr ""
+
+msgid ""
+"  -a, --no-connect         disable auto-connect to servers at startup\n"
+"  -c, --colors             display default colors in terminal and exit\n"
+"  -d, --dir <path>         force a single WeeChat home directory\n"
+"                           or 5 different directories separated by colons "
+"(in this order: config, data, state, cache, runtime)\n"
+"                           (environment variable WEECHAT_HOME is read if "
+"this option is not given)\n"
+"  -t, --temp-dir           create a temporary WeeChat home directory and "
+"delete it on exit\n"
+"                           (incompatible with option \"-d\")\n"
+"  -h, --help               display this help and exit\n"
+"  -i, --build-info         display build information and exit\n"
+"  -l, --license            display WeeChat license and exit\n"
+"  -p, --no-plugin          don't load any plugin at startup\n"
+"  -P, --plugins <plugins>  load only these plugins at startup\n"
+"                           (see /help weechat.plugin.autoload)\n"
+"  -r, --run-command <cmd>  run command(s) after startup;\n"
+"                           many commands can be separated by semicolons and "
+"are evaluated,\n"
+"                           this option can be given multiple times\n"
+"  -s, --no-script          don't load any script at startup\n"
+"      --upgrade            upgrade WeeChat using session files (see /help "
+"upgrade in WeeChat)\n"
+"  -v, --version            display WeeChat version and exit\n"
+"  plugin:option            option for plugin (see man weechat)\n"
+msgstr ""
+
+msgid "Extra options in headless mode:\n"
+msgstr ""
+
+msgid ""
+"      --doc-gen <path>     generate files to build documentation and exit\n"
+msgstr ""
+
+msgid ""
+"      --daemon             run WeeChat as a daemon (fork, new process group, "
+"file descriptors closed);\n"
+msgstr ""
+
+msgid ""
+"                           (by default in headless mode WeeChat is blocking "
+"and does not run in background)\n"
+msgstr ""
+
+msgid ""
+"      --stdout             display log messages on standard output instead "
+"of writing them in log file\n"
+msgstr ""
+
+msgid ""
+"                           (option ignored if option \"--daemon\" is given)\n"
+msgstr ""
+
+msgid ""
+"Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+"      --no-dlclose         do not call function dlclose after plugins are "
+"unloaded\n"
+"      --no-gnutls          disable init/deinit of gnutls\n"
+"      --no-gcrypt          disable init/deinit of gcrypt\n"
+msgstr ""
+
+#, c-format
+msgid "Error: missing argument for \"%s\" option\n"
+msgstr ""
+
 msgid "WeeChat is running in headless mode (ctrl-c to quit)."
 msgstr ""

@@ -6273,7 +6212,7 @@ msgstr ""
 msgid ""
 "    - ${index_displayed}: index of line displayed in the bar item (starts at "
 "0, only buffers displayed increment this index, see option "
-"buflist.look.display_conditions)"
+"buflist.look.display_conditions"
 msgstr ""

 msgid "buflist bar items"
@@ -7703,7 +7642,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr ""

 #, c-format
-msgid "%s: auto-reconnection is canceled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr ""

 #, c-format
@@ -7862,11 +7801,6 @@ msgid_plural "seconds"
 msgstr[0] ""
 msgstr[1] ""

-msgid "millisecond"
-msgid_plural "milliseconds"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
@@ -7999,7 +7933,7 @@ msgstr ""
 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
 "[-current] [-parted|-all] [-exclude=<channel>[,<channel>...]] <command> || [-"
-"current] [-parted|-all] [-include=<channel>[,<channel>...]] <command>"
+"current] [-parted|-all] -include=<channel>[,<channel>...] <command>"
 msgstr ""

 msgid "raw[-current]: execute command for channels of current server only"
@@ -8073,8 +8007,8 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] [-"
-"include=<nick>[,<nick>...]] <command>"
+"[-current] [-exclude=<nick>[,<nick>...]] <command> || [-current] "
+"-include=<nick>[,<nick>...] <command>"
 msgstr ""

 msgid ""
@@ -8120,8 +8054,8 @@ msgstr ""

 #. TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated
 msgid ""
-"[-exclude=<server>[,<server>...]] <command> || [-include=<server>[,"
-"<server>...]] <command>"
+"[-exclude=<server>[,<server>...]] <command> || -include=<server>[,"
+"<server>...] <command>"
 msgstr ""

 msgid "raw[-exclude]: exclude some servers (wildcard \"*\" is allowed)"
@@ -8245,7 +8179,7 @@ msgid ""
 msgstr ""

 msgid ""
-"raw[ack]: acknowledge capabilities which require client-side acknowledgment"
+"raw[ack]: acknowledge capabilities which require client-side acknowledgement"
 msgstr ""

 msgid "raw[end]: end the capability negotiation"
@@ -9859,9 +9793,8 @@ msgstr ""
 msgid ""
 "comma-separated list of fields to sort channels (see /help list for a list "
 "of fields); char \"-\" can be used before field to reverse order, char \"~\" "
-"can be used to do a case-insensitive comparison; example: \"-users,~name2\" "
-"for biggest channels first then case-insensitive sort on channel name "
-"without prefix"
+"can be used to do a case-insensitive comparison; example: \"-users,~name\" "
+"for biggest channels first then case-insensitive sort on name"
 msgstr ""

 msgid "strip channel topic colors in /list buffer"
@@ -12783,7 +12716,7 @@ msgid "%s%s: no connection to remote relay \"%s\""
 msgstr ""

 #, c-format
-msgid "remote[%s]: auto-reconnection is canceled"
+msgid "remote[%s]: auto-reconnection is cancelled"
 msgstr ""

 #, c-format
@@ -14848,7 +14781,7 @@ msgid "%s%s: invalid regular expression in trigger: \"%s\""
 msgstr ""

 #. TRANSLATORS: this text is displayed before the list of nicks typing in the bar item "typing", it must be as short as possible
-msgid "Typing: "
+msgid "Typing:"
 msgstr ""

 msgid ""
@@ -14882,11 +14815,6 @@ msgid ""
 "truncate content)"
 msgstr ""

-msgid ""
-"text to display before the nicks in the bar item \"typing\"; if set, it is "
-"used instead of the translated string \"Typing: \" which is used by default"
-msgstr ""
-
 msgid "Typing status of users"
 msgstr ""

@@ -15014,9 +14942,8 @@ msgid "does not wait for ACK when sending file"
 msgstr ""

 msgid ""
-"IP or DNS address used for sending and passively receiving files/chats; if "
-"empty, local interface IP is used (note: content is evaluated, see /help "
-"eval)"
+"IP or DNS address used for sending and passively receiving files/chats (if "
+"empty, local interface IP is used)"
 msgstr ""

 msgid ""
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2025-2026 Sébastien Helleu <flashcode@flashtux.org>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-line-length = 120
-
-[lint]
-select = ["ALL"]
-ignore = [
-    "D203", # incorrect-blank-line-before-class
-    "D213", # multi-line-summary-second-line
-]
-
-[lint.pylint]
-max-args = 10
@@ -23,7 +23,6 @@

 set(LIB_CORE_SRC
  weechat.c weechat.h
-  core-args.c core-args.h
  core-arraylist.c core-arraylist.h
  core-backtrace.c core-backtrace.h
  core-calc.c core-calc.h
@@ -82,6 +81,22 @@ set(LIB_CORE_SRC
 include(CheckSymbolExists)
 check_symbol_exists(flock "sys/file.h" HAVE_FLOCK)

+if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+  find_library(EXECINFO_LIB_PATH execinfo /usr/local/lib)
+  set(CMAKE_REQUIRED_LIBRARIES "${EXECINFO_LIB_PATH}")
+  check_function_exists(backtrace HAVE_BACKTRACE)
+else()
+  check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE)
+endif()
+
+if(ENABLE_ZSTD)
+  include_directories(${LIBZSTD_INCLUDE_DIRS})
+endif()
+
+if(ENABLE_CJSON)
+  include_directories(${LIBCJSON_INCLUDE_DIRS})
+endif()
+
 include_directories("${CMAKE_BINARY_DIR}")
 add_library(weechat_core OBJECT ${LIB_CORE_SRC})
 target_link_libraries(weechat_core coverage_config)
@@ -1,414 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2003-2026 Sébastien Helleu <flashcode@flashtux.org>
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * This file is part of WeeChat, the extensible chat client.
- *
- * WeeChat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * WeeChat is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-/* Function for command-line arguments */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <getopt.h>
-
-#include "weechat.h"
-#include "core-debug.h"
-#include "core-list.h"
-#include "core-string.h"
-#include "core-utf8.h"
-#include "core-version.h"
-#include "../gui/gui-color.h"
-#include "../plugins/plugin.h"
-
-/* some command line options */
-#define OPTION_DOCGEN     1000
-#define OPTION_NO_DLCLOSE 1001
-#define OPTION_NO_GNUTLS  1002
-#define OPTION_NO_GCRYPT  1003
-
-char *weechat_args_common[][2] = {
-    {
-        "-a, --no-connect",
-        /* TRANSLATORS: command line option "-a", "--no-connect" */
-        N_("disable auto-connect to servers at startup"),
-    },
-    {
-        "-c, --colors",
-        /* TRANSLATORS: command line option "-c", "--colors" */
-        N_("display default colors in terminal and exit"),
-    },
-    {
-        /* TRANSLATORS: only "<path>" may be translated */
-        N_("-d, --dir <path>"),
-        /* TRANSLATORS: command line option "-d", "--dir <path>" */
-        N_("force a single WeeChat home directory or 5 different directories "
-           "separated by colons (in this order: config, data, state, cache, runtime) "
-           "(environment variable WEECHAT_HOME is read if this option is not given)"),
-    },
-    {
-        "-t, --temp-dir",
-        /* TRANSLATORS: command line option "-t", "--temp-dir" */
-        N_("create a temporary WeeChat home directory and delete it on exit "
-           "(incompatible with option \"-d\")"),
-    },
-    {
-        "-h, --help",
-        /* TRANSLATORS: command line option "-h", "--help" */
-        N_("display this help and exit"),
-    },
-    {
-        "-i, --build-info",
-        /* TRANSLATORS: command line option "-i", "--build-info" */
-        N_("display build information and exit"),
-    },
-    {
-        "-l, --license",
-        /* TRANSLATORS: command line option "-l", "--license" */
-        N_("display WeeChat license and exit"),
-    },
-    {
-        "-p, --no-plugin",
-        /* TRANSLATORS: command line option "-p", "--no-plugin" */
-        N_("don't load any plugin at startup"),
-    },
-    {
-        /* TRANSLATORS: only "<plugins>" may be translated */
-        N_("-P, --plugins <plugins>"),
-        /* TRANSLATORS: command line option "-P", "--plugins <plugins>" */
-        N_("load only these plugins at startup (see /help weechat.plugin.autoload)"),
-    },
-    {
-        /* TRANSLATORS: only "<cmd>" may be translated (please keep it short) */
-        N_("-r, --run-command <cmd>"),
-        /* TRANSLATORS: command line option "-r", "--run-command <cmd>" */
-        N_("run command(s) after startup; many commands can be separated "
-           "by semicolons and are evaluated, this option can be given multiple times"),
-    },
-    {
-        "-s, --no-script",
-        /* TRANSLATORS: command line option "-s", "--no-script" */
-        N_("don't load any script at startup"),
-    },
-    {
-        "--upgrade",
-        /* TRANSLATORS: command line option "--upgrade" */
-        N_("upgrade WeeChat using session files (see /help upgrade in WeeChat)"),
-    },
-    {
-        "-v, --version",
-        /* TRANSLATORS: command line option "-v", "--version" */
-        N_("display WeeChat version and exit"),
-    },
-    {
-        /* TRANSLATORS: command line option: "plugin" and "option" may be translated */
-        N_("plugin:option"),
-        /* TRANSLATORS: command line option "plugin:option" */
-        N_("option for plugin (see man weechat)"),
-    },
-    { NULL, NULL },
-};
-char *weechat_args_headless[][2] = {
-    {
-        /* TRANSLATORS: only "<path>" may be translated */
-        N_("--doc-gen <path>"),
-        /* TRANSLATORS: command line option "--doc-gen <path>" */
-        N_("generate files to build documentation and exit"),
-    },
-    {
-        "--daemon",
-        /* TRANSLATORS: command line option "--daemon" */
-        N_("run WeeChat as a daemon (fork, new process group, file descriptors closed); "
-           "by default in headless mode WeeChat is blocking and does not run in background"),
-    },
-    {
-        "--stdout",
-        /* TRANSLATORS: command line option "--stdout" */
-        N_("display log messages on standard output instead of writing them in log file "
-           "(option ignored if option \"--daemon\" is given)"),
-    },
-    { NULL, NULL },
-};
-char *weechat_args_debug[][2] = {
-    {
-        "--no-dlclose",
-        /* TRANSLATORS: command line option "--no-dlclose" */
-        N_("do not call function dlclose after plugins are unloaded"),
-    },
-    {
-        "--no-gnutls",
-        /* TRANSLATORS: command line option "--no-gnutls" */
-        N_("disable init/deinit of gnutls"),
-    },
-    {
-        "--no-gcrypt",
-        /* TRANSLATORS: command line option "--no-gcrypt" */
-        N_("disable init/deinit of gcrypt"),
-    },
-    { NULL, NULL },
-};
-
-
-/*
- * Display WeeChat copyright on standard output.
- */
-
-void
-args_display_copyright (void)
-{
-    string_fprintf (stdout, "\n");
-    string_fprintf (
-        stdout,
-        /* TRANSLATORS: "%s %s" after "compiled on" is date and time */
-        _("WeeChat %s Copyright %s, compiled on %s %s\n"
-          "Developed by Sébastien Helleu <flashcode@flashtux.org> "
-          "- %s"),
-        version_get_version_with_git (),
-        WEECHAT_COPYRIGHT_DATE,
-        version_get_compilation_date (),
-        version_get_compilation_time (),
-        WEECHAT_WEBSITE);
-    string_fprintf (stdout, "\n");
-}
-
-void
-args_display_list_args (char *args[][2])
-{
-    int i, j, length, length_fill, max_length_screen;
-    const char *ptr_text;
-
-    max_length_screen = 0;
-    for (i = 0; args[i][0]; i++)
-    {
-        length = utf8_strlen_screen (_(args[i][0]));
-        if (length > max_length_screen)
-            max_length_screen = length;
-    }
-
-    for (i = 0; args[i][0]; i++)
-    {
-        ptr_text = _(args[i][0]);
-        length = utf8_strlen_screen (ptr_text);
-        length_fill = max_length_screen - length;
-        string_fprintf (stdout, "  %s", ptr_text);
-        for (j = 0; j < length_fill; j++)
-        {
-            string_fprintf (stdout, " ");
-        }
-        string_fprintf (stdout, "  %s\n", _(args[i][1]));
-    }
-}
-
-/*
- * Display WeeChat help on standard output.
- */
-
-void
-args_display_help (void)
-{
-    args_display_copyright ();
-    string_fprintf (stdout, "\n");
-    string_fprintf (stdout,
-                    "%s %s %s\n\n",
-                    _("Usage:"),
-                    weechat_argv0,
-                    _("[option...] [plugin:option...]"));
-    args_display_list_args (weechat_args_common);
-    string_fprintf (stdout, "\n");
-
-    /* extra options in headless mode */
-    if (weechat_headless)
-    {
-        string_fprintf (stdout, "%s\n",
-                        _("Extra options in headless mode:"));
-        args_display_list_args (weechat_args_headless);
-        string_fprintf (stdout, "\n");
-    }
-
-    /* debug options */
-    string_fprintf (stdout, "%s\n",
-                    _("Debug options (for tools like valgrind, "
-                      "DO NOT USE IN PRODUCTION):"));
-    args_display_list_args (weechat_args_debug);
-    string_fprintf (stdout, "\n");
-}
-
-/*
- * Parse command line arguments.
- *
- * Arguments argc and argv come from main() function.
- */
-
-void
-args_parse (int argc, char *argv[])
-{
-    int opt;
-    struct option long_options[] = {
-        /* standard options */
-        { "no-connect",  no_argument,       NULL, 'a'               },
-        { "colors",      no_argument,       NULL, 'c'               },
-        { "dir",         required_argument, NULL, 'd'               },
-        { "temp-dir",    no_argument,       NULL, 't'               },
-        { "help",        no_argument,       NULL, 'h'               },
-        { "build-info",  no_argument,       NULL, 'i'               },
-        { "license",     no_argument,       NULL, 'l'               },
-        { "no-plugin",   no_argument,       NULL, 'p'               },
-        { "plugins",     required_argument, NULL, 'P'               },
-        { "run-command", required_argument, NULL, 'r'               },
-        { "no-script",   no_argument,       NULL, 's'               },
-        { "upgrade",     no_argument,       NULL, 'u'               },
-        { "doc-gen",     required_argument, NULL, OPTION_DOCGEN     },
-        { "version",     no_argument,       NULL, 'v'               },
-        /* debug options */
-        { "no-dlclose",  no_argument,       NULL, OPTION_NO_DLCLOSE },
-        { "no-gnutls",   no_argument,       NULL, OPTION_NO_GNUTLS  },
-        { "no-gcrypt",   no_argument,       NULL, OPTION_NO_GCRYPT  },
-        { NULL,          0,                 NULL, 0                 },
-    };
-
-    weechat_argv0 = (argv[0]) ? strdup (argv[0]) : NULL;
-    weechat_upgrading = 0;
-    weechat_home_force = NULL;
-    weechat_home_temp = 0;
-    weechat_home_delete_on_exit = 0;
-    weechat_server_cmd_line = 0;
-    weechat_force_plugin_autoload = NULL;
-    weechat_doc_gen = 0;
-    weechat_plugin_no_dlclose = 0;
-
-    optind = 0;
-    opterr = 0;
-
-    while ((opt = getopt_long (argc, argv,
-                               ":acd:thilpP:r:sv",
-                               long_options, NULL)) != -1)
-    {
-        switch (opt)
-        {
-            case 'a': /* -a / --no-connect */
-                /* option ignored, it will be used by plugins/scripts */
-                break;
-            case 'c': /* -c / --colors */
-                gui_color_display_terminal_colors ();
-                weechat_shutdown (EXIT_SUCCESS, 0);
-                break;
-            case 'd': /* -d / --dir */
-                weechat_home_temp = 0;
-                free (weechat_home_force);
-                weechat_home_force = strdup (optarg);
-                break;
-            case 't': /* -t / --temp-dir */
-                weechat_home_temp = 1;
-                if (weechat_home_force)
-                {
-                    free (weechat_home_force);
-                    weechat_home_force = NULL;
-                }
-                break;
-            case 'h': /* -h / --help */
-                args_display_help ();
-                weechat_shutdown (EXIT_SUCCESS, 0);
-                break;
-            case 'i': /* -i / --build-info */
-                debug_build_info ();
-                weechat_shutdown (EXIT_SUCCESS, 0);
-                break;
-            case 'l': /* -l / --license */
-                args_display_copyright ();
-                string_fprintf (stdout, "\n");
-                string_fprintf (stdout, "%s%s", WEECHAT_LICENSE_TEXT);
-                weechat_shutdown (EXIT_SUCCESS, 0);
-                break;
-            case 'p': /* -p / --no-plugin */
-                free (weechat_force_plugin_autoload);
-                weechat_force_plugin_autoload = strdup ("!*");
-                break;
-            case 'P': /* -P / --plugins */
-                free (weechat_force_plugin_autoload);
-                weechat_force_plugin_autoload = strdup (optarg);
-                break;
-            case 'r': /* -r / --run-command */
-                if (!weechat_startup_commands)
-                    weechat_startup_commands = weelist_new ();
-                weelist_add (weechat_startup_commands, optarg,
-                             WEECHAT_LIST_POS_END, NULL);
-                break;
-            case 's': /* -s / --no-script */
-                /* option ignored, it will be used by the scripting plugins */
-                break;
-            case 'u': /* --upgrade */
-                weechat_upgrading = 1;
-                break;
-            case OPTION_DOCGEN: /* --doc-gen */
-                if (weechat_headless)
-                {
-                    weechat_doc_gen = 1;
-                    weechat_doc_gen_path = strdup (optarg);
-                }
-                break;
-            case 'v': /* -v / --version */
-                string_fprintf (stdout, version_get_version ());
-                fprintf (stdout, "\n");
-                weechat_shutdown (EXIT_SUCCESS, 0);
-                break;
-            case OPTION_NO_DLCLOSE: /* --no-dlclose */
-                /*
-                 * Valgrind works better when dlclose() is not done after
-                 * plugins are unloaded, it can display stack for plugins,*
-                 * otherwise you'll see "???" in stack for functions of
-                 * unloaded plugins.
-                 * This option disables the call to dlclose(),
-                 * it must NOT be used for other purposes!
-                 */
-                weechat_plugin_no_dlclose = 1;
-                break;
-            case OPTION_NO_GNUTLS: /* --no-gnutls */
-                /*
-                 * Electric-fence is not working fine when gnutls loads
-                 * certificates and Valgrind reports many memory errors with
-                 * gnutls.
-                 * This option disables the init/deinit of gnutls,
-                 * it must NOT be used for other purposes!
-                 */
-                weechat_no_gnutls = 1;
-                break;
-            case OPTION_NO_GCRYPT: /* --no-gcrypt */
-                /*
-                 * Valgrind reports many memory errors with gcrypt.
-                 * This option disables the init/deinit of gcrypt,
-                 * it must NOT be used for other purposes!
-                 */
-                weechat_no_gcrypt = 1;
-                break;
-            case ':':
-                string_fprintf (stderr,
-                                _("Error: missing argument for \"%s\" option\n"),
-                                argv[optind - 1]);
-                weechat_shutdown (EXIT_FAILURE, 0);
-                break;
-            case '?':
-                /* ignore any unknown option; plugins can use them */
-                break;
-            default:
-                /* ignore any other error */
-                break;
-        }
-    }
-}
@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2026 Sébastien Helleu <flashcode@flashtux.org>
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * This file is part of WeeChat, the extensible chat client.
- *
- * WeeChat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * WeeChat is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with WeeChat.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef WEECHAT_ARGS_H
-#define WEECHAT_ARGS_H
-
-extern void args_display_help (void);
-extern void args_parse (int argc, char *argv[]);
-
-#endif /* WEECHAT_ARGS_H */
@@ -35,9 +35,10 @@


 /*
- * Compare two arraylist entries (default comparator: compare pointers only).
+ * Compares two arraylist entries (default comparator).
+ * It just compares pointers.
 *
- * Return:
+ * Returns:
 *   -1: pointer1 < pointer2
 *    0: pointer1 == pointer2
 *    1: pointer1 > pointer2
@@ -59,9 +60,9 @@ arraylist_cmp_default_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Create a new arraylist.
+ * Creates a new arraylist.
 *
- * Return pointer to arraylist, NULL if error.
+ * Returns pointer to arraylist, NULL if error.
 */

 struct t_arraylist *
@@ -113,7 +114,7 @@ arraylist_new (int initial_size,
 }

 /*
- * Return the size of an arraylist (number of elements).
+ * Returns the size of an arraylist (number of elements).
 */

 int
@@ -126,7 +127,7 @@ arraylist_size (struct t_arraylist *arraylist)
 }

 /*
- * Return the pointer to an arraylist element, by index.
+ * Returns the pointer to an arraylist element, by index.
 */

 void *
@@ -139,11 +140,11 @@ arraylist_get (struct t_arraylist *arraylist, int index)
 }

 /*
- * Adjust the allocated size of arraylist to add one element (if needed),
+ * Adjusts the allocated size of arraylist to add one element (if needed),
 * so that the list has enough allocated data to store (current_size + 1)
 * elements.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -179,11 +180,11 @@ arraylist_grow (struct t_arraylist *arraylist)
 }

 /*
- * Adjust the allocated size of arraylist to remove one element (if needed),
+ * Adjusts the allocated size of arraylist to remove one element (if needed),
 * so that the list has enough allocated data to store (current size - 1)
 * elements.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -229,7 +230,7 @@ arraylist_shrink (struct t_arraylist *arraylist)
 }

 /*
- * Perform a binary search in the arraylist to find an element
+ * Performs a binary search in the arraylist to find an element
 * (this function must be called only if the arraylist is sorted).
 *
 * If "index" is not NULL, it is set with the index of element found (or -1 if
@@ -238,7 +239,7 @@ arraylist_shrink (struct t_arraylist *arraylist)
 * If "index_insert" is not NULL, it is set with the index that must be used to
 * insert the element in the arraylist (to keep arraylist sorted).
 *
- * Return pointer to element found, NULL if not found.
+ * Returns pointer to element found, NULL if not found.
 */

 void *
@@ -397,7 +398,7 @@ end:
 }

 /*
- * Perform a standard search in the arraylist to find an element
+ * Performs a standard search in the arraylist to find an element
 * (this function must be called only if the arraylist is NOT sorted).
 *
 * If "index" is not NULL, it is set with the index of element found (or -1 if
@@ -406,7 +407,7 @@ end:
 * If "index_insert" is not NULL, it is set to -1 (elements are always added
 * at the end of list when it is not sorted).
 *
- * Return pointer to element found, NULL if not found.
+ * Returns pointer to element found, NULL if not found.
 */

 void *
@@ -441,7 +442,7 @@ end:
 }

 /*
- * Search an element in the arraylist.
+ * Searches an element in the arraylist.
 *
 * If "index" is not NULL, it is set with the index of element found (or -1 if
 * element was not found).
@@ -449,7 +450,7 @@ end:
 * If "index_insert" is not NULL, it is set with the index that must be used to
 * insert the element in the arraylist (to keep arraylist sorted).
 *
- * Return pointer to element found, NULL if not found.
+ * Returns pointer to element found, NULL if not found.
 */

 void *
@@ -477,7 +478,7 @@ arraylist_search (struct t_arraylist *arraylist, void *pointer,
 }

 /*
- * Insert an element at a given index (and shifts next elements by one
+ * Inserts an element at a given index (and shifts next elements by one
 * position), or at automatic index if the arraylist is sorted.
 *
 * If the index is negative and that the arraylist is not sorted, the element
@@ -486,7 +487,7 @@ arraylist_search (struct t_arraylist *arraylist, void *pointer,
 * If the arraylist is sorted, the argument "index" is ignored (the element
 * will be inserted at appropriate position, to keep arraylist sorted).
 *
- * Return the index of the new element (>= 0) or -1 if error.
+ * Returns the index of the new element (>= 0) or -1 if error.
 */

 int
@@ -558,10 +559,10 @@ arraylist_insert (struct t_arraylist *arraylist, int index, void *pointer)
 }

 /*
- * Add an element at the end of arraylist (or in the middle if the arraylist
+ * Adds an element at the end of arraylist (or in the middle if the arraylist
 * is sorted).
 *
- * Return the index of the new element (>= 0) or -1 if error.
+ * Returns the index of the new element (>= 0) or -1 if error.
 */

 int
@@ -574,9 +575,9 @@ arraylist_add (struct t_arraylist *arraylist, void *pointer)
 }

 /*
- * Remove one element from the arraylist.
+ * Removes one element from the arraylist.
 *
- * Return the index removed or -1 if error.
+ * Returns the index removed or -1 if error.
 */

 int
@@ -613,9 +614,9 @@ arraylist_remove (struct t_arraylist *arraylist, int index)
 }

 /*
- * Remove all elements in the arraylist.
+ * Removes all elements in the arraylist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -668,7 +669,7 @@ arraylist_clear (struct t_arraylist *arraylist)
 }

 /*
- * Free an arraylist.
+ * Frees an arraylist.
 */

 void
@@ -693,7 +694,7 @@ arraylist_free (struct t_arraylist *arraylist)
 }

 /*
- * Print an arraylist in WeeChat log file (usually for crash dump).
+ * Prints an arraylist in WeeChat log file (usually for crash dump).
 */

 void
@@ -49,7 +49,7 @@


 /*
- * Display a backtrace line on standard error output and in WeeChat log.
+ * Displays a backtrace line on standard error output and in WeeChat log.
 */

 void
@@ -65,7 +65,7 @@ weechat_backtrace_printf (const char *message, ...)
 }

 /*
- * Display function name and line with a backtrace address.
+ * Displays function name and line with a backtrace address.
 */

 void
@@ -147,7 +147,7 @@ weechat_backtrace_addr2line (int number, void *address, const char *symbol)
 }

 /*
- * Display backtrace (function called when a SIGSEGV is received).
+ * Displays backtrace (function called when a SIGSEGV is received).
 */

 void
@@ -60,7 +60,7 @@ calc_list_free_cb (void *data, struct t_arraylist *arraylist, void *pointer)
 }

 /*
- * Return the precedence of an operator:
+ * Returns the precedence of an operator:
 *   - '*' and '/': 2
 *   - '+' and '-': 1
 *   - any other: 0
@@ -91,7 +91,7 @@ calc_operator_precedence (const char *oper)
 }

 /*
- * Pop an integer value from the stack of values.
+ * Pops an integer value from the stack of values.
 */

 double
@@ -117,7 +117,7 @@ calc_pop_value (struct t_arraylist *list_values)
 }

 /*
- * Calculate result of an operation using an operator and two values.
+ * Calculates result of an operation using an operator and two values.
 */

 double
@@ -151,7 +151,7 @@ calc_operation (const char *oper, double value1, double value2)
 }

 /*
- * Calculate result of an operation using the operator on the operators stack
+ * Calculates result of an operation using the operator on the operators stack
 * and the two values on the values stack.
 *
 * The result is pushed on values stack.
@@ -187,7 +187,7 @@ calc_operation_stacks (struct t_arraylist *list_values,
 }

 /*
- * Sanitize a decimal number: remove any thousands separator and replace
+ * Sanitizes a decimal number: removes any thousands separator and replaces
 * the decimal separator by a dot.
 *
 * The string is updated in-place, the result has always a length shorter or
@@ -203,7 +203,7 @@ calc_operation_stacks (struct t_arraylist *list_values,
 *   1,234,567.89  -->  1234567.89
 *   -2.345,67     -->  -2345.67
 *
- * Return:
+ * Returns:
 *   1: the number has decimal part
 *   0: the number has no decimal part
 */
@@ -279,7 +279,7 @@ calc_sanitize_decimal_number (char *string)
 }

 /*
- * Format the result as a decimal number (locale independent): remove any
+ * Formats the result as a decimal number (locale independent): remove any
 * extra "0" at the and the decimal point if needed.
 */

@@ -314,7 +314,7 @@ calc_format_result (double value, char *result, int max_size)
 }

 /*
- * Calculate an expression, which can contain:
+ * Calculates an expression, which can contain:
 *   - integer and decimal numbers (ie 2 or 2.5)
 *   - operators:
 *        +: addition
@@ -101,7 +101,7 @@ void command_set_display_option (struct t_config_option *option,


 /*
- * Callback for command "/allbuf": execute a command on all buffers.
+ * Callback for command "/allbuf": executes a command on all buffers.
 */

 COMMAND_CALLBACK(allbuf)
@@ -158,7 +158,7 @@ COMMAND_CALLBACK(allbuf)
 COMMAND_EMPTY(away)

 /*
- * Display a list of bars.
+ * Displays a list of bars.
 */

 void
@@ -234,7 +234,7 @@ command_bar_list (int full)
 }

 /*
- * Callback for command "/bar": manage bars.
+ * Callback for command "/bar": manages bars.
 */

 COMMAND_CALLBACK(bar)
@@ -599,11 +599,11 @@ COMMAND_CALLBACK(bar)
 }

 /*
- * Check if the buffer number is valid (in range 1 to GUI_BUFFER_NUMBER_MAX).
+ * Checks if the buffer number is valid (in range 1 to GUI_BUFFER_NUMBER_MAX).
 *
 * If the number is not valid, a warning is displayed.
 *
- * Return:
+ * Returns:
 *   1: buffer number is valid
 *   0: buffer number is invalid
 */
@@ -615,7 +615,7 @@ command_buffer_check_number (long number)
    {
        /* invalid number */
        gui_chat_printf (NULL,
-                         _("%sBuffer number %d is out of range "
+                         _("%sBuffer number \"%d\" is out of range "
                           "(it must be between 1 and %d)"),
                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                         number,
@@ -628,7 +628,7 @@ command_buffer_check_number (long number)
 }

 /*
- * Display a local variable for a buffer.
+ * Displays a local variable for a buffer.
 */

 void
@@ -659,7 +659,7 @@ command_buffer_display_localvar (void *data,
 }

 /*
- * Callback for command "/buffer": manage buffers.
+ * Callback for command "/buffer": manages buffers.
 */

 COMMAND_CALLBACK(buffer)
@@ -1646,7 +1646,7 @@ COMMAND_CALLBACK(buffer)
 }

 /*
- * Callback for command "/color": define custom colors and displays palette of
+ * Callback for command "/color": defines custom colors and displays palette of
 * colors.
 */

@@ -1845,7 +1845,7 @@ COMMAND_CALLBACK(color)
 }

 /*
- * Callback for command "/command": launch explicit WeeChat or plugin command.
+ * Callback for command "/command": launches explicit WeeChat or plugin command.
 */

 COMMAND_CALLBACK(command)
@@ -2036,7 +2036,7 @@ COMMAND_CALLBACK(cursor)
 }

 /*
- * Callback for command "/debug": control debug for core/plugins.
+ * Callback for command "/debug": controls debug for core/plugins.
 */

 COMMAND_CALLBACK(debug)
@@ -2313,7 +2313,7 @@ COMMAND_CALLBACK(debug)
 }

 /*
- * Print eval debug output.
+ * Prints eval debug output.
 */

 void
@@ -2342,17 +2342,16 @@ command_eval_print_debug (const char *debug)
 }

 /*
- * Callback for command "/eval": evaluate an expression and send result to buffer.
+ * Callback for command "/eval": evaluates an expression and sends result to
+ * buffer.
 */

 COMMAND_CALLBACK(eval)
 {
-    int i, rc, print_only, split_command, eval_first, condition, debug, error;
+    int i, rc, print_only, split_command, condition, debug, error;
    char *result, *ptr_args, **commands, **ptr_command, str_debug[32];
    const char *debug_output;
    struct t_hashtable *pointers, *options;
-    struct t_weelist *list_commands;
-    struct t_weelist_item *ptr_item;

    /* make C compiler happy */
    (void) pointer;
@@ -2362,7 +2361,6 @@ COMMAND_CALLBACK(eval)
    rc = WEECHAT_RC_OK;
    print_only = 0;
    split_command = 0;
-    eval_first = 0;
    condition = 0;
    debug = 0;
    error = 0;
@@ -2382,11 +2380,6 @@ COMMAND_CALLBACK(eval)
            split_command = 1;
            ptr_args = argv_eol[i + 1];
        }
-        else if (string_strcmp (argv[i], "-e") == 0)
-        {
-            eval_first = 1;
-            ptr_args = argv_eol[i + 1];
-        }
        else if (string_strcmp (argv[i], "-c") == 0)
        {
            condition = 1;
@@ -2404,89 +2397,97 @@ COMMAND_CALLBACK(eval)
        }
    }

-    if (!ptr_args)
-        return rc;
-
-    pointers = hashtable_new (32,
-                              WEECHAT_HASHTABLE_STRING,
-                              WEECHAT_HASHTABLE_POINTER,
-                              NULL,
-                              NULL);
-    if (pointers)
+    if (ptr_args)
    {
-        hashtable_set (pointers, "window",
-                       gui_window_search_with_buffer (buffer));
-        hashtable_set (pointers, "buffer", buffer);
-    }
-
-    options = NULL;
-    if (condition || debug)
-    {
-        options = hashtable_new (32,
-                                 WEECHAT_HASHTABLE_STRING,
-                                 WEECHAT_HASHTABLE_STRING,
-                                 NULL,
-                                 NULL);
-        if (options)
+        pointers = hashtable_new (32,
+                                  WEECHAT_HASHTABLE_STRING,
+                                  WEECHAT_HASHTABLE_POINTER,
+                                  NULL,
+                                  NULL);
+        if (pointers)
        {
-            if (condition)
-                hashtable_set (options, "type", "condition");
-            if (debug > 0)
+            hashtable_set (pointers, "window",
+                           gui_window_search_with_buffer (buffer));
+            hashtable_set (pointers, "buffer", buffer);
+        }
+
+        options = NULL;
+        if (condition || debug)
+        {
+            options = hashtable_new (32,
+                                     WEECHAT_HASHTABLE_STRING,
+                                     WEECHAT_HASHTABLE_STRING,
+                                     NULL,
+                                     NULL);
+            if (options)
            {
-                snprintf (str_debug, sizeof (str_debug), "%d", debug);
-                hashtable_set (options, "debug", str_debug);
+                if (condition)
+                    hashtable_set (options, "type", "condition");
+                if (debug > 0)
+                {
+                    snprintf (str_debug, sizeof (str_debug), "%d", debug);
+                    hashtable_set (options, "debug", str_debug);
+                }
            }
        }
-    }

-    if (print_only)
-    {
-        result = eval_expression (ptr_args, pointers, NULL, options);
-        gui_chat_printf_date_tags (NULL, 0, "no_log", "\t>> %s", ptr_args);
-        if (result)
+        if (print_only)
        {
-            gui_chat_printf_date_tags (NULL, 0, "no_log", "\t== %s[%s%s%s]",
-                                       GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
-                                       GUI_COLOR(GUI_COLOR_CHAT),
-                                       result,
-                                       GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
-            free (result);
+            result = eval_expression (ptr_args, pointers, NULL, options);
+            gui_chat_printf_date_tags (NULL, 0, "no_log", "\t>> %s", ptr_args);
+            if (result)
+            {
+                gui_chat_printf_date_tags (NULL, 0, "no_log", "\t== %s[%s%s%s]",
+                                           GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
+                                           GUI_COLOR(GUI_COLOR_CHAT),
+                                           result,
+                                           GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
+                free (result);
+            }
+            else
+            {
+                gui_chat_printf_date_tags (NULL, 0, "no_log", "\t== %s<%s%s%s>",
+                                           GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
+                                           GUI_COLOR(GUI_COLOR_CHAT),
+                                           _("error"),
+                                           GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
+            }
+            if (options && debug)
+            {
+                debug_output = hashtable_get (options,
+                                              "debug_output");
+                if (debug_output)
+                    command_eval_print_debug (debug_output);
+            }
        }
        else
        {
-            gui_chat_printf_date_tags (NULL, 0, "no_log", "\t== %s<%s%s%s>",
-                                       GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS),
-                                       GUI_COLOR(GUI_COLOR_CHAT),
-                                       _("error"),
-                                       GUI_COLOR(GUI_COLOR_CHAT_DELIMITERS));
-        }
-        if (options && debug)
-        {
-            debug_output = hashtable_get (options,
-                                          "debug_output");
-            if (debug_output)
-                command_eval_print_debug (debug_output);
-        }
-        return rc;
-    }
-
-    if (split_command)
-    {
-        commands = string_split_command (ptr_args, ';');
-        if (commands)
-        {
-            if (eval_first)
+            if (split_command)
            {
-                list_commands = weelist_new ();
-                if (list_commands)
+                commands = string_split_command (ptr_args, ';');
+                if (commands)
                {
-                    /* first build a list of all evaluated commands */
                    for (ptr_command = commands; *ptr_command; ptr_command++)
                    {
-                        result = eval_expression (*ptr_command, pointers, NULL, options);
+                        if (!gui_buffer_valid (buffer))
+                        {
+                            buffer = gui_current_window->buffer;
+                            if (pointers)
+                            {
+                                hashtable_set (pointers, "window",
+                                               gui_window_search_with_buffer (buffer));
+                                hashtable_set (pointers, "buffer", buffer);
+                            }
+                        }
+                        result = eval_expression (*ptr_command, pointers, NULL,
+                                                  options);
                        if (result)
                        {
-                            weelist_add (list_commands, result, WEECHAT_LIST_POS_END, NULL);
+                            (void) input_data (buffer,
+                                               result,
+                                               NULL,
+                                               0,  /* split_newline */
+                                               0);  /* user_data */
                            free (result);
                        }
                        else
@@ -2501,103 +2502,52 @@ COMMAND_CALLBACK(eval)
                                command_eval_print_debug (debug_output);
                        }
                    }
-                    /* execute evaluated commands */
-                    for (ptr_item = list_commands->items; ptr_item;
-                         ptr_item = ptr_item->next_item)
-                    {
-                        if (!gui_buffer_valid (buffer))
-                            buffer = gui_current_window->buffer;
-                        (void) input_data (buffer,
-                                           ptr_item->data,
-                                           NULL,
-                                           0,  /* split_newline */
-                                           0);  /* user_data */
-                    }
-                    weelist_free (list_commands);
+                    string_free_split_command (commands);
                }
            }
            else
            {
-                for (ptr_command = commands; *ptr_command; ptr_command++)
+                result = eval_expression (ptr_args, pointers, NULL, options);
+                if (result)
                {
-                    if (!gui_buffer_valid (buffer))
-                    {
-                        buffer = gui_current_window->buffer;
-                        if (pointers)
-                        {
-                            hashtable_set (pointers, "window",
-                                           gui_window_search_with_buffer (buffer));
-                            hashtable_set (pointers, "buffer", buffer);
-                        }
-                    }
-                    result = eval_expression (*ptr_command, pointers, NULL,
-                                              options);
-                    if (result)
-                    {
-                        (void) input_data (buffer,
-                                           result,
-                                           NULL,
-                                           0,  /* split_newline */
-                                           0);  /* user_data */
-                        free (result);
-                    }
-                    else
-                    {
-                        error = 1;
-                    }
-                    if (options && debug)
-                    {
-                        debug_output = hashtable_get (options,
-                                                      "debug_output");
-                        if (debug_output)
-                            command_eval_print_debug (debug_output);
-                    }
+                    (void) input_data (buffer,
+                                       result,
+                                       NULL,
+                                       0,  /* split_newline */
+                                       0);  /* user_data */
+                    free (result);
+                }
+                else
+                {
+                    error = 1;
+                }
+                if (options && debug)
+                {
+                    debug_output = hashtable_get (options,
+                                                  "debug_output");
+                    if (debug_output)
+                        command_eval_print_debug (debug_output);
                }
            }
-            string_free_split_command (commands);
        }
-    }
-    else
-    {
-        result = eval_expression (ptr_args, pointers, NULL, options);
-        if (result)
-        {
-            (void) input_data (buffer,
-                               result,
-                               NULL,
-                               0,  /* split_newline */
-                               0);  /* user_data */
-            free (result);
-        }
-        else
-        {
-            error = 1;
-        }
-        if (options && debug)
-        {
-            debug_output = hashtable_get (options,
-                                          "debug_output");
-            if (debug_output)
-                command_eval_print_debug (debug_output);
-        }
-    }

-    if (error)
-    {
-        gui_chat_printf (NULL,
-                         _("%sError in expression to evaluate"),
-                         gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
-        rc = WEECHAT_RC_ERROR;
-    }
+        if (error)
+        {
+            gui_chat_printf (NULL,
+                             _("%sError in expression to evaluate"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
+            rc = WEECHAT_RC_ERROR;
+        }

-    hashtable_free (pointers);
-    hashtable_free (options);
+        hashtable_free (pointers);
+        hashtable_free (options);
+    }

    return rc;
 }

 /*
- * Display one filter.
+ * Displays one filter.
 */

 void
@@ -2620,7 +2570,7 @@ command_filter_display (struct t_gui_filter *filter)
 }

 /*
- * Callback for command "/filter": manage message filters.
+ * Callback for command "/filter": manages message filters.
 */

 COMMAND_CALLBACK(filter)
@@ -2967,7 +2917,7 @@ COMMAND_CALLBACK(filter)
 }

 /*
- * Display help for commands of a plugin (or core commands if plugin is NULL).
+ * Displays help for commands of a plugin (or core commands if plugin is NULL).
 */

 void
@@ -3112,7 +3062,7 @@ command_help_list_plugin_commands (struct t_weechat_plugin *plugin,
 }

 /*
- * Display help for commands.
+ * Displays help for commands.
 */

 void
@@ -3132,7 +3082,7 @@ command_help_list_commands (int verbose)
 }

 /*
- * Return translated help text for values of a color option.
+ * Returns translated help text for values of a color option.
 */

 const char *
@@ -3153,7 +3103,7 @@ command_help_option_color_values (void)
             "\"_\" for underline");
 }
 /*
- * Callback for command "/help": display help about commands and options.
+ * Callback for command "/help": displays help about commands and options.
 */

 COMMAND_CALLBACK(help)
@@ -3524,7 +3474,7 @@ COMMAND_CALLBACK(help)
 }

 /*
- * Callback for command "/history": display command history for current buffer.
+ * Callback for command "/history": displays command history for current buffer.
 */

 COMMAND_CALLBACK(history)
@@ -3586,7 +3536,7 @@ COMMAND_CALLBACK(history)
 }

 /*
- * Callback for command "/hotlist": manage hotlist.
+ * Callback for command "/hotlist": manages hotlist.
 */

 COMMAND_CALLBACK(hotlist)
@@ -3839,7 +3789,7 @@ COMMAND_CALLBACK(input)
 }

 /*
- * Callback for command "/item": manage custom bar items
+ * Callback for command "/item": manages custom bar items
 */

 COMMAND_CALLBACK(item)
@@ -4040,7 +3990,7 @@ COMMAND_CALLBACK(item)
 }

 /*
- * Display a key binding.
+ * Displays a key binding.
 */

 void
@@ -4070,7 +4020,7 @@ command_key_display (struct t_gui_key *key, struct t_gui_key *default_key)
 }

 /*
- * Display a list of keys.
+ * Displays a list of keys.
 */

 void
@@ -4100,7 +4050,7 @@ command_key_display_list (const char *message_no_key,
 }

 /*
- * Display differences between default and current keys (keys added, redefined
+ * Displays differences between default and current keys (keys added, redefined
 * or removed).
 */

@@ -4183,7 +4133,7 @@ command_key_display_listdiff (int context)
 }

 /*
- * Reset a key in the given context.
+ * Resets a key in the given context.
 */

 int
@@ -4249,7 +4199,7 @@ command_key_reset (int context, const char *key)
 }

 /*
- * Callback for command "/key": bind/unbind keys.
+ * Callback for command "/key": binds/unbinds keys.
 */

 COMMAND_CALLBACK(key)
@@ -4534,9 +4484,8 @@ COMMAND_CALLBACK(key)
                keys_added = (gui_keys_count[context] > old_keys_count) ?
                    gui_keys_count[context] - old_keys_count : 0;
                gui_chat_printf (NULL,
-                                 NG_("%d new key added (context: \"%s\")",
-                                     "%d new keys added (context: \"%s\")",
-                                     keys_added),
+                                 NG_("%d new key added", "%d new keys added "
+                                     "(context: \"%s\")", keys_added),
                                 keys_added,
                                 gui_key_context_string[context]);
            }
@@ -4570,7 +4519,7 @@ COMMAND_CALLBACK(key)
 }

 /*
- * Display a tree of windows.
+ * Displays a tree of windows.
 */

 void
@@ -4614,7 +4563,7 @@ command_layout_display_tree (struct t_gui_layout_window *layout_window,
 }

 /*
- * Get arguments for /layout command (if option is store/apply/del).
+ * Gets arguments for /layout command (if option is store/apply/del).
 */

 void
@@ -4651,7 +4600,7 @@ command_layout_get_arguments (int argc, char **argv,
 }

 /*
- * Callback for command "/layout": manage layouts.
+ * Callback for command "/layout": manages layouts.
 */

 COMMAND_CALLBACK(layout)
@@ -4884,7 +4833,7 @@ command_mouse_timer (const char *delay)
 }

 /*
- * Callback for command "/mouse": control mouse.
+ * Callback for command "/mouse": controls mouse.
 */

 COMMAND_CALLBACK(mouse)
@@ -4943,7 +4892,7 @@ COMMAND_CALLBACK(mouse)
 }

 /*
- * Callback for command "/mute": silently execute a command.
+ * Callback for command "/mute": silently executes a command.
 */

 COMMAND_CALLBACK(mute)
@@ -5031,9 +4980,9 @@ COMMAND_CALLBACK(mute)
 }

 /*
- * Open a file in write mode to redirect messages.
+ * Opens a file in write mode to redirect messages.
 *
- * Return a pointer to the file, NULL if error.
+ * Returns a pointer to the file, NULL if error.
 */

 FILE *
@@ -5285,7 +5234,7 @@ COMMAND_CALLBACK(pipe)
 }

 /*
- * Display a list of loaded plugins.
+ * Displays a list of loaded plugins.
 */

 void
@@ -5354,9 +5303,9 @@ command_plugin_list (const char *name, int full)
 }

 /*
- * List loaded plugins in input.
+ * Lists loaded plugins in input.
 *
- * Send input to buffer if send_to_buffer == 1.
+ * Sends input to buffer if send_to_buffer == 1.
 * String is translated if translated == 1 (otherwise it's English).
 */

@@ -5434,7 +5383,7 @@ command_plugin_list_input (struct t_gui_buffer *buffer,
 }

 /*
- * Callback for command "/plugin": list/load/unload WeeChat plugins.
+ * Callback for command "/plugin": lists/loads/unloads WeeChat plugins.
 */

 COMMAND_CALLBACK(plugin)
@@ -5817,7 +5766,7 @@ COMMAND_CALLBACK(print)
 }

 /*
- * Display a list of proxies.
+ * Displays a list of proxies.
 */

 void
@@ -5871,7 +5820,7 @@ command_proxy_list (void)
 }

 /*
- * Callback for command "/proxy": manage proxies.
+ * Callback for command "/proxy": manages proxies.
 */

 COMMAND_CALLBACK(proxy)
@@ -6010,7 +5959,7 @@ COMMAND_CALLBACK(proxy)
 }

 /*
- * Callback for command "/quit": quit WeeChat.
+ * Callback for command "/quit": quits WeeChat.
 */

 COMMAND_CALLBACK(quit)
@@ -6065,7 +6014,7 @@ COMMAND_CALLBACK(quit)
 }

 /*
- * Reload a configuration file.
+ * Reloads a configuration file.
 */

 void
@@ -6097,7 +6046,7 @@ command_reload_file (struct t_config_file *config_file)
 }

 /*
- * Callback for command "/reload": reload a configuration file.
+ * Callback for command "/reload": reloads a configuration file.
 */

 COMMAND_CALLBACK(reload)
@@ -6148,7 +6097,7 @@ COMMAND_CALLBACK(reload)
 }

 /*
- * Execute a repeated command.
+ * Executes a repeated command.
 */

 void
@@ -6249,7 +6198,7 @@ command_repeat_timer_cb (const void *pointer, void *data, int remaining_calls)
 }

 /*
- * Callback for command "/repeat": execute a command several times.
+ * Callback for command "/repeat": executes a command several times.
 */

 COMMAND_CALLBACK(repeat)
@@ -6331,7 +6280,7 @@ COMMAND_CALLBACK(repeat)
 }

 /*
- * Reset one option.
+ * Resets one option.
 */

 void
@@ -6358,7 +6307,7 @@ command_reset_option (struct t_config_option *option,
 }

 /*
- * Callback for command "/reset": reset configuration options.
+ * Callback for command "/reset": resets configuration options.
 */

 COMMAND_CALLBACK(reset)
@@ -6441,7 +6390,7 @@ COMMAND_CALLBACK(reset)
 }

 /*
- * Save a configuration file to disk.
+ * Saves a configuration file to disk.
 */

 void
@@ -6463,7 +6412,7 @@ command_save_file (struct t_config_file *config_file)
 }

 /*
- * Callback for command "/save": save configuration files to disk.
+ * Callback for command "/save": saves configuration files to disk.
 */

 COMMAND_CALLBACK(save)
@@ -6702,7 +6651,7 @@ COMMAND_CALLBACK(secure)
 }

 /*
- * Display a configuration section.
+ * Displays a configuration section.
 */

 void
@@ -6721,7 +6670,7 @@ command_set_display_section (struct t_config_file *config_file,
 }

 /*
- * Display a configuration option.
+ * Displays a configuration option.
 */

 void
@@ -6807,9 +6756,9 @@ command_set_display_option (struct t_config_option *option,
 }

 /*
- * Display a list of options.
+ * Displays a list of options.
 *
- * Return the number of options displayed.
+ * Returns the number of options displayed.
 */

 int
@@ -6878,12 +6827,12 @@ command_set_display_option_list (const char *message, const char *search,
 }

 /*
- * Display multiple lists of options.
+ * Displays multiple lists of options.
 *
- * If display_only_changed == 1, then display only options with value changed
- * (different from default value).
+ * If display_only_changed == 1, then it will display only options with value
+ * changed (different from default value).
 *
- * Return the total number of options displayed.
+ * Returns the total number of options displayed.
 */

 int
@@ -6967,7 +6916,7 @@ command_set_display_option_lists (char **argv, int arg_start, int arg_end,
 }

 /*
- * Callback for command "/set": display or set configuration options.
+ * Callback for command "/set": displays or sets configuration options.
 */

 COMMAND_CALLBACK(set)
@@ -7237,7 +7186,7 @@ COMMAND_CALLBACK(sys)
 }

 /*
- * Callback for command "/toggle": toggle value of configuration option.
+ * Callback for command "/toggle": toggles value of configuration option.
 */

 COMMAND_CALLBACK(toggle)
@@ -7319,7 +7268,7 @@ COMMAND_CALLBACK(toggle)
 }

 /*
- * Unset/reset one option.
+ * Unsets/resets one option.
 */

 void
@@ -7352,7 +7301,7 @@ command_unset_option (struct t_config_option *option,
 }

 /*
- * Callback for command "/unset": unset/reset configuration options.
+ * Callback for command "/unset": unsets/resets configuration options.
 */

 COMMAND_CALLBACK(unset)
@@ -7443,7 +7392,7 @@ COMMAND_CALLBACK(unset)
 }

 /*
- * Display the number of upgrades done and the date of first/last start.
+ * Displays the number of upgrades done and the date of first/last start.
 */

 void
@@ -7525,7 +7474,7 @@ command_upgrade_display (struct t_gui_buffer *buffer,
 }

 /*
- * Callback for command "/upgrade": upgrade WeeChat.
+ * Callback for command "/upgrade": upgrades WeeChat.
 */

 COMMAND_CALLBACK(upgrade)
@@ -7776,7 +7725,7 @@ COMMAND_CALLBACK(upgrade)
 }

 /*
- * Callback for command "/uptime": display WeeChat uptime.
+ * Callback for command "/uptime": displays WeeChat uptime.
 */

 COMMAND_CALLBACK(uptime)
@@ -7857,7 +7806,7 @@ COMMAND_CALLBACK(uptime)
 }

 /*
- * Display WeeChat version.
+ * Displays WeeChat version.
 */

 void
@@ -7901,7 +7850,7 @@ command_version_display (struct t_gui_buffer *buffer,
 }

 /*
- * Callback for command "/version": display WeeChat version.
+ * Callback for command "/version": displays WeeChat version.
 */

 COMMAND_CALLBACK(version)
@@ -7946,7 +7895,7 @@ COMMAND_CALLBACK(version)
 }

 /*
- * Callback for command "/wait": schedule a command execution in future.
+ * Callback for command "/wait": schedules a command execution in future.
 */

 COMMAND_CALLBACK(wait)
@@ -7973,7 +7922,7 @@ COMMAND_CALLBACK(wait)
 }

 /*
- * Callback for command "/window": manage windows.
+ * Callback for command "/window": manages windows.
 */

 COMMAND_CALLBACK(window)
@@ -8382,7 +8331,7 @@ COMMAND_CALLBACK(window)
 }

 /*
- * Hook WeeChat core commands.
+ * Hooks WeeChat core commands.
 */

 void
@@ -8456,7 +8405,7 @@ command_init (void)
            N_("mask: name where wildcard \"*\" is allowed"),
            N_("raw[set]: set a value for a bar property"),
            N_("option: option to change (for options list, look at /set "
-               "weechat.bar.<bar_name>.*)"),
+               "weechat.bar.<barname>.*)"),
            N_("value: new value for option"),
            N_("raw[hide]: hide a bar"),
            N_("raw[show]: show an hidden bar"),
@@ -8806,13 +8755,12 @@ command_init (void)
        NULL, "eval",
        N_("evaluate expression"),
        /* TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated */
-        N_("[-n|-s] [-e] [-d] <expression>"
+        N_("[-n|-s] [-d] <expression>"
           " || [-n] [-d [-d]] -c <expression1> <operator> <expression2>"),
        CMD_ARGS_DESC(
            N_("raw[-n]: display result without sending it to buffer (debug mode)"),
            N_("raw[-s]: split expression before evaluating it "
               "(many commands can be separated by semicolons)"),
-            N_("raw[-e]: evaluate all commands before executing them"),
            N_("raw[-d]: display debug output after evaluation "
               "(with two -d: more verbose debug)"),
            N_("raw[-c]: evaluate as condition: use operators and parentheses, "
@@ -9083,7 +9031,7 @@ command_init (void)
        NULL, "help",
        N_("display help about commands and options"),
        /* TRANSLATORS: only text between angle brackets (eg: "<name>") may be translated */
-        N_("-list|-listfull [<plugin>...] || <command> || <option>"),
+        N_("-list|-listfull [<plugin>...]] || <command> || <option>"),
        CMD_ARGS_DESC(
            N_("raw[-list]: list commands, by plugin (without argument, this list is "
               "displayed)"),
@@ -9119,7 +9067,7 @@ command_init (void)
               "are NOT checked)"),
            N_("raw[clear]: clear hotlist"),
            N_("level: \"lowest\" to clear only lowest level in hotlist, "
-               "\"highest\" to clear only highest level in hotlist, or level mask: "
+               "highest\" to clear only highest level in hotlist, or level mask: "
               "integer which is a combination of 1=join/part, 2=message, "
               "4=private, 8=highlight"),
            N_("raw[remove]: remove current buffer from hotlist"),
@@ -9653,7 +9601,7 @@ command_init (void)
            N_("mask: name where wildcard \"*\" is allowed"),
            N_("raw[set]: set a value for a proxy property"),
            N_("option: option to change (for options list, look at /set "
-               "weechat.proxy.<proxy_name>.*)"),
+               "weechat.proxy.<proxyname>.*)"),
            N_("value: new value for option"),
            "",
            N_("Examples:"),
@@ -9816,13 +9764,13 @@ command_init (void)
            N_("  use program \"pass\" to read the passphrase on startup:"),
            AI("    /set sec.crypt.passphrase_command \"/usr/bin/pass show weechat/passphrase\""),
            N_("  encrypt libera SASL password:"),
-            N_("    /secure set libera my_password"),
+            N_("    /secure set libera mypassword"),
            AI("    /set irc.server.libera.sasl_password \"${sec.data.libera}\""),
            N_("  encrypt oftc password for nickserv:"),
-            N_("    /secure set oftc my_password"),
+            N_("    /secure set oftc mypassword"),
            AI("    /set irc.server.oftc.command \"/msg nickserv identify ${sec.data.oftc}\""),
-            N_("  alias to ghost the nick \"andrew\":"),
-            N_("    /alias add ghost /eval /msg -server libera nickserv ghost andrew "
+            N_("  alias to ghost the nick \"mynick\":"),
+            N_("    /alias add ghost /eval /msg -server libera nickserv ghost mynick "
               "${sec.data.libera}")),
        "passphrase -delete"
        " || decrypt -discard"
@@ -9994,7 +9942,7 @@ command_init (void)
            N_("  4. execute new WeeChat binary and reload session."),
            "",
            N_("With option \"-quit\", the process is:"),
-            N_("  1. close *ALL* connections (irc, xfer, relay, etc.)"),
+            N_("  1. close *ALL* connections (irc, xfer, relay, ...)"),
            N_("  2. save session into files (*.upgrade)"),
            N_("  3. unload all plugins"),
            N_("  4. save WeeChat configuration"),
@@ -10179,7 +10127,7 @@ command_init (void)
 }

 /*
- * Execute a list of commands (separated by ";").
+ * Executes a list of commands (separated by ";").
 */

 void
@@ -10211,7 +10159,7 @@ command_exec_list (const char *command_list)
 }

 /*
- * Execute commands at startup.
+ * Executes commands at startup.
 */

 void
@@ -65,7 +65,7 @@ extern char **environ;


 /*
- * Add a word with quotes around to completion list.
+ * Adds a word with quotes around to completion list.
 */

 void
@@ -82,7 +82,7 @@ completion_list_add_quoted_word (struct t_gui_completion *completion,
 }

 /*
- * Add bar names to completion list.
+ * Adds bar names to completion list.
 */

 int
@@ -109,7 +109,7 @@ completion_list_add_bars_names_cb (const void *pointer, void *data,
 }

 /*
- * Add bar items to completion list.
+ * Adds bar items to completion list.
 */

 int
@@ -137,7 +137,7 @@ completion_list_add_bars_items_cb (const void *pointer, void *data,
 }

 /*
- * Add custom bar items names to completion list.
+ * Adds custom bar items names to completion list.
 */

 int
@@ -165,7 +165,7 @@ completion_list_add_custom_bar_items_names_cb (const void *pointer, void *data,
 }

 /*
- * Add custom bar item conditions to completion list.
+ * Adds custom bar item conditions to completion list.
 */

 int
@@ -190,7 +190,7 @@ completion_list_add_custom_bar_item_conditions_cb (const void *pointer, void *da
 }

 /*
- * Add custom bar item contents to completion list.
+ * Adds custom bar item contents to completion list.
 */

 int
@@ -215,7 +215,7 @@ completion_list_add_custom_bar_item_contents_cb (const void *pointer, void *data
 }

 /*
- * Add arguments for commands that add a custom bar item.
+ * Adds arguments for commands that add a custom bar item.
 */

 int
@@ -283,7 +283,7 @@ completion_list_add_custom_bar_item_add_arguments_cb (const void *pointer, void
 }

 /*
- * Add bar options to completion list.
+ * Adds bar options to completion list.
 */

 int
@@ -310,7 +310,7 @@ completion_list_add_bars_options_cb (const void *pointer, void *data,
 }

 /*
- * Add buffer names to completion list.
+ * Adds buffer names to completion list.
 */

 int
@@ -338,7 +338,7 @@ completion_list_add_buffers_names_cb (const void *pointer, void *data,
 }

 /*
- * Add buffer numbers to completion list.
+ * Adds buffer numbers to completion list.
 */

 int
@@ -368,7 +368,7 @@ completion_list_add_buffers_numbers_cb (const void *pointer, void *data,
 }

 /*
- * Add plugin+buffer names to completion list.
+ * Adds plugin+buffer names to completion list.
 */

 int
@@ -396,7 +396,7 @@ completion_list_add_buffers_plugins_names_cb (const void *pointer, void *data,
 }

 /*
- * Add a buffer local variable to completions list.
+ * Adds a buffer local variable to completions list.
 */

 void
@@ -414,7 +414,7 @@ completion_list_map_buffer_local_variable_cb (void *data,
 }

 /*
- * Add buffer local variables to completion list.
+ * Adds buffer local variables to completion list.
 */

 int
@@ -437,7 +437,7 @@ completion_list_add_buffer_local_variables_cb (const void *pointer, void *data,
 }

 /*
- * Add buffer local variable value to completion list.
+ * Adds buffer local variable value to completion list.
 */

 int
@@ -487,7 +487,7 @@ completion_list_add_buffer_local_variable_value_cb (const void *pointer, void *d
 }

 /*
- * Add buffer properties (that can be set) to completion list.
+ * Adds buffer properties (that can be set) to completion list.
 */

 int
@@ -515,7 +515,7 @@ completion_list_add_buffer_properties_set_cb (const void *pointer, void *data,
 }

 /*
- * Add a buffer local variable to completions list (for `/buffer setauto`).
+ * Adds a buffer local variable to completions list (for `/buffer setauto`).
 */

 void
@@ -538,7 +538,7 @@ completion_list_map_buffer_local_variable_setauto_cb (void *data,
 }

 /*
- * Add buffer properties (that can be set), local variables and key bindings
+ * Adds buffer properties (that can be set), local variables and key bindings
 * to completion list.
 */

@@ -585,7 +585,7 @@ completion_list_add_buffer_properties_setauto_cb (const void *pointer, void *dat
 }

 /*
- * Add buffer properties (that can be read) to completion list.
+ * Adds buffer properties (that can be read) to completion list.
 */

 int
@@ -625,7 +625,7 @@ completion_list_add_buffer_properties_get_cb (const void *pointer, void *data,
 }

 /*
- * Add window numbers to completion list.
+ * Adds window numbers to completion list.
 */

 int
@@ -654,7 +654,7 @@ completion_list_add_windows_numbers_cb (const void *pointer, void *data,
 }

 /*
- * Add colors to completion list.
+ * Adds colors to completion list.
 */

 int
@@ -711,7 +711,7 @@ completion_list_add_colors_cb (const void *pointer, void *data,
 }

 /*
- * Add a palette color to completion list.
+ * Adds a palette color to completion list.
 */

 void
@@ -729,7 +729,7 @@ completion_list_map_add_palette_color_cb (void *data,
 }

 /*
- * Add palette colors to completion list.
+ * Adds palette colors to completion list.
 */

 int
@@ -752,7 +752,7 @@ completion_list_add_palette_colors_cb (const void *pointer, void *data,
 }

 /*
- * Add configuration files to completion list.
+ * Adds configuration files to completion list.
 */

 int
@@ -780,7 +780,7 @@ completion_list_add_config_files_cb (const void *pointer, void *data,
 }

 /*
- * Add path/filename to completion list.
+ * Adds path/filename to completion list.
 */

 int
@@ -923,7 +923,7 @@ end:
 }

 /*
- * Add filter names to completion list.
+ * Adds filter names to completion list.
 */

 int
@@ -951,7 +951,7 @@ completion_list_add_filters_cb (const void *pointer, void *data,
 }

 /*
- * Add disabled filter names to completion list.
+ * Adds disabled filter names to completion list.
 */

 int
@@ -982,7 +982,7 @@ completion_list_add_filters_disabled_cb (const void *pointer, void *data,
 }

 /*
- * Add enabled filter names to completion list.
+ * Adds enabled filter names to completion list.
 */

 int
@@ -1013,7 +1013,7 @@ completion_list_add_filters_enabled_cb (const void *pointer, void *data,
 }

 /*
- * Add command hook types to completion list.
+ * Adds command hook types to completion list.
 */

 int
@@ -1040,7 +1040,7 @@ completion_list_add_hook_types_cb (const void *pointer, void *data,
 }

 /*
- * Add command hooks to completion list.
+ * Adds command hooks to completion list.
 */

 int
@@ -1091,7 +1091,7 @@ completion_list_add_commands_cb (const void *pointer, void *data,
 }

 /*
- * Add info hooks to completion list.
+ * Adds info hooks to completion list.
 */

 int
@@ -1123,7 +1123,7 @@ completion_list_add_infos_cb (const void *pointer, void *data,
 }

 /*
- * Add infolist hooks to completion list.
+ * Adds infolist hooks to completion list.
 */

 int
@@ -1155,7 +1155,7 @@ completion_list_add_infolists_cb (const void *pointer, void *data,
 }

 /*
- * Add nicks to completion list.
+ * Adds nicks to completion list.
 */

 int
@@ -1206,7 +1206,7 @@ completion_list_add_nicks_cb (const void *pointer, void *data,
 }

 /*
- * Add configuration options to completion list.
+ * Adds configuration options to completion list.
 */

 int
@@ -1254,7 +1254,7 @@ completion_list_add_config_options_cb (const void *pointer, void *data,
 }

 /*
- * Add plugin names to completion list.
+ * Adds plugin names to completion list.
 */

 int
@@ -1282,7 +1282,7 @@ completion_list_add_plugins_cb (const void *pointer, void *data,
 }

 /*
- * Add a plugin installed to completion list.
+ * Adds a plugin installed to completion list.
 */

 void
@@ -1317,7 +1317,7 @@ completion_list_add_plugins_installed_exec_cb (void *data,
 }

 /*
- * Add plugins installed to completion list.
+ * Adds plugins installed to completion list.
 */

 int
@@ -1384,7 +1384,7 @@ completion_list_add_plugins_installed_cb (const void *pointer, void *data,
 }

 /*
- * Add plugin commands to completion list.
+ * Adds plugin commands to completion list.
 *
 * The plugin name is read in previous argument.
 */
@@ -1472,7 +1472,7 @@ completion_list_add_plugins_commands_cb (const void *pointer, void *data,
 }

 /*
- * Add value of option to completion list.
+ * Adds value of option to completion list.
 *
 * The option name is read in previous argument.
 */
@@ -1688,7 +1688,7 @@ completion_list_add_config_option_values_cb (const void *pointer, void *data,
 }

 /*
- * Add WeeChat commands to completion list.
+ * Adds WeeChat commands to completion list.
 */

 int
@@ -1740,7 +1740,7 @@ completion_list_add_weechat_commands_cb (const void *pointer, void *data,
 }

 /*
- * Add proxy names to completion list.
+ * Adds proxy names to completion list.
 */

 int
@@ -1768,7 +1768,7 @@ completion_list_add_proxies_names_cb (const void *pointer, void *data,
 }

 /*
- * Add proxy options to completion list.
+ * Adds proxy options to completion list.
 */

 int
@@ -1795,7 +1795,7 @@ completion_list_add_proxies_options_cb (const void *pointer, void *data,
 }

 /*
- * Add key contexts to completion list.
+ * Adds key contexts to completion list.
 */

 int
@@ -1822,7 +1822,7 @@ completion_list_add_keys_contexts_cb (const void *pointer, void *data,
 }

 /*
- * Add keys to completion list.
+ * Adds keys to completion list.
 */

 int
@@ -1853,7 +1853,7 @@ completion_list_add_keys_codes_cb (const void *pointer, void *data,
 }

 /*
- * Add keys that can be reset (keys added, redefined or removed) to completion
+ * Adds keys that can be reset (keys added, redefined or removed) to completion
 * list.
 */

@@ -1905,7 +1905,7 @@ completion_list_add_keys_codes_for_reset_cb (const void *pointer, void *data,
 }

 /*
- * Add areas for free cursor movement ("chat" and bar names) to completion
+ * Adds areas for free cursor movement ("chat" and bar names) to completion
 * list.
 */

@@ -1947,7 +1947,7 @@ completion_list_add_cursor_areas_cb (const void *pointer, void *data,
 }

 /*
- * Add layout names to completion list.
+ * Adds layout names to completion list.
 */

 int
@@ -1975,7 +1975,7 @@ completion_list_add_layouts_names_cb (const void *pointer, void *data,
 }

 /*
- * Add a secured data to completion list.
+ * Adds a secured data to completion list.
 */

 void
@@ -1993,7 +1993,7 @@ completion_list_map_add_secured_data_cb (void *data,
 }

 /*
- * Add secured data to completion list.
+ * Adds secured data to completion list.
 */

 int
@@ -2016,7 +2016,7 @@ completion_list_add_secured_data_cb (const void *pointer, void *data,
 }

 /*
- * Add environment variables to completion list.
+ * Adds environment variables to completion list.
 */

 int
@@ -2052,7 +2052,7 @@ completion_list_add_env_vars_cb (const void *pointer, void *data,
 }

 /*
- * Add value of an environment variable to completion list.
+ * Adds value of an environment variable to completion list.
 */

 int
@@ -2099,7 +2099,7 @@ completion_list_add_env_value_cb (const void *pointer, void *data,
 }

 /*
- * Add a buffer local variable for /eval to completions list.
+ * Adds a buffer local variable for /eval to completions list.
 */

 void
@@ -2122,7 +2122,7 @@ completion_list_map_eval_buffer_local_variable_cb (void *data,
 }

 /*
- * Add /eval variables to completion list.
+ * Adds /eval variables to completion list.
 */

 int
@@ -2225,7 +2225,7 @@ completion_list_add_eval_variables_cb (const void *pointer, void *data,
 }

 /*
- * Add hooks for completions done by WeeChat core.
+ * Adds hooks for completions done by WeeChat core.
 */

 void
@@ -65,9 +65,9 @@ void config_file_option_free_data (struct t_config_option *option);


 /*
- * Check if a configuration file pointer is valid.
+ * Checks if a configuration file pointer is valid.
 *
- * Return:
+ * Returns:
 *   1: configuration file exists
 *   0: configuration file does not exist
 */
@@ -92,7 +92,7 @@ config_file_valid (struct t_config_file *config_file)
 }

 /*
- * Search for a configuration file.
+ * Searches for a configuration file.
 */

 struct t_config_file *
@@ -119,7 +119,7 @@ config_file_search (const char *name)
 }

 /*
- * Search for position of configuration file (to keep configuration files
+ * Searches for position of configuration file (to keep configuration files
 * sorted by name).
 */

@@ -143,7 +143,7 @@ config_file_find_pos (const char *name)
 }

 /*
- * Insert a configuration file (keeping files sorted by name).
+ * Inserts a configuration file (keeping files sorted by name).
 */

 void
@@ -188,9 +188,9 @@ config_file_config_insert (struct t_config_file *config_file)
 }

 /*
- * Create a new configuration file.
+ * Creates a new configuration file.
 *
- * Return pointer to new configuration file, NULL if error.
+ * Returns pointer to new configuration file, NULL if error.
 */

 struct t_config_file *
@@ -250,10 +250,10 @@ config_file_new (struct t_weechat_plugin *plugin, const char *name,
 }

 /*
- * Set configuration file version and a callback to update config
+ * Sets configuration file version and a callback to update config
 * sections/options on-the-fly when the config is read.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -282,10 +282,10 @@ config_file_set_version (struct t_config_file *config_file,
 }

 /*
- * Compare two configuration files to sort them by priority (highest priority
+ * Compares two configuration files to sort them by priority (highest priority
 * at beginning of list).
 *
- * Return:
+ * Returns:
 *   -1: config1 has higher priority than config2
 *    1: config1 has same or lower priority than config2
 */
@@ -308,7 +308,7 @@ config_file_arraylist_cmp_config_cb (void *data,
 }

 /*
- * Return an arraylist with pointers to configuration files, sorted by
+ * Returns an arraylist with pointers to configuration files, sorted by
 * priority (from highest to lowest).
 */

@@ -339,7 +339,7 @@ config_file_get_configs_by_priority (void)
 }

 /*
- * Search for position of section in configuration file (to keep sections
+ * Searches for position of section in configuration file (to keep sections
 * sorted by name).
 */

@@ -364,9 +364,9 @@ config_file_section_find_pos (struct t_config_file *config_file,
 }

 /*
- * Create a new section in a configuration file.
+ * Creates a new section in a configuration file.
 *
- * Return pointer to new section, NULL if error.
+ * Returns pointer to new section, NULL if error.
 */

 struct t_config_section *
@@ -459,9 +459,9 @@ config_file_new_section (struct t_config_file *config_file, const char *name,
 }

 /*
- * Search for a section in a configuration file.
+ * Searches for a section in a configuration file.
 *
- * Return pointer to section found, NULL if not found.
+ * Returns pointer to section found, NULL if not found.
 */

 struct t_config_section *
@@ -485,7 +485,7 @@ config_file_search_section (struct t_config_file *config_file,
 }

 /*
- * Build full name for an option, using format: "file.section.option".
+ * Builds full name for an option, using format: "file.section.option".
 *
 * Note: result must be freed after use.
 */
@@ -508,7 +508,7 @@ config_file_option_full_name (struct t_config_option *option)
 }

 /*
- * Execute hook_config for modified option.
+ * Executes hook_config for modified option.
 */

 void
@@ -561,7 +561,7 @@ config_file_hook_config_exec (struct t_config_option *option)
 }

 /*
- * Search for position of option in section (to keep options sorted by name).
+ * Searches for position of option in section (to keep options sorted by name).
 */

 struct t_config_option *
@@ -583,7 +583,7 @@ config_file_option_find_pos (struct t_config_section *section, const char *name)
 }

 /*
- * Insert an option in section (keeping options sorted by name).
+ * Inserts an option in section (keeping options sorted by name).
 */

 void
@@ -629,9 +629,9 @@ config_file_option_insert_in_section (struct t_config_option *option)
 }

 /*
- * Allocate memory for a new option and initializes it.
+ * Allocates memory for a new option and initializes it.
 *
- * Return pointer to new option, NULL if error.
+ * Returns pointer to new option, NULL if error.
 */

 struct t_config_option *
@@ -672,9 +672,9 @@ config_file_option_malloc (void)
 }

 /*
- * Create a new option.
+ * Creates a new option.
 *
- * Return pointer to new option, NULL if error.
+ * Returns pointer to new option, NULL if error.
 */

 struct t_config_option *
@@ -977,9 +977,9 @@ end:
 }

 /*
- * Search for an option in a configuration file or section.
+ * Searches for an option in a configuration file or section.
 *
- * Return pointer to option found, NULL if error.
+ * Returns pointer to option found, NULL if error.
 */

 struct t_config_option *
@@ -1028,9 +1028,9 @@ config_file_search_option (struct t_config_file *config_file,
 }

 /*
- * Search for an option in a configuration file or section.
+ * Searches for an option in a configuration file or section.
 *
- * Return section/option found (in section_found/option_found), NULL if not
+ * Returns section/option found (in section_found/option_found), NULL if not
 * found.
 */

@@ -1090,7 +1090,7 @@ config_file_search_section_option (struct t_config_file *config_file,
 }

 /*
- * Search for a file/section/option using a full name of option (format:
+ * Searches for a file/section/option using a full name of option (format:
 * "file.section.option").
 */

@@ -1165,7 +1165,7 @@ config_file_search_with_string (const char *option_name,
 }

 /*
- * Get pointer to parent option, NULL if the option has no parent.
+ * Gets pointer to parent option, NULL if the option has no parent.
 */

 struct t_config_option *
@@ -1187,9 +1187,9 @@ config_file_get_parent_option (struct t_config_option *option)
 }

 /*
- * Check if a string with boolean value is valid.
+ * Checks if a string with boolean value is valid.
 *
- * Return:
+ * Returns:
 *   1: boolean value is valid
 *   0: boolean value is NOT valid
 */
@@ -1219,9 +1219,9 @@ config_file_string_boolean_is_valid (const char *text)
 }

 /*
- * Convert string to boolean value.
+ * Converts string to boolean value.
 *
- * Return:
+ * Returns:
 *   1: boolean value is true
 *   0: boolean value is false
 */
@@ -1244,9 +1244,9 @@ config_file_string_to_boolean (const char *text)
 }

 /*
- * Reset an option to its default value.
+ * Resets an option to its default value.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -1392,9 +1392,9 @@ config_file_option_reset (struct t_config_option *option, int run_callback)
 }

 /*
- * Set the value for an option.
+ * Sets the value for an option.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -1718,9 +1718,9 @@ config_file_option_set (struct t_config_option *option, const char *value,
 }

 /*
- * Toggle value of an option.
+ * Toggles value of an option.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -1825,9 +1825,9 @@ end:
 }

 /*
- * Set null (undefined) value for an option.
+ * Sets null (undefined) value for an option.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -1875,9 +1875,9 @@ config_file_option_set_null (struct t_config_option *option, int run_callback)
 }

 /*
- * Set the default value for an option.
+ * Sets the default value for an option.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, default value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, default value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -2190,9 +2190,9 @@ config_file_option_set_default (struct t_config_option *option,
 }

 /*
- * Unset/reset an option.
+ * Unsets/resets an option.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET: OK, value has not been reset
 *   WEECHAT_CONFIG_OPTION_UNSET_OK_RESET: OK, value has been reset
 *   WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED: OK, value has been removed
@@ -2265,7 +2265,7 @@ config_file_option_unset (struct t_config_option *option)
 }

 /*
- * Rename an option.
+ * Renames an option.
 */

 void
@@ -2340,7 +2340,7 @@ config_file_option_rename (struct t_config_option *option,
 }

 /*
- * Build a string with the value or default value of option,
+ * Builds a string with the value or default value of option,
 * depending on the type of option.
 *
 * According to default_value:
@@ -2435,7 +2435,7 @@ config_file_option_value_to_string (struct t_config_option *option,
 }

 /*
- * Get a string value of an option property.
+ * Gets a string value of an option property.
 */

 const char *
@@ -2462,7 +2462,7 @@ config_file_option_get_string (struct t_config_option *option,
 }

 /*
- * Get a pointer on an option property.
+ * Gets a pointer on an option property.
 */

 void *
@@ -2503,9 +2503,9 @@ config_file_option_get_pointer (struct t_config_option *option,
 }

 /*
- * Check if an option has a null value.
+ * Checks if an option has a null value.
 *
- * Return:
+ * Returns:
 *   1: value of option is null
 *   0: value of option is not null
 */
@@ -2520,9 +2520,9 @@ config_file_option_is_null (struct t_config_option *option)
 }

 /*
- * Check if an option has a null default value.
+ * Checks if an option has a null default value.
 *
- * Return:
+ * Returns:
 *   1: default value of option is null
 *   0: default value of option is not null
 */
@@ -2537,9 +2537,9 @@ config_file_option_default_is_null (struct t_config_option *option)
 }

 /*
- * Check if an option has changed (current value different from default value).
+ * Checks if an option has changed (current value different from default value).
 *
- * Return:
+ * Returns:
 *   1: option has changed
 *   0: option has default value
 */
@@ -2580,10 +2580,10 @@ int config_file_option_has_changed (struct t_config_option *option)
 }

 /*
- * Set the value for an option using a full name of option (format:
+ * Sets the value for an option using a full name of option (format:
 * "file.section.option").
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: OK, value has been changed
 *   WEECHAT_CONFIG_OPTION_SET_OK_SAME_VALUE: OK, value not changed
 *   WEECHAT_CONFIG_OPTION_SET_ERROR: error
@@ -2632,9 +2632,9 @@ config_file_option_set_with_string (const char *option_name, const char *value)
 }

 /*
- * Return boolean value of an option.
+ * Returns boolean value of an option.
 *
- * Return 1 if value is true, 0 if it is false.
+ * Returns 1 if value is true, 0 if it is false.
 */

 int
@@ -2647,9 +2647,9 @@ config_file_option_boolean (struct t_config_option *option)
 }

 /*
- * Return default boolean value of an option.
+ * Returns default boolean value of an option.
 *
- * Return 1 if default value is true, 0 if it is false.
+ * Returns 1 if default value is true, 0 if it is false.
 */

 int
@@ -2662,11 +2662,11 @@ config_file_option_boolean_default (struct t_config_option *option)
 }

 /*
- * Return inherited boolean value of an option: value of option if not NULL,
+ * Returns inherited boolean value of an option: value of option if not NULL,
 * or value of the parent option (if option inherits from another option).
 *
- * If the parent option is not found, return the default value of the option.
- * If the parent value is NULL, return the default value of the parent option.
+ * If the parent option is not found, returns the default value of the option.
+ * If the parent value is NULL, returns the default value of the parent option.
 */

 int
@@ -2690,7 +2690,7 @@ config_file_option_boolean_inherited (struct t_config_option *option)
 }

 /*
- * Return integer value of an option.
+ * Returns integer value of an option.
 */

 int
@@ -2721,7 +2721,7 @@ config_file_option_integer (struct t_config_option *option)
 }

 /*
- * Return default integer value of an option.
+ * Returns default integer value of an option.
 */

 int
@@ -2752,11 +2752,11 @@ config_file_option_integer_default (struct t_config_option *option)
 }

 /*
- * Return inherited integer value of an option: value of option if not NULL,
+ * Returns inherited integer value of an option: value of option if not NULL,
 * or value of the parent option (if option inherits from another option).
 *
- * If the parent option is not found, return the default value of the option.
- * If the parent value is NULL, return the default value of the parent option.
+ * If the parent option is not found, returns the default value of the option.
+ * If the parent value is NULL, returns the default value of the parent option.
 */

 int
@@ -2780,7 +2780,7 @@ config_file_option_integer_inherited (struct t_config_option *option)
 }

 /*
- * Return string value of an option.
+ * Returns string value of an option.
 */

 const char *
@@ -2811,7 +2811,7 @@ config_file_option_string (struct t_config_option *option)
 }

 /*
- * Return default string value of an option.
+ * Returns default string value of an option.
 */

 const char *
@@ -2842,11 +2842,11 @@ config_file_option_string_default (struct t_config_option *option)
 }

 /*
- * Return inherited string value of an option: value of option if not NULL,
+ * Returns inherited string value of an option: value of option if not NULL,
 * or value of the parent option (if option inherits from another option).
 *
- * If the parent option is not found, return the default value of the option.
- * If the parent value is NULL, return the default value of the parent option.
+ * If the parent option is not found, returns the default value of the option.
+ * If the parent value is NULL, returns the default value of the parent option.
 */

 const char *
@@ -2870,7 +2870,7 @@ config_file_option_string_inherited (struct t_config_option *option)
 }

 /*
- * Return color value of an option.
+ * Returns color value of an option.
 */

 const char *
@@ -2883,7 +2883,7 @@ config_file_option_color (struct t_config_option *option)
 }

 /*
- * Return default color value of an option.
+ * Returns default color value of an option.
 */

 const char *
@@ -2896,11 +2896,11 @@ config_file_option_color_default (struct t_config_option *option)
 }

 /*
- * Return inherited color value of an option: value of option if not NULL,
+ * Returns inherited color value of an option: value of option if not NULL,
 * or value of the parent option (if option inherits from another option).
 *
- * If the parent option is not found, return the default value of the option.
- * If the parent value is NULL, return the default value of the parent option.
+ * If the parent option is not found, returns the default value of the option.
+ * If the parent value is NULL, returns the default value of the parent option.
 */

 const char *
@@ -2922,7 +2922,7 @@ config_file_option_color_inherited (struct t_config_option *option)
 }

 /*
- * Return enum value of an option.
+ * Returns enum value of an option.
 */

 int
@@ -2953,7 +2953,7 @@ config_file_option_enum (struct t_config_option *option)
 }

 /*
- * Return default enum value of an option.
+ * Returns default enum value of an option.
 */

 int
@@ -2984,11 +2984,11 @@ config_file_option_enum_default (struct t_config_option *option)
 }

 /*
- * Return inherited enum value of an option: value of option if not NULL,
+ * Returns inherited enum value of an option: value of option if not NULL,
 * or value of the parent option (if option inherits from another option).
 *
- * If the parent option is not found, return the default value of the option.
- * If the parent value is NULL, return the default value of the parent option.
+ * If the parent option is not found, returns the default value of the option.
+ * If the parent value is NULL, returns the default value of the parent option.
 */

 int
@@ -3012,9 +3012,9 @@ config_file_option_enum_inherited (struct t_config_option *option)
 }

 /*
- * Return a char to add before the name of option to escape it.
+ * Returns a char to add before the name of option to escape it.
 *
- * Return:
+ * Returns:
 *   "\": name must be escaped with "\" (if names begins with # [ \)
 *   "": name must not be escaped
 */
@@ -3034,9 +3034,9 @@ config_file_option_escape (const char *name)
 }

 /*
- * Write an option in a configuration file.
+ * Writes an option in a configuration file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -3102,11 +3102,11 @@ config_file_write_option (struct t_config_file *config_file,
 }

 /*
- * Write a line in a configuration file.
+ * Writes a line in a configuration file.
 *
- * If value is NULL, write a section with `[` and `]` around.
+ * If value is NULL, then writes a section with [ ] around.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -3142,9 +3142,9 @@ config_file_write_line (struct t_config_file *config_file,
 }

 /*
- * Write a configuration file (this function must not be called directly).
+ * Writes a configuration file (this function must not be called directly).
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_WRITE_OK: OK
 *   WEECHAT_CONFIG_WRITE_ERROR: error
 *   WEECHAT_CONFIG_WRITE_MEMORY_ERROR: not enough memory
@@ -3357,9 +3357,9 @@ end:
 }

 /*
- * Write a configuration file.
+ * Writes a configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_WRITE_OK: OK
 *   WEECHAT_CONFIG_WRITE_ERROR: error
 *   WEECHAT_CONFIG_WRITE_MEMORY_ERROR: not enough memory
@@ -3372,9 +3372,9 @@ config_file_write (struct t_config_file *config_file)
 }

 /*
- * Parse configuration version.
+ * Parses configuration version.
 *
- * Return:
+ * Returns:
 *   >= 1: configuration version
 *     -1: error
 */
@@ -3397,7 +3397,8 @@ config_file_parse_version (const char *version)
 }

 /*
- * Backup a configuration file if its version is unsupported and cannot be loaded.
+ * Backups a configuration file if its version is unsupported and cannot be
+ * loaded.
 */

 void
@@ -3456,13 +3457,13 @@ config_file_backup (const char *filename)
 }

 /*
- * Update data read from config file: either section or option + value.
+ * Updates data read from config file: either section or option + value.
 * The update callback (if defined in config) is called if the config version
 * read in file is less than to the current config version.
 *
 * Parameters "section", "option" and "value" are updated in place: if the
 * callback gives a new value, they are first freed and allocated again with
- * the new value (or set to NULL for the value if the callback return
+ * the new value (or set to NULL for the value if the callback returns
 * special key "value_null").
 *
 * Section can be updated only if option and value are NULL (ie if we are
@@ -3589,9 +3590,9 @@ config_file_update_data_read (struct t_config_file *config_file,
 }

 /*
- * Read a configuration file (this function must not be called directly).
+ * Reads a configuration file (this function must not be called directly).
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -3919,9 +3920,9 @@ end_file:
 }

 /*
- * Read a configuration file.
+ * Reads a configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -3934,9 +3935,9 @@ config_file_read (struct t_config_file *config_file)
 }

 /*
- * Reload a configuration file.
+ * Reloads a configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -3990,7 +3991,7 @@ config_file_reload (struct t_config_file *config_file)
 }

 /*
- * Free data in an option.
+ * Frees data in an option.
 */

 void
@@ -4008,7 +4009,7 @@ config_file_option_free_data (struct t_config_option *option)
 }

 /*
- * Free an option.
+ * Frees an option.
 */

 void
@@ -4056,7 +4057,7 @@ config_file_option_free (struct t_config_option *option, int run_callback)
 }

 /*
- * Free options in a section.
+ * Frees options in a section.
 */

 void
@@ -4072,7 +4073,7 @@ config_file_section_free_options (struct t_config_section *section)
 }

 /*
- * Free a section.
+ * Frees a section.
 */

 void
@@ -4115,7 +4116,7 @@ config_file_section_free (struct t_config_section *section)
 }

 /*
- * Free a configuration file.
+ * Frees a configuration file.
 */

 void
@@ -4158,7 +4159,7 @@ config_file_free (struct t_config_file *config_file)
 }

 /*
- * Free all configuration files.
+ * Frees all configuration files.
 */

 void
@@ -4171,7 +4172,7 @@ config_file_free_all (void)
 }

 /*
- * Free all configuration files for a plugin.
+ * Frees all configuration files for a plugin.
 */

 void
@@ -4192,7 +4193,7 @@ config_file_free_all_plugin (struct t_weechat_plugin *plugin)
 }

 /*
- * Return hdata for structure t_config_file.
+ * Returns hdata for structure t_config_file.
 */

 struct t_hdata *
@@ -4229,7 +4230,7 @@ config_file_hdata_config_file_cb (const void *pointer, void *data,
 }

 /*
- * Return hdata for structure t_config_section.
+ * Returns hdata for structure t_config_section.
 */

 struct t_hdata *
@@ -4274,7 +4275,7 @@ config_file_hdata_config_section_cb (const void *pointer, void *data,
 }

 /*
- * Return hdata for structure t_config_option.
+ * Returns hdata for structure t_config_option.
 */

 struct t_hdata *
@@ -4320,9 +4321,9 @@ config_file_hdata_config_option_cb (const void *pointer, void *data,
 }

 /*
- * Add a configuration option in an infolist.
+ * Adds a configuration option in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -4462,9 +4463,9 @@ end:
 }

 /*
- * Add configuration options in an infolist.
+ * Adds configuration options in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -4505,7 +4506,7 @@ config_file_add_to_infolist (struct t_infolist *infolist,
 }

 /*
- * Print configuration file in WeeChat log file (usually for crash dump).
+ * Prints configuration file in WeeChat log file (usually for crash dump).
 */

 void
@@ -404,7 +404,7 @@ config_change_sys_rlimit (const void *pointer, void *data,
 }

 /*
- * Check option "weechat.look.config_permissions".
+ * Checks option "weechat.look.config_permissions".
 */

 int
@@ -507,7 +507,7 @@ config_change_window_title (const void *pointer, void *data,
 }

 /*
- * Set word chars array with a word chars option.
+ * Sets word chars array with a word chars option.
 */

 void
@@ -762,7 +762,7 @@ config_change_buffer_time_same (const void *pointer, void *data,
 }

 /*
- * Compute the "prefix_max_length" on all buffers.
+ * Computes the "prefix_max_length" on all buffers.
 */

 void
@@ -781,7 +781,7 @@ config_compute_prefix_max_length_all_buffers (void)
 }

 /*
- * Set nick colors using option "weechat.color.chat_nick_colors".
+ * Sets nick colors using option "weechat.color.chat_nick_colors".
 */

 void
@@ -859,7 +859,8 @@ config_change_look_nick_color_force (const void *pointer, void *data,
 }

 /*
- * Set eval syntax highlighting colors using option "weechat.color.eval_syntax_colors".
+ * Sets eval syntax highlighting colors using option
+ * "weechat.color.eval_syntax_colors".
 */

 void
@@ -1175,7 +1176,7 @@ config_change_item_time_format (const void *pointer, void *data,
 }

 /*
- * Get the current time formatted for the bar item status.
+ * Gets the current time formatted for the bar item status.
 */

 void
@@ -1264,7 +1265,7 @@ config_change_prefix_align_min (const void *pointer, void *data,
 }

 /*
- * Check option "weechat.look.prefix_align_more".
+ * Checks option "weechat.look.prefix_align_more".
 */

 int
@@ -1281,7 +1282,7 @@ config_check_prefix_align_more (const void *pointer, void *data,
 }

 /*
- * Check option "weechat.look.prefix_buffer_align_more".
+ * Checks option "weechat.look.prefix_buffer_align_more".
 */

 int
@@ -1298,7 +1299,7 @@ config_check_prefix_buffer_align_more (const void *pointer, void *data,
 }

 /*
- * Check options "weechat.look.separator_{horizontal|vertical}".
+ * Checks options "weechat.look.separator_{horizontal|vertical}".
 */

 int
@@ -1315,7 +1316,7 @@ config_check_separator (const void *pointer, void *data,
 }

 /*
- * Check options "weechat.look.whitespace_char" and
+ * Checks options "weechat.look.whitespace_char" and
 * "weechat.look.tab_whitespace_char".
 */

@@ -1472,7 +1473,8 @@ config_change_completion_nick_ignore_words (const void *pointer,
 }

 /*
- * Callback for changes on option "weechat.completion.partial_completion_templates".
+ * Callback for changes on option
+ * "weechat.completion.partial_completion_templates".
 */

 void
@@ -1540,7 +1542,7 @@ config_change_network_gnutls_ca (const void *pointer, void *data,
 }

 /*
- * Check option "weechat.network.proxy_curl".
+ * Checks option "weechat.network.proxy_curl".
 */

 int
@@ -1600,9 +1602,9 @@ config_change_plugin_extension (const void *pointer, void *data,
 }

 /*
- * Timer called each minute: check if the day has changed, and if yes:
- * - refresh screen (if needed)
- * - send signal "day_changed"
+ * Timer called each minute: checks if the day has changed, and if yes:
+ * - refreshes screen (if needed)
+ * - sends signal "day_changed"
 */

 int
@@ -1650,7 +1652,7 @@ config_day_change_timer_cb (const void *pointer, void *data,
 }

 /*
- * Initialize some things after reading/reloading WeeChat configuration file.
+ * Initializes some things after reading/reloading WeeChat configuration file.
 */

 void
@@ -1699,7 +1701,7 @@ config_weechat_init_after_read (void)
 }

 /*
- * Update options in configuration file while reading the file.
+ * Updates options in configuration file while reading the file.
 */

 struct t_hashtable *
@@ -1937,9 +1939,9 @@ config_weechat_update_cb (const void *pointer, void *data,
 }

 /*
- * Reload WeeChat configuration file.
+ * Reloads WeeChat configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -1992,7 +1994,7 @@ config_weechat_reload_cb (const void *pointer, void *data,
 }

 /*
- * Get debug level for a plugin (or "core").
+ * Gets debug level for a plugin (or "core").
 */

 struct t_config_option *
@@ -2004,7 +2006,8 @@ config_weechat_debug_get (const char *plugin_name)
 }

 /*
- * Set debug level for "core" and all plugins, using values from section "debug".
+ * Sets debug level for "core" and all plugins, using values from section
+ * "debug".
 */

 void
@@ -2126,7 +2129,7 @@ config_weechat_debug_delete_option_cb (const void *pointer, void *data,
 }

 /*
- * Set debug level for a plugin (or "core").
+ * Sets debug level for a plugin (or "core").
 */

 int
@@ -2263,7 +2266,7 @@ config_weechat_palette_delete_option_cb (const void *pointer, void *data,
 }

 /*
- * Read a proxy option in WeeChat configuration file.
+ * Reads a proxy option in WeeChat configuration file.
 */

 int
@@ -2342,7 +2345,7 @@ config_weechat_proxy_read_cb (const void *pointer, void *data,
 }

 /*
- * Read a bar option in WeeChat configuration file.
+ * Reads a bar option in WeeChat configuration file.
 */

 int
@@ -2422,7 +2425,7 @@ config_weechat_bar_read_cb (const void *pointer, void *data,
 }

 /*
- * Read a custom bar item option in WeeChat configuration file.
+ * Reads a custom bar item option in WeeChat configuration file.
 */

 int
@@ -2512,7 +2515,7 @@ config_weechat_custom_bar_item_read_cb (const void *pointer, void *data,
 }

 /*
- * Read a layout option in WeeChat configuration file.
+ * Reads a layout option in WeeChat configuration file.
 */

 int
@@ -2643,9 +2646,9 @@ config_weechat_layout_read_cb (const void *pointer, void *data,
 }

 /*
- * Write layout of windows in WeeChat configuration file.
+ * Writes layout of windows in WeeChat configuration file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: write error
 */
@@ -2686,7 +2689,7 @@ config_weechat_layout_write_tree (struct t_config_file *config_file,
 }

 /*
- * Write section "layout" in WeeChat configuration file.
+ * Writes section "layout" in WeeChat configuration file.
 */

 int
@@ -2746,7 +2749,7 @@ config_weechat_layout_write_cb (const void *pointer, void *data,
 }

 /*
- * Apply a buffer option to all matching buffers.
+ * Applies a buffer option to all matching buffers.
 */

 void
@@ -2868,9 +2871,9 @@ config_weechat_buffer_create_option_cb (const void *pointer, void *data,
 }

 /*
- * Set a buffer property.
+ * Sets a buffer property.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -3021,12 +3024,12 @@ config_weechat_notify_delete_option_cb (const void *pointer, void *data,
 }

 /*
- * Set a notify level for a buffer.
+ * Sets a notify level for a buffer.
 *
 * A negative value resets notify for buffer to its default value (and
 * removes buffer from config file).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -3051,7 +3054,7 @@ config_weechat_notify_set (struct t_gui_buffer *buffer, const char *notify)
 }

 /*
- * Read a filter option in WeeChat configuration file.
+ * Reads a filter option in WeeChat configuration file.
 */

 int
@@ -3095,7 +3098,7 @@ config_weechat_filter_read_cb (const void *pointer, void *data,
 }

 /*
- * Write section "filter" in WeeChat configuration file.
+ * Writes section "filter" in WeeChat configuration file.
 */

 int
@@ -3129,9 +3132,9 @@ config_weechat_filter_write_cb (const void *pointer, void *data,
 }

 /*
- * Search key context with the section pointer.
+ * Searches key context with the section pointer.
 *
- * Return key context, -1 if not found.
+ * Returns key context, -1 if not found.
 */

 int
@@ -3220,9 +3223,9 @@ config_weechat_key_delete_option_cb (const void *pointer, void *data,
 }

 /*
- * Create options in WeeChat configuration.
+ * Creates options in WeeChat configuration.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -5596,9 +5599,9 @@ config_weechat_init_options (void)
 }

 /*
- * Initialize WeeChat configuration.
+ * Initializes WeeChat configuration.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -5658,9 +5661,9 @@ config_weechat_init (void)
 }

 /*
- * Read WeeChat configuration file.
+ * Reads WeeChat configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -5681,9 +5684,9 @@ config_weechat_read (void)
 }

 /*
- * Write WeeChat configuration file.
+ * Writes WeeChat configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_WRITE_OK: OK
 *   WEECHAT_CONFIG_WRITE_ERROR: error
 *   WEECHAT_CONFIG_WRITE_MEMORY_ERROR: not enough memory
@@ -5696,7 +5699,7 @@ config_weechat_write (void)
 }

 /*
- * Free WeeChat configuration file and variables.
+ * Frees WeeChat configuration file and variables.
 */

 void
@@ -46,9 +46,6 @@
 #include <netinet/in.h>
 #include <inttypes.h>
 #define BE_INT64 htonll
-#elif defined(__HAIKU__)
-#include <ByteOrder.h>
-#define BE_INT64 B_HOST_TO_BENDIAN_INT64
 #else
 #define BE_INT64 htobe64
 #endif
@@ -126,7 +123,7 @@ int weecrypto_cipher[] = {


 /*
- * Return the hash algorithm with the name, or GCRY_MD_NONE if not found.
+ * Returns the hash algorithm with the name, or GCRY_MD_NONE if not found.
 */

 int
@@ -147,7 +144,7 @@ weecrypto_get_hash_algo (const char *hash_algo)
 }

 /*
- * Return the cipher with the name, or GCRY_CIPHER_NONE if not found.
+ * Returns the cipher with the name, or GCRY_CIPHER_NONE if not found.
 */

 int
@@ -168,7 +165,7 @@ weecrypto_get_cipher (const char *cipher)
 }

 /*
- * Compute hash of data using the given hash algorithm.
+ * Computes hash of data using the given hash algorithm.
 *
 * The hash size depends on the algorithm, common ones are:
 *
@@ -199,7 +196,7 @@ weecrypto_get_cipher (const char *cipher)
 * If hash_size is not NULL, the length of hash is stored in *hash_size
 * (in bytes).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -258,7 +255,7 @@ hash_end:
 }

 /*
- * Compute hash of file using the given hash algorithm.
+ * Computes hash of file using the given hash algorithm.
 *
 * The hash size depends on the algorithm, common ones are:
 *
@@ -289,7 +286,7 @@ hash_end:
 * If hash_size is not NULL, the length of hash is stored in *hash_size
 * (in bytes).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -364,7 +361,7 @@ hash_end:
 }

 /*
- * Compute PKCS#5 Passphrase Based Key Derivation Function number 2 (PBKDF2)
+ * Computes PKCS#5 Passphrase Based Key Derivation Function number 2 (PBKDF2)
 * hash of data.
 *
 * The hash size depends on the algorithm, common ones are:
@@ -378,7 +375,7 @@ hash_end:
 * If hash_size is not NULL, the length of hash is stored in *hash_size
 * (in bytes).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -422,7 +419,7 @@ hash_pbkdf2_end:
 }

 /*
- * Compute keyed-hash message authentication code (HMAC).
+ * Computes keyed-hash message authentication code (HMAC).
 *
 * The hash size depends on the algorithm, common ones are:
 *
@@ -453,7 +450,7 @@ hash_pbkdf2_end:
 * If hash_size is not NULL, the length of hash is stored in *hash_size
 * (in bytes).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -517,10 +514,10 @@ hmac_end:
 }

 /*
- * Generate a Time-based One-Time Password (TOTP), as described
+ * Generates a Time-based One-Time Password (TOTP), as described
 * in the RFC 6238.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -559,10 +556,10 @@ weecrypto_totp_generate_internal (const char *secret, int length_secret,
 }

 /*
- * Generate a Time-based One-Time Password (TOTP), as described
+ * Generates a Time-based One-Time Password (TOTP), as described
 * in the RFC 6238.
 *
- * Return the password as string, NULL if error.
+ * Returns the password as string, NULL if error.
 *
 * Note: result must be freed after use.
 */
@@ -618,9 +615,9 @@ error:
 }

 /*
- * Validate a Time-based One-Time Password (TOTP).
+ * Validates a Time-based One-Time Password (TOTP).
 *
- * Return:
+ * Returns:
 *   1: OTP is OK
 *   0: OTP is invalid
 */
@@ -660,18 +657,15 @@ weecrypto_totp_validate (const char *secret_base32, time_t totp_time,

    otp_ok = 0;

-    /*
-     * Compare in constant time and never break early: a non-constant
-     * compare and an early exit on match would let an observer measure
-     * how many digits of the expected OTP they got right and which
-     * time-window offset matched.
-     */
    for (i = moving_factor - window; i <= moving_factor + window; i++)
    {
        rc = weecrypto_totp_generate_internal (secret, length_secret,
                                               i, digits, str_otp);
-        if (rc && (string_memcmp_constant_time (str_otp, otp, digits) == 0))
+        if (rc && (strcmp (str_otp, otp) == 0))
+        {
            otp_ok = 1;
+            break;
+        }
    }

    free (secret);
@@ -91,7 +91,7 @@ long long debug_long_callbacks = 0;    /* callbacks taking more than        */


 /*
- * Display build information on stdout.
+ * Displays build information on stdout.
 */

 void
@@ -149,7 +149,7 @@ debug_build_info (void)
 }

 /*
- * Write dump of data to WeeChat log file.
+ * Writes dump of data to WeeChat log file.
 */

 void
@@ -226,7 +226,7 @@ debug_dump_cb (const void *pointer, void *data,
 /*
 * Callback for system signal SIGSEGV handler.
 *
- * Write dump of data and backtrace to WeeChat log file, then exit.
+ * Writes dump of data and backtrace to WeeChat log file, then exit.
 */

 void
@@ -271,7 +271,7 @@ debug_sigsegv_cb (int signo)
 }

 /*
- * Display tree of windows (this function must not be called directly).
+ * Displays tree of windows (this function must not be called directly).
 */

 void
@@ -341,7 +341,7 @@ debug_windows_tree_display (struct t_gui_window_tree *tree, int indent)
 }

 /*
- * Display tree of windows.
+ * Displays tree of windows.
 */

 void
@@ -353,7 +353,7 @@ debug_windows_tree (void)
 }

 /*
- * Display information about dynamic memory allocation.
+ * Displays information about dynamic memory allocation.
 */

 void
@@ -499,7 +499,7 @@ debug_hdata_map_cb (void *data,
 }

 /*
- * Display a list of hdata in memory.
+ * Displays a list of hdata in memory.
 */

 void
@@ -517,7 +517,7 @@ debug_hdata (void)
 }

 /*
- * Display info about hooks.
+ * Displays info about hooks.
 */

 void
@@ -538,7 +538,7 @@ debug_hooks (void)
 }

 /*
- * Display info about hooks for one or multiple plugins matching a mask.
+ * Displays info about hooks for one or multiple plugins matching a mask.
 */

 void
@@ -657,7 +657,7 @@ debug_hooks_plugin_types (const char *plugin_mask, const char **hook_types)
 }

 /*
- * Display a list of infolists in memory.
+ * Displays a list of infolists in memory.
 */

 void
@@ -748,7 +748,7 @@ debug_infolists (void)
 }

 /*
- * Callback for signal "debug_libs": display infos about external libraries
+ * Callback for signal "debug_libs": displays infos about external libraries
 * used (called when command "/debug libs" is issued).
 *
 * Note: this function displays libraries for WeeChat core only: plugins can
@@ -821,7 +821,7 @@ debug_libs_cb (const void *pointer, void *data,
 }

 /*
- * Display WeeChat directories.
+ * Displays WeeChat directories.
 */

 void
@@ -859,7 +859,8 @@ debug_directories (void)
 /*
 * Display time elapsed between two times.
 *
- * If display is 1, display message in core buffer, otherwise write in log file.
+ * If display is 1, the message is displayed in core buffer, otherwise it's
+ * written in log file.
 */

 void
@@ -1031,7 +1032,7 @@ debug_unicode (const char *string)
 }

 /*
- * Initialize debug.
+ * Initializes debug.
 */

 void
@@ -1047,7 +1048,7 @@ debug_init (void)
 }

 /*
- * End debug.
+ * Ends debug.
 */

 void
@@ -57,7 +57,7 @@


 /*
- * Return the path to a temporary directory, the first valid directory in
+ * Returns the path to a temporary directory, the first valid directory in
 * this list:
 *   - content of environment variable "TMPDIR"
 *   - P_tmpdir (from stdio.h)
@@ -100,9 +100,9 @@ dir_get_temp_dir (void)
 }

 /*
- * Create a directory in WeeChat home.
+ * Creates a directory in WeeChat home.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -175,9 +175,9 @@ end:
 }

 /*
- * Create a directory.
+ * Creates a directory.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -198,9 +198,9 @@ dir_mkdir (const char *directory, int mode)
 }

 /*
- * Create a directory and make parent directories as needed.
+ * Creates a directory and makes parent directories as needed.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -257,9 +257,9 @@ dir_mkdir_parents (const char *directory, int mode)
 }

 /*
- * Unlink a file or directory; callback called by function dir_rmtree().
+ * Unlinks a file or directory; callback called by function dir_rmtree().
 *
- * Return the return code of remove():
+ * Returns the return code of remove():
 *   0: OK
 *   -1: error
 */
@@ -277,9 +277,9 @@ dir_unlink_cb (const char *fpath, const struct stat *sb, int typeflag,
 }

 /*
- * Remove a directory and all files inside recursively.
+ * Removes a directory and all files inside recursively.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -298,12 +298,12 @@ dir_rmtree (const char *directory)
 }

 /*
- * Use one or four different paths for WeeChat home directories.
+ * Uses one or four different paths for WeeChat home directories.
 *
 * If 4 paths are given, they must be separated by colons and given in this
 * order: config, data, cache, runtime.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -374,9 +374,9 @@ end:
 }

 /*
- * Create WeeChat temporary home directory (deleted on exit).
+ * Creates WeeChat temporary home directory (deleted on exit).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -435,9 +435,9 @@ end:
 }

 /*
- * Find XDG directories.
+ * Finds XDG directories.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -592,10 +592,10 @@ error:
 }

 /*
- * Find WeeChat home directories: it can be either XDG directories or the
+ * Finds WeeChat home directories: it can be either XDG directories or the
 * same directory for all files (like the legacy directory ~/.weechat).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -673,7 +673,7 @@ use_xdg:
 }

 /*
- * Remove trailing separators in path, which is modified in place
+ * Removes trailing separators in path, which is modified in place
 * (each trailing separator is replaced by NUL char).
 *
 * Example on Linux: "/home/xxx/" => "/home/xxx".
@@ -696,9 +696,9 @@ dir_remove_trailing_separators (char *path)
 }

 /*
- * Create a home directory.
+ * Creates a home directory.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -733,7 +733,7 @@ dir_create_home_dir (char *path)
 }

 /*
- * Create WeeChat home directories.
+ * Creates WeeChat home directories.
 *
 * Any error in this function (or a sub function called) is fatal: WeeChat
 * cannot run at all without the home directories.
@@ -770,7 +770,7 @@ error:
 }

 /*
- * Remove WeeChat home directories (called when -t / --temp-dir is given).
+ * Removes WeeChat home directories (called when -t / --temp-dir is given).
 */

 void
@@ -788,7 +788,7 @@ dir_remove_home_dirs (void)
 }

 /*
- * Return a string with home directories separated by colons, in this order:
+ * Returns a string with home directories separated by colons, in this order:
 * config_dir, data_dir, state_dir, cache_dir, runtime_dir.
 *
 * Example of value returned:
@@ -815,7 +815,7 @@ dir_get_string_home_dirs (void)
 }

 /*
- * Find files in a directory and execute a function on each file.
+ * Finds files in a directory and executes a function on each file.
 */

 void
@@ -863,10 +863,10 @@ dir_exec_on_files (const char *directory, int recurse_subdirs,
 }

 /*
- * Search for the full name of a WeeChat library with name and extension
+ * Searches for the full name of a WeeChat library with name and extension
 * (searches first in WeeChat user's dir, then WeeChat global lib directory).
 *
- * Return name of library found, NULL if not found.
+ * Returns name of library found, NULL if not found.
 *
 * Note: result must be freed after use (if not NULL).
 */
@@ -933,7 +933,7 @@ dir_search_full_lib_name_ext (const char *filename, const char *extension,
 }

 /*
- * Search for the full name of a WeeChat library with name.
+ * Searches for the full name of a WeeChat library with name.
 *
 * All extensions listed in option "weechat.plugin.extension" are tested.
 *
@@ -986,9 +986,9 @@ dir_search_full_lib_name (const char *filename, const char *plugins_dir)
 }

 /*
- * Read content of a file.
+ * Reads content of a file.
 *
- * Return an allocated buffer with the content of file, NULL if error.
+ * Returns an allocated buffer with the content of file, NULL if error.
 *
 * Note: result must be freed after use.
 */
@@ -1042,9 +1042,9 @@ error:
 }

 /*
- * Copy a file to another location.
+ * Copies a file to another location.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1097,13 +1097,13 @@ end:
 }

 /*
- * Compress a file with gzip.
+ * Compresses a file with gzip.
 *
 * Notes:
 *   - the output file must not exist
 *   - compression_level is an integer between 1 and 9
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1203,13 +1203,13 @@ end:
 }

 /*
- * Compress a file with zstandard.
+ * Compresses a file with zstandard.
 *
 * Notes:
 *   - the output file must not exist
 *   - compression_level is an integer between 1 and 19
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1387,7 +1387,7 @@ end:
 }

 /*
- * Compress a file with gzip or zstandard.
+ * Compresses a file with gzip or zstandard.
 *
 * The output file must not exist.
 *
@@ -1398,7 +1398,7 @@ end:
 * Parameter "compression_level" is the compression level as percentage:
 * from 1 (fast, low compression) to 100 (slow, best compression).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1433,14 +1433,14 @@ dir_file_compress (const char *filename_input,
 }

 /*
- * Compare the content of two files (the attributes of the files like the
+ * Compares the content of two files (the attributes of the files like the
 * permissions or timestamp are ignored).
 *
 * Comparison is done like this:
 *   1. if sizes are different, return 1 (different content)
 *   2. if sizes are the same, read both files until a difference is found
 *
- * Return:
+ * Returns:
 *   0: both files exist and their content is exactly the same
 *   1: content is different
 *   2: other error (file not found, read error)
@@ -61,7 +61,7 @@ char *string_escaped[32];


 /*
- * Escape a string to display in a table: replace "|" by "\|".
+ * Escapes a string to display in a table: replace "|" by "\|".
 */

 char *
@@ -74,7 +74,7 @@ doc_gen_escape_table (const char *message)
 }

 /*
- * Escape a string to be used as anchor link: replace ",", "@" and "*" by "-".
+ * Escapes a string to be used as anchor link: replace ",", "@" and "*" by "-".
 */

 char *
@@ -94,13 +94,13 @@ doc_gen_escape_anchor_link (const char *message)
 }

 /*
- * Open a file for write using:
+ * Opens a file for write using:
 *   - path
 *   - doc: "api" or "user"
 *   - name
 *   - language (eg: "fr")
 *
- * Return the file opened, NULL if error.
+ * Returns the file opened, NULL if error.
 */

 FILE *
@@ -135,13 +135,13 @@ doc_gen_open_file (const char *path, const char *doc, const char *name,
 }

 /*
- * Close the file and rename it without ".temp" suffix, if the target name
+ * Closes the file and renames it without ".temp" suffix, if the target name
 * does not exist or if it exists with a different (obsolete) content.
 *
- * If the target name exists with same content, keep it as-is (so the
- * timestamp does not change) and just delete the temporary file.
+ * If the target name exists with same content it's kept as-is (so the
+ * timestamp does not change) and the temporary file is just deleted.
 *
- * Return:
+ * Returns:
 *    1: target file has been updated
 *    0: target file unchanged
 *   -1: error
@@ -183,7 +183,7 @@ doc_gen_close_file (const char *path, const char *doc, const char *name,
 }

 /*
- * Check if a command must be documented or not: all commands are documented
+ * Checks if a command must be documented or not: all commands are documented
 * except the default aliases (that create commands).
 */

@@ -195,7 +195,7 @@ doc_gen_check_command (const char *plugin, const char *command)
 }

 /*
- * Compare two hooks "command" to sort by plugin / command.
+ * Compares two hooks "command" to sort by plugin / command.
 */

 int
@@ -221,9 +221,9 @@ doc_gen_hook_command_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with commands.
+ * Generates files with commands.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -366,7 +366,7 @@ doc_gen_user_commands (const char *path, const char *lang)
 }

 /*
- * Check if an option must be documented or not.
+ * Checks if an option must be documented or not.
 */

 int
@@ -395,7 +395,7 @@ doc_gen_check_option (struct t_config_option *option)
 }

 /*
- * Compare two options to sort by plugin / command.
+ * Compares two options to sort by plugin / command.
 */

 int
@@ -425,9 +425,9 @@ doc_gen_option_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with commands.
+ * Generates files with commands.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -588,9 +588,9 @@ doc_gen_user_options (const char *path, const char *lang)
 }

 /*
- * Generate files with default aliases.
+ * Generates files with default aliases.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -638,9 +638,9 @@ doc_gen_user_default_aliases (const char *path, const char *lang)
 }

 /*
- * Generate files with IRC colors.
+ * Generates files with IRC colors.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -684,7 +684,7 @@ doc_gen_user_irc_colors (const char *path, const char *lang)
 }

 /*
- * Compare two hooks "info" to sort by plugin / info.
+ * Compares two hooks "info" to sort by plugin / info.
 */

 int
@@ -710,9 +710,9 @@ doc_gen_hook_info_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with infos.
+ * Generates files with infos.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -773,7 +773,7 @@ doc_gen_api_infos (const char *path, const char *lang)
 }

 /*
- * Compare two hooks "info_hashtable" to sort by plugin / info.
+ * Compares two hooks "info_hashtable" to sort by plugin / info.
 */

 int
@@ -799,9 +799,9 @@ doc_gen_hook_info_hashtable_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with infos_hashtable.
+ * Generates files with infos_hashtable.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -864,7 +864,7 @@ doc_gen_api_infos_hashtable (const char *path, const char *lang)
 }

 /*
- * Compare two hooks "infolist" to sort by plugin / infolist.
+ * Compares two hooks "infolist" to sort by plugin / infolist.
 */

 int
@@ -890,9 +890,9 @@ doc_gen_hook_infolist_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with infolists.
+ * Generates files with infolists.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -955,7 +955,7 @@ doc_gen_api_infolists (const char *path, const char *lang)
 }

 /*
- * Compare two hooks "hdata" to sort by plugin / hdata.
+ * Compares two hooks "hdata" to sort by plugin / hdata.
 */

 int
@@ -981,7 +981,7 @@ doc_gen_hook_hdata_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Compare two hooks lists to sort by name (and lists beginning with "last_"
+ * Compares two hooks lists to sort by name (and lists beginning with "last_"
 * at the end).
 */

@@ -1009,7 +1009,7 @@ doc_gen_hdata_list_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Compare two hooks hdata keys to sort by offset.
+ * Compares two hooks hdata keys to sort by offset.
 */

 int
@@ -1030,7 +1030,7 @@ doc_gen_hdata_key_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate content of a hdata.
+ * Generates content of a hdata.
 */

 void
@@ -1172,9 +1172,9 @@ doc_gen_api_hdata_content (FILE *file, struct t_hdata *hdata)
 }

 /*
- * Generate files with hdata.
+ * Generates files with hdata.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1250,7 +1250,7 @@ doc_gen_api_hdata (const char *path, const char *lang)
 }

 /*
- * Compare two hooks "completion" to sort by plugin / completion.
+ * Compares two hooks "completion" to sort by plugin / completion.
 */

 int
@@ -1276,9 +1276,9 @@ doc_gen_hook_completion_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with completions.
+ * Generates files with completions.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1337,9 +1337,9 @@ doc_gen_api_completions (const char *path, const char *lang)
 }

 /*
- * Generate files with URL options.
+ * Generates files with URL options.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1397,7 +1397,7 @@ doc_gen_api_url_options (const char *path, const char *lang)
 }

 /*
- * Compare two plugins to sort by priority (descending).
+ * Compares two plugins to sort by priority (descending).
 */

 int
@@ -1421,9 +1421,9 @@ doc_gen_plugin_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with plugins priority.
+ * Generates files with plugins priority.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1483,7 +1483,7 @@ doc_gen_api_plugins_priority (const char *path, const char *lang)
 }

 /*
- * Compare two configurations to sort by priority (descending).
+ * Compares two configurations to sort by priority (descending).
 */

 int
@@ -1507,9 +1507,9 @@ doc_gen_config_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Generate files with config priority.
+ * Generates files with config priority.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1569,9 +1569,9 @@ doc_gen_api_config_priority (const char *path, const char *lang)
 }

 /*
- * Generate files with scripting API functions.
+ * Generates files with scripting API functions.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1602,9 +1602,9 @@ doc_gen_scripting_functions (const char *path, const char *lang)
 }

 /*
- * Generate files with scripting API constants.
+ * Generates files with scripting API constants.
 *
- * Return:
+ * Returns:
 *    1: OK, target file updated
 *    0: OK, target file unchanged
 *   -1: error
@@ -1664,9 +1664,9 @@ doc_gen_scripting_constants (const char *path, const char *lang)
 }

 /*
- * Generate WeeChat files used to build documentation.
+ * Generates WeeChat files used to build documentation.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -96,7 +96,7 @@ char *eval_expression_condition (const char *expr,


 /*
- * Add a debug message in the debug output.
+ * Adds a debug message in the debug output.
 */

 void
@@ -142,7 +142,7 @@ eval_debug_message (struct t_eval_context *eval_context, int debug_id,


 /*
- * Add a debug message in the debug output, with variable arguments.
+ * Adds a debug message in the debug output, with variable arguments.
 */

 void
@@ -159,10 +159,10 @@ eval_debug_message_vargs (struct t_eval_context *eval_context, int debug_id,
 }

 /*
- * Check if a value is true: a value is true if string is non-NULL, non-empty
+ * Checks if a value is true: a value is true if string is non-NULL, non-empty
 * and different from "0".
 *
- * Return:
+ * Returns:
 *   1: value is true
 *   0: value is false
 */
@@ -174,7 +174,7 @@ eval_is_true (const char *value)
 }

 /*
- * Search a string in another at same level (skip sub-expressions between
+ * Searches a string in another at same level (skip sub-expressions between
 * prefix/suffix).
 *
 * If escape is 1, the prefix can be escaped with '\' (and then is ignored).
@@ -184,7 +184,7 @@ eval_is_true (const char *value)
 * will return a pointer on  "|| z" (because the first "||" is
 * in a sub-expression, which is skipped).
 *
- * Return pointer to string found, or NULL if not found.
+ * Returns pointer to string found, or NULL if not found.
 */

 const char *
@@ -267,7 +267,7 @@ end:
 }

 /*
- * Evaluate a condition and return boolean result:
+ * Evaluates a condition and returns boolean result:
 *   "0" if false
 *   "1" if true
 *
@@ -287,7 +287,7 @@ eval_string_eval_cond (const char *text, struct t_eval_context *eval_context)
 }

 /*
- * Add range of chars.
+ * Adds range of chars.
 *
 * Note: result must be freed after use.
 */
@@ -350,7 +350,7 @@ end:
 }

 /*
- * Hide chars in a string.
+ * Hides chars in a string.
 *
 * Note: result must be freed after use.
 */
@@ -391,7 +391,7 @@ eval_string_hide (const char *text)
 }

 /*
- * Cut string.
+ * Cuts string.
 *
 * Note: result must be freed after use.
 */
@@ -444,7 +444,7 @@ eval_string_cut (const char *text, int screen)
 }

 /*
- * Repeat string.
+ * Repeats string.
 *
 * Note: result must be freed after use.
 */
@@ -477,12 +477,12 @@ eval_string_repeat (const char *text)
 }

 /*
- * Split string.
+ * Splits string.
 *
 * Format: number,separators,flags,string
 *
- * If number == "count", return the number of items after split.
- * If number == "random", return a random item.
+ * If number == "count", returns the number of items after split.
+ * If number == "random", returns a random item.
 * If number > 0, return this index (empty string if not enough items).
 * If number < 0, return this index starting from the end (-1 = last item,
 * -2 = penultimate item, etc.).
@@ -642,12 +642,12 @@ end:
 }

 /*
- * Split shell arguments.
+ * Splits shell arguments.
 *
 * Format: number,string
 *
- * If number == "count", return the number of arguments.
- * If number == "random", return a random argument.
+ * If number == "count", returns the number of arguments.
+ * If number == "random", returns a random argument.
 * If number > 0, return this index (empty string if not enough arguments).
 * If number < 0, return this index starting from the end (-1 = last argument,
 * -2 = penultimate argument, etc.).
@@ -738,7 +738,7 @@ end:
 }

 /*
- * Return a regex group captured.
+ * Returns a regex group captured.
 *
 * Note: result must be freed after use.
 */
@@ -790,7 +790,7 @@ eval_string_regex_group (const char *text, struct t_eval_context *eval_context)
 }

 /*
- * Return a string with color code.
+ * Returns a string with color code.
 *
 * Note: result must be freed after use.
 */
@@ -809,7 +809,7 @@ eval_string_color (const char *text)
 }

 /*
- * Return a string modified by a modifier.
+ * Returns a string modified by a modifier.
 *
 * Note: result must be freed after use.
 */
@@ -844,7 +844,7 @@ eval_string_modifier (const char *text)
 }

 /*
- * Return an info.
+ * Returns an info.
 *
 * Note: result must be freed after use.
 */
@@ -878,7 +878,7 @@ eval_string_info (const char *text)
 }

 /*
- * Encode a string in base 16, 32, or 64.
+ * Encodes a string in base 16, 32, or 64.
 *
 * Note: result must be freed after use.
 */
@@ -921,7 +921,7 @@ end:
 }

 /*
- * Decode a string encoded in base 16, 32, or 64.
+ * Decodes a string encoded in base 16, 32, or 64.
 *
 * Note: result must be freed after use.
 */
@@ -962,7 +962,7 @@ end:
 }

 /*
- * Return a date.
+ * Returns a date.
 *
 * Note: result must be freed after use.
 */
@@ -982,7 +982,7 @@ eval_string_date (const char *text)
 }

 /*
- * Evaluate a condition and return evaluated if/else clause.
+ * Evaluates a condition and returns evaluated if/else clause.
 *
 * Note: result must be freed after use.
 */
@@ -1050,7 +1050,7 @@ eval_string_if (const char *text, struct t_eval_context *eval_context)
 }

 /*
- * Return a random integer number.
+ * Returns a random integer number.
 *
 * Note: result must be freed after use.
 */
@@ -1103,7 +1103,7 @@ error:
 }

 /*
- * Translate text.
+ * Translates text.
 *
 * Note: result must be freed after use.
 */
@@ -1122,7 +1122,7 @@ eval_string_translate (const char *text)
 }

 /*
- * Define a variable.
+ * Defines a variable.
 */

 void
@@ -1144,7 +1144,7 @@ eval_string_define (const char *text, struct t_eval_context *eval_context)
 }

 /*
- * Return count of items in a hdata, as a string.
+ * Returns count of items in a hdata, as a string.
 *
 * Note: result must be freed after use.
 */
@@ -1218,7 +1218,7 @@ end:
 }

 /*
- * Get value of hdata using "path" to a variable.
+ * Gets value of hdata using "path" to a variable.
 *
 * Note: result must be freed after use.
 */
@@ -1411,7 +1411,7 @@ end:
 }

 /*
- * Return a string using hdata.
+ * Returns a string using hdata.
 *
 * Note: result must be freed after use.
 */
@@ -1519,7 +1519,7 @@ end:
 }

 /*
- * Return text with syntax highlighting (using markers, to be replaced by
+ * Returns text with syntax highlighting (using markers, to be replaced by
 * colors later).
 *
 * Note: result must be freed after use.
@@ -1546,7 +1546,7 @@ eval_syntax_highlight_add_markers (const char *prefix, const char *text,
 }

 /*
- * Replace raw highlight markers with color codes defined in option
+ * Replaces raw highlight markers with color codes defined in option
 * weechat.color.eval_syntax_colors.
 *
 * Note: result must be freed after use.
@@ -1603,7 +1603,7 @@ eval_syntax_highlight_colorize (const char *value)
 }

 /*
- * Add syntax highlighting in text.
+ * Adds syntax highlighting in text.
 *
 * Note: result must be freed after use.
 */
@@ -1625,7 +1625,7 @@ eval_syntax_highlight (const char *text, struct t_eval_context *eval_context)
 }

 /*
- * Replace variables, which can be, by order of priority:
+ * Replaces variables, which can be, by order of priority:
 *   - ${raw_hl:string}: the string itself without evaluation but with syntax highlighting
 *   - ${raw:string}: the string itself without evaluation
 *   - ${hl:string}: the string with syntax highlighting
@@ -2088,7 +2088,7 @@ end:
 }

 /*
- * Replace variables in a string.
+ * Replaces variables in a string.
 *
 * Note: result must be freed after use.
 */
@@ -2131,15 +2131,15 @@ eval_replace_vars (const char *expr, struct t_eval_context *eval_context)
 }

 /*
- * Compare two expressions.
+ * Compares two expressions.
 *
- * Return:
+ * Returns:
 *   "1": comparison is true
 *   "0": comparison is false
 *
 * Examples:
- *   "15 > 2": return "1"
- *   "abc == def": return "0"
+ *   "15 > 2": returns "1"
+ *   "abc == def": returns "0"
 *
 * Note: result must be freed after use.
 */
@@ -2275,7 +2275,7 @@ end:
 }

 /*
- * Evaluate a condition (this function must not be called directly).
+ * Evaluates a condition (this function must not be called directly).
 *
 * For return value, see function eval_expression().
 *
@@ -2498,7 +2498,7 @@ end:
 }

 /*
- * Replace text in a string using a regular expression and replacement text.
+ * Replaces text in a string using a regular expression and replacement text.
 *
 * The argument "regex" is a pointer to a regex compiled with WeeChat function
 * string_regcomp (or function regcomp).
@@ -2637,7 +2637,7 @@ end:
 }

 /*
- * Evaluate an expression.
+ * Evaluates an expression.
 *
 * The hashtable "pointers" must have string for keys, pointer for values.
 * The hashtable "extra_vars" must have string for keys and values.
@@ -50,9 +50,9 @@ char *hashtable_type_string[HASHTABLE_NUM_TYPES] =


 /*
- * Search for a hashtable type.
+ * Searches for a hashtable type.
 *
- * Return index of type in enum t_hashtable_type, -1 if type is not found.
+ * Returns index of type in enum t_hashtable_type, -1 if type is not found.
 */

 int
@@ -74,9 +74,9 @@ hashtable_get_type (const char *type)
 }

 /*
- * Hash a string using a variant of djb2 hash.
+ * Hashes a string using a variant of djb2 hash.
 *
- * Return the hash of the string.
+ * Returns the hash of the string.
 */

 unsigned long long
@@ -98,9 +98,9 @@ hashtable_hash_key_djb2 (const char *string)
 }

 /*
- * Hash a key (default callback).
+ * Hashes a key (default callback).
 *
- * Return the hash of the key, depending on the type.
+ * Returns the hash of the key, depending on the type.
 */

 unsigned long long
@@ -135,9 +135,9 @@ hashtable_hash_key_default_cb (struct t_hashtable *hashtable, const void *key)
 }

 /*
- * Compare two keys (default callback).
+ * Compares two keys (default callback).
 *
- * Return:
+ * Returns:
 *   < 0: key1 < key2
 *     0: key1 == key2
 *   > 0: key1 > key2
@@ -200,14 +200,14 @@ hashtable_keycmp_default_cb (struct t_hashtable *hashtable,
 }

 /*
- * Create a new hashtable.
+ * Creates a new hashtable.
 *
 * The size is NOT a limit for number of items in hashtable. It is the size of
 * internal array to store hashed keys: a high value uses more memory, but has
 * better performance because this reduces the collisions of hashed keys and
- * then reduce length of linked lists.
+ * then reduces length of linked lists.
 *
- * Return pointer to new hashtable, NULL if error.
+ * Returns pointer to new hashtable, NULL if error.
 */

 struct t_hashtable *
@@ -266,7 +266,7 @@ hashtable_new (int size,
 }

 /*
- * Allocate space for a key or value.
+ * Allocates space for a key or value.
 */

 void
@@ -334,7 +334,7 @@ hashtable_alloc_type (enum t_hashtable_type type,
 }

 /*
- * Free space used by a key.
+ * Frees space used by a key.
 */

 void
@@ -366,7 +366,7 @@ hashtable_free_key (struct t_hashtable *hashtable,
 }

 /*
- * Free space used by a value.
+ * Frees space used by a value.
 */

 void
@@ -399,11 +399,11 @@ hashtable_free_value (struct t_hashtable *hashtable,
 }

 /*
- * Set value for a key in hashtable.
+ * Sets value for a key in hashtable.
 *
 * The size arguments are used only for type "buffer".
 *
- * Return pointer to item created/updated, NULL if error.
+ * Returns pointer to item created/updated, NULL if error.
 */

 struct t_hashtable_item *
@@ -490,12 +490,12 @@ hashtable_set_with_size (struct t_hashtable *hashtable,
 }

 /*
- * Set value for a key in hashtable.
+ * Sets value for a key in hashtable.
 *
 * Note: this function can be called *only* if key AND value are *not* of type
 * "buffer".
 *
- * Return pointer to item created/updated, NULL if error.
+ * Returns pointer to item created/updated, NULL if error.
 */

 struct t_hashtable_item *
@@ -506,9 +506,9 @@ hashtable_set (struct t_hashtable *hashtable,
 }

 /*
- * Search for an item in hashtable.
+ * Searches for an item in hashtable.
 *
- * If hash is non NULL, then set it with hash value of key (even if key is
+ * If hash is non NULL, then it is set with hash value of key (even if key is
 * not found).
 */

@@ -541,9 +541,9 @@ hashtable_get_item (struct t_hashtable *hashtable, const void *key,
 }

 /*
- * Get value for a key in hashtable.
+ * Gets value for a key in hashtable.
 *
- * Return pointer to value for key, NULL if key is not found.
+ * Returns pointer to value for key, NULL if key is not found.
 */

 void *
@@ -557,9 +557,9 @@ hashtable_get (struct t_hashtable *hashtable, const void *key)
 }

 /*
- * Check if a key exists in the hashtable.
+ * Checks if a key exists in the hashtable.
 *
- * Return:
+ * Returns:
 *   1: key exists
 *   0: key does not exist
 */
@@ -571,9 +571,9 @@ hashtable_has_key (struct t_hashtable *hashtable, const void *key)
 }

 /*
- * Convert a value (from any type) to a string.
+ * Converts a value (from any type) to a string.
 *
- * Return pointer to a static buffer (for type string, return pointer to
+ * Returns pointer to a static buffer (for type string, returns pointer to
 * string itself), which must be used immediately, it is overwritten by
 * subsequent calls to this function.
 */
@@ -611,7 +611,7 @@ hashtable_to_string (enum t_hashtable_type type, const void *value)
 }

 /*
- * Call a function on all hashtable entries.
+ * Calls a function on all hashtable entries.
 */

 void
@@ -639,7 +639,7 @@ hashtable_map (struct t_hashtable *hashtable,
 }

 /*
- * Call a function on all hashtable entries (sends keys and values as strings).
+ * Calls a function on all hashtable entries (sends keys and values as strings).
 */

 void
@@ -680,7 +680,7 @@ hashtable_map_string (struct t_hashtable *hashtable,
 }

 /*
- * Duplicate key/value in another hashtable (callback called for each variable
+ * Duplicates key/value in another hashtable (callback called for each variable
 * in hashtable).
 */

@@ -700,9 +700,9 @@ hashtable_duplicate_map_cb (void *data,
 }

 /*
- * Duplicate a hashtable.
+ * Duplicates a hashtable.
 *
- * Return pointer to new hashtable, NULL if error.
+ * Returns pointer to new hashtable, NULL if error.
 */

 struct t_hashtable *
@@ -731,7 +731,7 @@ hashtable_dup (struct t_hashtable *hashtable)
 }

 /*
- * Build sorted list of keys (callback called for each variable in hashtable).
+ * Builds sorted list of keys (callback called for each variable in hashtable).
 */

 void
@@ -752,7 +752,7 @@ hashtable_get_list_keys_map_cb (void *data,
 }

 /*
- * Get list with sorted keys of hashtable.
+ * Gets list with sorted keys of hashtable.
 *
 * Note: list must be freed after use.
 */
@@ -772,7 +772,7 @@ hashtable_get_list_keys (struct t_hashtable *hashtable)
 }

 /*
- * Get a hashtable property as integer.
+ * Gets a hashtable property as integer.
 */

 int
@@ -790,7 +790,7 @@ hashtable_get_integer (struct t_hashtable *hashtable, const char *property)
 }

 /*
- * Compute length of all keys (callback called for each variable in hashtable).
+ * Computes length of all keys (callback called for each variable in hashtable).
 */

 void
@@ -812,7 +812,7 @@ hashtable_compute_length_keys_cb (void *data,
 }

 /*
- * Compute length of all values (callback called for each variable in
+ * Computes length of all values (callback called for each variable in
 * hashtable).
 */

@@ -842,7 +842,7 @@ hashtable_compute_length_values_cb (void *data,
 }

 /*
- * Compute length of all keys + values (callback called for each variable in
+ * Computes length of all keys + values (callback called for each variable in
 * hashtable).
 */

@@ -856,7 +856,7 @@ hashtable_compute_length_keys_values_cb (void *data,
 }

 /*
- * Build a string with all keys (callback called for each variable in
+ * Builds a string with all keys (callback called for each variable in
 * hashtable).
 */

@@ -882,7 +882,7 @@ hashtable_build_string_keys_cb (void *data,
 }

 /*
- * Build a string with all values (callback called for each variable in
+ * Builds a string with all values (callback called for each variable in
 * hashtable).
 */

@@ -915,7 +915,7 @@ hashtable_build_string_values_cb (void *data,
 }

 /*
- * Build a string with all keys + values (callback called for each variable in
+ * Builds a string with all keys + values (callback called for each variable in
 * hashtable).
 */

@@ -951,9 +951,9 @@ hashtable_build_string_keys_values_cb (void *data,
 }

 /*
- * Get keys and/or values of hashtable as string.
+ * Gets keys and/or values of hashtable as string.
 *
- * Return a string with one of these formats:
+ * Returns a string with one of these formats:
 *   if keys == 1 and values == 0: "key1,key2,key3"
 *   if keys == 0 and values == 1: "value1,value2,value3"
 *   if keys == 1 and values == 1: "key1:value1,key2:value2,key3:value3"
@@ -1028,7 +1028,7 @@ hashtable_get_keys_values (struct t_hashtable *hashtable,
 }

 /*
- * Get a hashtable property as string.
+ * Gets a hashtable property as string.
 */

 const char *
@@ -1056,7 +1056,7 @@ hashtable_get_string (struct t_hashtable *hashtable, const char *property)
 }

 /*
- * Set a hashtable property (pointer).
+ * Sets a hashtable property (pointer).
 */

 void
@@ -1073,9 +1073,9 @@ hashtable_set_pointer (struct t_hashtable *hashtable, const char *property,
 }

 /*
- * Add hashtable keys and values in an infolist.
+ * Adds hashtable keys and values in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1148,9 +1148,9 @@ hashtable_add_to_infolist (struct t_hashtable *hashtable,
 }

 /*
- * Add hashtable keys and values from an infolist.
+ * Adds hashtable keys and values from an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1238,7 +1238,7 @@ hashtable_add_from_infolist (struct t_hashtable *hashtable,
 }

 /*
- * Remove an item from hashtable.
+ * Removes an item from hashtable.
 */

 void
@@ -1277,7 +1277,7 @@ hashtable_remove_item (struct t_hashtable *hashtable,
 }

 /*
- * Remove an item from hashtable (searches it with key).
+ * Removes an item from hashtable (searches it with key).
 */

 void
@@ -1295,7 +1295,7 @@ hashtable_remove (struct t_hashtable *hashtable, const void *key)
 }

 /*
- * Remove all items from hashtable.
+ * Removes all items from hashtable.
 */

 void
@@ -1316,7 +1316,7 @@ hashtable_remove_all (struct t_hashtable *hashtable)
 }

 /*
- * Free a hashtable: removes all items and frees hashtable.
+ * Frees a hashtable: removes all items and frees hashtable.
 */

 void
@@ -1332,7 +1332,7 @@ hashtable_free (struct t_hashtable *hashtable)
 }

 /*
- * Print hashtable in WeeChat log file (usually for crash dump).
+ * Prints hashtable in WeeChat log file (usually for crash dump).
 */

 void
@@ -46,7 +46,7 @@ char *hdata_type_string[WEECHAT_NUM_HDATA_TYPES] =


 /*
- * Free a hdata variable.
+ * Frees a hdata variable.
 */

 void
@@ -68,7 +68,7 @@ hdata_free_var_cb (struct t_hashtable *hashtable, const void *key, void *value)
 }

 /*
- * Free a hdata list.
+ * Frees a hdata list.
 */

 void
@@ -82,9 +82,9 @@ hdata_free_list_cb (struct t_hashtable *hashtable, const void *key, void *value)
 }

 /*
- * Create a new hdata.
+ * Creates a new hdata.
 *
- * Return pointer to new hdata, NULL if error.
+ * Returns pointer to new hdata, NULL if error.
 */

 struct t_hdata *
@@ -133,7 +133,7 @@ hdata_new (struct t_weechat_plugin *plugin, const char *hdata_name,
 }

 /*
- * Add a new variable in a hdata.
+ * Adds a new variable in a hdata.
 */

 void
@@ -172,7 +172,7 @@ hdata_new_var (struct t_hdata *hdata, const char *name, int offset, int type,
 }

 /*
- * Add a new list pointer in a hdata.
+ * Adds a new list pointer in a hdata.
 */

 void
@@ -194,7 +194,7 @@ hdata_new_list (struct t_hdata *hdata, const char *name, void *pointer,
 }

 /*
- * Get offset of variable in hdata.
+ * Gets offset of variable in hdata.
 */

 int
@@ -213,7 +213,7 @@ hdata_get_var_offset (struct t_hdata *hdata, const char *name)
 }

 /*
- * Get type of variable in hdata (as integer).
+ * Gets type of variable in hdata (as integer).
 */

 int
@@ -232,7 +232,7 @@ hdata_get_var_type (struct t_hdata *hdata, const char *name)
 }

 /*
- * Get type of variable in hdata (as string).
+ * Gets type of variable in hdata (as string).
 */

 const char *
@@ -251,9 +251,9 @@ hdata_get_var_type_string (struct t_hdata *hdata, const char *name)
 }

 /*
- * Get size of array for a variable (if variable is an array).
+ * Gets size of array for a variable (if variable is an array).
 *
- * Return size of array, -1 if variable is not an array (or if error).
+ * Returns size of array, -1 if variable is not an array (or if error).
 */

 int
@@ -351,7 +351,7 @@ hdata_get_var_array_size (struct t_hdata *hdata, void *pointer,
 }

 /*
- * Get size of array for variable as string.
+ * Gets size of array for variable as string.
 */

 const char *
@@ -374,9 +374,9 @@ hdata_get_var_array_size_string (struct t_hdata *hdata, void *pointer,
 }

 /*
- * Get hdata name for a variable.
+ * Gets hdata name for a variable.
 *
- * Return hdata name, NULL if variable has no hdata.
+ * Returns hdata name, NULL if variable has no hdata.
 */

 const char *
@@ -395,7 +395,7 @@ hdata_get_var_hdata (struct t_hdata *hdata, const char *name)
 }

 /*
- * Get pointer to content of variable using hdata variable name.
+ * Gets pointer to content of variable using hdata variable name.
 */

 void *
@@ -414,7 +414,7 @@ hdata_get_var (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get pointer to content of variable using hdata variable offset.
+ * Gets pointer to content of variable using hdata variable offset.
 */

 void *
@@ -427,7 +427,7 @@ hdata_get_var_at_offset (struct t_hdata *hdata, void *pointer, int offset)
 }

 /*
- * Get a list pointer in hdata.
+ * Gets a list pointer in hdata.
 */

 void *
@@ -446,9 +446,9 @@ hdata_get_list (struct t_hdata *hdata, const char *name)
 }

 /*
- * Check if a pointer is in the list.
+ * Checks if a pointer is in the list.
 *
- * Return:
+ * Returns:
 *   1: pointer exists in list
 *   0: pointer does not exist
 */
@@ -476,7 +476,7 @@ hdata_check_pointer_in_list (struct t_hdata *hdata, void *list, void *pointer)
 }

 /*
- * Check if a pointer is in a list with flag "check_pointers".
+ * Checks if a pointer is in a list with flag "check_pointers".
 */

 void
@@ -513,14 +513,14 @@ hdata_check_pointer_map_cb (void *data, struct t_hashtable *hashtable,
 }

 /*
- * Check if a pointer is valid for a given hdata/list.
+ * Checks if a pointer is valid for a given hdata/list.
 *
 * If argument "list" is NULL, the check is made with all lists in hdata
 * that have flag "check_pointers". If no list is defined with this flag,
- * the pointer is considered valid (so this function return 1); if the
- * pointer is not found in any list, this function return 0.
+ * the pointer is considered valid (so this function returns 1); if the
+ * pointer is not found in any list, this function returns 0.
 *
- * Return:
+ * Returns:
 *   1: pointer exists in the given list (or a list with check_pointers flag)
 *   0: pointer does not exist
 */
@@ -553,7 +553,7 @@ hdata_check_pointer (struct t_hdata *hdata, void *list, void *pointer)
 }

 /*
- * Move pointer to another element in list.
+ * Moves pointer to another element in list.
 */

 void *
@@ -579,9 +579,9 @@ hdata_move (struct t_hdata *hdata, void *pointer, int count)
 }

 /*
- * Search for an element in list using expression.
+ * Searches for an element in list using expression.
 *
- * Return pointer to element found, NULL if not found.
+ * Returns pointer to element found, NULL if not found.
 */

 void *
@@ -659,7 +659,7 @@ end:
 }

 /*
- * Return number of item in this hdata, starting at "pointer".
+ * Returns number of item in this hdata, starting at "pointer".
 */

 int
@@ -680,7 +680,7 @@ hdata_count (struct t_hdata *hdata, void *pointer)
 }

 /*
- * Extract index from name of a variable.
+ * Extracts index from name of a variable.
 *
 * A name can contain index with this format: "NNN|name" (where NNN is an
 * integer >= 0).
@@ -723,7 +723,7 @@ hdata_get_index_and_name (const char *name, int *index, const char **ptr_name)
 }

 /*
- * Get char value of a variable in hdata.
+ * Gets char value of a variable in hdata.
 */

 char
@@ -757,7 +757,7 @@ hdata_char (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get integer value of a variable in hdata.
+ * Gets integer value of a variable in hdata.
 */

 int
@@ -791,7 +791,7 @@ hdata_integer (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get long value of a variable in hdata.
+ * Gets long value of a variable in hdata.
 */

 long
@@ -825,7 +825,7 @@ hdata_long (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get "long long" value of a variable in hdata.
+ * Gets "long long" value of a variable in hdata.
 */

 long long
@@ -859,7 +859,7 @@ hdata_longlong (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get string value of a variable in hdata.
+ * Gets string value of a variable in hdata.
 */

 const char *
@@ -896,7 +896,7 @@ hdata_string (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get pointer value of a variable in hdata.
+ * Gets pointer value of a variable in hdata.
 */

 void *
@@ -930,7 +930,7 @@ hdata_pointer (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get time value of a variable in hdata.
+ * Gets time value of a variable in hdata.
 */

 time_t
@@ -964,7 +964,7 @@ hdata_time (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Get hashtable value of a variable in hdata.
+ * Gets hashtable value of a variable in hdata.
 */

 struct t_hashtable *
@@ -998,11 +998,11 @@ hdata_hashtable (struct t_hdata *hdata, void *pointer, const char *name)
 }

 /*
- * Compare a hdata variable of two objects.
+ * Compares a hdata variable of two objects.
 *
 * If case_sensitive == 1, the comparison of strings is case-sensitive.
 *
- * Return:
+ * Returns:
 *   -1: variable1 < variable2
 *    0: variable1 == variable2
 *    1: variable1 > variable2
@@ -1230,13 +1230,13 @@ end:
 }

 /*
- * Set value for a variable in hdata.
+ * Sets value for a variable in hdata.
 *
 * WARNING: this is dangerous, and only some variables can be set by this
 * function (this depends on hdata, see API doc for more info) and this
 * function can be called *ONLY* in an "update" callback (in hdata).
 *
- * Return:
+ * Returns:
 *   1: OK (value set)
 *   0: error (or not allowed)
 */
@@ -1338,7 +1338,7 @@ hdata_set (struct t_hdata *hdata, void *pointer, const char *name,
 }

 /*
- * Update some data in hdata.
+ * Updates some data in hdata.
 *
 * The hashtable contains keys with new values.
 * A special key "__delete" can be used to delete the whole structure at
@@ -1347,8 +1347,8 @@ hdata_set (struct t_hdata *hdata, void *pointer, const char *name,
 * WARNING: this is dangerous, and only some data can be updated by this
 * function (this depends on hdata, see API doc for more info).
 *
- * Return number of variables updated, 0 if nothing has been updated.
- * In case of deletion, return 1 if OK, 0 if error.
+ * Returns number of variables updated, 0 if nothing has been updated.
+ * In case of deletion, returns 1 if OK, 0 if error.
 */

 int
@@ -1390,7 +1390,7 @@ hdata_update (struct t_hdata *hdata, void *pointer,
 }

 /*
- * Get a hdata property as string.
+ * Gets a hdata property as string.
 */

 const char *
@@ -1420,7 +1420,7 @@ hdata_get_string (struct t_hdata *hdata, const char *property)
 }

 /*
- * Free a hdata.
+ * Frees a hdata.
 */

 void
@@ -1439,7 +1439,7 @@ hdata_free (struct t_hdata *hdata)
 }

 /*
- * Free hdata for a plugin (callback called for each hdata in memory).
+ * Frees hdata for a plugin (callback called for each hdata in memory).
 */

 void
@@ -1455,7 +1455,7 @@ hdata_free_all_plugin_map_cb (void *data, struct t_hashtable *hashtable,
 }

 /*
- * Free all hdata created by a plugin.
+ * Frees all hdata created by a plugin.
 */

 void
@@ -1465,7 +1465,7 @@ hdata_free_all_plugin (struct t_weechat_plugin *plugin)
 }

 /*
- * Free all hdata.
+ * Frees all hdata.
 */

 void
@@ -1475,7 +1475,7 @@ hdata_free_all (void)
 }

 /*
- * Print variable of a hdata in WeeChat log file (callback called for each
+ * Prints variable of a hdata in WeeChat log file (callback called for each
 * variable in hdata).
 */

@@ -1501,7 +1501,7 @@ hdata_print_log_var_map_cb (void *data, struct t_hashtable *hashtable,
 }

 /*
- * Print hdata in WeeChat log file (callback called for each hdata in memory).
+ * Prints hdata in WeeChat log file (callback called for each hdata in memory).
 */

 void
@@ -1538,7 +1538,7 @@ hdata_print_log_map_cb (void *data, struct t_hashtable *hashtable,
 }

 /*
- * Print hdata in WeeChat log file (usually for crash dump).
+ * Prints hdata in WeeChat log file (usually for crash dump).
 */

 void
@@ -1548,7 +1548,7 @@ hdata_print_log (void)
 }

 /*
- * Free a hdata in hashtable "weechat_hdata".
+ * Frees a hdata in hashtable "weechat_hdata".
 */

 void
@@ -1563,7 +1563,7 @@ hdata_free_hdata_cb (struct t_hashtable *hashtable,
 }

 /*
- * Initialize hdata: creates a hashtable with hdata.
+ * Initializes hdata: creates a hashtable with hdata.
 */

 void
@@ -1578,7 +1578,7 @@ hdata_init (void)
 }

 /*
- * Free all hdata and hashtable with hdata.
+ * Frees all hdata and hashtable with hdata.
 */

 void
@@ -158,7 +158,7 @@ t_callback_hook *hook_callback_print_log[HOOK_NUM_TYPES] =


 /*
- * Initialize hooks.
+ * Initializes hooks.
 */

 void
@@ -214,9 +214,9 @@ hook_init (void)
 }

 /*
- * Search for a hook type.
+ * Searches for a hook type.
 *
- * Return index of type in enum t_hook_type, -1 if type is not found.
+ * Returns index of type in enum t_hook_type, -1 if type is not found.
 */

 int
@@ -238,7 +238,7 @@ hook_search_type (const char *type)
 }

 /*
- * Search for position of hook in list (to keep hooks sorted).
+ * Searches for position of hook in list (to keep hooks sorted).
 *
 * Hooks are sorted by priority, except commands which are sorted by command
 * name, and then priority.
@@ -283,7 +283,7 @@ hook_find_pos (struct t_hook *hook)
 }

 /*
- * Add a hook to list.
+ * Adds a hook to list.
 */

 void
@@ -330,7 +330,7 @@ hook_add_to_list (struct t_hook *new_hook)
 }

 /*
- * Remove a hook from list.
+ * Removes a hook from list.
 */

 void
@@ -366,7 +366,7 @@ hook_remove_from_list (struct t_hook *hook)
 }

 /*
- * Remove hooks marked as "deleted" from list.
+ * Removes hooks marked as "deleted" from list.
 */

 void
@@ -395,7 +395,7 @@ hook_remove_deleted (void)
 }

 /*
- * Initialize a new hook with default values.
+ * Initializes a new hook with default values.
 */

 void
@@ -426,9 +426,9 @@ hook_init_data (struct t_hook *hook, struct t_weechat_plugin *plugin,
 }

 /*
- * Check if a hook pointer is valid.
+ * Checks if a hook pointer is valid.
 *
- * Return:
+ * Returns:
 *   1: hook exists
 *   0: hook does not exist
 */
@@ -457,7 +457,7 @@ hook_valid (struct t_hook *hook)
 }

 /*
- * Start a hook exec.
+ * Starts a hook exec.
 */

 void
@@ -467,7 +467,7 @@ hook_exec_start (void)
 }

 /*
- * End a hook_exec.
+ * Ends a hook_exec.
 */

 void
@@ -481,7 +481,7 @@ hook_exec_end (void)
 }

 /*
- * Start execution of a hook callback.
+ * Starts execution of a hook callback.
 */

 void
@@ -504,7 +504,7 @@ hook_callback_start (struct t_hook *hook, struct t_hook_exec_cb *hook_exec_cb)
 }

 /*
- * End execution of a hook callback.
+ * Ends execution of a hook callback.
 */

 void
@@ -541,7 +541,7 @@ hook_callback_end (struct t_hook *hook, struct t_hook_exec_cb *hook_exec_cb)
 }

 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -553,7 +553,7 @@ hook_get_description (struct t_hook *hook)
 }

 /*
- * Set a hook property (string).
+ * Sets a hook property (string).
 */

 void
@@ -691,7 +691,7 @@ hook_schedule_clean_process (pid_t pid)
 }

 /*
- * Unhook something.
+ * Unhooks something.
 */

 void
@@ -743,7 +743,7 @@ unhook (struct t_hook *hook)
 }

 /*
- * Unhook everything for a plugin/subplugin.
+ * Unhooks everything for a plugin/subplugin.
 */

 void
@@ -773,7 +773,7 @@ unhook_all_plugin (struct t_weechat_plugin *plugin, const char *subplugin)
 }

 /*
- * Unhook everything.
+ * Unhooks everything.
 */

 void
@@ -795,7 +795,7 @@ unhook_all (void)
 }

 /*
- * Return hdata for hook.
+ * Returns hdata for hook.
 */

 struct t_hdata *
@@ -839,9 +839,9 @@ hook_hdata_hook_cb (const void *pointer, void *data, const char *hdata_name)
 }

 /*
- * Add a hook in an infolist.
+ * Adds a hook in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -890,9 +890,9 @@ hook_add_to_infolist_pointer (struct t_infolist *infolist, struct t_hook *hook)
 }

 /*
- * Add hooks of a type in an infolist.
+ * Adds hooks of a type in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -930,11 +930,11 @@ hook_add_to_infolist_type (struct t_infolist *infolist, int type,
 }

 /*
- * Add hooks in an infolist.
+ * Adds hooks in an infolist.
 *
 * Argument "arguments" can be a hook type with optional comma + name after.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -982,7 +982,7 @@ hook_add_to_infolist (struct t_infolist *infolist, struct t_hook *pointer,
 }

 /*
- * Print hooks in WeeChat log file (usually for crash dump).
+ * Prints hooks in WeeChat log file (usually for crash dump).
 */

 void
@@ -43,9 +43,9 @@ char *infolist_type_char_string[INFOLIST_NUM_TYPES] = {


 /*
- * Create a new infolist.
+ * Creates a new infolist.
 *
- * Return pointer to infolist, NULL if error.
+ * Returns pointer to infolist, NULL if error.
 */

 struct t_infolist *
@@ -74,9 +74,9 @@ infolist_new (struct t_weechat_plugin *plugin)
 }

 /*
- * Check if an infolist pointer is valid.
+ * Checks if an infolist pointer is valid.
 *
- * Return:
+ * Returns:
 *   1: infolist exists
 *   0: infolist is not found
 */
@@ -101,9 +101,9 @@ infolist_valid (struct t_infolist *infolist)
 }

 /*
- * Create a new item in an infolist.
+ * Creates a new item in an infolist.
 *
- * Return pointer to new item, NULL if error.
+ * Returns pointer to new item, NULL if error.
 */

 struct t_infolist_item *
@@ -131,9 +131,9 @@ infolist_new_item (struct t_infolist *infolist)
 }

 /*
- * Create a new integer variable in an item.
+ * Creates a new integer variable in an item.
 *
- * Return pointer to new variable, NULL if error.
+ * Returns pointer to new variable, NULL if error.
 */

 struct t_infolist_var *
@@ -168,9 +168,9 @@ infolist_new_var_integer (struct t_infolist_item *item,
 }

 /*
- * Create a new string variable in an item.
+ * Creates a new string variable in an item.
 *
- * Return pointer to new variable, NULL if error.
+ * Returns pointer to new variable, NULL if error.
 */

 struct t_infolist_var *
@@ -203,9 +203,9 @@ infolist_new_var_string (struct t_infolist_item *item,
 }

 /*
- * Create a new pointer variable in an item.
+ * Creates a new pointer variable in an item.
 *
- * Return pointer to new variable, NULL if error.
+ * Returns pointer to new variable, NULL if error.
 */

 struct t_infolist_var *
@@ -238,9 +238,9 @@ infolist_new_var_pointer (struct t_infolist_item *item,
 }

 /*
- * Create a new buffer variable in an item.
+ * Creates a new buffer variable in an item.
 *
- * Return pointer to new variable, NULL if error.
+ * Returns pointer to new variable, NULL if error.
 */

 struct t_infolist_var *
@@ -285,9 +285,9 @@ infolist_new_var_buffer (struct t_infolist_item *item,
 }

 /*
- * Create a new time variable in an item.
+ * Creates a new time variable in an item.
 *
- * Return pointer to new variable, NULL if error.
+ * Returns pointer to new variable, NULL if error.
 */

 struct t_infolist_var *
@@ -322,9 +322,9 @@ infolist_new_var_time (struct t_infolist_item *item,
 }

 /*
- * Get next item for an infolist.
+ * Gets next item for an infolist.
 *
- * If pointer is NULL, return first item of infolist.
+ * If pointer is NULL, returns first item of infolist.
 */

 struct t_infolist_item *
@@ -343,9 +343,9 @@ infolist_next (struct t_infolist *infolist)
 }

 /*
- * Get previous item for an infolist.
+ * Gets previous item for an infolist.
 *
- * If pointer is NULL, return last item of infolist.
+ * If pointer is NULL, returns last item of infolist.
 */

 struct t_infolist_item *
@@ -364,7 +364,7 @@ infolist_prev (struct t_infolist *infolist)
 }

 /*
- * Reset pointer to current item in infolist.
+ * Resets pointer to current item in infolist.
 */

 void
@@ -377,7 +377,7 @@ infolist_reset_item_cursor (struct t_infolist *infolist)
 }

 /*
- * Search for a variable in current infolist item.
+ * Searches for a variable in current infolist item.
 */

 struct t_infolist_var *
@@ -400,7 +400,7 @@ infolist_search_var (struct t_infolist *infolist, const char *name)
 }

 /*
- * Get list of fields for current infolist item.
+ * Gets list of fields for current infolist item.
 */

 const char *
@@ -434,7 +434,7 @@ infolist_fields (struct t_infolist *infolist)
 }

 /*
- * Get integer value for a variable in current infolist item.
+ * Gets integer value for a variable in current infolist item.
 */

 int
@@ -462,7 +462,7 @@ infolist_integer (struct t_infolist *infolist, const char *var)
 }

 /*
- * Get string value for a variable in current infolist item.
+ * Gets string value for a variable in current infolist item.
 */

 const char *
@@ -490,7 +490,7 @@ infolist_string (struct t_infolist *infolist, const char *var)
 }

 /*
- * Get pointer value for a variable in current infolist item.
+ * Gets pointer value for a variable in current infolist item.
 */

 void *
@@ -518,7 +518,7 @@ infolist_pointer (struct t_infolist *infolist, const char *var)
 }

 /*
- * Get buffer value for a variable in current infolist item.
+ * Gets buffer value for a variable in current infolist item.
 *
 * Argument "size" is set with the size of buffer.
 */
@@ -552,7 +552,7 @@ infolist_buffer (struct t_infolist *infolist, const char *var,
 }

 /*
- * Get time value for a variable in current infolist item.
+ * Gets time value for a variable in current infolist item.
 */

 time_t
@@ -580,7 +580,7 @@ infolist_time (struct t_infolist *infolist, const char *var)
 }

 /*
- * Free a variable in item.
+ * Frees a variable in item.
 */

 void
@@ -623,7 +623,7 @@ infolist_var_free (struct t_infolist_item *item,
 }

 /*
- * Free an item in infolist.
+ * Frees an item in infolist.
 */

 void
@@ -662,7 +662,7 @@ infolist_item_free (struct t_infolist *infolist,
 }

 /*
- * Free an infolist.
+ * Frees an infolist.
 */

 void
@@ -699,7 +699,7 @@ infolist_free (struct t_infolist *infolist)
 }

 /*
- * Free all infolists created by a plugin.
+ * Frees all infolists created by a plugin.
 */

 void
@@ -718,7 +718,7 @@ infolist_free_all_plugin (struct t_weechat_plugin *plugin)
 }

 /*
- * Print infolists in WeeChat log file (usually for crash dump).
+ * Prints infolists in WeeChat log file (usually for crash dump).
 */

 void
@@ -45,9 +45,9 @@ char **input_commands_allowed = NULL;


 /*
- * Send data to buffer input callback.
+ * Sends data to buffer input callback.
 *
- * Return the return code of buffer callback, or WEECHAT_RC_ERROR if the
+ * Returns the return code of buffer callback, or WEECHAT_RC_ERROR if the
 * buffer has no input callback.
 */

@@ -72,9 +72,9 @@ input_exec_data (struct t_gui_buffer *buffer, const char *data)
 }

 /*
- * Execute a command.
+ * Executes a command.
 *
- * Return:
+ * Returns:
 *   WEECHAT_RC_OK: command executed
 *   WEECHAT_RC_ERROR: error, command not executed
 */
@@ -228,12 +228,12 @@ end:
 }

 /*
- * Send data to a buffer's callback.
+ * Sends data to a buffer's callback.
 *
 * If split_newline = 1 and if buffer input_multiline = 0, the string
 * is split on "\n" and multiple commands can then be executed.
 *
- * Return:
+ * Returns:
 *   WEECHAT_RC_OK: data properly sent (or command executed successfully)
 *   WEECHAT_RC_ERROR: error
 */
@@ -399,12 +399,12 @@ input_data_timer_cb (const void *pointer, void *data, int remaining_calls)
 }

 /*
- * Send data to a buffer's callback with an optional delay (in milliseconds).
+ * Sends data to a buffer's callback with an optional delay (in milliseconds).
 *
 * If delay < 1, the command is executed immediately.
 * If delay >= 1, the command is scheduled for execution in this number of ms.
 *
- * Return:
+ * Returns:
 *   WEECHAT_RC_OK: data properly sent or scheduled for execution
 *   WEECHAT_RC_ERROR: error
 */
@@ -36,9 +36,9 @@


 /*
- * Create a new list.
+ * Creates a new list.
 *
- * Return pointer to new list, NULL if error.
+ * Returns pointer to new list, NULL if error.
 */

 struct t_weelist *
@@ -57,7 +57,7 @@ weelist_new (void)
 }

 /*
- * Search for position of data (to keep list sorted).
+ * Searches for position of data (to keep list sorted).
 */

 struct t_weelist_item *
@@ -79,7 +79,7 @@ weelist_find_pos (struct t_weelist *weelist, const char *data)
 }

 /*
- * Insert an element in the list (keeping list sorted).
+ * Inserts an element in the list (keeping list sorted).
 */

 void
@@ -140,9 +140,9 @@ weelist_insert (struct t_weelist *weelist, struct t_weelist_item *item,
 }

 /*
- * Create new data and add it to the list.
+ * Creates new data and add it to the list.
 *
- * Return pointer to new item, NULL if error.
+ * Returns pointer to new item, NULL if error.
 */

 struct t_weelist_item *
@@ -166,9 +166,9 @@ weelist_add (struct t_weelist *weelist, const char *data, const char *where,
 }

 /*
- * Search for data in a list (case-sensitive).
+ * Searches for data in a list (case-sensitive).
 *
- * Return pointer to item found, NULL if not found.
+ * Returns pointer to item found, NULL if not found.
 */

 struct t_weelist_item *
@@ -190,9 +190,9 @@ weelist_search (struct t_weelist *weelist, const char *data)
 }

 /*
- * Search for data in a list (case-sensitive).
+ * Searches for data in a list (case-sensitive).
 *
- * Return position of item found (>= 0), -1 if not found.
+ * Returns position of item found (>= 0), -1 if not found.
 */

 int
@@ -217,9 +217,9 @@ weelist_search_pos (struct t_weelist *weelist, const char *data)
 }

 /*
- * Search for data in a list (case-insensitive).
+ * Searches for data in a list (case-insensitive).
 *
- * Return pointer to item found, NULL if not found.
+ * Returns pointer to item found, NULL if not found.
 */

 struct t_weelist_item *
@@ -241,9 +241,9 @@ weelist_casesearch (struct t_weelist *weelist, const char *data)
 }

 /*
- * Search for data in a list (case-insensitive).
+ * Searches for data in a list (case-insensitive).
 *
- * Return position of item found (>= 0), -1 if not found.
+ * Returns position of item found (>= 0), -1 if not found.
 */

 int
@@ -268,7 +268,7 @@ weelist_casesearch_pos (struct t_weelist *weelist, const char *data)
 }

 /*
- * Get an item in a list by position (0 is first element).
+ * Gets an item in a list by position (0 is first element).
 */

 struct t_weelist_item *
@@ -294,7 +294,7 @@ weelist_get (struct t_weelist *weelist, int position)
 }

 /*
- * Set a new value for an item.
+ * Sets a new value for an item.
 */

 void
@@ -308,9 +308,9 @@ weelist_set (struct t_weelist_item *item, const char *value)
 }

 /*
- * Get next item.
+ * Gets next item.
 *
- * Return NULL if end of list has been reached.
+ * Returns NULL if end of list has been reached.
 */

 struct t_weelist_item *
@@ -323,9 +323,9 @@ weelist_next (struct t_weelist_item *item)
 }

 /*
- * Get previous item.
+ * Gets previous item.
 *
- * Return NULL if beginning of list has been reached.
+ * Returns NULL if beginning of list has been reached.
 */

 struct t_weelist_item *
@@ -338,7 +338,7 @@ weelist_prev (struct t_weelist_item *item)
 }

 /*
- * Get string pointer to item data.
+ * Gets string pointer to item data.
 */

 const char *
@@ -351,7 +351,7 @@ weelist_string (struct t_weelist_item *item)
 }

 /*
- * Get user data pointer to item data.
+ * Gets user data pointer to item data.
 */

 void *
@@ -364,7 +364,7 @@ weelist_user_data (struct t_weelist_item *item)
 }

 /*
- * Get size of list.
+ * Gets size of list.
 */

 int
@@ -377,7 +377,7 @@ weelist_size (struct t_weelist *weelist)
 }

 /*
- * Remove an item from a list.
+ * Removes an item from a list.
 */

 void
@@ -411,7 +411,7 @@ weelist_remove (struct t_weelist *weelist, struct t_weelist_item *item)
 }

 /*
- * Remove all items from a list.
+ * Removes all items from a list.
 */

 void
@@ -427,7 +427,7 @@ weelist_remove_all (struct t_weelist *weelist)
 }

 /*
- * Free a list.
+ * Frees a list.
 */

 void
@@ -441,7 +441,7 @@ weelist_free (struct t_weelist *weelist)
 }

 /*
- * Print list in WeeChat log file (usually for crash dump).
+ * Prints list in WeeChat log file (usually for crash dump).
 */

 void
@@ -54,9 +54,9 @@ int weechat_log_use_time = 1;      /* 0 to temporary disable time in log,   */


 /*
- * Open the WeeChat log file.
+ * Opens the WeeChat log file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -116,7 +116,7 @@ log_open (const char *filename, const char *mode)
 }

 /*
- * Initialize the WeeChat log file.
+ * Initializes the WeeChat log file.
 */

 void
@@ -140,7 +140,7 @@ log_init (void)
 }

 /*
- * Write a message in WeeChat log file.
+ * Writes a message in WeeChat log file.
 */

 void
@@ -193,7 +193,7 @@ log_printf (const char *message, ...)
 }

 /*
- * Dump a string as hexa data in WeeChat log file.
+ * Dumps a string as hexa data in WeeChat log file.
 */

 void
@@ -227,7 +227,7 @@ log_printf_hexa (const char *spaces, const char *string)
 }

 /*
- * Close the WeeChat log file.
+ * Closes the WeeChat log file.
 */

 void
@@ -252,7 +252,7 @@ log_close (void)
 }

 /*
- * Rename the WeeChat log file (when crashing).
+ * Renames the WeeChat log file (when crashing).
 *
 * The file "weechat.log" is renamed to "weechat_crash_YYYYMMDD_NNNN.log",
 * where YYYYMMDD is the current date and NNNN the PID of WeeChat process.
@@ -72,7 +72,7 @@ gnutls_certificate_credentials_t gnutls_xcred; /* GnuTLS client credentials */


 /*
- * Initialize gcrypt.
+ * Initializes gcrypt.
 */

 void
@@ -87,7 +87,7 @@ network_init_gcrypt (void)
 }

 /*
- * Allocate credentials structure.
+ * Allocates credentials structure.
 */

 void
@@ -101,9 +101,9 @@ network_allocate_credentials (void)
 }

 /*
- * Load system's default trusted certificate authorities.
+ * Loads system's default trusted certificate authorities.
 *
- * Return the number of certificates loaded.
+ * Returns the number of certificates loaded.
 */

 int
@@ -143,7 +143,7 @@ network_load_system_ca_file (int force_display)
 }

 /*
- * Load user's trusted certificate authorities.
+ * Loads user's trusted certificate authorities.
 */

 int
@@ -229,7 +229,7 @@ end:
 }

 /*
- * Load system's default and user's trusted certificate authorities.
+ * Loads system's default and user's trusted certificate authorities.
 */

 void
@@ -247,7 +247,7 @@ network_load_ca_files (int force_display)
 }

 /*
- * Reload system's default and user's trusted certificate authorities.
+ * Reloads system's default and user's trusted certificate authorities.
 */

 void
@@ -271,7 +271,7 @@ network_reload_ca_files (int force_display)
 }

 /*
- * Initialize GnuTLS.
+ * Initializes GnuTLS.
 */

 void
@@ -288,7 +288,7 @@ network_init_gnutls (void)
 }

 /*
- * End network.
+ * Ends network.
 */

 void
@@ -306,9 +306,9 @@ network_end (void)
 }

 /*
- * Check if a string contains a valid IP address (IPv4 or IPv6).
+ * Checks if a string contains a valid IP address (IPv4 or IPv6).
 *
- * Return:
+ * Returns:
 *   1: string is a valid IPv4 or IPv6
 *   0: string is not a valid IP address
 */
@@ -335,12 +335,12 @@ network_is_ip_address (const char *address)
 }

 /*
- * Send data on a socket with retry.
+ * Sends data on a socket with retry.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return number of bytes sent, -1 if error.
+ * Returns number of bytes sent, -1 if error.
 */

 int
@@ -367,12 +367,12 @@ network_send_with_retry (int sock, const void *buffer, int length, int flags)
 }

 /*
- * Receive data on a socket with retry.
+ * Receives data on a socket with retry.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return number of bytes received, -1 if error.
+ * Returns number of bytes received, -1 if error.
 */

 int
@@ -399,12 +399,12 @@ network_recv_with_retry (int sock, void *buffer, int length, int flags)
 }

 /*
- * Establish a connection and authenticates with a HTTP proxy.
+ * Establishes a connection and authenticates with a HTTP proxy.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -463,9 +463,9 @@ network_pass_httpproxy (struct t_proxy *proxy, int sock, const char *address,
 }

 /*
- * Resolve a hostname to its IP address (works with IPv4 and IPv6).
+ * Resolves a hostname to its IP address (works with IPv4 and IPv6).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -510,14 +510,14 @@ network_resolve (const char *hostname, char *ip, int *version)
 }

 /*
- * Establish a connection and authenticates with a socks4 proxy.
+ * Establishes a connection and authenticates with a socks4 proxy.
 *
 * The socks4 protocol is explained here: https://en.wikipedia.org/wiki/SOCKS
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -563,7 +563,7 @@ network_pass_socks4proxy (struct t_proxy *proxy, int sock, const char *address,
 }

 /*
- * Establish a connection and authenticates with a socks5 proxy.
+ * Establishes a connection and authenticates with a socks5 proxy.
 *
 * The socks5 protocol is explained in RFC 1928.
 * The socks5 authentication with username/pass is explained in RFC 1929.
@@ -571,7 +571,7 @@ network_pass_socks4proxy (struct t_proxy *proxy, int sock, const char *address,
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -734,12 +734,12 @@ network_pass_socks5proxy (struct t_proxy *proxy, int sock, const char *address,
 }

 /*
- * Establish a connection and authenticates with a proxy.
+ * Establishes a connection and authenticates with a proxy.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -772,12 +772,12 @@ network_pass_proxy (const char *proxy, int sock, const char *address, int port)
 }

 /*
- * Connect to a remote host and wait for connection if socket is non blocking.
+ * Connects to a remote host and wait for connection if socket is non blocking.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -822,12 +822,12 @@ network_connect (int sock, const struct sockaddr *addr, socklen_t addrlen)
 }

 /*
- * Connect to a remote host.
+ * Connects to a remote host.
 *
 * WARNING: this function is blocking, it must be called only in a forked
 * process.
 *
- * Return:
+ * Returns:
 *   >= 0: connected socket fd
 *     -1: error
 */
@@ -913,7 +913,7 @@ error:
 }

 /*
- * Connect to peer in a child process.
+ * Connects to peer in a child process.
 */

 void
@@ -1563,7 +1563,7 @@ network_connect_gnutls_handshake_timer_cb (const void *pointer,
 }

 /*
- * Read connection progress from child process.
+ * Reads connection progress from child process.
 */

 int
@@ -1784,7 +1784,7 @@ network_connect_child_read_cb (const void *pointer, void *data, int fd)
 }

 /*
- * Connect with fork (called by hook_connect() only!).
+ * Connects with fork (called by hook_connect() only!).
 */

 void
@@ -56,9 +56,9 @@ struct t_proxy *last_weechat_temp_proxy = NULL; /* reading configuration    */


 /*
- * Search for a proxy option.
+ * Searches for a proxy option.
 *
- * Return index of option in enum t_proxy_option, -1 if option is not found.
+ * Returns index of option in enum t_proxy_option, -1 if option is not found.
 */

 int
@@ -80,9 +80,9 @@ proxy_search_option (const char *option_name)
 }

 /*
- * Search for a proxy type.
+ * Searches for a proxy type.
 *
- * Return index of option in enum t_proxy_type, -1 if type is not found.
+ * Returns index of option in enum t_proxy_type, -1 if type is not found.
 */

 int
@@ -104,9 +104,9 @@ proxy_search_type (const char *type)
 }

 /*
- * Check if a proxy pointer is valid.
+ * Checks if a proxy pointer is valid.
 *
- * Return:
+ * Returns:
 *   1: proxy exists
 *   0: proxy does not exist
 */
@@ -131,9 +131,9 @@ proxy_valid (struct t_proxy *proxy)
 }

 /*
- * Search for a proxy by name.
+ * Searches for a proxy by name.
 *
- * Return pointer to proxy found, NULL if not found.
+ * Returns pointer to proxy found, NULL if not found.
 */

 struct t_proxy *
@@ -156,7 +156,7 @@ proxy_search (const char *name)
 }

 /*
- * Set name for a proxy.
+ * Sets name for a proxy.
 */

 void
@@ -193,9 +193,9 @@ proxy_set_name (struct t_proxy *proxy, const char *name)
 }

 /*
- * Set a property for a proxy.
+ * Sets a property for a proxy.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -246,9 +246,9 @@ proxy_set (struct t_proxy *proxy, const char *property, const char *value)
 }

 /*
- * Create an option for a proxy.
+ * Creates an option for a proxy.
 *
- * Return pointer to new option, NULL if error.
+ * Returns pointer to new option, NULL if error.
 */

 struct t_config_option *
@@ -330,7 +330,7 @@ proxy_create_option (const char *proxy_name, int index_option,
 }

 /*
- * Create an option for a temporary proxy (when reading configuration file).
+ * Creates an option for a temporary proxy (when reading configuration file).
 */

 void
@@ -347,9 +347,9 @@ proxy_create_option_temp (struct t_proxy *temp_proxy, int index_option,
 }

 /*
- * Allocate and initialize a new proxy structure.
+ * Allocates and initializes a new proxy structure.
 *
- * Return pointer to new proxy, NULL if error.
+ * Returns pointer to new proxy, NULL if error.
 */

 struct t_proxy *
@@ -374,9 +374,9 @@ proxy_alloc (const char *name)
 }

 /*
- * Add a new proxy with options.
+ * Adds a new proxy with options.
 *
- * Return pointer to new proxy, NULL if error.
+ * Returns pointer to new proxy, NULL if error.
 */

 struct t_proxy *
@@ -415,9 +415,9 @@ proxy_new_with_options (const char *name,
 }

 /*
- * Add a new proxy.
+ * Adds a new proxy.
 *
- * Return pointer to new proxy, NULL if error.
+ * Returns pointer to new proxy, NULL if error.
 */

 struct t_proxy *
@@ -470,7 +470,7 @@ proxy_new (const char *name, const char *type, const char *ipv6,
 }

 /*
- * Use temporary proxies (added by reading configuration file).
+ * Uses temporary proxies (added by reading configuration file).
 */

 void
@@ -532,7 +532,7 @@ proxy_use_temp_proxies (void)
 }

 /*
- * Free a proxy.
+ * Frees a proxy.
 */

 void
@@ -564,7 +564,7 @@ proxy_free (struct t_proxy *proxy)
 }

 /*
- * Free all proxies.
+ * Frees all proxies.
 */

 void
@@ -577,7 +577,7 @@ proxy_free_all (void)
 }

 /*
- * Return hdata for proxy.
+ * Returns hdata for proxy.
 */

 struct t_hdata *
@@ -605,9 +605,9 @@ proxy_hdata_proxy_cb (const void *pointer, void *data,
 }

 /*
- * Add a proxy in an infolist.
+ * Adds a proxy in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -645,7 +645,7 @@ proxy_add_to_infolist (struct t_infolist *infolist, struct t_proxy *proxy)
 }

 /*
- * Print proxies in WeeChat log file (usually for crash dump).
+ * Prints proxies in WeeChat log file (usually for crash dump).
 */

 void
@@ -49,7 +49,7 @@ int secure_buffer_display_values = 0;


 /*
- * Display a secured data.
+ * Displays a secured data.
 */

 void
@@ -83,7 +83,7 @@ secure_buffer_display_data (void *data,
 }

 /*
- * Display content of secured data buffer.
+ * Displays content of secured data buffer.
 */

 void
@@ -195,7 +195,7 @@ secure_buffer_close_cb (const void *pointer, void *data,
 }

 /*
- * Assign secured data buffer to pointer if it is not yet set.
+ * Assigns secured data buffer to pointer if it is not yet set.
 */

 void
@@ -213,7 +213,7 @@ secure_buffer_assign (void)
 }

 /*
- * Open a buffer to display secured data.
+ * Opens a buffer to display secured data.
 */

 void
@@ -56,7 +56,7 @@ int secure_config_loading = 0;


 /*
- * Get passphrase from user and put it in variable "secure_passphrase".
+ * Gets passphrase from user and puts it in variable "secure_passphrase".
 */

 void
@@ -103,9 +103,9 @@ secure_config_get_passphrase_from_user (const char *error)
 }

 /*
- * Get passphrase from a command.
+ * Gets passphrase from a command.
 *
- * Return passphrase from command output (only the first line with max length
+ * Returns passphrase from command output (only the first line with max length
 * of SECURE_PASSPHRASE_MAX_LENGTH chars), or NULL if error.
 *
 * Note: result must be freed after use.
@@ -144,9 +144,9 @@ secure_config_get_passphrase_from_command (const char *command)
 }

 /*
- * Reload secured data configuration file.
+ * Reloads secured data configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -212,7 +212,7 @@ secure_config_check_crypt_option_cb (const void *pointer, void *data,
 }

 /*
- * Read a data option in secured data configuration file.
+ * Reads a data option in secured data configuration file.
 */

 int
@@ -371,7 +371,7 @@ secure_config_data_read_cb (const void *pointer, void *data,
 }

 /*
- * Encrypt data and write it in secured data configuration file.
+ * Encrypts data and writes it in secured data configuration file.
 */

 void
@@ -464,7 +464,7 @@ secure_config_data_write_map_cb (void *data,
 }

 /*
- * Write already encrypted data in secured data configuration file.
+ * Writes already encrypted data in secured data configuration file.
 */

 void
@@ -484,7 +484,7 @@ secure_config_data_write_map_encrypted_cb (void *data,
 }

 /*
- * Write section "data" in secured data configuration file.
+ * Writes section "data" in secured data configuration file.
 */

 int
@@ -536,9 +536,9 @@ secure_config_data_write_cb (const void *pointer, void *data,
 }

 /*
- * Create options in secured data configuration.
+ * Creates options in secured data configuration.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -631,9 +631,9 @@ secure_config_init_options (void)
 }

 /*
- * Read secured data configuration file.
+ * Reads secured data configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_READ_OK: OK
 *   WEECHAT_CONFIG_READ_MEMORY_ERROR: not enough memory
 *   WEECHAT_CONFIG_READ_FILE_NOT_FOUND: file not found
@@ -654,9 +654,9 @@ secure_config_read (void)
 }

 /*
- * Write secured data configuration file.
+ * Writes secured data configuration file.
 *
- * Return:
+ * Returns:
 *   WEECHAT_CONFIG_WRITE_OK: OK
 *   WEECHAT_CONFIG_WRITE_ERROR: error
 *   WEECHAT_CONFIG_WRITE_MEMORY_ERROR: not enough memory
@@ -669,9 +669,9 @@ secure_config_write (void)
 }

 /*
- * Initialize secured data configuration.
+ * Initializes secured data configuration.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -693,7 +693,7 @@ secure_config_init (void)
 }

 /*
- * Free secured data file and variables.
+ * Frees secured data file and variables.
 */

 void
@@ -56,9 +56,9 @@ int secure_data_encrypted = 0;


 /*
- * Derive a key from salt + passphrase (using a hash).
+ * Derives a key from salt + passphrase (using a hash).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -101,9 +101,9 @@ secure_derive_key (const char *salt, const char *passphrase,
 }

 /*
- * Encrypt data using a hash algorithm + cipher + passphrase.
+ * Encrypts data using a hash algorithm + cipher + passphrase.
 *
- * The following actions are performed:
+ * Following actions are performed:
 *   1. derive a key from the passphrase (with optional salt)
 *   2. compute hash of data
 *   3. store hash + data in a buffer
@@ -124,7 +124,7 @@ secure_derive_key (const char *salt, const char *passphrase,
 *            \_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _/
 *                          encrypted data
 *
- * Return:
+ * Returns:
 *     0: OK
 *    -1: not enough memory
 *    -2: key derive error
@@ -260,13 +260,13 @@ encrypt_end:
 }

 /*
- * Decrypt data using a hash algorithm + cipher + passphrase.
+ * Decrypts data using a hash algorithm + cipher + passphrase.
 *
 * The buffer must contain:
 * - salt (8 bytes, used to derive a key from the passphrase)
 * - encrypted hash(data) + data
 *
- * The following actions are performed:
+ * Following actions are performed:
 *   1. check length of buffer (it must have at least salt + hash + some data)
 *   2. derive a key from the passphrase using salt (at beginning of buffer)
 *   3. decrypt hash + data in a buffer
@@ -274,7 +274,7 @@ encrypt_end:
 *   5. check that decrypted hash is equal to hash of data
 *   6. return decrypted data
 *
- * Return:
+ * Returns:
 *    0: OK
 *   -1: not enough memory
 *   -2: buffer is not long enough
@@ -410,10 +410,10 @@ decrypt_end:
 }

 /*
- * Decrypt data still encrypted (data that could not be decrypted when reading
+ * Decrypts data still encrypted (data that could not be decrypted when reading
 * secured data configuration file (because no passphrase was given).
 *
- * Return:
+ * Returns:
 *   >= 0: number of decrypted data
 *     -1: error decrypting data (bad passphrase)
 *     -2: unsupported hash algorithm
@@ -494,9 +494,9 @@ secure_decrypt_data_not_decrypted (const char *passphrase)
 }

 /*
- * Initialize secured data.
+ * Initializes secured data.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -539,7 +539,7 @@ secure_init (void)
 }

 /*
- * Free all allocated data.
+ * Frees all allocated data.
 */

 void
@@ -128,10 +128,10 @@ signal_sigusr2_cb (int signo)
 }

 /*
- * Get a signal index with a signal number; only some commonly used signal
+ * Gets a signal index with a signal number; only some commonly used signal
 * names are supported here (see declaration of signal_list[]).
 *
- * Return the index of signal in structure string_signal, -1 if not found.
+ * Returns the index of signal in structure string_signal, -1 if not found.
 */

 int
@@ -150,10 +150,10 @@ signal_search_number (int signal_number)
 }

 /*
- * Get a signal number with a name; only some commonly used signal names are
+ * Gets a signal number with a name; only some commonly used signal names are
 * supported here (see declaration of signal_list[]).
 *
- * Return the signal number, -1 if not found.
+ * Returns the signal number, -1 if not found.
 */

 int
@@ -175,7 +175,7 @@ signal_search_name (const char *name)
 }

 /*
- * Catch a system signal.
+ * Catches a system signal.
 */

 void
@@ -190,9 +190,9 @@ signal_catch (int signum, void (*handler)(int))
 }

 /*
- * Send a WeeChat signal on a system signal received.
+ * Sends a WeeChat signal on a system signal received.
 *
- * Return:
+ * Returns:
 *   WEECHAT_RC_OK: the WeeChat handler must be executed
 *   WEECHAT_RC_OK_EAT: signal eaten, the WeeChat handler must NOT be executed
 */
@@ -215,7 +215,7 @@ signal_send_to_weechat (int signal_index)
 }

 /*
- * Evaluate and execute the command bound to a signal.
+ * Evaluates and executes the command bound to a signal.
 */

 void
@@ -253,7 +253,7 @@ signal_exec_command (int signal_index, const char *command)
 }

 /*
- * Handle a specific signal received.
+ * Handles a specific signal received:
 */

 void
@@ -278,7 +278,7 @@ signal_handle_number (int signal_number, int count, const char *command)
 }

 /*
- * Handle signals received: sends WeeChat signal and execute the configured
+ * Handles signals received: sends WeeChat signal and executes the configured
 * command (is signal not eaten).
 */

@@ -312,7 +312,7 @@ signal_handle (void)
 }

 /*
- * Suspend WeeChat process.
+ * Suspends WeeChat process.
 */

 void
@@ -323,7 +323,7 @@ signal_suspend (void)
 }

 /*
- * Initialize signal.
+ * Initializes signal.
 */

 void
@@ -72,13 +72,13 @@ char **string_concat_buffer[STRING_NUM_CONCAT_BUFFERS];


 /*
- * Format a message in a string allocated by the function.
+ * Formats a message in a string allocated by the function.
 *
 * This function is defined for systems where the GNU function `asprintf()`
 * is not available.
 * The behavior is almost the same except that `*result` is set to NULL on error.
 *
- * Return the number of bytes in the resulting string, negative value in case
+ * Returns the number of bytes in the resulting string, negative value in case
 * of error.
 *
 * Value of `*result` is allocated with the result string (NULL if error),
@@ -127,7 +127,7 @@ string_asprintf (char **result, const char *fmt, ...)
 }

 /*
- * Define a "strndup" function for systems where this function does not exist
+ * Defines a "strndup" function for systems where this function does not exist
 * (FreeBSD and maybe others).
 *
 * Note: result must be freed after use.
@@ -155,7 +155,7 @@ string_strndup (const char *string, int bytes)
 }

 /*
- * Cut a string after max "length" chars, adds an optional suffix
+ * Cuts a string after max "length" chars, adds an optional suffix
 * after the string if it is cut.
 *
 * If count_suffix == 1, the length of suffix is counted in the max length.
@@ -224,7 +224,7 @@ string_cut (const char *string, int length, int count_suffix, int screen,
 }

 /*
- * Reverse a string.
+ * Reverses a string.
 *
 * Note: result must be freed after use.
 */
@@ -266,7 +266,7 @@ string_reverse (const char *string)
 }

 /*
- * Reverse a string for screen: color codes are not reversed.
+ * Reverses a string for screen: color codes are not reversed.
 * For example: reverse of "<red>test" is "test<red>" where the color code
 * "<red>" is kept as-is, so it is still valid (this is not the case with
 * function string_reverse).
@@ -328,7 +328,7 @@ string_reverse_screen (const char *string)
 }

 /*
- * Repeat a string a given number of times.
+ * Repeats a string a given number of times.
 *
 * Note: result must be freed after use.
 */
@@ -371,7 +371,7 @@ string_repeat (const char *string, int count)
 }

 /*
- * Convert string to lowercase (locale dependent).
+ * Converts string to lowercase (locale dependent).
 */

 char *
@@ -414,7 +414,7 @@ string_tolower (const char *string)
 }

 /*
- * Convert string to uppercase (locale dependent).
+ * Converts string to uppercase (locale dependent).
 */

 char *
@@ -457,7 +457,7 @@ string_toupper (const char *string)
 }

 /*
- * Convert string to lower case (using a range of chars).
+ * Converts string to lower case (using a range of chars).
 *
 * Note: result must be freed after use.
 */
@@ -489,7 +489,7 @@ string_tolower_range (const char *string, int range)
 }

 /*
- * Convert string to upper case (using a range of char).
+ * Converts string to upper case (using a range of char).
 *
 * Note: result must be freed after use.
 */
@@ -521,9 +521,9 @@ string_toupper_range (const char *string, int range)
 }

 /*
- * Compare two chars (case-sensitive).
+ * Compares two chars (case-sensitive).
 *
- * Return: arithmetic result of subtracting the first UTF-8 char in string2
+ * Returns: arithmetic result of subtracting the first UTF-8 char in string2
 * from the first UTF-8 char in string1:
 *   < 0: string1 < string2
 *     0: string1 == string2
@@ -537,9 +537,9 @@ string_charcmp (const char *string1, const char *string2)
 }

 /*
- * Compare two chars (case-insensitive).
+ * Compares two chars (case-insensitive).
 *
- * Return: arithmetic result of subtracting the first UTF-8 char in string2
+ * Returns: arithmetic result of subtracting the first UTF-8 char in string2
 * (converted to lowercase) from the first UTF-8 char in string1 (converted
 * to lowercase):
 *   < 0: string1 < string2
@@ -576,7 +576,7 @@ string_charcasecmp (const char *string1, const char *string2)
 }

 /*
- * Compare two chars (case-insensitive using a range).
+ * Compares two chars (case-insensitive using a range).
 *
 * The range is the number of chars which can be converted from upper to lower
 * case. For example 26 = all letters of alphabet, 29 = all letters + 3 chars.
@@ -587,7 +587,7 @@ string_charcasecmp (const char *string1, const char *string2)
 *   - range = 30: A-Z [ \ ] ^ ==> a-z { | } ~
 *   (ranges 29 and 30 are used by some protocols like IRC)
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase) from the last compared UTF-8 char in
 * string1 (converted to lowercase):
 *   < 0: string1 < string2
@@ -612,9 +612,9 @@ string_charcasecmp_range (const char *string1, const char *string2, int range)
 }

 /*
- * Compare two strings (case-sensitive).
+ * Compares two strings (case-sensitive).
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 from the last compared UTF-8 char in string1:
 *   < 0: string1 < string2
 *     0: string1 == string2
@@ -646,9 +646,9 @@ string_strcmp (const char *string1, const char *string2)
 }

 /*
- * Compare two strings with max length (case-sensitive).
+ * Compares two strings with max length (case-sensitive).
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 from the last compared UTF-8 char in string1:
 *   < 0: string1 < string2
 *     0: string1 == string2
@@ -685,9 +685,9 @@ string_strncmp (const char *string1, const char *string2, int max)
 }

 /*
- * Compare two strings (case-insensitive).
+ * Compares two strings (case-insensitive).
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase) from the last compared UTF-8 char in
 * string1 (converted to lowercase):
 *   < 0: string1 < string2
@@ -720,7 +720,7 @@ string_strcasecmp (const char *string1, const char *string2)
 }

 /*
- * Compare two strings (case-insensitive using a range).
+ * Compares two strings (case-insensitive using a range).
 *
 * The range is the number of chars which can be converted from upper to lower
 * case. For example 26 = all letters of alphabet, 29 = all letters + 3 chars.
@@ -731,7 +731,7 @@ string_strcasecmp (const char *string1, const char *string2)
 *   - range = 30: A-Z [ \ ] ^ ==> a-z { | } ~
 *   (ranges 29 and 30 are used by some protocols like IRC)
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase) from the last compared UTF-8 char in
 * string1 (converted to lowercase):
 *   < 0: string1 < string2
@@ -764,9 +764,9 @@ string_strcasecmp_range (const char *string1, const char *string2, int range)
 }

 /*
- * Compare two strings with max length (case-insensitive).
+ * Compares two strings with max length (case-insensitive).
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase) from the last compared UTF-8 char in
 * string1 (converted to lowercase):
 *   < 0: string1 < string2
@@ -804,7 +804,7 @@ string_strncasecmp (const char *string1, const char *string2, int max)
 }

 /*
- * Compare two strings with max length (case-insensitive using a range).
+ * Compares two strings with max length (case-insensitive using a range).
 *
 * The range is the number of chars which can be converted from upper to lower
 * case. For example 26 = all letters of alphabet, 29 = all letters + 3 chars.
@@ -815,7 +815,7 @@ string_strncasecmp (const char *string1, const char *string2, int max)
 *   - range = 30: A-Z [ \ ] ^ ==> a-z { | } ~
 *   (ranges 29 and 30 are used by some protocols like IRC)
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase) from the last compared UTF-8 char in
 * string1 (converted to lowercase):
 *   < 0: string1 < string2
@@ -854,9 +854,9 @@ string_strncasecmp_range (const char *string1, const char *string2, int max,
 }

 /*
- * Compare two strings, ignoring some chars.
+ * Compares two strings, ignoring some chars.
 *
- * Return: arithmetic result of subtracting the last compared UTF-8 char in
+ * Returns: arithmetic result of subtracting the last compared UTF-8 char in
 * string2 (converted to lowercase if case_sensitive is set to 0) from the last
 * compared UTF-8 char in string1 (converted to lowercase if case_sensitive is
 * set to 0):
@@ -923,46 +923,9 @@ string_strcmp_ignore_chars (const char *string1, const char *string2,
 }

 /*
- * Compare two memory areas of the same size in constant time.
+ * Searches for a string in another string (locale and case independent).
 *
- * Use to compare secrets (e.g. password hashes, MACs) without leaking
- * information through the comparison's running time. The loop always
- * walks the full "size" bytes and uses only bitwise operations on the
- * data, so the execution time depends on "size" alone, not on the
- * position of the first differing byte.
- *
- * If either pointer is NULL, the areas are considered different (the
- * NULL check itself is not constant time but does not look at any
- * secret content).
- *
- * Return:
- *   0: areas are equal
- *   1: areas differ
- */
-
-int
-string_memcmp_constant_time (const void *area1, const void *area2, size_t size)
-{
-    const unsigned char *p1, *p2;
-    unsigned char diff;
-    size_t i;
-
-    if (!area1 || !area2)
-        return (area1 == area2) ? 0 : 1;
-
-    p1 = (const unsigned char *)area1;
-    p2 = (const unsigned char *)area2;
-    diff = 0;
-    for (i = 0; i < size; i++)
-        diff |= p1[i] ^ p2[i];
-
-    return (diff == 0) ? 0 : 1;
-}
-
-/*
- * Search for a string in another string (locale and case independent).
- *
- * Return pointer to string found, or NULL if not found.
+ * Returns pointer to string found, or NULL if not found.
 */

 const char *
@@ -987,12 +950,12 @@ string_strcasestr (const char *string, const char *search)
 }

 /*
- * Check if a string matches a mask.
+ * Checks if a string matches a mask.
 *
 * The mask can contain wildcards ("*"), each wildcard matches 0 or more chars
 * in the string.
 *
- * Return:
+ * Returns:
 *   1: string matches mask
 *   0: string does not match mask
 */
@@ -1117,7 +1080,7 @@ string_match (const char *string, const char *mask, int case_sensitive)
 }

 /*
- * Check if a string matches a list of masks. Negative masks are allowed
+ * Checks if a string matches a list of masks. Negative masks are allowed
 * with "!mask" to exclude this mask and have higher priority than standard
 * masks.
 *
@@ -1127,7 +1090,7 @@ string_match (const char *string, const char *mask, int case_sensitive)
 * forbidden:
 *   "*", "!toto", "!abc"
 *
- * Return:
+ * Returns:
 *   1: string matches list of masks
 *   0: string does not match list of masks
 */
@@ -1159,7 +1122,7 @@ string_match_list (const char *string, const char **masks, int case_sensitive)
 }

 /*
- * Expand home in a path.
+ * Expands home in a path.
 *
 * Example: "~/file.txt" => "/home/user/file.txt"
 *
@@ -1195,7 +1158,7 @@ string_expand_home (const char *path)
 *   2. "~" by user home directory (call to string_expand_home)
 *   3. evaluated variables (see /help eval)
 *
- * Return the evaluated path, NULL if error.
+ * Returns the evaluated path, NULL if error.
 *
 * Note: result must be freed after use.
 */
@@ -1262,7 +1225,7 @@ end:
 }

 /*
- * Remove quotes at beginning/end of string (ignores spaces if there are before
+ * Removes quotes at beginning/end of string (ignores spaces if there are before
 * first quote or after last quote).
 *
 * Note: result must be freed after use.
@@ -1305,7 +1268,7 @@ string_remove_quotes (const char *string, const char *quotes)
 }

 /*
- * Strip chars at beginning/end of string.
+ * Strips chars at beginning/end of string.
 *
 * Note: result must be freed after use.
 */
@@ -1348,7 +1311,7 @@ string_strip (const char *string, int left, int right, const char *chars)
 }

 /*
- * Convert escaped chars to their values.
+ * Converts escaped chars to their values.
 *
 * Following escaped chars are supported:
 *   \"         double quote
@@ -1509,9 +1472,9 @@ string_convert_escaped_chars (const char *string)
 }

 /*
- * Check if first char of string is a whitespace (space, tab, newline or carriage return).
+ * Checks if first char of string is a whitespace (space, tab, newline or carriage return).
 *
- * Return:
+ * Returns:
 *   1: first char is whitespace
 *   0: first char is not whitespace
 */
@@ -1527,11 +1490,11 @@ string_is_whitespace_char (const char *string)
 }

 /*
- * Check if first char of string is a "word char".
+ * Checks if first char of string is a "word char".
 *
 * The word chars are customizable with options "weechat.look.word_chars_*".
 *
- * Return:
+ * Returns:
 *   1: first char is a word char
 *   0: first char is not a word char
 */
@@ -1577,12 +1540,12 @@ string_is_word_char (const char *string,
 }

 /*
- * Check if first char of string is a "word char" (for highlight).
+ * Checks if first char of string is a "word char" (for highlight).
 *
 * The word chars for highlights are customizable with option
 * "weechat.look.word_chars_highlight".
 *
- * Return:
+ * Returns:
 *   1: first char is a word char
 *   0: first char is not a word char
 */
@@ -1596,12 +1559,12 @@ string_is_word_char_highlight (const char *string)
 }

 /*
- * Check if first char of string is a "word char" (for input).
+ * Checks if first char of string is a "word char" (for input).
 *
 * The word chars for input are customizable with option
 * "weechat.look.word_chars_input".
 *
- * Return:
+ * Returns:
 *   1: first char is a word char
 *   0: first char is not a word char
 */
@@ -1615,7 +1578,7 @@ string_is_word_char_input (const char *string)
 }

 /*
- * Convert a mask (string with only "*" as wildcard) to a regex, paying
+ * Converts a mask (string with only "*" as wildcard) to a regex, paying
 * attention to special chars in a regex.
 *
 * Note: result must be freed after use.
@@ -1667,7 +1630,7 @@ string_mask_to_regex (const char *mask)
 }

 /*
- * Extract flags and regex from a string.
+ * Extracts flags and regex from a string.
 *
 * Format of flags is: (?eins-eins)string
 * Flags are:
@@ -1743,10 +1706,10 @@ string_regex_flags (const char *regex, int default_flags, int *flags)
 }

 /*
- * Compile a regex using optional flags at beginning of string (for format of
+ * Compiles a regex using optional flags at beginning of string (for format of
 * flags in regex, see string_regex_flags()).
 *
- * Return:
+ * Returns:
 *   0: successful compilation
 *   other value: compilation failed
 *
@@ -1770,9 +1733,9 @@ string_regcomp (void *preg, const char *regex, int default_flags)
 }

 /*
- * Check if a string has a highlight (using list of words to highlight).
+ * Checks if a string has a highlight (using list of words to highlight).
 *
- * Return:
+ * Returns:
 *   1: string has a highlight
 *   0: string has no highlight
 */
@@ -1877,7 +1840,7 @@ string_has_highlight (const char *string, const char *highlight_words)
 }

 /*
- * Check if a string has a highlight using a compiled regular expression (any
+ * Checks if a string has a highlight using a compiled regular expression (any
 * match in string must be surrounded by delimiters).
 */

@@ -1926,7 +1889,7 @@ string_has_highlight_regex_compiled (const char *string, regex_t *regex)
 }

 /*
- * Check if a string has a highlight using a regular expression (any match in
+ * Checks if a string has a highlight using a regular expression (any match in
 * string must be surrounded by delimiters).
 */

@@ -1950,7 +1913,7 @@ string_has_highlight_regex (const char *string, const char *regex)
 }

 /*
- * Replace a string by new one in a string.
+ * Replaces a string by new one in a string.
 *
 * Note: result must be freed after use.
 */
@@ -1965,9 +1928,6 @@ string_replace (const char *string, const char *search, const char *replace)
    if (!string || !search || !replace)
        return NULL;

-    if (!search[0])
-        return strdup (string);
-
    length1 = strlen (search);
    length2 = strlen (replace);

@@ -2180,7 +2140,7 @@ string_replace_regex_get_replace (const char *string, regmatch_t *regex_match,
 }

 /*
- * Replace text in a string using a regular expression and replacement text.
+ * Replaces text in a string using a regular expression and replacement text.
 *
 * The argument "regex" is a pointer to a regex compiled with WeeChat function
 * string_regcomp (or function regcomp).
@@ -2302,7 +2262,7 @@ string_replace_regex (const char *string, void *regex, const char *replace,
 }

 /*
- * Translate chars by other ones in a string.
+ * Translates chars by other ones in a string.
 *
 * Note: result must be freed after use.
 */
@@ -2354,7 +2314,7 @@ string_translate_chars (const char *string,
 }

 /*
- * Split a string according to separators.
+ * Splits a string according to separators.
 *
 * This function must not be called directly (call string_split or
 * string_split_shared instead).
@@ -2647,7 +2607,7 @@ error:
 }

 /*
- * Split a string according to separators.
+ * Splits a string according to separators.
 *
 * For full description, see function string_split_internal.
 */
@@ -2662,7 +2622,7 @@ string_split (const char *string, const char *separators,
 }

 /*
- * Split a string according to separators, and use shared strings for the
+ * Splits a string according to separators, and use shared strings for the
 * strings in the array returned.
 *
 * For full description, see function string_split_internal.
@@ -2678,7 +2638,7 @@ string_split_shared (const char *string, const char *separators,
 }

 /*
- * Split a string like the shell does for a command with arguments.
+ * Splits a string like the shell does for a command with arguments.
 *
 * This function is a C conversion of Python class "shlex"
 * (file: Lib/shlex.py in Python repository)
@@ -2876,7 +2836,7 @@ string_split_shell (const char *string, int *num_items)
 }

 /*
- * Free a split string.
+ * Frees a split string.
 */

 void
@@ -2893,7 +2853,7 @@ string_free_split (char **split_string)
 }

 /*
- * Free a split string (using shared strings).
+ * Frees a split string (using shared strings).
 */

 void
@@ -2910,7 +2870,7 @@ string_free_split_shared (char **split_string)
 }

 /*
- * Rebuild a split string using a delimiter and optional index of start/end
+ * Rebuilds a split string using a delimiter and optional index of start/end
 * string.
 *
 * If index_end < 0, then all arguments are used until NULL is found.
@@ -2954,7 +2914,7 @@ string_rebuild_split_string (const char **split_string,
 }

 /*
- * Split a list of commands separated by 'separator' and escaped with '\'.
+ * Splits a list of commands separated by 'separator' and escaped with '\'.
 * Empty commands are removed, spaces on the left of each commands are stripped.
 *
 * Note: result must be freed after use with function
@@ -3045,7 +3005,7 @@ string_split_command (const char *command, char separator)
 }

 /*
- * Free a command split.
+ * Frees a command split.
 */

 void
@@ -3062,7 +3022,7 @@ string_free_split_command (char **split_command)
 }

 /*
- * Split tags in an array of tags.
+ * Splits tags in an array of tags.
 *
 * The format of tags is a list of tags separated by commas (logical OR),
 * and for each item, multiple tags can be separated by "+" (logical AND).
@@ -3114,7 +3074,7 @@ string_split_tags (const char *tags, int *num_tags)
 }

 /*
- * Free tags split.
+ * Frees tags split.
 */

 void
@@ -3131,7 +3091,7 @@ string_free_split_tags (char ***split_tags)
 }

 /*
- * Convert a string to another charset.
+ * Converts a string to another charset.
 *
 * Note: result must be freed after use.
 */
@@ -3247,7 +3207,7 @@ string_iconv (int from_utf8, const char *from_code, const char *to_code,
 }

 /*
- * Convert a string to WeeChat internal storage charset (UTF-8).
+ * Converts a string to WeeChat internal storage charset (UTF-8).
 *
 * Note: result must be freed after use.
 */
@@ -3287,7 +3247,7 @@ string_iconv_to_internal (const char *charset, const char *string)
 }

 /*
- * Convert internal string to terminal charset, for display or write of
+ * Converts internal string to terminal charset, for display or write of
 * configuration files.
 *
 * Note: result must be freed after use.
@@ -3329,9 +3289,9 @@ string_iconv_from_internal (const char *charset, const char *string)
 }

 /*
- * Encode a string to terminal charset and calls fprintf.
+ * Encodes a string to terminal charset and calls fprintf.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -3361,7 +3321,7 @@ string_fprintf (FILE *file, const char *data, ...)
 }

 /*
- * Format a string with size and unit name (bytes, KB, MB, GB).
+ * Formats a string with size and unit name (bytes, KB, MB, GB).
 *
 * Note: result must be freed after use.
 */
@@ -3415,7 +3375,7 @@ string_format_size (unsigned long long size)
 }

 /*
- * Parse a string with a size and return the size in bytes.
+ * Parses a string with a size and returns the size in bytes.
 *
 * The format is "123" or "123x" or "123 x"  where "123" is any positive
 * integer number and "x" the unit, which can be one of (lower or upper case
@@ -3427,7 +3387,7 @@ string_format_size (unsigned long long size)
 *   g  gigabytes (1g = 1000m = 1,000,000,000 bytes)
 *   t  terabytes (1t = 1000g = 1,000,000,000,000 bytes)
 *
- * Return the parsed size, 0 if error.
+ * Returns the parsed size, 0 if error.
 */

 unsigned long long
@@ -3505,12 +3465,12 @@ end:
 }

 /*
- * Encode a string in base16 (hexadecimal).
+ * Encodes a string in base16 (hexadecimal).
 *
 * Argument "length" is number of bytes in "from" to convert (commonly
 * strlen(from)).
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3536,9 +3496,9 @@ string_base16_encode (const char *from, int length, char *to)
 }

 /*
- * Decode a base16 string (hexadecimal).
+ * Decodes a base16 string (hexadecimal).
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3583,7 +3543,7 @@ string_base16_decode (const char *from, char *to)
 }

 /*
- * Encode a string in base32.
+ * Encodes a string in base32.
 *
 * Argument "length" is number of bytes in "from" to convert (commonly
 * strlen(from)).
@@ -3608,7 +3568,7 @@ string_base16_decode (const char *from, char *to)
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3664,7 +3624,7 @@ string_base32_encode (const char *from, int length, char *to)
 }

 /*
- * Decode a base32 string.
+ * Decodes a base32 string.
 *
 * This function is inspired by:
 *   https://github.com/google/google-authenticator-libpam/blob/master/src/base32.c
@@ -3687,7 +3647,7 @@ string_base32_encode (const char *from, int length, char *to)
 *   limitations under the License.
 *
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3744,7 +3704,7 @@ string_base32_decode (const char *from, char *to)
 }

 /*
- * Convert 3 bytes of 8 bits in 4 bytes of 6 bits.
+ * Converts 3 bytes of 8 bits in 4 bytes of 6 bits.
 */

 void
@@ -3765,7 +3725,7 @@ string_convbase64_8x3_to_6x4 (int url, const char *from, char *to)
 }

 /*
- * Encode a string in base64.
+ * Encodes a string in base64.
 *
 * If url == 1, base64url is decoded, otherwise standard base64.
 *
@@ -3777,7 +3737,7 @@ string_convbase64_8x3_to_6x4 (int url, const char *from, char *to)
 * Argument "length" is number of bytes in "from" to convert (commonly
 * strlen(from)).
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3842,7 +3802,7 @@ string_base64_encode (int url, const char *from, int length, char *to)
 }

 /*
- * Convert 4 bytes of 6 bits to 3 bytes of 8 bits.
+ * Converts 4 bytes of 6 bits to 3 bytes of 8 bits.
 */

 void
@@ -3854,7 +3814,7 @@ string_convbase64_6x4_to_8x3 (const unsigned char *from, unsigned char *to)
 }

 /*
- * Decode a base64 string.
+ * Decodes a base64 string.
 *
 * If url == 1, base64url is decoded, otherwise standard base64.
 *
@@ -3863,7 +3823,7 @@ string_convbase64_6x4_to_8x3 (const unsigned char *from, unsigned char *to)
 *   "/" --> “_” (underline)
 *   no padding char ("=")
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3932,14 +3892,14 @@ string_base64_decode (int url, const char *from, char *to)
 }

 /*
- * Encode a string, according to "base" parameter:
+ * Encodes a string, according to "base" parameter:
 *   - "16": base16
 *   - "32": base32
 *   - "64": base64
 *   - "64url": base64url: same as base64 with no padding ("="), chars replaced:
 *              “+” --> “-” and "/" --> “_”
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3965,14 +3925,14 @@ string_base_encode (const char *base, const char *from, int length, char *to)
 }

 /*
- * Decode a string, according to "base" parameter:
+ * Decodes a string, according to "base" parameter:
 *   - "16": base16
 *   - "32": base32
 *   - "64": base64
 *   - "64url": base64url: same as base64 with no padding ("="), chars replaced:
 *              “+” --> “-” and "/" --> “_”
 *
- * Return length of string in "*to" (it does not count final \0),
+ * Returns length of string in "*to" (it does not count final \0),
 * -1 if error.
 */

@@ -3998,7 +3958,7 @@ string_base_decode (const char *base, const char *from, char *to)
 }

 /*
- * Dump a data buffer as hexadecimal + ascii.
+ * Dumps a data buffer as hexadecimal + ascii.
 *
 * Note: result must be freed after use.
 */
@@ -4099,9 +4059,9 @@ end:
 }

 /*
- * Check if a string is a command.
+ * Checks if a string is a command.
 *
- * Return:
+ * Returns:
 *   1: first char of string is a command char
 *   0: string is not a command
 */
@@ -4132,9 +4092,9 @@ string_is_command_char (const char *string)
 }

 /*
- * Get pointer to input text for buffer.
+ * Gets pointer to input text for buffer.
 *
- * Return pointer inside "string" argument or NULL if it's a command (by
+ * Returns pointer inside "string" argument or NULL if it's a command (by
 * default a command starts with a single '/').
 */

@@ -4199,7 +4159,7 @@ string_input_for_buffer (const char *string)
 }

 /*
- * Return the number of bytes in common between two strings (this function
+ * Returns the number of bytes in common between two strings (this function
 * works with bytes and not UTF-8 chars).
 */

@@ -4224,7 +4184,7 @@ string_get_common_bytes_count (const char *string1, const char *string2)
 }

 /*
- * Return the distance between two strings using the Levenshtein algorithm.
+ * Returns the distance between two strings using the Levenshtein algorithm.
 * See: https://en.wikipedia.org/wiki/Levenshtein_distance
 */

@@ -4284,7 +4244,7 @@ string_levenshtein (const char *string1, const char *string2,
 }

 /*
- * Replace ${vars} using a callback that return replacement value (this value
+ * Replaces ${vars} using a callback that returns replacement value (this value
 * must be newly allocated because it will be freed in this function).
 *
 * Nested variables are supported, for example: "${var1:${var2}}".
@@ -4465,7 +4425,7 @@ string_replace_with_callback (const char *string,
 }

 /*
- * Extract priority and name from a string.
+ * Extracts priority and name from a string.
 *
 * String can be:
 *   - a simple name like "test":
@@ -4511,10 +4471,10 @@ string_get_priority_and_name (const char *string,
 }

 /*
- * Hash a shared string.
+ * Hashes a shared string.
 * The string starts after the reference count, which is skipped.
 *
- * Return the hash of the shared string (variant of djb2).
+ * Returns the hash of the shared string (variant of djb2).
 */

 unsigned long long
@@ -4528,10 +4488,10 @@ string_shared_hash_key (struct t_hashtable *hashtable,
 }

 /*
- * Compare two shared strings.
+ * Compares two shared strings.
 * Each string starts after the reference count, which is skipped.
 *
- * Return:
+ * Returns:
 *   < 0: key1 < key2
 *     0: key1 == key2
 *   > 0: key1 > key2
@@ -4549,7 +4509,7 @@ string_shared_keycmp (struct t_hashtable *hashtable,
 }

 /*
- * Free a shared string.
+ * Frees a shared string.
 */

 void
@@ -4562,7 +4522,7 @@ string_shared_free_key (struct t_hashtable *hashtable, void *key)
 }

 /*
- * Get a pointer to a shared string.
+ * Gets a pointer to a shared string.
 *
 * A shared string is an entry in the hashtable "string_hashtable_shared", with:
 * - key: reference count (unsigned integer on 32 bits) + string
@@ -4571,7 +4531,7 @@ string_shared_free_key (struct t_hashtable *hashtable, void *key)
 * The initial reference count is set to 1 and is incremented each time this
 * function is called for a same string (string content, not the pointer).
 *
- * Return the pointer to the shared string (start of string in key, after the
+ * Returns the pointer to the shared string (start of string in key, after the
 * reference count), NULL if error.
 * The string returned has exactly same content as string received in argument,
 * but the pointer to the string is different.
@@ -4637,7 +4597,7 @@ string_shared_get (const char *string)
 }

 /*
- * Free a shared string.
+ * Frees a shared string.
 *
 * The reference count of the string is decremented. If it becomes 0, then the
 * shared string is removed from the hashtable (and then the string is really
@@ -4661,12 +4621,12 @@ string_shared_free (const char *string)
 }

 /*
- * Allocate a dynamic string (with a variable length).
+ * Allocates a dynamic string (with a variable length).
 *
 * The parameter size_alloc is the initial allocated size, which must be
 * greater than zero.
 *
- * Return the pointer to the allocated string, which is initialized as empty
+ * Returns the pointer to the allocated string, which is initialized as empty
 * string.
 *
 * The string returned can be used with following restrictions:
@@ -4707,14 +4667,14 @@ string_dyn_alloc (int size_alloc)
 }

 /*
- * Copy "new_string" into a dynamic string and replaces its current content
+ * Copies "new_string" into a dynamic string and replaces its current content
 * (adjusts its size accordingly).
 *
 * The string pointer (*string) is updated with the new allocated string
 * if the string had to be extended, or the same pointer if there was enough
 * size to copy the new string.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -4758,7 +4718,7 @@ string_dyn_copy (char **string, const char *new_string)
 }

 /*
- * Concatenate a string to a dynamic string and adjusts its size accordingly.
+ * Concatenates a string to a dynamic string and adjusts its size accordingly.
 *
 * The parameter "bytes" is the max number of bytes to concatenate
 * (a terminating null byte '\0' is automatically added); value -1 means
@@ -4768,7 +4728,7 @@ string_dyn_copy (char **string, const char *new_string)
 * if the string had to be extended, or the same pointer if there was enough
 * size to concatenate the new string.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -4823,7 +4783,7 @@ string_dyn_concat (char **string, const char *add, int bytes)
 }

 /*
- * Free a dynamic string.
+ * Frees a dynamic string.
 *
 * The argument "string" is a pointer on a string returned by function
 * string_dyn_alloc or a string pointer modified by string_dyn_concat.
@@ -4835,7 +4795,7 @@ string_dyn_concat (char **string, const char *add, int bytes)
 * Be careful, the pointer in *string may change after this call because
 * the string can be reallocated to its exact size.
 *
- * Return the pointer to the string if "free_string" is 0 (string
+ * Returns the pointer to the string if "free_string" is 0 (string
 * pointer is still valid), or NULL if "free_string" is 1 (string
 * has been freed).
 */
@@ -4875,7 +4835,7 @@ string_dyn_free (char **string, int free_string)
 }

 /*
- * Concatenate strings, using a separator (which can be NULL or empty string
+ * Concatenates strings, using a separator (which can be NULL or empty string
 * to not use any separator).
 *
 * Last argument must be NULL to terminate the variable list of arguments.
@@ -4922,7 +4882,7 @@ string_concat (const char *separator, ...)
 }

 /*
- * Initialize string.
+ * Initializes string.
 */

 void
@@ -4937,7 +4897,7 @@ string_init (void)
 }

 /*
- * Free all allocated data.
+ * Frees all allocated data.
 */

 void
@@ -69,8 +69,6 @@ extern int string_strcmp_ignore_chars (const char *string1,
                                       const char *string2,
                                       const char *chars_ignored,
                                       int case_sensitive);
-extern int string_memcmp_constant_time (const void *area1, const void *area2,
-                                        size_t size);
 extern const char *string_strcasestr (const char *string, const char *search);
 extern int string_match (const char *string, const char *mask,
                         int case_sensitive);
@@ -104,7 +104,7 @@ struct t_rlimit_resource rlimit_resource[] =


 /*
- * Set resource limit.
+ * Sets resource limit.
 */

 #ifdef HAVE_SYS_RESOURCE_H
@@ -174,7 +174,7 @@ sys_setrlimit_resource (const char *resource_name, long long limit)
 #endif /* HAVE_SYS_RESOURCE_H */

 /*
- * Set resource limits using value of option "weechat.startup.sys_rlimit".
+ * Sets resource limits using value of option "weechat.startup.sys_rlimit".
 */

 void
@@ -220,7 +220,7 @@ sys_setrlimit (void)
 }

 /*
- * Display resource limits.
+ * Displays resource limits.
 */

 void
@@ -278,7 +278,7 @@ sys_display_rlimit (void)
 }

 /*
- * Display resource usage.
+ * Displays resource usage.
 */

 void
@@ -346,7 +346,7 @@ sys_display_rusage (void)
 }

 /*
- * Call waitpid() to acknowledge the end of forked processes, thus preventing
+ * Calls waitpid() to acknowledge the end of forked processes, thus preventing
 * them to become zombies.
 */

@@ -48,7 +48,7 @@ struct t_upgrade_file *last_upgrade_file = NULL;


 /*
- * Display an error with upgrade.
+ * Displays an error with upgrade.
 */

 void
@@ -85,9 +85,9 @@ upgrade_file_error (struct t_upgrade_file *upgrade_file, char *message1,
 }

 /*
- * Write an integer value in upgrade file.
+ * Writes an integer value in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -102,9 +102,9 @@ upgrade_file_write_integer (struct t_upgrade_file *upgrade_file, int value)
 }

 /*
- * Write a time value in upgrade file.
+ * Writes a time value in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -119,9 +119,9 @@ upgrade_file_write_time (struct t_upgrade_file *upgrade_file, time_t date)
 }

 /*
- * Write a string in upgrade file.
+ * Writes a string in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -150,9 +150,9 @@ upgrade_file_write_string (struct t_upgrade_file *upgrade_file,
 }

 /*
- * Write a buffer in upgrade file.
+ * Writes a buffer in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -178,11 +178,11 @@ upgrade_file_write_buffer (struct t_upgrade_file *upgrade_file, void *pointer,
 }

 /*
- * Create an upgrade file.
+ * Creates an upgrade file.
 *
 * If write == 1, then opens in write mode, otherwise in read mode.
 *
- * Return pointer to new upgrade file, NULL if error.
+ * Returns pointer to new upgrade file, NULL if error.
 */

 struct t_upgrade_file *
@@ -255,9 +255,9 @@ upgrade_file_new (const char *filename,
 }

 /*
- * Write an object in upgrade file.
+ * Writes an object in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -414,9 +414,9 @@ upgrade_file_write_object (struct t_upgrade_file *upgrade_file, int object_id,
 }

 /*
- * Read an integer in upgrade file.
+ * Reads an integer in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -441,9 +441,9 @@ upgrade_file_read_integer (struct t_upgrade_file *upgrade_file, int *value)
 }

 /*
- * Read a string in upgrade file.
+ * Reads a string in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -491,9 +491,9 @@ upgrade_file_read_string (struct t_upgrade_file *upgrade_file, char **string)
 }

 /*
- * Read a buffer in upgrade file.
+ * Reads a buffer in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -537,9 +537,9 @@ upgrade_file_read_buffer (struct t_upgrade_file *upgrade_file,
 }

 /*
- * Read time in upgrade file.
+ * Reads time in upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -565,9 +565,9 @@ upgrade_file_read_time (struct t_upgrade_file *upgrade_file, time_t *time)
 }

 /*
- * Read an object in upgrade file and calls read callback.
+ * Reads an object in upgrade file and calls read callback.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -600,7 +600,7 @@ upgrade_file_read_object (struct t_upgrade_file *upgrade_file)

    if (type != UPGRADE_TYPE_OBJECT_START)
    {
-        UPGRADE_ERROR(_("read - bad object type (\"object start\" expected)"), "");
+        UPGRADE_ERROR(_("read - bad object type ('object start' expected)"), "");
        goto end;
    }

@@ -716,9 +716,9 @@ end:
 }

 /*
- * Read an upgrade file.
+ * Reads an upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -758,7 +758,7 @@ upgrade_file_read (struct t_upgrade_file *upgrade_file)
 }

 /*
- * Close and frees an upgrade file.
+ * Closes and frees an upgrade file.
 */

 void
@@ -59,10 +59,10 @@ struct t_gui_layout *upgrade_layout = NULL;


 /*
- * Save history in WeeChat upgrade file (from last to first, to restore it in
+ * Saves history in WeeChat upgrade file (from last to first, to restore it in
 * good order).
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -113,9 +113,9 @@ upgrade_weechat_save_history (struct t_upgrade_file *upgrade_file,
 }

 /*
- * Save buffers in WeeChat upgrade file.
+ * Saves buffers in WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -202,9 +202,9 @@ upgrade_weechat_save_buffers (struct t_upgrade_file *upgrade_file)
 }

 /*
- * Save miscellaneous info in WeeChat upgrade file.
+ * Saves miscellaneous info in WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -251,9 +251,9 @@ upgrade_weechat_save_misc (struct t_upgrade_file *upgrade_file)
 }

 /*
- * Save hotlist in WeeChat upgrade file.
+ * Saves hotlist in WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -288,9 +288,9 @@ upgrade_weechat_save_hotlist (struct t_upgrade_file *upgrade_file)
 }

 /*
- * Save tree with layout for windows in WeeChat upgrade file.
+ * Saves tree with layout for windows in WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -338,9 +338,9 @@ upgrade_weechat_save_layout_window_tree (struct t_upgrade_file *upgrade_file,
 }

 /*
- * Save layout for windows in WeeChat upgrade file.
+ * Saves layout for windows in WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -370,9 +370,9 @@ upgrade_weechat_save_layout_window (struct t_upgrade_file *upgrade_file)
 }

 /*
- * Save WeeChat upgrade file.
+ * Saves WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -401,7 +401,7 @@ upgrade_weechat_save (void)
 }

 /*
- * Read a buffer from infolist.
+ * Reads a buffer from infolist.
 */

 void
@@ -647,7 +647,7 @@ upgrade_weechat_read_buffer (struct t_infolist *infolist)
 }

 /*
- * Read a buffer line from infolist.
+ * Reads a buffer line from infolist.
 */

 void
@@ -704,7 +704,7 @@ upgrade_weechat_read_buffer_line (struct t_infolist *infolist)
 }

 /*
- * Read a nicklist from infolist.
+ * Reads a nicklist from infolist.
 */

 void
@@ -781,7 +781,7 @@ upgrade_weechat_read_nicklist (struct t_infolist *infolist)
 }

 /*
- * Read hotlist from infolist.
+ * Reads hotlist from infolist.
 */

 void
@@ -832,7 +832,7 @@ upgrade_weechat_read_hotlist (struct t_infolist *infolist)
 }

 /*
- * Read WeeChat upgrade file.
+ * Reads WeeChat upgrade file.
 */

 int
@@ -898,9 +898,9 @@ upgrade_weechat_read_cb (const void *pointer, void *data,
 }

 /*
- * Load WeeChat upgrade file.
+ * Loads WeeChat upgrade file.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -956,7 +956,7 @@ upgrade_weechat_load (void)
 }

 /*
- * Remove a .upgrade file (callback called for each .upgrade file in WeeChat
+ * Removes a .upgrade file (callback called for each .upgrade file in WeeChat
 * home directory).
 */

@@ -975,7 +975,7 @@ upgrade_weechat_remove_file_cb (void *data, const char *filename)
 }

 /*
- * Remove *.upgrade files after upgrade and send signal "weechat_upgrade_done".
+ * Removes *.upgrade files after upgrade and send signal "weechat_upgrade_done".
 */

 void
@@ -89,14 +89,12 @@ struct t_url_constant url_protocols[] =
    URL_DEF_CONST(PROTO, SMTP),
    URL_DEF_CONST(PROTO, SMTPS),
    URL_DEF_CONST(PROTO, RTSP),
-#if LIBCURL_VERSION_NUM < 0x081400 /* < 8.20.0 */
    URL_DEF_CONST(PROTO, RTMP),
    URL_DEF_CONST(PROTO, RTMPT),
    URL_DEF_CONST(PROTO, RTMPE),
    URL_DEF_CONST(PROTO, RTMPTE),
    URL_DEF_CONST(PROTO, RTMPS),
    URL_DEF_CONST(PROTO, RTMPTS),
-#endif
    URL_DEF_CONST(PROTO, GOPHER),
    URL_DEF_CONST(PROTO, SMB),
    URL_DEF_CONST(PROTO, SMBS),
@@ -125,9 +123,7 @@ struct t_url_constant url_auth[] =
    URL_DEF_CONST(AUTH, NTLM),
    URL_DEF_CONST(AUTH, ANY),
    URL_DEF_CONST(AUTH, ANYSAFE),
-#if LIBCURL_VERSION_NUM < 0x081500 /* < 8.21.0 */
    URL_DEF_CONST(AUTH, DIGEST_IE),
-#endif
    URL_DEF_CONST(AUTH, ONLY),
 #if LIBCURL_VERSION_NUM < 0x080800 /* < 8.8.0 */
    URL_DEF_CONST(AUTH, NTLM_WB),
@@ -685,9 +681,9 @@ struct t_url_option url_options[] =


 /*
- * Search for a constant in array of constants.
+ * Searches for a constant in array of constants.
 *
- * Return index of constant, -1 if not found.
+ * Returns index of constant, -1 if not found.
 */

 int
@@ -711,7 +707,7 @@ weeurl_search_constant (struct t_url_constant *constants, const char *name)
 }

 /*
- * Get value of mask using constants.
+ * Gets value of mask using constants.
 *
 * Argument "string_mask" has format: "const1+const2+const3".
 */
@@ -754,9 +750,9 @@ weeurl_get_mask_value (struct t_url_constant *constants,
 }

 /*
- * Search for an URL option in table of options.
+ * Searches for an URL option in table of options.
 *
- * Return index of option, -1 if not found.
+ * Returns index of option, -1 if not found.
 */

 int
@@ -780,7 +776,7 @@ weeurl_search_option (const char *name)
 }

 /*
- * Read data from a file (callback called to read a file).
+ * Reads data from a file (callback called to read a file).
 */

 size_t
@@ -790,7 +786,7 @@ weeurl_read_stream (void *buffer, size_t size, size_t nmemb, void *stream)
 }

 /*
- * Write data in a file (callback called to write a file).
+ * Writes data in a file (callback called to write a file).
 */

 size_t
@@ -800,7 +796,7 @@ weeurl_write_stream (void *buffer, size_t size, size_t nmemb, void *stream)
 }

 /*
- * Add data to a dynamic string (callback called to catch stdout).
+ * Adds data to a dynamic string (callback called to catch stdout).
 */

 size_t
@@ -815,7 +811,7 @@ weeurl_write_string (void *buffer, size_t size, size_t nmemb, void *string)
 }

 /*
- * Set option in CURL easy handle (callback called for each option in hashtable
+ * Sets option in CURL easy handle (callback called for each option in hashtable
 * "options").
 */

@@ -922,7 +918,7 @@ weeurl_option_map_cb (void *data,
 }

 /*
- * Set proxy in CURL easy handle.
+ * Sets proxy in CURL easy handle.
 */

 void
@@ -970,7 +966,7 @@ weeurl_set_proxy (CURL *curl, struct t_proxy *proxy)
 }

 /*
- * Download URL using options.
+ * Downloads URL using options.
 *
 * If output is not NULL, it must be a hashtable with keys and values of type
 * "string". The following keys may be added in the hashtable,
@@ -984,7 +980,7 @@ weeurl_set_proxy (CURL *curl, struct t_proxy *proxy)
 *   error         | error message (set only in case of error)
 *
 * If timeout is 0, the function blocks until the end of the transfer.
- * If timeout (in milliseconds) is > 0, the function return an error in the
+ * If timeout (in milliseconds) is > 0, the function returns an error in the
 * output hashtable if the timeout is reached while the transfer is still
 * active.
 *
@@ -992,7 +988,7 @@ weeurl_set_proxy (CURL *curl, struct t_proxy *proxy)
 * pointed integer becomes different from 0 (set by the caller of this function),
 * the download is immediately stopped with an error.
 *
- * Return:
+ * Returns:
 *   0: OK
 *   1: invalid URL
 *   2: error downloading URL
@@ -1263,9 +1259,9 @@ end:
 }

 /*
- * Add an URL option in an infolist.
+ * Adds an URL option in an infolist.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1321,7 +1317,7 @@ weeurl_option_add_to_infolist (struct t_infolist *infolist,
 }

 /*
- * Initialize URL.
+ * Initializes URL.
 */

 void
@@ -1331,7 +1327,7 @@ weeurl_init (void)
 }

 /*
- * End URL.
+ * Ends URL.
 */

 void
@@ -44,7 +44,7 @@ int local_utf8 = 0;


 /*
- * Initialize UTF-8 in WeeChat.
+ * Initializes UTF-8 in WeeChat.
 */

 void
@@ -54,9 +54,9 @@ utf8_init (void)
 }

 /*
- * Check if a string has some 8-bit chars.
+ * Checks if a string has some 8-bit chars.
 *
- * Return:
+ * Returns:
 *   1: string has 8-bit chars
 *   0: string has only 7-bit chars
 */
@@ -74,12 +74,12 @@ utf8_has_8bits (const char *string)
 }

 /*
- * Check if a string is UTF-8 valid.
+ * Checks if a string is UTF-8 valid.
 *
 * If length is <= 0, checks whole string.
 * If length is > 0, checks only this number of chars (not bytes).
 *
- * Return:
+ * Returns:
 *   1: string is UTF-8 valid
 *   0: string it not UTF-8 valid, and then if error is not NULL, it is set
 *      with first non valid UTF-8 char in string
@@ -167,7 +167,7 @@ invalid:
 }

 /*
- * Normalize an string: removes non UTF-8 chars and replaces them by a
+ * Normalizes an string: removes non UTF-8 chars and replaces them by a
 * "replacement" char.
 */

@@ -186,9 +186,9 @@ utf8_normalize (char *string, char replacement)
 }

 /*
- * Get pointer to previous UTF-8 char in a string.
+ * Gets pointer to previous UTF-8 char in a string.
 *
- * Return pointer to previous UTF-8 char, NULL if not found (for example
+ * Returns pointer to previous UTF-8 char, NULL if not found (for example
 * "string_start" was reached).
 */

@@ -234,9 +234,9 @@ utf8_prev_char (const char *string_start, const char *string)
 }

 /*
- * Get pointer to next UTF-8 char in a string.
+ * Gets pointer to next UTF-8 char in a string.
 *
- * Return pointer to next UTF-8 char, NULL if string was NULL.
+ * Returns pointer to next UTF-8 char, NULL if string was NULL.
 */

 const char *
@@ -277,9 +277,9 @@ utf8_next_char (const char *string)
 }

 /*
- * Get pointer to the beginning of the UTF-8 line in a string.
+ * Gets pointer to the beginning of the UTF-8 line in a string.
 *
- * Return pointer to the beginning of the UTF-8 line, NULL if string was NULL.
+ * Returns pointer to the beginning of the UTF-8 line, NULL if string was NULL.
 */

 const char *
@@ -300,9 +300,9 @@ utf8_beginning_of_line (const char *string_start, const char *string)
 }

 /*
- * Get pointer to the end of the UTF-8 line in a string.
+ * Gets pointer to the end of the UTF-8 line in a string.
 *
- * Return pointer to the end of the UTF-8 line, NULL if string was NULL.
+ * Returns pointer to the end of the UTF-8 line, NULL if string was NULL.
 */

 const char *
@@ -320,9 +320,9 @@ utf8_end_of_line (const char *string)
 }

 /*
- * Get UTF-8 char as an integer.
+ * Gets UTF-8 char as an integer.
 *
- * Return the UTF-8 char as integer number.
+ * Returns the UTF-8 char as integer number.
 */

 int
@@ -377,7 +377,7 @@ utf8_char_int (const char *string)
 }

 /*
- * Convert a unicode char (as unsigned integer) to a string.
+ * Converts a unicode char (as unsigned integer) to a string.
 *
 * The string must have a size >= 5
 * (4 bytes for the UTF-8 char + the final '\0').
@@ -385,7 +385,7 @@ utf8_char_int (const char *string)
 * In case of error (if unicode value is > 0x1FFFFF), the string is set to an
 * empty string (string[0] == '\0').
 *
- * Return the number of bytes in the UTF-8 char (not counting the final '\0').
+ * Returns the number of bytes in the UTF-8 char (not counting the final '\0').
 */

 int
@@ -443,9 +443,9 @@ utf8_int_string (unsigned int unicode_value, char *string)
 }

 /*
- * Get size of UTF-8 char (in bytes).
+ * Gets size of UTF-8 char (in bytes).
 *
- * Return an integer between 0 and 4.
+ * Returns an integer between 0 and 4.
 */

 int
@@ -464,10 +464,10 @@ utf8_char_size (const char *string)
 }

 /*
- * Get length of an UTF-8 string in number of chars (not bytes).
+ * Gets length of an UTF-8 string in number of chars (not bytes).
 * Result is <= strlen (string).
 *
- * Return length of string (>= 0).
+ * Returns length of string (>= 0).
 */

 int
@@ -488,9 +488,9 @@ utf8_strlen (const char *string)
 }

 /*
- * Get length of an UTF-8 string for N bytes max in string.
+ * Gets length of an UTF-8 string for N bytes max in string.
 *
- * Return length of string (>= 0).
+ * Returns length of string (>= 0).
 */

 int
@@ -513,9 +513,9 @@ utf8_strnlen (const char *string, int bytes)
 }

 /*
- * Get number of chars needed on screen to display the UTF-8 char.
+ * Gets number of chars needed on screen to display the UTF-8 char.
 *
- * Return the number of chars (>= 0).
+ * Returns the number of chars (>= 0).
 */

 int
@@ -552,9 +552,9 @@ utf8_char_size_screen (const char *string)
 }

 /*
- * Get number of chars needed on screen to display the UTF-8 string.
+ * Gets number of chars needed on screen to display the UTF-8 string.
 *
- * Return the number of chars (>= 0).
+ * Returns the number of chars (>= 0).
 */

 int
@@ -584,9 +584,9 @@ utf8_strlen_screen (const char *string)
 }

 /*
- * Move forward N chars in an UTF-8 string.
+ * Moves forward N chars in an UTF-8 string.
 *
- * Return pointer to the new position in string.
+ * Returns pointer to the new position in string.
 */

 const char *
@@ -604,13 +604,13 @@ utf8_add_offset (const char *string, int offset)
 }

 /*
- * Get real position in UTF-8 string, in bytes.
+ * Gets real position in UTF-8 string, in bytes.
 *
 * Argument "pos" is a number of chars (not bytes).
 *
- * Example: ("déca", 2) return 3.
+ * Example: ("déca", 2) returns 3.
 *
- * Return the real position (>= 0).
+ * Returns the real position (>= 0).
 */

 int
@@ -635,13 +635,13 @@ utf8_real_pos (const char *string, int pos)
 }

 /*
- * Get position in UTF-8 string, in chars.
+ * Gets position in UTF-8 string, in chars.
 *
 * Argument "real_pos" is a number of bytes (not chars).
 *
- * Example: ("déca", 3) return 2.
+ * Example: ("déca", 3) returns 2.
 *
- * Return the position in string.
+ * Returns the position in string.
 */

 int
@@ -664,7 +664,7 @@ utf8_pos (const char *string, int real_pos)
 }

 /*
- * Duplicate an UTF-8 string, with max N chars.
+ * Duplicates an UTF-8 string, with max N chars.
 *
 * Note: result must be freed after use.
 */
@@ -688,7 +688,7 @@ utf8_strndup (const char *string, int length)
 }

 /*
- * Copy max N chars from a string to another and adds null byte at the end.
+ * Copies max N chars from a string to another and adds null byte at the end.
 *
 * Note: the target string "dest" must be long enough.
 */
@@ -50,12 +50,12 @@


 /*
- * Parse an integer.
+ * Parses an integer.
 *
 * If result is not NULL, *result is set with the parsed integer in case
 * there is no error.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -88,12 +88,12 @@ util_parse_int (const char *string, int base, int *result)
 }

 /*
- * Parse a long integer.
+ * Parses a long integer.
 *
 * If result is not NULL, *result is set with the parsed long integer in case
 * there is no error.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -125,12 +125,12 @@ util_parse_long (const char *string, int base, long *result)
 }

 /*
- * Parse a long long integer.
+ * Parses a long long integer.
 *
 * If result is not NULL, *result is set with the parsed long integer in case
 * there is no error.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -162,9 +162,9 @@ util_parse_longlong (const char *string, int base, long long *result)
 }

 /*
- * Compare two timeval structures.
+ * Compares two timeval structures.
 *
- * Return:
+ * Returns:
 *   -1: tv1 < tv2
 *    0: tv1 == tv2
 *    1: tv1 > tv2
@@ -188,9 +188,9 @@ util_timeval_cmp (struct timeval *tv1, struct timeval *tv2)
 }

 /*
- * Calculate difference between two timeval structures.
+ * Calculates difference between two timeval structures.
 *
- * Return difference in microseconds.
+ * Returns difference in microseconds.
 */

 long long
@@ -208,7 +208,7 @@ util_timeval_diff (struct timeval *tv1, struct timeval *tv2)
 }

 /*
- * Add interval (in microseconds) to a timeval structure.
+ * Adds interval (in microseconds) to a timeval structure.
 */

 void
@@ -231,7 +231,7 @@ util_timeval_add (struct timeval *tv, long long interval)
 }

 /*
- * Convert microseconds to a string, using format: "H:MM:SS.mmmmmm"
+ * Converts microseconds to a string, using format: "H:MM:SS.mmmmmm"
 * where: H=hours, MM=minutes, SS=seconds, mmmmmm=microseconds
 *
 * Note: result must be freed after use.
@@ -256,7 +256,7 @@ util_get_microseconds_string (unsigned long long microseconds)
 }

 /*
- * Convert date to a string, using format of option "weechat.look.time_format"
+ * Converts date to a string, using format of option "weechat.look.time_format"
 * (can be localized).
 */

@@ -279,7 +279,7 @@ util_get_time_string (const time_t *date)
 }

 /*
- * Format date and time like strftime (but with timeval structure as input)
+ * Formats date and time like strftime (but with timeval structure as input)
 * and adds extra specifiers:
 *   - "%@": return the date expressed in Coordinated Universal Time (UTC)
 *           instead of date relative to the user's specified timezone
@@ -383,7 +383,7 @@ util_strftimeval (char *string, int max, const char *format, struct timeval *tv)
 }

 /*
- * Parse a date/time string, which can be one of these formats:
+ * Parses a date/time string, which can be one of these formats:
 *
 *   Format                               | Example
 *   -------------------------------------+----------------------------------
@@ -399,7 +399,7 @@ util_strftimeval (char *string, int max, const char *format, struct timeval *tv)
 *   UTC time                             | 19:04:55.123456Z
 *   Timestamp date                       | 1756580695.123456
 *
- * Notes:
+ * Notes :
 *
 * - For ISO 8601, characters `T' and `Z` can be used in lower case: `t` and `z`.
 * - The timezone offset format is `[+/-]hh:mm`, `[+/-]hhmm` or `[+/-]hh`.
@@ -408,7 +408,7 @@ util_strftimeval (char *string, int max, const char *format, struct timeval *tv)
 *   A dot (`.`) or comma (`,`) can be used to separate seconds from the other
 *   digits.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -676,7 +676,7 @@ util_parse_time (const char *datetime, struct timeval *tv)
 }

 /*
- * Return difference between two times.
+ * Returns difference between two times.
 *
 * The following variables are set, if pointer is not NULL:
 *   - number of total seconds between the two times (basic subtraction)
@@ -705,7 +705,7 @@ util_get_time_diff (time_t time1, time_t time2,
 }

 /*
- * Parse a string with a delay and optional unit, return the delay in
+ * Parses a string with a delay and optional unit, returns the delay in
 * microseconds.
 *
 * The delay is a number followed by a unit which can be:
@@ -722,7 +722,7 @@ util_get_time_diff (time_t time1, time_t time2,
 *   - 60000000: minutes
 *   - 3600000000: hours
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -794,7 +794,7 @@ util_parse_delay (const char *string_delay, unsigned long long default_factor,
 }

 /*
- * Get version number (integer) with a version as string.
+ * Gets version number (integer) with a version as string.
 *
 * Non-digit chars like "-dev" are ignored.
 *
@@ -30,7 +30,7 @@


 /*
- * Return package name ("weechat").
+ * Returns package name ("weechat").
 */

 const char *
@@ -40,7 +40,7 @@ version_get_name (void)
 }

 /*
- * Return the WeeChat version.
+ * Returns the WeeChat version.
 *
 * Examples:
 *   0.3.9-dev
@@ -55,7 +55,7 @@ version_get_version (void)
 }

 /*
- * Return the package name ("weechat") + WeeChat version.
+ * Returns the package name ("weechat") + WeeChat version.
 *
 * Examples:
 *   weechat 0.3.9-dev
@@ -70,7 +70,7 @@ version_get_name_version (void)
 }

 /*
- * Return the output of "git describe" (non-empty only for a devel version,
+ * Returns the output of "git describe" (non-empty only for a devel version,
 * if compilation was made using the git repository, if git command was found).
 *
 * Example:
@@ -84,7 +84,7 @@ version_get_git (void)
 }

 /*
- * Return the WeeChat version + the git version (between brackets, and only if
+ * Returns the WeeChat version + the git version (between brackets, and only if
 * it is not empty).
 *
 * Examples:
@@ -112,7 +112,7 @@ version_get_version_with_git (void)
 }

 /*
- * Return date of WeeChat compilation.
+ * Returns date of WeeChat compilation.
 *
 * Example:
 *   Dec 16 2012
@@ -125,7 +125,7 @@ version_get_compilation_date (void)
 }

 /*
- * Return time of WeeChat compilation.
+ * Returns time of WeeChat compilation.
 *
 * Example:
 *   18:10:22
@@ -138,7 +138,7 @@ version_get_compilation_time (void)
 }

 /*
- * Return date/time of WeeChat compilation.
+ * Returns date/time of WeeChat compilation.
 *
 * Example:
 *   Dec 16 2012 18:10:22
@@ -39,7 +39,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -51,9 +51,9 @@ hook_command_run_get_description (struct t_hook *hook)
 }

 /*
- * Hook a command when it's run by WeeChat.
+ * Hooks a command when it's run by WeeChat.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -98,7 +98,7 @@ hook_command_run (struct t_weechat_plugin *plugin,
 }

 /*
- * Execute a command_run hook.
+ * Executes a command_run hook.
 */

 int
@@ -185,7 +185,7 @@ hook_command_run_exec (struct t_gui_buffer *buffer, const char *command)
 }

 /*
- * Free data in a command_run hook.
+ * Frees data in a command_run hook.
 */

 void
@@ -205,7 +205,7 @@ hook_command_run_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for command_run hook.
+ * Returns hdata for command_run hook.
 */

 struct t_hdata *
@@ -229,9 +229,9 @@ hook_command_run_hdata_hook_command_run_cb (const void *pointer, void *data,
 }

 /*
- * Add command_run hook data in the infolist item.
+ * Adds command_run hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -254,7 +254,7 @@ hook_command_run_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print command_run hook data in WeeChat log file (usually for crash dump).
+ * Prints command_run hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -44,7 +44,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -56,9 +56,9 @@ hook_command_get_description (struct t_hook *hook)
 }

 /*
- * Search for a command hook in list.
+ * Searches for a command hook in list.
 *
- * Return pointer to hook found, NULL if not found.
+ * Returns pointer to hook found, NULL if not found.
 */

 struct t_hook *
@@ -83,7 +83,7 @@ hook_command_search (struct t_weechat_plugin *plugin, const char *command)
 }

 /*
- * Build variables/arrays that will be used for completion of commands
+ * Builds variables/arrays that will be used for completion of commands
 * arguments.
 */

@@ -273,7 +273,7 @@ hook_command_build_completion (struct t_hook_command *hook_command)
 }

 /*
- * Remove all raw markers from a string: converts "raw[xxx]" to "xxx".
+ * Removes all raw markers from a string: converts "raw[xxx]" to "xxx".
 *
 * Note: result must be freed after use.
 */
@@ -318,7 +318,7 @@ hook_command_remove_raw_markers (const char *string)
 }

 /*
- * Free an argument description.
+ * Frees an argument description.
 */

 void
@@ -333,7 +333,7 @@ hook_command_arraylist_arg_desc_free (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Format and translates arguments description of a command.
+ * Formats and translates arguments description of a command.
 *
 * Note: result must be freed after use.
 */
@@ -500,9 +500,9 @@ error:
 }

 /*
- * Hook a command.
+ * Hooks a command.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -576,9 +576,9 @@ hook_command (struct t_weechat_plugin *plugin, const char *command,
 }

 /*
- * Execute a command hook.
+ * Executes a command hook.
 *
- * Return:
+ * Returns:
 *   HOOK_COMMAND_EXEC_OK: command executed successfully
 *   HOOK_COMMAND_EXEC_ERROR: command executed and failed
 *   HOOK_COMMAND_EXEC_NOT_FOUND: command not found
@@ -768,12 +768,12 @@ end:
 }

 /*
- * Get relevance for cmd2 (existing command) compared to cmd1 (non-existing
+ * Gets relevance for cmd2 (existing command) compared to cmd1 (non-existing
 * command).
 *
 * Both commands are in lower case.
 *
- * Return a number based on the Levenshtein distance between two commands,
+ * Returns a number based on the Levenshtein distance between two commands,
 * lower is better.
 */

@@ -812,7 +812,7 @@ hook_command_similar_get_relevance (const char *cmd1, int length_cmd1,
 }

 /*
- * Compare similar commands to sort them by relevance (lower number first:
+ * Compares similar commands to sort them by relevance (lower number first:
 * best relevance).
 */

@@ -839,7 +839,7 @@ hook_command_similar_cmp_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Free a similar command.
+ * Frees a similar command.
 */

 void
@@ -854,7 +854,7 @@ hook_command_similar_free_cb (void *data, struct t_arraylist *arraylist,
 }

 /*
- * Build an arraylist with similar commands.
+ * Builds an arraylist with similar commands.
 *
 * Note: result must be freed after use.
 */
@@ -906,7 +906,7 @@ hook_command_build_list_similar_commands (const char *command)
 }

 /*
- * Display an error on unknown command, with a list of existing similar
+ * Displays an error on unknown command, with a list of existing similar
 * command names.
 */

@@ -971,7 +971,7 @@ hook_command_display_error_unknown (const char *command)
 }

 /*
- * Free data in a command hook.
+ * Frees data in a command hook.
 */

 void
@@ -1049,7 +1049,7 @@ hook_command_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for command hook.
+ * Returns hdata for command hook.
 */

 struct t_hdata *
@@ -1084,9 +1084,9 @@ hook_command_hdata_hook_command_cb (const void *pointer, void *data,
 }

 /*
- * Add command hook data in the infolist item.
+ * Adds command hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1141,7 +1141,7 @@ hook_command_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print command hook data in WeeChat log file (usually for crash dump).
+ * Prints command hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -39,7 +39,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -51,9 +51,9 @@ hook_completion_get_description (struct t_hook *hook)
 }

 /*
- * Hook a completion.
+ * Hooks a completion.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -101,7 +101,7 @@ hook_completion (struct t_weechat_plugin *plugin, const char *completion_item,
 }

 /*
- * Execute a completion hook.
+ * Executes a completion hook.
 */

 void
@@ -158,7 +158,7 @@ hook_completion_exec (struct t_weechat_plugin *plugin,
 }

 /*
- * Free data in a completion hook.
+ * Frees data in a completion hook.
 */

 void
@@ -183,7 +183,7 @@ hook_completion_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for completion hook.
+ * Returns hdata for completion hook.
 */

 struct t_hdata *
@@ -207,9 +207,9 @@ hook_completion_hdata_hook_completion_cb (const void *pointer, void *data,
 }

 /*
- * Add completion hook data in the infolist item.
+ * Adds completion hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -237,7 +237,7 @@ hook_completion_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print completion hook data in WeeChat log file (usually for crash dump).
+ * Prints completion hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -50,9 +50,9 @@ hook_config_get_description (struct t_hook *hook)
 }

 /*
- * Hook a configuration option.
+ * Hooks a configuration option.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -95,7 +95,7 @@ hook_config (struct t_weechat_plugin *plugin, const char *option,
 }

 /*
- * Execute a config hook.
+ * Executes a config hook.
 */

 void
@@ -132,7 +132,7 @@ hook_config_exec (const char *option, const char *value)
 }

 /*
- * Free data in a config hook.
+ * Frees data in a config hook.
 */

 void
@@ -152,7 +152,7 @@ hook_config_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for config hook.
+ * Returns hdata for config hook.
 */

 struct t_hdata *
@@ -175,9 +175,9 @@ hook_config_hdata_hook_config_cb (const void *pointer, void *data,
 }

 /*
- * Add config hook data in the infolist item.
+ * Adds config hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -198,7 +198,7 @@ hook_config_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print config hook data in WeeChat log file (usually for crash dump).
+ * Prints config hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -42,7 +42,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -63,9 +63,9 @@ hook_connect_get_description (struct t_hook *hook)
 }

 /*
- * Hook a connection to a peer (using fork).
+ * Hooks a connection to a peer (using fork).
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -140,7 +140,7 @@ hook_connect (struct t_weechat_plugin *plugin, const char *proxy,
 }

 /*
- * Verify certificates.
+ * Verifies certificates.
 */

 int
@@ -173,7 +173,7 @@ hook_connect_gnutls_verify_certificates (gnutls_session_t tls_session)
 }

 /*
- * Set certificates.
+ * Sets certificates.
 */

 int
@@ -210,7 +210,7 @@ hook_connect_gnutls_set_certificates (gnutls_session_t tls_session,
 }

 /*
- * Free data in a connect hook.
+ * Frees data in a connect hook.
 */

 void
@@ -314,7 +314,7 @@ hook_connect_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for connect hook.
+ * Returns hdata for connect hook.
 */

 struct t_hdata *
@@ -360,9 +360,9 @@ hook_connect_hdata_hook_connect_cb (const void *pointer, void *data,
 }

 /*
- * Add connect hook data in the infolist item.
+ * Adds connect hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -421,7 +421,7 @@ hook_connect_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print connect hook data in WeeChat log file (usually for crash dump).
+ * Prints connect hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -45,7 +45,7 @@ int hook_fd_pollfd_count = 0;          /* number of file descriptors        */


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -67,9 +67,9 @@ hook_fd_get_description (struct t_hook *hook)
 }

 /*
- * Search for a fd hook in list.
+ * Searches for a fd hook in list.
 *
- * Return pointer to hook found, NULL if not found.
+ * Returns pointer to hook found, NULL if not found.
 */

 struct t_hook *
@@ -89,7 +89,7 @@ hook_fd_search (int fd)
 }

 /*
- * Reallocate the "struct pollfd" array for poll().
+ * Reallocates the "struct pollfd" array for poll().
 */

 void
@@ -150,9 +150,9 @@ hook_fd_remove_cb (struct t_hook *hook)
 }

 /*
- * Hook a fd event.
+ * Hooks a fd event.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -199,9 +199,9 @@ hook_fd (struct t_weechat_plugin *plugin, int fd, int flag_read,
 }

 /*
- * Execute fd hooks:
- *   - poll() on fie descriptors
- *   - call of hook fd callbacks if needed.
+ * Executes fd hooks:
+ * - poll() on fie descriptors
+ * - call of hook fd callbacks if needed.
 */

 void
@@ -300,7 +300,7 @@ hook_fd_exec (void)
 }

 /*
- * Free data in a fd hook.
+ * Frees data in a fd hook.
 */

 void
@@ -314,7 +314,7 @@ hook_fd_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for fd hook.
+ * Returns hdata for fd hook.
 */

 struct t_hdata *
@@ -338,9 +338,9 @@ hook_fd_hdata_hook_fd_cb (const void *pointer, void *data, const char *hdata_nam
 }

 /*
- * Add fd hook data in the infolist item.
+ * Adds fd hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -365,7 +365,7 @@ hook_fd_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print fd hook data in WeeChat log file (usually for crash dump).
+ * Prints fd hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -39,7 +39,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -51,9 +51,9 @@ hook_focus_get_description (struct t_hook *hook)
 }

 /*
- * Hook a focus.
+ * Hooks a focus.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -96,7 +96,7 @@ hook_focus (struct t_weechat_plugin *plugin,
 }

 /*
- * Add keys of a hashtable into another.
+ * Adds keys of a hashtable into another.
 */

 void
@@ -116,7 +116,7 @@ hook_focus_hashtable_map_cb (void *data,
 }

 /*
- * Add keys of a hashtable into another (adding suffix "2" to keys).
+ * Adds keys of a hashtable into another (adding suffix "2" to keys).
 */

 void
@@ -143,7 +143,7 @@ hook_focus_hashtable_map2_cb (void *data,
 }

 /*
- * Get data for focus on (x,y) on screen.
+ * Gets data for focus on (x,y) on screen.
 *
 * Argument hashtable_focus2 is not NULL only for a mouse gesture (it's for
 * point where mouse button has been released).
@@ -276,7 +276,7 @@ hook_focus_get_data (struct t_hashtable *hashtable_focus1,
 }

 /*
- * Free data in a focus hook.
+ * Frees data in a focus hook.
 */

 void
@@ -296,7 +296,7 @@ hook_focus_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for focus hook.
+ * Returns hdata for focus hook.
 */

 struct t_hdata *
@@ -319,9 +319,9 @@ hook_focus_hdata_hook_focus_cb (const void *pointer, void *data,
 }

 /*
- * Add focus hook data in the infolist item.
+ * Adds focus hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -342,7 +342,7 @@ hook_focus_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print focus hook data in WeeChat log file (usually for crash dump).
+ * Prints focus hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -39,7 +39,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -51,9 +51,9 @@ hook_hdata_get_description (struct t_hook *hook)
 }

 /*
- * Hook a hdata.
+ * Hooks a hdata.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -98,7 +98,7 @@ hook_hdata (struct t_weechat_plugin *plugin, const char *hdata_name,
 }

 /*
- * Get hdata via hdata hook.
+ * Gets hdata via hdata hook.
 */

 struct t_hdata *
@@ -153,7 +153,7 @@ hook_hdata_get (struct t_weechat_plugin *plugin, const char *hdata_name)
 }

 /*
- * Free data in a hdata hook.
+ * Frees data in a hdata hook.
 */

 void
@@ -178,7 +178,7 @@ hook_hdata_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for hdata hook.
+ * Returns hdata for hdata hook.
 */

 struct t_hdata *
@@ -202,9 +202,9 @@ hook_hdata_hdata_hook_hdata_cb (const void *pointer, void *data,
 }

 /*
- * Add hdata hook data in the infolist item.
+ * Adds hdata hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -232,7 +232,7 @@ hook_hdata_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print hdata hook data in WeeChat log file (usually for crash dump).
+ * Prints hdata hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -39,7 +39,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -52,9 +52,9 @@ hook_hsignal_get_description (struct t_hook *hook)
 }

 /*
- * Hook a hsignal (signal with hashtable).
+ * Hooks a hsignal (signal with hashtable).
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -103,10 +103,10 @@ hook_hsignal (struct t_weechat_plugin *plugin, const char *signal,
 }

 /*
- * Check if a hooked hsignal matches a signal sent: it matches if at least
+ * Checks if a hooked hsignal matches a signal sent: it matches if at least
 * one of the signal masks are matching the signal sent.
 *
- * Return:
+ * Returns:
 *   1: hook matches signal sent
 *   0: hook does not match signal sent
 */
@@ -126,7 +126,7 @@ hook_hsignal_match (const char *signal, struct t_hook *hook)
 }

 /*
- * Send a hsignal (signal with hashtable).
+ * Sends a hsignal (signal with hashtable).
 */

 int
@@ -185,7 +185,7 @@ hook_hsignal_send (const char *signal, struct t_hashtable *hashtable)
 }

 /*
- * Free data in a hsignal hook.
+ * Frees data in a hsignal hook.
 */

 void
@@ -206,7 +206,7 @@ hook_hsignal_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for hsignal hook.
+ * Returns hdata for hsignal hook.
 */

 struct t_hdata *
@@ -230,9 +230,9 @@ hook_hsignal_hdata_hook_hsignal_cb (const void *pointer, void *data,
 }

 /*
- * Add hsignal hook data in the infolist item.
+ * Adds hsignal hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -264,7 +264,7 @@ hook_hsignal_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print hsignal hook data in WeeChat log file (usually for crash dump).
+ * Prints hsignal hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -50,9 +50,9 @@ hook_info_hashtable_get_description (struct t_hook *hook)
 }

 /*
- * Hook an info using hashtable.
+ * Hooks an info using hashtable.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -102,7 +102,7 @@ hook_info_hashtable (struct t_weechat_plugin *plugin, const char *info_name,
 }

 /*
- * Get info (as hashtable) via info hook.
+ * Gets info (as hashtable) via info hook.
 */

 struct t_hashtable *
@@ -152,7 +152,7 @@ hook_info_get_hashtable (struct t_weechat_plugin *plugin, const char *info_name,
 }

 /*
- * Free data in an info_hashtable hook.
+ * Frees data in an info_hashtable hook.
 */

 void
@@ -187,7 +187,7 @@ hook_info_hashtable_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for info_hashtable hook.
+ * Returns hdata for info_hashtable hook.
 */

 struct t_hdata *
@@ -214,9 +214,9 @@ hook_info_hashtable_hdata_hook_info_hashtable_cb (const void *pointer,
 }

 /*
- * Add info_hashtable hook data in the infolist item.
+ * Adds info_hashtable hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -258,7 +258,7 @@ hook_info_hashtable_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print info_hashtable hook data in WeeChat log file (usually for crash dump).
+ * Prints info_hashtable hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -50,9 +50,9 @@ hook_info_get_description (struct t_hook *hook)
 }

 /*
- * Hook an info.
+ * Hooks an info.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -99,7 +99,7 @@ hook_info (struct t_weechat_plugin *plugin, const char *info_name,
 }

 /*
- * Get info (as string) via info hook.
+ * Gets info (as string) via info hook.
 *
 * Note: result must be freed after use.
 */
@@ -151,7 +151,7 @@ hook_info_get (struct t_weechat_plugin *plugin, const char *info_name,
 }

 /*
- * Free data in an info hook.
+ * Frees data in an info hook.
 */

 void
@@ -181,7 +181,7 @@ hook_info_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for info hook.
+ * Returns hdata for info hook.
 */

 struct t_hdata *
@@ -206,9 +206,9 @@ hook_info_hdata_hook_info_cb (const void *pointer, void *data,
 }

 /*
- * Add info hook data in the infolist item.
+ * Adds info hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -243,7 +243,7 @@ hook_info_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print info hook data in WeeChat log file (usually for crash dump).
+ * Prints info hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -50,9 +50,9 @@ hook_infolist_get_description (struct t_hook *hook)
 }

 /*
- * Hook an infolist.
+ * Hooks an infolist.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -102,7 +102,7 @@ hook_infolist (struct t_weechat_plugin *plugin, const char *infolist_name,
 }

 /*
- * Get an infolist via infolist hook.
+ * Gets an infolist via infolist hook.
 */

 struct t_infolist *
@@ -153,7 +153,7 @@ hook_infolist_get (struct t_weechat_plugin *plugin, const char *infolist_name,
 }

 /*
- * Free data in an infolist hook.
+ * Frees data in an infolist hook.
 */

 void
@@ -188,7 +188,7 @@ hook_infolist_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for infolist hook.
+ * Returns hdata for infolist hook.
 */

 struct t_hdata *
@@ -214,9 +214,9 @@ hook_infolist_hdata_hook_infolist_cb (const void *pointer, void *data,
 }

 /*
- * Add infolist hook data in the infolist item.
+ * Adds infolist hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -258,7 +258,7 @@ hook_infolist_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print infolist hook data in WeeChat log file (usually for crash dump).
+ * Prints infolist hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -41,7 +41,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -61,9 +61,9 @@ hook_line_get_description (struct t_hook *hook)
 }

 /*
- * Hook a line added in a buffer.
+ * Hooks a line added in a buffer.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -121,7 +121,7 @@ hook_line (struct t_weechat_plugin *plugin, const char *buffer_type,
 }

 /*
- * Execute a line hook and updates the line data.
+ * Executes a line hook and updates the line data.
 */

 void
@@ -212,7 +212,7 @@ hook_line_exec (struct t_gui_line *line)
 }

 /*
- * Free data in a line hook.
+ * Frees data in a line hook.
 */

 void
@@ -237,7 +237,7 @@ hook_line_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for line hook.
+ * Returns hdata for line hook.
 */

 struct t_hdata *
@@ -264,9 +264,9 @@ hook_line_hdata_hook_line_cb (const void *pointer, void *data,
 }

 /*
- * Add line hook data in the infolist item.
+ * Adds line hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -295,7 +295,7 @@ hook_line_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print line hook data in WeeChat log file (usually for crash dump).
+ * Prints line hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -50,9 +50,9 @@ hook_modifier_get_description (struct t_hook *hook)
 }

 /*
- * Hook a modifier.
+ * Hooks a modifier.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -94,7 +94,7 @@ hook_modifier (struct t_weechat_plugin *plugin, const char *modifier,
 }

 /*
- * Execute a modifier hook.
+ * Executes a modifier hook.
 *
 * Note: result must be freed after use.
 */
@@ -164,7 +164,7 @@ hook_modifier_exec (struct t_weechat_plugin *plugin, const char *modifier,
 }

 /*
- * Free data in a modifier hook.
+ * Frees data in a modifier hook.
 */

 void
@@ -184,7 +184,7 @@ hook_modifier_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for modifier hook.
+ * Returns hdata for modifier hook.
 */

 struct t_hdata *
@@ -207,9 +207,9 @@ hook_modifier_hdata_hook_modifier_cb (const void *pointer, void *data,
 }

 /*
- * Add modifier hook data in the infolist item.
+ * Adds modifier hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -230,7 +230,7 @@ hook_modifier_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print modifier hook data in WeeChat log file (usually for crash dump).
+ * Prints modifier hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -41,7 +41,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -73,9 +73,9 @@ hook_print_get_description (struct t_hook *hook)
 }

 /*
- * Hook a message printed by WeeChat.
+ * Hooks a message printed by WeeChat.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -118,7 +118,7 @@ hook_print (struct t_weechat_plugin *plugin, struct t_gui_buffer *buffer,
 }

 /*
- * Execute a print hook.
+ * Executes a print hook.
 */

 void
@@ -190,7 +190,7 @@ hook_print_exec (struct t_gui_buffer *buffer, struct t_gui_line *line)
 }

 /*
- * Free data in a print hook.
+ * Frees data in a print hook.
 */

 void
@@ -215,7 +215,7 @@ hook_print_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for print hook.
+ * Returns hdata for print hook.
 */

 struct t_hdata *
@@ -242,9 +242,9 @@ hook_print_hdata_hook_print_cb (const void *pointer, void *data,
 }

 /*
- * Add print hook data in the infolist item.
+ * Adds print hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -273,7 +273,7 @@ hook_print_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print print hook data in WeeChat log file (usually for crash dump).
+ * Prints print hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -53,7 +53,7 @@ void hook_process_run (struct t_hook *hook_process);


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -72,9 +72,9 @@ hook_process_get_description (struct t_hook *hook)
 }

 /*
- * Hook a process (using fork) with options in hashtable.
+ * Hooks a process (using fork) with options in hashtable.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -188,9 +188,9 @@ error:
 }

 /*
- * Hook a process (using fork).
+ * Hooks a process (using fork).
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -206,7 +206,7 @@ hook_process (struct t_weechat_plugin *plugin,
 }

 /*
- * Child process for hook process: execute command and return string result
+ * Child process for hook process: executes command and returns string result
 * into pipe for WeeChat process.
 */

@@ -379,7 +379,7 @@ hook_process_child (struct t_hook *hook_process)
 }

 /*
- * Send buffers (stdout/stderr) to callback.
+ * Sends buffers (stdout/stderr) to callback.
 */

 void
@@ -412,7 +412,7 @@ hook_process_send_buffers (struct t_hook *hook_process, int callback_rc)
 }

 /*
- * Add some data to buffer (stdout or stderr).
+ * Adds some data to buffer (stdout or stderr).
 */

 void
@@ -429,7 +429,7 @@ hook_process_add_to_buffer (struct t_hook *hook_process, int index_buffer,
 }

 /*
- * Read process output (stdout or stderr) from child process.
+ * Reads process output (stdout or stderr) from child process.
 */

 void
@@ -462,7 +462,7 @@ hook_process_child_read (struct t_hook *hook_process, int fd,
 }

 /*
- * Read process output (stdout) from child process.
+ * Reads process output (stdout) from child process.
 */

 int
@@ -481,7 +481,7 @@ hook_process_child_read_stdout_cb (const void *pointer, void *data, int fd)
 }

 /*
- * Read process output (stderr) from child process.
+ * Reads process output (stderr) from child process.
 */

 int
@@ -500,7 +500,7 @@ hook_process_child_read_stderr_cb (const void *pointer, void *data, int fd)
 }

 /*
- * Read process output from child process until EOF
+ * Reads process output from child process until EOF
 * (called when the child process has ended).
 */

@@ -576,7 +576,7 @@ hook_process_child_read_until_eof (struct t_hook *hook_process)
 }

 /*
- * Check if child process is still alive.
+ * Checks if child process is still alive.
 */

 int
@@ -635,7 +635,8 @@ hook_process_timer_cb (const void *pointer, void *data, int remaining_calls)
 }

 /*
- * Execute process command in child, and read data in current process, with fd hook.
+ * Executes process command in child, and read data in current process,
+ * with fd hook.
 */

 void
@@ -787,7 +788,7 @@ error:
 }

 /*
- * Execute all process commands pending.
+ * Executes all process commands pending.
 */

 void
@@ -821,7 +822,7 @@ hook_process_exec (void)
 }

 /*
- * Free data in a process hook.
+ * Frees data in a process hook.
 */

 void
@@ -917,7 +918,7 @@ hook_process_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for process hook.
+ * Returns hdata for process hook.
 */

 struct t_hdata *
@@ -951,9 +952,9 @@ hook_process_hdata_hook_process_cb (const void *pointer, void *data,
 }

 /*
- * Add process hook data in the infolist item.
+ * Adds process hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -1002,7 +1003,7 @@ hook_process_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print process hook data in WeeChat log file (usually for crash dump).
+ * Prints process hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -38,7 +38,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -51,9 +51,9 @@ hook_signal_get_description (struct t_hook *hook)
 }

 /*
- * Hook a signal.
+ * Hooks a signal.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -102,10 +102,10 @@ hook_signal (struct t_weechat_plugin *plugin, const char *signal,
 }

 /*
- * Check if a hooked signal matches a signal sent: it matches if at least
+ * Checks if a hooked signal matches a signal sent: it matches if at least
 * one of the signal masks are matching the signal sent.
 *
- * Return:
+ * Returns:
 *   1: hook matches signal sent
 *   0: hook does not match signal sent
 */
@@ -125,7 +125,7 @@ hook_signal_match (const char *signal, struct t_hook *hook)
 }

 /*
- * Extract flags from signal and return flags and pointer to start of signal.
+ * Extracts flags from signal and returns flags and pointer to start of signal.
 */

 void
@@ -176,7 +176,7 @@ hook_signal_extract_flags (const char *signal, const char **ptr_signal,
 }

 /*
- * Send a signal.
+ * Sends a signal.
 */

 int
@@ -236,7 +236,7 @@ hook_signal_send (const char *signal, const char *type_data, void *signal_data)
 }

 /*
- * Free data in a signal hook.
+ * Frees data in a signal hook.
 */

 void
@@ -257,7 +257,7 @@ hook_signal_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for signal hook.
+ * Returns hdata for signal hook.
 */

 struct t_hdata *
@@ -281,9 +281,9 @@ hook_signal_hdata_hook_signal_cb (const void *pointer, void *data,
 }

 /*
- * Add signal hook data in the infolist item.
+ * Adds signal hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -315,7 +315,7 @@ hook_signal_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print signal hook data in WeeChat log file (usually for crash dump).
+ * Prints signal hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -43,7 +43,7 @@ time_t hook_last_system_time = 0;      /* used to detect system clock skew  */


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -80,7 +80,7 @@ hook_timer_get_description (struct t_hook *hook)
 }

 /*
- * Initialize a timer hook.
+ * Initializes a timer hook.
 */

 void
@@ -136,9 +136,9 @@ hook_timer_init (struct t_hook *hook)
 }

 /*
- * Hook a timer.
+ * Hooks a timer.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -180,8 +180,8 @@ hook_timer (struct t_weechat_plugin *plugin, long interval, int align_second,
 }

 /*
- * Check if system clock is older than previous call to this function (that
- * means new time is lower than in past). If yes, adjust all timers to current
+ * Checks if system clock is older than previous call to this function (that
+ * means new time is lower than in past). If yes, adjusts all timers to current
 * time.
 */

@@ -222,7 +222,7 @@ hook_timer_check_system_clock (void)
 }

 /*
- * Return time until next timeout (in milliseconds).
+ * Returns time until next timeout (in milliseconds).
 */

 int
@@ -300,7 +300,7 @@ end:
 }

 /*
- * Execute timer hooks.
+ * Executes timer hooks.
 */

 void
@@ -361,7 +361,7 @@ hook_timer_exec (void)
 }

 /*
- * Free data in a timer hook.
+ * Frees data in a timer hook.
 */

 void
@@ -375,7 +375,7 @@ hook_timer_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for timer hook.
+ * Returns hdata for timer hook.
 */

 struct t_hdata *
@@ -404,9 +404,9 @@ hook_timer_hdata_hook_timer_cb (const void *pointer, void *data,
 }

 /*
- * Add timer hook data in the infolist item.
+ * Adds timer hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -442,7 +442,7 @@ hook_timer_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print timer hook data in WeeChat log file (usually for crash dump).
+ * Prints timer hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -47,7 +47,7 @@


 /*
- * Return description of hook.
+ * Returns description of hook.
 *
 * Note: result must be freed after use.
 */
@@ -66,7 +66,7 @@ hook_url_get_description (struct t_hook *hook)
 }

 /*
- * Display keys and values of a hashtable.
+ * Displays keys and values of a hashtable.
 */

 void
@@ -83,7 +83,7 @@ hook_url_hashtable_map_cb (void *data, struct t_hashtable *hashtable,
 }

 /*
- * Run callback of url hook.
+ * Runs callback of url hook.
 */

 void
@@ -154,7 +154,7 @@ hook_url_transfer_thread (void *hook_pointer)
 }

 /*
- * Check if thread is still alive.
+ * Checks if thread is still alive.
 */

 int
@@ -218,7 +218,7 @@ hook_url_timer_cb (const void *pointer, void *data, int remaining_calls)
 }

 /*
- * Start transfer for an URL hook.
+ * Starts transfer for an URL hook.
 */

 void
@@ -286,9 +286,9 @@ hook_url_transfer (struct t_hook *hook)
 }

 /*
- * Hook a URL.
+ * Hooks a URL.
 *
- * Return pointer to new hook, NULL if error.
+ * Returns pointer to new hook, NULL if error.
 */

 struct t_hook *
@@ -358,7 +358,7 @@ error:
 }

 /*
- * Free data in a url hook.
+ * Frees data in a url hook.
 */

 void
@@ -422,7 +422,7 @@ hook_url_free_data (struct t_hook *hook)
 }

 /*
- * Return hdata for url hook.
+ * Returns hdata for url hook.
 */

 struct t_hdata *
@@ -452,9 +452,9 @@ hook_url_hdata_hook_url_cb (const void *pointer, void *data,
 }

 /*
- * Add url hook data in the infolist item.
+ * Adds url hook data in the infolist item.
 *
- * Return:
+ * Returns:
 *   1: OK
 *   0: error
 */
@@ -489,7 +489,7 @@ hook_url_add_to_infolist (struct t_infolist_item *item,
 }

 /*
- * Print url hook data in WeeChat log file (usually for crash dump).
+ * Prints url hook data in WeeChat log file (usually for crash dump).
 */

 void
@@ -46,6 +46,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <getopt.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -57,7 +58,6 @@
 #endif

 #include "weechat.h"
-#include "core-args.h"
 #include "core-command.h"
 #include "core-completion.h"
 #include "core-config.h"
@@ -79,6 +79,7 @@
 #include "core-url.h"
 #include "core-utf8.h"
 #include "core-util.h"
+#include "core-version.h"
 #include "../gui/gui-chat.h"
 #include "../gui/gui-color.h"
 #include "../gui/gui-completion.h"
@@ -89,6 +90,12 @@
 #include "../plugins/plugin.h"
 #include "../plugins/plugin-api.h"

+/* some command line options */
+#define OPTION_DOCGEN     1000
+#define OPTION_NO_DLCLOSE 1001
+#define OPTION_NO_GNUTLS  1002
+#define OPTION_NO_GCRYPT  1003
+
 int weechat_headless = 0;              /* 1 if running headless (no GUI)    */
 int weechat_daemon = 0;                /* 1 if daemonized (no foreground)   */
 int weechat_log_stdout = 0;            /* 1 to log messages on stdout       */
@@ -133,7 +140,275 @@ int weechat_auto_load_scripts = 1;     /* auto-load scripts                 */


 /*
- * Display WeeChat startup message.
+ * Displays WeeChat copyright on standard output.
+ */
+
+void
+weechat_display_copyright (void)
+{
+    string_fprintf (stdout, "\n");
+    string_fprintf (
+        stdout,
+        /* TRANSLATORS: "%s %s" after "compiled on" is date and time */
+        _("WeeChat %s Copyright %s, compiled on %s %s\n"
+          "Developed by Sébastien Helleu <flashcode@flashtux.org> "
+          "- %s"),
+        version_get_version_with_git (),
+        WEECHAT_COPYRIGHT_DATE,
+        version_get_compilation_date (),
+        version_get_compilation_time (),
+        WEECHAT_WEBSITE);
+    string_fprintf (stdout, "\n");
+}
+
+/*
+ * Displays WeeChat usage on standard output.
+ */
+
+void
+weechat_display_usage (void)
+{
+    weechat_display_copyright ();
+    string_fprintf (stdout, "\n");
+    string_fprintf (stdout,
+                    _("Usage: %s [option...] [plugin:option...]\n"),
+                    weechat_argv0);
+    string_fprintf (stdout, "\n");
+    string_fprintf (
+        stdout,
+        _("  -a, --no-connect         disable auto-connect to servers at "
+          "startup\n"
+          "  -c, --colors             display default colors in terminal "
+          "and exit\n"
+          "  -d, --dir <path>         force a single WeeChat home directory\n"
+          "                           or 5 different directories separated "
+          "by colons (in this order: config, data, state, cache, runtime)\n"
+          "                           (environment variable WEECHAT_HOME is "
+          "read if this option is not given)\n"
+          "  -t, --temp-dir           create a temporary WeeChat home "
+          "directory and delete it on exit\n"
+          "                           (incompatible with option \"-d\")\n"
+          "  -h, --help               display this help and exit\n"
+          "  -i, --build-info         display build information and exit\n"
+          "  -l, --license            display WeeChat license and exit\n"
+          "  -p, --no-plugin          don't load any plugin at startup\n"
+          "  -P, --plugins <plugins>  load only these plugins at startup\n"
+          "                           (see /help weechat.plugin.autoload)\n"
+          "  -r, --run-command <cmd>  run command(s) after startup;\n"
+          "                           many commands can be separated by "
+          "semicolons and are evaluated,\n"
+          "                           this option can be given multiple "
+          "times\n"
+          "  -s, --no-script          don't load any script at startup\n"
+          "      --upgrade            upgrade WeeChat using session files "
+          "(see /help upgrade in WeeChat)\n"
+          "  -v, --version            display WeeChat version and exit\n"
+          "  plugin:option            option for plugin (see man weechat)\n"));
+    string_fprintf (stdout, "\n");
+
+    /* extra options in headless mode */
+    if (weechat_headless)
+    {
+        string_fprintf (stdout, _("Extra options in headless mode:\n"));
+        string_fprintf (
+            stdout,
+            _("      --doc-gen <path>     generate files to build "
+              "documentation and exit\n"));
+        string_fprintf (
+            stdout,
+            _("      --daemon             run WeeChat as a daemon (fork, "
+              "new process group, file descriptors closed);\n"));
+        string_fprintf (
+            stdout,
+            _("                           (by default in headless mode "
+              "WeeChat is blocking and does not run in background)\n"));
+        string_fprintf (
+            stdout,
+            _("      --stdout             display log messages on standard "
+              "output instead of writing them in log file\n"));
+        string_fprintf (
+            stdout,
+            _("                           (option ignored if option "
+              "\"--daemon\" is given)\n"));
+        string_fprintf (stdout, "\n");
+    }
+
+    /* debug options */
+    string_fprintf (
+        stdout,
+        _("Debug options (for tools like valgrind, DO NOT USE IN PRODUCTION):\n"
+          "      --no-dlclose         do not call function dlclose after "
+          "plugins are unloaded\n"
+          "      --no-gnutls          disable init/deinit of gnutls\n"
+          "      --no-gcrypt          disable init/deinit of gcrypt\n"));
+    string_fprintf (stdout, "\n");
+}
+
+/*
+ * Parses command line arguments.
+ *
+ * Arguments argc and argv come from main() function.
+ */
+
+void
+weechat_parse_args (int argc, char *argv[])
+{
+    int opt;
+    struct option long_options[] = {
+        /* standard options */
+        { "no-connect",  no_argument,       NULL, 'a'               },
+        { "colors",      no_argument,       NULL, 'c'               },
+        { "dir",         required_argument, NULL, 'd'               },
+        { "temp-dir",    no_argument,       NULL, 't'               },
+        { "help",        no_argument,       NULL, 'h'               },
+        { "build-info",  no_argument,       NULL, 'i'               },
+        { "license",     no_argument,       NULL, 'l'               },
+        { "no-plugin",   no_argument,       NULL, 'p'               },
+        { "plugins",     required_argument, NULL, 'P'               },
+        { "run-command", required_argument, NULL, 'r'               },
+        { "no-script",   no_argument,       NULL, 's'               },
+        { "upgrade",     no_argument,       NULL, 'u'               },
+        { "doc-gen",     required_argument, NULL, OPTION_DOCGEN     },
+        { "version",     no_argument,       NULL, 'v'               },
+        /* debug options */
+        { "no-dlclose",  no_argument,       NULL, OPTION_NO_DLCLOSE },
+        { "no-gnutls",   no_argument,       NULL, OPTION_NO_GNUTLS  },
+        { "no-gcrypt",   no_argument,       NULL, OPTION_NO_GCRYPT  },
+        { NULL,          0,                 NULL, 0                 },
+    };
+
+    weechat_argv0 = (argv[0]) ? strdup (argv[0]) : NULL;
+    weechat_upgrading = 0;
+    weechat_home_force = NULL;
+    weechat_home_temp = 0;
+    weechat_home_delete_on_exit = 0;
+    weechat_server_cmd_line = 0;
+    weechat_force_plugin_autoload = NULL;
+    weechat_doc_gen = 0;
+    weechat_plugin_no_dlclose = 0;
+
+    optind = 0;
+    opterr = 0;
+
+    while ((opt = getopt_long (argc, argv,
+                               ":acd:thilpP:r:sv",
+                               long_options, NULL)) != -1)
+    {
+        switch (opt)
+        {
+            case 'a': /* -a / --no-connect */
+                /* option ignored, it will be used by plugins/scripts */
+                break;
+            case 'c': /* -c / --colors */
+                gui_color_display_terminal_colors ();
+                weechat_shutdown (EXIT_SUCCESS, 0);
+                break;
+            case 'd': /* -d / --dir */
+                weechat_home_temp = 0;
+                free (weechat_home_force);
+                weechat_home_force = strdup (optarg);
+                break;
+            case 't': /* -t / --temp-dir */
+                weechat_home_temp = 1;
+                if (weechat_home_force)
+                {
+                    free (weechat_home_force);
+                    weechat_home_force = NULL;
+                }
+                break;
+            case 'h': /* -h / --help */
+                weechat_display_usage ();
+                weechat_shutdown (EXIT_SUCCESS, 0);
+                break;
+            case 'i': /* -i / --build-info */
+                debug_build_info ();
+                weechat_shutdown (EXIT_SUCCESS, 0);
+                break;
+            case 'l': /* -l / --license */
+                weechat_display_copyright ();
+                string_fprintf (stdout, "\n");
+                string_fprintf (stdout, "%s%s", WEECHAT_LICENSE_TEXT);
+                weechat_shutdown (EXIT_SUCCESS, 0);
+                break;
+            case 'p': /* -p / --no-plugin */
+                free (weechat_force_plugin_autoload);
+                weechat_force_plugin_autoload = strdup ("!*");
+                break;
+            case 'P': /* -P / --plugins */
+                free (weechat_force_plugin_autoload);
+                weechat_force_plugin_autoload = strdup (optarg);
+                break;
+            case 'r': /* -r / --run-command */
+                if (!weechat_startup_commands)
+                    weechat_startup_commands = weelist_new ();
+                weelist_add (weechat_startup_commands, optarg,
+                             WEECHAT_LIST_POS_END, NULL);
+                break;
+            case 's': /* -s / --no-script */
+                /* option ignored, it will be used by the scripting plugins */
+                break;
+            case 'u': /* --upgrade */
+                weechat_upgrading = 1;
+                break;
+            case OPTION_DOCGEN: /* --doc-gen */
+                if (weechat_headless)
+                {
+                    weechat_doc_gen = 1;
+                    weechat_doc_gen_path = strdup (optarg);
+                }
+                break;
+            case 'v': /* -v / --version */
+                string_fprintf (stdout, version_get_version ());
+                fprintf (stdout, "\n");
+                weechat_shutdown (EXIT_SUCCESS, 0);
+                break;
+            case OPTION_NO_DLCLOSE: /* --no-dlclose */
+                /*
+                 * Valgrind works better when dlclose() is not done after
+                 * plugins are unloaded, it can display stack for plugins,*
+                 * otherwise you'll see "???" in stack for functions of
+                 * unloaded plugins.
+                 * This option disables the call to dlclose(),
+                 * it must NOT be used for other purposes!
+                 */
+                weechat_plugin_no_dlclose = 1;
+                break;
+            case OPTION_NO_GNUTLS: /* --no-gnutls */
+                /*
+                 * Electric-fence is not working fine when gnutls loads
+                 * certificates and Valgrind reports many memory errors with
+                 * gnutls.
+                 * This option disables the init/deinit of gnutls,
+                 * it must NOT be used for other purposes!
+                 */
+                weechat_no_gnutls = 1;
+                break;
+            case OPTION_NO_GCRYPT: /* --no-gcrypt */
+                /*
+                 * Valgrind reports many memory errors with gcrypt.
+                 * This option disables the init/deinit of gcrypt,
+                 * it must NOT be used for other purposes!
+                 */
+                weechat_no_gcrypt = 1;
+                break;
+            case ':':
+                string_fprintf (stderr,
+                                _("Error: missing argument for \"%s\" option\n"),
+                                argv[optind - 1]);
+                weechat_shutdown (EXIT_FAILURE, 0);
+                break;
+            case '?':
+                /* ignore any unknown option; plugins can use them */
+                break;
+            default:
+                /* ignore any other error */
+                break;
+        }
+    }
+}
+
+/*
+ * Displays WeeChat startup message.
 */

 void
@@ -205,10 +480,10 @@ weechat_startup_message (void)
 }

 /*
- * Display warnings about $TERM if it is detected as wrong.
+ * Displays warnings about $TERM if it is detected as wrong.
 *
 * If $TERM is different from "screen" or "screen-256color" and that $STY is
- * set (GNU screen) or $TMUX is set (tmux), then display a warning.
+ * set (GNU screen) or $TMUX is set (tmux), then a warning is displayed.
 */

 void
@@ -275,8 +550,8 @@ weechat_term_check (void)
 }

 /*
- * Display warning about wrong locale ($LANG and $LC_*) if they are detected as
- * wrong.
+ * Displays warning about wrong locale ($LANG and $LC_*) if they are detected
+ * as wrong.
 */

 void
@@ -293,7 +568,7 @@ weechat_locale_check (void)
 }

 /*
- * Shut down WeeChat.
+ * Shutdowns WeeChat.
 */

 void
@@ -332,7 +607,7 @@ weechat_shutdown (int return_code, int crash)
 }

 /*
- * Initialize gettext.
+ * Initializes gettext.
 */

 void
@@ -354,7 +629,7 @@ weechat_init_gettext (void)
 }

 /*
- * Initialize WeeChat.
+ * Initializes WeeChat.
 */

 void
@@ -386,7 +661,7 @@ weechat_init (int argc, char *argv[], void (*gui_init_cb)(void))
        weechat_shutdown (EXIT_FAILURE, 0);
    if (!config_weechat_init ())        /* init WeeChat options (weechat.*) */
        weechat_shutdown (EXIT_FAILURE, 0);
-    args_parse (argc, argv);            /* parse command line args          */
+    weechat_parse_args (argc, argv);    /* parse command line args          */
    dir_create_home_dirs ();            /* create WeeChat home directories  */
    log_init ();                        /* init log file                    */
    plugin_api_init ();                 /* create some hooks (info,hdata,..)*/
@@ -426,7 +701,7 @@ weechat_init (int argc, char *argv[], void (*gui_init_cb)(void))
 }

 /*
- * End WeeChat.
+ * Ends WeeChat.
 */

 void
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sébastien Helleu	aa2067b240	irc: fix typo on field name in /help irc.look.list_buffer_sort	2026-03-16 13:21:55 +01:00
Sébastien Helleu	cf5c24c2f7	core: fix crash with /eval when the current buffer is closed in a command	2026-03-14 00:12:53 +01:00
Sébastien Helleu	9b389b5736	core: update copyright dates	2026-03-08 10:44:23 +01:00
Sébastien Helleu	8c422a199e	core: update copyright date	2026-03-07 00:02:09 +01:00
Sébastien Helleu	4dd36270a8	core: disable "fuzzing" phase in schemathesis config	2026-03-06 23:39:17 +01:00
Sébastien Helleu	a639271e93	Version 4.8.3-dev	2026-03-06 23:24:12 +01:00
Sébastien Helleu	b452be6417	Version 4.8.2	2026-03-06 23:15:44 +01:00
Sébastien Helleu	0fbb99763d	core: remove trailing backslash in German translation of `/help buflist.look.add_newline`	2026-02-16 20:15:23 +01:00
Sébastien Helleu	65ef552251	core: replace real tab by `\t` in German translation of `/help filter` This was causing a display issue because the tab char is used to separate prefix from message.	2026-02-16 20:13:59 +01:00
Sébastien Helleu	05f9129e65	relay/api: fix memory leak in receive of message from remote WeeChat	2026-02-16 20:11:51 +01:00
Sébastien Helleu	113f72f70e	relay/api: fix memory leaks in resources "ping" and "sync"	2026-02-16 20:11:36 +01:00
Sébastien Helleu	0987e12e83	irc: ignore self join if the channel is already joined (issue #2291 ) There is an issue with some IRC servers that may send a JOIN with self nick once already on the channel, this results in a clear of the nicklist on the second JOIN received. This fix silently ignores the second self JOIN if the channel is already joined (with at least one nick).	2025-12-14 15:22:30 +01:00
Sébastien Helleu	097862e0f0	Version 4.8.2-dev	2025-12-01 19:45:34 +01:00
Sébastien Helleu	6b3398fcb5	Version 4.8.1	2025-12-01 19:43:41 +01:00
Sébastien Helleu	52c53d6985	core: add IRC SASL EXTERNAL in upgrade guidelines for version 4.8.0	2025-12-01 18:02:35 +01:00
Sébastien Helleu	608038374e	irc: fix creation of irc.msgbuffer option without a server name The regression was introduced by commit `1b669cd13c`, which allowed a server name with upper case but rejected a name or alias with upper case. This commit fixed the creation of the option when the server name is not given, so this command works again: /set irc.msgbuffer.whois current	2025-12-01 07:49:36 +01:00
Sébastien Helleu	7f3ad1c054	ci: add build with type "Release" and gcc hardened options in matrix	2025-11-30 14:19:25 +01:00
Sébastien Helleu	5d4546eb85	core: update ChangeLog (issue #2289 )	2025-11-30 13:35:19 +01:00
Sébastien Helleu	00b7a656a7	Version 4.8.1-dev	2025-11-30 13:35:19 +01:00
Sébastien Helleu	3520c9af0f	core: fix order of sections in ChangeLog	2025-11-30 11:34:44 +01:00
Sébastien Helleu	a76bfb1f26	core: fix compiler warning on possible buffer overflow in function util_parse_time (issue #2289 )	2025-11-30 11:32:27 +01:00