diff -Nru ncmpc-0.45/debian/changelog ncmpc-0.46/debian/changelog
--- ncmpc-0.45/debian/changelog	2021-11-06 11:25:39.000000000 +0000
+++ ncmpc-0.46/debian/changelog	2021-11-27 14:39:16.000000000 +0000
@@ -1,3 +1,12 @@
+ncmpc (0.46-1) unstable; urgency=medium
+
+  * Revert "Depends on python3:any for ncmpc-lyrics"
+  * Remove libboost-dev build dependency
+  * Update build dependency for libpcre
+  * Disable explicitly playlist_editor build option
+
+ -- Geoffroy Youri Berret <efrim@azylum.org>  Sat, 27 Nov 2021 15:39:16 +0100
+
 ncmpc (0.45-2) unstable; urgency=medium
 
   * Declare compliance with Debian Policy 4.6.0
diff -Nru ncmpc-0.45/debian/control ncmpc-0.46/debian/control
--- ncmpc-0.45/debian/control	2021-11-06 09:40:18.000000000 +0000
+++ ncmpc-0.46/debian/control	2021-11-27 14:39:16.000000000 +0000
@@ -6,11 +6,10 @@
 Build-Depends: debhelper-compat (= 13),
         meson (>= 0.47),
         libncursesw5-dev,
-        libboost-dev,
         libmpdclient-dev,
         liblircclient-dev,
         pkg-config,
-        libpcre++-dev,
+        libpcre2-dev,
 # for doc
         python3-sphinx
 Standards-Version: 4.6.0
@@ -41,7 +40,7 @@
 
 Package: ncmpc-lyrics
 Architecture: all
-Depends: ncmpc, python3:any, python3-unidecode, ${misc:Depends}
+Depends: ncmpc, python3, python3-unidecode, ${misc:Depends}
 Description: ncurses-based audio player (lyrics plugins)
  ncmpc is a text-mode client for MPD, the Music Player Daemon. Its goal is to
  provide a keyboard oriented and consistent interface to MPD, without wasting
diff -Nru ncmpc-0.45/debian/rules ncmpc-0.46/debian/rules
--- ncmpc-0.45/debian/rules	2021-11-06 11:25:39.000000000 +0000
+++ ncmpc-0.46/debian/rules	2021-11-27 14:39:16.000000000 +0000
@@ -27,6 +27,7 @@
 				-Dmultibyte=true \
 				-Dnls=enabled \
 				-Doutputs_screen=true \
+				-Dplaylist_editor=false \
 				-Dregex=enabled \
 				-Dsearch_screen=true \
 				-Dsong_screen=true
diff -Nru ncmpc-0.45/doc/conf.py ncmpc-0.46/doc/conf.py
--- ncmpc-0.45/doc/conf.py	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/doc/conf.py	2021-11-26 15:32:38.000000000 +0000
@@ -38,7 +38,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.45'
+version = '0.46'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff -Nru ncmpc-0.45/doc/meson.build ncmpc-0.46/doc/meson.build
--- ncmpc-0.45/doc/meson.build	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/doc/meson.build	2021-11-26 15:32:38.000000000 +0000
@@ -24,7 +24,8 @@
     output: 'upload',
     build_always_stale: true,
     command: [
-      'rsync', '-vpruz', '--delete', '@INPUT@',
+      find_program('rsync', required: false, disabler: true)
+      , '-vpruz', '--delete', '@INPUT@',
       'www.musicpd.org:/var/www/mpd/doc/ncmpc/',
       '--chmod=a+rX',
     ],
diff -Nru ncmpc-0.45/.github/workflows/build.yml ncmpc-0.46/.github/workflows/build.yml
--- ncmpc-0.45/.github/workflows/build.yml	1970-01-01 00:00:00.000000000 +0000
+++ ncmpc-0.46/.github/workflows/build.yml	2021-11-26 15:32:38.000000000 +0000
@@ -0,0 +1,80 @@
+---
+on:
+  workflow_dispatch:
+  push:
+    paths-ignore:
+      - 'doc/**'
+      - 'lyrics/**'
+      - 'po/**'
+    branches:
+      - master
+  pull_request:
+    paths-ignore:
+      - 'doc/**'
+      - 'lyrics/**'
+      - 'po/**'
+    branches:
+      - master
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - id: checkout
+        uses: actions/checkout@v2
+
+      - id: cache-ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: linux
+
+      - name: Install dependencies
+        run: |
+          sudo apt install -y --no-install-recommends \
+            meson \
+            libncursesw5-dev \
+            libncurses5-dev \
+            libpcre2-dev \
+            libmpdclient-dev
+
+      - name: Full Build
+        uses: BSFishy/meson-build@v1.0.3
+        with:
+          action: test
+          directory: output/full
+          setup-options: -Ddocumentation=disabled -Dlyrics_screen=true -Dchat_screen=true
+
+      - name: Mini Build
+        uses: BSFishy/meson-build@v1.0.3
+        with:
+          action: test
+          directory: output/mini
+          setup-options: -Ddocumentation=disabled -Dbuildtype=minsize -Db_ndebug=true -Db_lto=true -Dauto_features=disabled -Dcurses=ncurses -Dcolors=false -Dmultibyte=false -Dtcp=false -Dasync_connect=false -Dmini=true
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - id: checkout
+        uses: actions/checkout@v2
+
+      - id: cache-ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: macos
+
+      - uses: actions/setup-python@v1
+
+      - name: Install dependencies
+        run: |
+          brew install \
+            meson ninja \
+            ncurses \
+            pcre2 \
+            libmpdclient
+
+      - name: Meson Build
+        uses: BSFishy/meson-build@v1.0.3
+        with:
+          action: test
+          directory: output
+          setup-options: -Ddocumentation=disabled -Dlyrics_screen=true -Dchat_screen=true
diff -Nru ncmpc-0.45/lyrics/20-azlyrics.py ncmpc-0.46/lyrics/20-azlyrics.py
--- ncmpc-0.45/lyrics/20-azlyrics.py	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/lyrics/20-azlyrics.py	2021-11-26 15:32:38.000000000 +0000
@@ -52,26 +52,38 @@
 def html_to_text(s):
     return html.unescape(html_elements_to_text(s))
 
-artist = normalize_parameter(sys.argv[1])
+artists = normalize_parameter(sys.argv[1])
 title = normalize_parameter(sys.argv[2])
-artist = re.sub("[^A-Za-z0-9]+", "", artist)
+artists = [
+    artist.removeprefix('the ')
+    for artist in artists.split(',')
+]
+artists = [
+    re.sub("[^A-Za-z0-9]+", "", artist)
+    for artist in artists
+]
+title = re.sub('\(.*\)', '', title)
 title = re.sub("[^A-Za-z0-9]+", "", title)
 
-url = "http://azlyrics.com/lyrics/" + artist + "/" + title + ".html"
+for artist in artists:
+    url = "http://azlyrics.com/lyrics/" + artist + "/" + title + ".html"
 
-try:
-    r = urllib.request.urlopen(url)
-    response = r.read().decode()
-    start = response.find("that. -->")
-    end = response.find("<!-- MxM")
-    lyrics = response[start + 9 : end]
-    lyrics = (
-        html_to_text(lyrics).strip()
-    )
-    print(lyrics)
-except urllib.error.HTTPError:
-    print("Lyrics not found :(", file=sys.stderr)
-    exit(1)
-except Exception as e:
-    print("Unknown error: ", e, file=sys.stderr)
-    exit(2)
+    try:
+        r = urllib.request.urlopen(url)
+        response = r.read().decode()
+        start = response.find("that. -->")
+        end = response.find("<!-- MxM")
+        lyrics = response[start + 9 : end]
+        lyrics = (
+            html_to_text(lyrics).strip()
+        )
+        print(lyrics)
+        exit(0)
+    except urllib.error.HTTPError:
+        if artist is artists[-1]:
+            print("Lyrics not found :(", file=sys.stderr)
+            exit(1)
+    except Exception as e:
+        if artist is artists[-1]:
+            print("Unknown error: ", e, file=sys.stderr)
+            exit(2)
diff -Nru ncmpc-0.45/meson.build ncmpc-0.46/meson.build
--- ncmpc-0.45/meson.build	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/meson.build	2021-11-26 15:32:38.000000000 +0000
@@ -1,6 +1,6 @@
 project('ncmpc', 'cpp',
-  version: '0.45',
-  meson_version: '>= 0.47',
+  version: '0.46',
+  meson_version: '>= 0.49',
   default_options: [
     'cpp_std=c++17',
     'warning_level=3',
@@ -116,57 +116,87 @@
 
 conf.set('ENABLE_COLORS', curses_color and get_option('colors'))
 
-common_cflags = [
+common_cppflags = [
   # for getaddrinfo() and sigaction() with glibc
   '-D_GNU_SOURCE',
 ]
 
-test_cflags = [
-  '-Wshadow',
-  '-Wpointer-arith',
+test_global_common_flags = [
+  '-fvisibility=hidden',
+]
+
+test_common_flags = [
   '-Wcast-qual',
   '-Wcast-align',
-  '-Wwrite-strings',
-  '-Wmissing-declarations', '-Wmissing-noreturn', '-Wmissing-format-attribute',
-  '-Wredundant-decls', '-Wundef',
+  '-Wdouble-promotion',
+  '-Wmissing-declarations',
+  '-Wmissing-format-attribute',
+  '-Wmissing-noreturn',
+  '-Wredundant-decls',
+  '-Wshadow',
+  '-Wundef',
   '-Wvla',
+  '-Wwrite-strings',
+
+  # clang specific warning options:
+  '-Wunreachable-code-aggressive',
+  '-Wused-but-marked-unused',
+]
+
+test_global_cxxflags = test_global_common_flags + [
+]
+
+test_cxxflags = test_common_flags + [
+  '-fno-threadsafe-statics',
+  '-fmerge-all-constants',
 
+  # a vtable without a dtor is just fine
   '-Wno-non-virtual-dtor',
 
   # the only warnings we got from this are from formatted error
   # messages, and their truncation is harmless
   '-Wno-format-truncation',
 
-  '-fvisibility=hidden',
+  # clang specific warning options:
+  '-Wcomma',
+  '-Wheader-hygiene',
+  '-Winconsistent-missing-destructor-override',
+]
 
-  '-fno-threadsafe-statics',
-  '-fmerge-all-constants',
+test_ldflags = [
 ]
 
 if get_option('buildtype') != 'debug'
-  test_cflags += [
+  test_global_cxxflags += [
     '-ffunction-sections',
     '-fdata-sections',
   ]
+  test_ldflags += [
+    '-Wl,--gc-sections',
+  ]
 endif
 
-foreach f: test_cflags
-  if cc.has_argument(f)
-    common_cflags += [ f ]
-  endif
-endforeach
-
-add_global_arguments(common_cflags, language: 'cpp')
+add_global_arguments(common_cppflags, language: 'cpp')
+add_global_arguments(cc.get_supported_arguments(test_global_cxxflags), language: 'cpp')
+add_project_arguments(cc.get_supported_arguments(test_cxxflags), language: 'cpp')
+add_project_link_arguments(cc.get_supported_link_arguments(test_ldflags), language: 'cpp')
 
 is_linux = host_machine.system() == 'linux'
 is_windows = host_machine.system() == 'windows'
 
 thread_dep = dependency('threads')
-boost_dep = dependency('boost', version: '>= 1.62')
 libmpdclient_dep = dependency('libmpdclient', version: '>= 2.9')
 
 if not mini
-  pcre_dep = dependency('libpcre', required: get_option('regex'))
+  pcre_dep = dependency('libpcre2-8', required: get_option('regex'))
+
+  if pcre_dep.found()
+    pcre_dep = declare_dependency(
+      compile_args: '-DPCRE2_CODE_UNIT_WIDTH=0',
+      dependencies: pcre_dep,
+    )
+  endif
+
   conf.set('HAVE_PCRE', pcre_dep.found())
 else
   pcre_dep = declare_dependency()
@@ -378,7 +408,6 @@
   include_directories: inc,
   dependencies: [
     thread_dep,
-    boost_dep,
     event_dep,
     pcre_dep,
     curses_dep,
diff -Nru ncmpc-0.45/NEWS ncmpc-0.46/NEWS
--- ncmpc-0.45/NEWS	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/NEWS	2021-11-26 15:32:38.000000000 +0000
@@ -1,3 +1,8 @@
+ncmpc 0.46 - (2021-11-26)
+* eliminate Boost dependency
+* install Lithuanian translation
+* migrate to PCRE2
+
 ncmpc 0.45 - (2021-02-12)
 * make "tagtypes" errors non-fatal
 * check which tag types are supported by MPD (fixes MPD 0.21 support)
diff -Nru ncmpc-0.45/po/eo.po ncmpc-0.46/po/eo.po
--- ncmpc-0.45/po/eo.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/eo.po	2021-11-26 15:32:38.000000000 +0000
@@ -8,338 +8,340 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-24 15:23+0200\n"
-"PO-Revision-Date: 2011-05-16 15:13+0000\n"
-"Last-Translator: Aleksej <Unknown>\n"
-"Language-Team: Esperanto <eo@li.org>\n"
+"PO-Revision-Date: 2021-03-29 23:26+0000\n"
+"Last-Translator: phlostically <phlostically@mailinator.com>\n"
+"Language-Team: Esperanto <https://hosted.weblate.org/projects/ncmpc/"
+"translations/eo/>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.6-dev\n"
 "X-Launchpad-Export-Date: 2011-06-23 08:56+0000\n"
-"X-Generator: Launchpad (build 13265)\n"
 
 #: src/Bindings.cxx:80 src/Bindings.cxx:86
 #, c-format
 msgid "Key %s assigned to %s and %s"
-msgstr ""
+msgstr "Klavo %s estas asignita al %s kaj %s"
 
 #: src/ChatPage.cxx:64 src/ChatPage.cxx:182
 msgid "Chat"
-msgstr ""
+msgstr "Babili"
 
 #: src/ChatPage.cxx:163
 msgid "Your message"
-msgstr ""
+msgstr "Via mesaĝo"
 
 #: src/ChatPage.cxx:172
 msgid "Message could not be sent"
-msgstr ""
+msgstr "Malsukcesis sendi mesaĝon"
 
 #: src/Command.cxx:30
 msgid "Key configuration screen"
-msgstr ""
+msgstr "Klavo-agorda ekrano"
 
 #: src/Command.cxx:33
 msgid "Quit"
-msgstr ""
+msgstr "Forlasi"
 
 #: src/Command.cxx:37
 msgid "Move cursor up"
-msgstr ""
+msgstr "Movi kursoron supren"
 
 #: src/Command.cxx:39
 msgid "Move cursor down"
-msgstr ""
+msgstr "Movi kursoron suben"
 
 #: src/Command.cxx:41
 msgid "Move cursor to the top of screen"
-msgstr ""
+msgstr "Movi kursoron al la supro de la ekrano"
 
 #: src/Command.cxx:43
 msgid "Move cursor to the middle of screen"
-msgstr ""
+msgstr "Movi kursoron al la mezo de la ekrano"
 
 #: src/Command.cxx:45
 msgid "Move cursor to the bottom of screen"
-msgstr ""
+msgstr "Movi kursoron al la malsupro de la ekrano"
 
 #: src/Command.cxx:47
 msgid "Move cursor to the top of the list"
-msgstr ""
+msgstr "Movi kursoron al la supro de la listo"
 
 #: src/Command.cxx:49
 msgid "Move cursor to the bottom of the list"
-msgstr ""
+msgstr "Movi kursoron al la malsupro de la listo"
 
 #: src/Command.cxx:51
 msgid "Page up"
-msgstr ""
+msgstr "Supreniri unu paĝon"
 
 #: src/Command.cxx:53
 msgid "Page down"
-msgstr ""
+msgstr "Malsupreniri unu paĝon"
 
 #: src/Command.cxx:55
 msgid "Range selection"
-msgstr ""
+msgstr "Intervala elektado"
 
 #: src/Command.cxx:57
 msgid "Scroll down one line"
-msgstr ""
+msgstr "Rulumi malsupren unu linion"
 
 #: src/Command.cxx:59
 msgid "Scroll up one line"
-msgstr ""
+msgstr "Rulumi supren unu linion"
 
 #: src/Command.cxx:61
 msgid "Scroll up half a screen"
-msgstr ""
+msgstr "Rulumi supren ekranduonon"
 
 #: src/Command.cxx:63
 msgid "Scroll down half a screen"
-msgstr ""
+msgstr "Rulumi malsupren ekranduonon"
 
 #: src/Command.cxx:65
 msgid "Select currently playing song"
-msgstr ""
+msgstr "Elekti nuntempe ludatan kanton"
 
 #: src/Command.cxx:70
 msgid "Help screen"
-msgstr ""
+msgstr "Helpa ekrano"
 
 #: src/Command.cxx:72 src/HelpPage.cxx:141
 msgid "Queue screen"
-msgstr ""
+msgstr "Vica ekrano"
 
 #: src/Command.cxx:74 src/HelpPage.cxx:156
 msgid "Browse screen"
-msgstr ""
+msgstr "Foliuma ekrano"
 
 #: src/Command.cxx:79
 msgid "Play/Enter directory"
-msgstr ""
+msgstr "Ludi/Eniri dosierujon"
 
 #: src/Command.cxx:81
 msgid "Pause"
-msgstr ""
+msgstr "Paŭzi"
 
 #: src/Command.cxx:83
 msgid "Stop"
-msgstr ""
+msgstr "Ĉesigi"
 
 #: src/Command.cxx:85
 msgid "Crop"
-msgstr ""
+msgstr "Stuci"
 
 #: src/Command.cxx:87
 msgid "Next track"
-msgstr ""
+msgstr "Sekva trako"
 
 #: src/Command.cxx:89
 msgid "Previous track"
-msgstr ""
+msgstr "Antaŭa trako"
 
 #: src/Command.cxx:91
 msgid "Seek forward"
-msgstr ""
+msgstr "Salti antaŭen"
 
 #: src/Command.cxx:93
 msgid "Seek backward"
-msgstr ""
+msgstr "Salti malantaŭen"
 
 #: src/Command.cxx:95
 msgid "Increase volume"
-msgstr ""
+msgstr "Plilaŭtigi"
 
 #: src/Command.cxx:97
 msgid "Decrease volume"
-msgstr ""
+msgstr "Malplilaŭtigi"
 
 #: src/Command.cxx:99
 msgid "Select/deselect song in queue"
-msgstr ""
+msgstr "Elekti/malelekti kanton en vico"
 
 #: src/Command.cxx:101
 msgid "Select all listed items"
-msgstr ""
+msgstr "Elekti ĉiujn erojn en listo"
 
 #: src/Command.cxx:103
 msgid "Delete song from queue"
-msgstr ""
+msgstr "Forigi kanton for de vico"
 
 #: src/Command.cxx:105
 msgid "Shuffle queue"
-msgstr ""
+msgstr "Miksi vicon"
 
 #: src/Command.cxx:107
 msgid "Clear queue"
-msgstr ""
+msgstr "Malplenigi vicon"
 
 #: src/Command.cxx:109
 msgid "Toggle repeat mode"
-msgstr ""
+msgstr "Baskuligi ripetan reĝimon"
 
 #: src/Command.cxx:111
 msgid "Toggle random mode"
-msgstr ""
+msgstr "Baskuligi hazardan reĝimon"
 
 #: src/Command.cxx:113
 msgid "Toggle single mode"
-msgstr ""
+msgstr "Baskuligi unuopan reĝimon"
 
 #: src/Command.cxx:115
 msgid "Toggle consume mode"
-msgstr ""
+msgstr "Baskuligi konsuman reĝimon"
 
 #: src/Command.cxx:117
 msgid "Toggle crossfade mode"
-msgstr ""
+msgstr "Baskuligi interfadan reĝimon"
 
 #: src/Command.cxx:119
 msgid "Start a music database update"
-msgstr ""
+msgstr "Ekĝisdatigi muzikan datenbankon"
 
 #: src/Command.cxx:121
 msgid "Save queue"
-msgstr ""
+msgstr "Konservi vicon"
 
 #: src/Command.cxx:123 src/HelpPage.cxx:175
 msgid "Append song to queue"
-msgstr ""
+msgstr "Postmeti kanton en vicon"
 
 #: src/Command.cxx:126
 msgid "Go to root directory"
-msgstr ""
+msgstr "Iri al radika dosierujo"
 
 #: src/Command.cxx:128
 msgid "Go to parent directory"
-msgstr ""
+msgstr "Iri al patra dosierujo"
 
 #: src/Command.cxx:131
 msgid "Locate song in browser"
-msgstr ""
+msgstr "Trovi kanton en foliumilo"
 
 #: src/Command.cxx:135
 msgid "Move item up"
-msgstr ""
+msgstr "Movi eron supren"
 
 #: src/Command.cxx:137
 msgid "Move item down"
-msgstr ""
+msgstr "Movi eron malsupren"
 
 #: src/Command.cxx:139
 msgid "Refresh screen"
-msgstr ""
+msgstr "Reŝargi ekranon"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
 #: src/Command.cxx:146
 msgid "Toggle find mode"
-msgstr ""
+msgstr "Baskuligi serĉan reĝimon"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
 #: src/Command.cxx:150
 msgid "Toggle auto center mode"
-msgstr ""
+msgstr "Baskuligi aŭtomate centrigan reĝimon"
 
 #: src/Command.cxx:155
 msgid "Next screen"
-msgstr ""
+msgstr "Sekva ekrano"
 
 #: src/Command.cxx:157
 msgid "Previous screen"
-msgstr ""
+msgstr "Antaŭa ekrano"
 
 #: src/Command.cxx:159
 msgid "Swap to most recent screen"
-msgstr ""
+msgstr "Iri al lasta ekrano"
 
 #: src/Command.cxx:164
 msgid "Forward find"
-msgstr ""
+msgstr "Serĉi finen"
 
 #: src/Command.cxx:166
 msgid "Forward find next"
-msgstr ""
+msgstr "Serĉi la sekvan"
 
 #: src/Command.cxx:168
 msgid "Backward find"
-msgstr ""
+msgstr "Serĉi komencen"
 
 #: src/Command.cxx:170
 msgid "Backward find previous"
-msgstr ""
+msgstr "Serĉi la antaŭan"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
 #: src/Command.cxx:175
 msgid "Jump to"
-msgstr ""
+msgstr "Salti al"
 
 #: src/Command.cxx:181
 msgid "Library page"
-msgstr ""
+msgstr "Biblioteka paĝo"
 
 #: src/Command.cxx:185 src/HelpPage.cxx:170
 msgid "Search screen"
-msgstr ""
+msgstr "Serĉa ekrano"
 
 #: src/Command.cxx:187
 msgid "Change search mode"
-msgstr ""
+msgstr "Ŝanĝi serĉan reĝimon"
 
 #: src/Command.cxx:191
 msgid "View the selected and the currently playing song"
-msgstr ""
+msgstr "Vidi la elektitan ludatan kanton"
 
 #: src/Command.cxx:195 src/HelpPage.cxx:182
 msgid "Lyrics screen"
-msgstr ""
+msgstr "Kantoteksta ekrano"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
 #: src/Command.cxx:199
 msgid "Interrupt action"
-msgstr ""
+msgstr "Interrompi agon"
 
 #: src/Command.cxx:201
 msgid "Update Lyrics"
-msgstr ""
+msgstr "Ĝisdatigi Kantotekstojn"
 
 #: src/Command.cxx:205
 msgid "Edit the current item"
-msgstr ""
+msgstr "Redakti la aktualan eron"
 
 #: src/Command.cxx:210 src/HelpPage.cxx:197
 msgid "Outputs screen"
-msgstr ""
+msgstr "Eliga ekrano"
 
 #: src/Command.cxx:215 src/HelpPage.cxx:204
 msgid "Chat screen"
-msgstr ""
+msgstr "Babila ekrano"
 
 #: src/ConfigParser.cxx:120
 msgid "Word expected"
-msgstr ""
+msgstr "Vorto estas atendata"
 
 #: src/ConfigParser.cxx:139
 msgid "Malformed hotkey definition"
-msgstr ""
+msgstr "Misformita klavasigno"
 
 #. the hotkey configuration
 #. line is incomplete
 #: src/ConfigParser.cxx:158
 msgid "Incomplete hotkey configuration"
-msgstr ""
+msgstr "Nekompleta klavasigno"
 
 #. the hotkey configuration
 #. contains an unknown
 #. command
 #: src/ConfigParser.cxx:172
 msgid "Unknown command"
-msgstr ""
+msgstr "Nekonata komando"
 
 #. translators: ncmpc
 #. supports displaying the
@@ -351,29 +353,29 @@
 #. setting
 #: src/ConfigParser.cxx:210
 msgid "Bad time display type"
-msgstr ""
+msgstr "Nekonata tempo-montra tipo"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
 #: src/ConfigParser.cxx:224 src/ConfigParser.cxx:454
 msgid "Missing '='"
-msgstr ""
+msgstr "Mankas '='"
 
 #: src/ConfigParser.cxx:273
 msgid "Bad color name"
-msgstr ""
+msgstr "Nevalida kolornomo"
 
 #: src/ConfigParser.cxx:282
 msgid "Incomplete color definition"
-msgstr ""
+msgstr "Nekompleta kolordifino"
 
 #: src/ConfigParser.cxx:288 src/SearchPage.cxx:244
 msgid "Invalid number"
-msgstr ""
+msgstr "Nevalida nombro"
 
 #: src/ConfigParser.cxx:295
 msgid "Malformed color definition"
-msgstr ""
+msgstr "Misformita kolordifino"
 
 #. an unknown screen
 #. name was specified
@@ -382,161 +384,161 @@
 #. file
 #: src/ConfigParser.cxx:359
 msgid "Unknown screen name"
-msgstr ""
+msgstr "Nekonata nomo de ekrano"
 
 #: src/ConfigParser.cxx:388
 msgid "Unknown MPD tag"
-msgstr ""
+msgstr "Nekonata MPD-etikedo"
 
 #: src/ConfigParser.cxx:415
 msgid "Invalid search mode"
-msgstr ""
+msgstr "Nevalida serĉa reĝimo"
 
 #: src/ConfigParser.cxx:433
 msgid "Unknown search mode"
-msgstr ""
+msgstr "Nekonata serĉa reĝimo"
 
 #: src/ConfigParser.cxx:621
 msgid "Unknown configuration parameter"
-msgstr ""
+msgstr "Nekonata agorda parametro"
 
 #: src/CustomColors.cxx:57
 msgid "Terminal lacks support for changing colors"
-msgstr ""
+msgstr "Al la terminalo mankas kapablo ŝanĝi kolorojn"
 
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
 #: src/FileBrowserPage.cxx:246
 msgid "Deleting this item is not possible"
-msgstr ""
+msgstr "Ne eblas forviŝi ĉi tiun eron"
 
 #: src/FileBrowserPage.cxx:254
 #, c-format
 msgid "Delete playlist %s?"
-msgstr ""
+msgstr "Ĉu forviŝi ludliston %s?"
 
 #. translators: a dialog was aborted by the user
 #: src/FileBrowserPage.cxx:259 src/KeyDefPage.cxx:182 src/LyricsPage.cxx:388
 #: src/save_playlist.cxx:111
 msgid "Aborted"
-msgstr ""
+msgstr "Nuligita"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
 #: src/FileBrowserPage.cxx:272
 msgid "Playlist deleted"
-msgstr ""
+msgstr "Forviŝiĝis ludlisto"
 
 #. translators: caption of the browser screen
 #: src/FileBrowserPage.cxx:299 src/FileBrowserPage.cxx:381
 msgid "Browse"
-msgstr ""
+msgstr "Foliumi"
 
 #: src/FileListPage.cxx:125
 #, c-format
 msgid "Loading playlist '%s'"
-msgstr ""
+msgstr "Ŝargante ludliston '%s'"
 
 #: src/FileListPage.cxx:165 src/FileListPage.cxx:254 src/FileListPage.cxx:277
 #: src/TagListPage.cxx:184
-#, fuzzy, c-format
+#, c-format
 msgid "Adding '%s' to queue"
-msgstr "Aldonas \"%s\" al la ludlisto"
+msgstr "Aldonante \"%s\" en vicon"
 
 #: src/HelpPage.cxx:61
 msgid "Movement"
-msgstr ""
+msgstr "Movado"
 
 #: src/HelpPage.cxx:106
 msgid "Global"
-msgstr ""
+msgstr "Malloka"
 
 #: src/HelpPage.cxx:143
 msgid "Play"
-msgstr ""
+msgstr "Ludi"
 
 #: src/HelpPage.cxx:150
 msgid "Center"
-msgstr ""
+msgstr "Centrigi"
 
 #: src/HelpPage.cxx:158
 msgid "Enter directory/Select and play song"
-msgstr ""
+msgstr "Eniri en dosierujon/Elekti kaj ludi kanton"
 
 #: src/HelpPage.cxx:162
 msgid "Delete playlist"
-msgstr ""
+msgstr "Forviŝi ludliston"
 
 #: src/HelpPage.cxx:172
 msgid "New search"
-msgstr ""
+msgstr "Nova serĉo"
 
 #: src/HelpPage.cxx:173
 msgid "Select and play"
-msgstr ""
+msgstr "Elekti kaj ludi"
 
 #: src/HelpPage.cxx:184
 msgid "View Lyrics"
-msgstr ""
+msgstr "Vidi Kantotekstojn"
 
 #: src/HelpPage.cxx:185
 msgid "(Re)load lyrics"
-msgstr ""
+msgstr "(Re)ŝargi kantotekstojn"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
 #: src/HelpPage.cxx:188
 msgid "Interrupt retrieval"
-msgstr ""
+msgstr "Haltigi elŝutadon"
 
 #: src/HelpPage.cxx:189
 msgid "Download lyrics for currently playing song"
-msgstr ""
+msgstr "Elŝuti kantotekstojn de ludata kanto"
 
 #: src/HelpPage.cxx:190
 msgid "Add or edit lyrics"
-msgstr ""
+msgstr "Aldoni aŭ redakti kantotekstojn"
 
 #: src/HelpPage.cxx:191
 msgid "Save lyrics"
-msgstr ""
+msgstr "Konservi kantotekstojn"
 
 #: src/HelpPage.cxx:192
 msgid "Delete saved lyrics"
-msgstr ""
+msgstr "Forviŝi konservitajn kantotekstojn"
 
 #: src/HelpPage.cxx:199
 msgid "Enable/disable output"
-msgstr ""
+msgstr "Ŝalti/malŝalti eligon"
 
 #: src/HelpPage.cxx:206
 msgid "Write a message"
-msgstr ""
+msgstr "Skribi mesaĝon"
 
 #: src/HelpPage.cxx:211
 msgid "Keydef screen"
-msgstr ""
+msgstr "Klavdifina ekrano"
 
 #: src/HelpPage.cxx:213
 msgid "Edit keydefs for selected command"
-msgstr ""
+msgstr "Redakti klavdifinojn por la elektita komando"
 
 #: src/HelpPage.cxx:214
 msgid "Remove selected keydef"
-msgstr ""
+msgstr "Forigi elektitan klavdifinon"
 
 #: src/HelpPage.cxx:215
 msgid "Add a keydef"
-msgstr ""
+msgstr "Aldoni klavdifinon"
 
 #: src/HelpPage.cxx:216
 msgid "Go up a level"
-msgstr ""
+msgstr "Supreniri unu nivelon"
 
 #: src/HelpPage.cxx:217
 msgid "Apply and save changes"
-msgstr ""
+msgstr "Efektivigi kaj konservi ŝanĝojn"
 
 #: src/HelpPage.cxx:246 src/HelpPage.cxx:330
 msgid "Help"
@@ -552,244 +554,244 @@
 
 #: src/KeyDefPage.cxx:161
 msgid "Deleted"
-msgstr ""
+msgstr "Forviŝiĝis"
 
 #: src/KeyDefPage.cxx:177
 #, c-format
 msgid "Enter new key for %s: "
-msgstr ""
+msgstr "Premu novan klavon por %s: "
 
 #: src/KeyDefPage.cxx:187
 msgid "Ctrl-Space can't be used"
-msgstr ""
+msgstr "Stir-Spaceto ne uzeblas"
 
 #: src/KeyDefPage.cxx:193
 #, c-format
 msgid "Error: key %s is already used for %s"
-msgstr ""
+msgstr "Eraro: klavo %s jam estas asignita por %s"
 
 #: src/KeyDefPage.cxx:203
 #, c-format
 msgid "Assigned %s to %s"
-msgstr ""
+msgstr "Asignis la klavon %s al %s"
 
 #: src/KeyDefPage.cxx:230
 msgid "Add new key"
-msgstr ""
+msgstr "Aldoni novan klavon"
 
 #: src/KeyDefPage.cxx:252
 #, c-format
 msgid "Edit keys for %s"
-msgstr ""
+msgstr "Redakti klavojn por %s"
 
 #: src/KeyDefPage.cxx:395
 msgid "You have new key bindings"
-msgstr ""
+msgstr "Efektiviĝis novaj klavasignoj"
 
 #: src/KeyDefPage.cxx:397
 msgid "Keybindings unchanged."
-msgstr ""
+msgstr "Ne ŝanĝiĝis klavasignoj."
 
 #: src/KeyDefPage.cxx:407
 msgid "Unable to write configuration"
-msgstr ""
+msgstr "Malsukcesis skribi agordojn"
 
 #: src/KeyDefPage.cxx:416 src/KeyDefPage.cxx:425
 msgid "Error"
-msgstr ""
+msgstr "Eraro"
 
 #: src/KeyDefPage.cxx:423
 #, c-format
 msgid "Wrote %s"
-msgstr ""
+msgstr "Skribis sur %s"
 
 #: src/KeyDefPage.cxx:436
 msgid "===> Apply key bindings "
-msgstr ""
+msgstr "===> Efektivigi klavasignojn "
 
 #: src/KeyDefPage.cxx:438
 msgid "===> Apply & Save key bindings  "
-msgstr ""
+msgstr "===> Efektivigi kaj Konservi klavasignojn  "
 
 #: src/KeyDefPage.cxx:475
 msgid "Edit key bindings"
-msgstr ""
+msgstr "Redakti klavasignojn"
 
 #: src/KeyDefPage.cxx:557
 msgid "Note: Did you forget to 'Apply' your changes?"
-msgstr ""
+msgstr "Noto: Ĉu vi forgesis 'Efektivigi' viajn ŝanĝojn?"
 
 #: src/KeyDefPage.cxx:607
 msgid "Keys"
-msgstr ""
+msgstr "Klavoj"
 
 #: src/KeyName.cxx:115
 msgid "Undefined"
-msgstr ""
+msgstr "Nedifinita"
 
 #: src/KeyName.cxx:117
 msgid "Space"
-msgstr ""
+msgstr "Spaceto"
 
 #: src/KeyName.cxx:119
 msgid "Enter"
-msgstr ""
+msgstr "Enigo"
 
 #: src/KeyName.cxx:121
 msgid "Backspace"
-msgstr ""
+msgstr "Retropaŝo"
 
 #: src/KeyName.cxx:123
 msgid "Delete"
-msgstr ""
+msgstr "Forigo"
 
 #: src/KeyName.cxx:125
 msgid "Up"
-msgstr ""
+msgstr "Supren"
 
 #: src/KeyName.cxx:127
 msgid "Down"
-msgstr ""
+msgstr "Malsupren"
 
 #: src/KeyName.cxx:129
 msgid "Left"
-msgstr ""
+msgstr "Maldekstren"
 
 #: src/KeyName.cxx:131
 msgid "Right"
-msgstr ""
+msgstr "Dekstren"
 
 #: src/KeyName.cxx:133
 msgid "Home"
-msgstr ""
+msgstr "Hejmen"
 
 #: src/KeyName.cxx:135
 msgid "End"
-msgstr ""
+msgstr "Finen"
 
 #: src/KeyName.cxx:137
 msgid "PageDown"
-msgstr ""
+msgstr "Paĝosuben"
 
 #: src/KeyName.cxx:139
 msgid "PageUp"
-msgstr ""
+msgstr "Paĝosupren"
 
 #: src/KeyName.cxx:141
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/KeyName.cxx:143
 msgid "Shift+Tab"
-msgstr ""
+msgstr "Maj+Tab"
 
 #: src/KeyName.cxx:145
 msgid "Esc"
-msgstr ""
+msgstr "Esk"
 
 #: src/KeyName.cxx:147
 msgid "Insert"
-msgstr ""
+msgstr "Enmeto"
 
 #. translate "^X" to "Ctrl-X"
 #: src/KeyName.cxx:167
 #, c-format
 msgid "Ctrl-%c"
-msgstr ""
+msgstr "Stir-%c"
 
 #. translate "M-X" to "Alt-X"
 #: src/KeyName.cxx:173
 #, c-format
 msgid "Alt-%c"
-msgstr ""
+msgstr "Alt-%c"
 
 #: src/LibraryPage.cxx:45
 msgid "Artists"
-msgstr ""
+msgstr "Muzikistoj"
 
 #: src/LibraryPage.cxx:48 src/LibraryPage.cxx:175
 msgid "Albums"
-msgstr ""
+msgstr "Albumoj"
 
 #: src/LibraryPage.cxx:123
 msgid "All"
-msgstr ""
+msgstr "Ĉiuj"
 
 #: src/LibraryPage.cxx:197
 msgid "Songs"
-msgstr ""
+msgstr "Kantoj"
 
 #: src/LibraryPage.cxx:314
 msgid "Library"
-msgstr ""
+msgstr "Biblioteko"
 
 #: src/ListWindow.cxx:213
 msgid "Range selection disabled"
-msgstr ""
+msgstr "Intervala elektado estas neaktiva"
 
 #: src/ListWindow.cxx:216
 msgid "Range selection enabled"
-msgstr ""
+msgstr "Intervala elektado estas aktiva"
 
 #. translators: no lyrics were found for the song
 #: src/LyricsPage.cxx:253
 msgid "No lyrics"
-msgstr ""
+msgstr "Neniuj kantotekstoj"
 
 #: src/LyricsPage.cxx:270
 #, c-format
 msgid "Lyrics timeout occurred after %d seconds"
-msgstr ""
+msgstr "Elĉerpiĝis templimo por elŝuti kantotektojn post %d sekundoj"
 
 #: src/LyricsPage.cxx:353 src/LyricsPage.cxx:361 src/LyricsPage.cxx:371
 #: src/LyricsPage.cxx:507
 msgid "Lyrics"
-msgstr ""
+msgstr "Kantotekstoj"
 
 #. translators: this message is displayed
 #. while data is retrieved
 #: src/LyricsPage.cxx:356
 msgid "loading..."
-msgstr ""
+msgstr "ŝargante..."
 
 #: src/LyricsPage.cxx:378
 msgid "Editor not configured"
-msgstr ""
+msgstr "Redaktilo ne estas agordita"
 
 #: src/LyricsPage.cxx:385
 msgid "Do you really want to start an editor and edit these lyrics?"
-msgstr ""
+msgstr "Ĉu lanĉi redaktilon kaj redakti tiujn kantotekstojn?"
 
 #: src/LyricsPage.cxx:403 src/LyricsPage.cxx:427
 msgid "Can't start editor"
-msgstr ""
+msgstr "Malsukcesis lanĉi redaktilon"
 
 #: src/LyricsPage.cxx:430 src/LyricsPage.cxx:434
 msgid "Editor exited unexpectedly"
-msgstr ""
+msgstr "Redaktilo neatendite kolapsis"
 
 #. lyrics for the song were saved on hard disk
 #: src/LyricsPage.cxx:456
 msgid "Lyrics saved"
-msgstr ""
+msgstr "Konserviĝis kantotekstoj"
 
 #: src/LyricsPage.cxx:462
 msgid "Lyrics deleted"
-msgstr ""
+msgstr "Forviŝiĝis kantotekstoj"
 
 #: src/LyricsPage.cxx:463
 msgid "No saved lyrics"
-msgstr ""
+msgstr "Neniuj konservitaj kantotekstoj"
 
 #: src/Main.cxx:133
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s"
-msgstr "Konektite al %s"
+msgstr "Konektante al %s"
 
 #: src/Main.cxx:149
-#, fuzzy, c-format
+#, c-format
 msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
-msgstr "Problemo: la versio %d.%d.%d de MPD estas tro malnova (necesas %s)"
+msgstr "Eraro: la versio %d.%d.%d de MPD estas tro malnova (necesas %s)"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
@@ -804,41 +806,41 @@
 #: src/OutputsPage.cxx:168
 #, c-format
 msgid "Switched to partition '%s'"
-msgstr ""
+msgstr "Iris al dividaĵo '%s'"
 
 #: src/OutputsPage.cxx:180 src/SongPage.cxx:69
 msgid "Name"
-msgstr ""
+msgstr "Nomo"
 
 #: src/OutputsPage.cxx:230
 #, c-format
 msgid "Output '%s' enabled"
-msgstr ""
+msgstr "Eligo '%s' estas aktiva"
 
 #: src/OutputsPage.cxx:241
 #, c-format
 msgid "Output '%s' disabled"
-msgstr ""
+msgstr "Eligo '%s' estas neaktiva"
 
 #: src/OutputsPage.cxx:371 src/OutputsPage.cxx:480
 msgid "Outputs"
-msgstr ""
+msgstr "Eligoj"
 
 #: src/OutputsPage.cxx:383
 msgid "Partition"
-msgstr ""
+msgstr "Dividaĵo"
 
 #: src/OutputsPage.cxx:407
 msgid "Create new partition"
-msgstr ""
+msgstr "Krei novan dividaĵon"
 
 #: src/player_command.cxx:94 src/QueuePage.cxx:651
 msgid "Shuffled queue"
-msgstr ""
+msgstr "Miksiĝis vico"
 
 #: src/player_command.cxx:100
 msgid "Cleared queue"
-msgstr ""
+msgstr "Malpleniĝis vico"
 
 #. get path
 #: src/QueuePage.cxx:314
@@ -847,58 +849,57 @@
 
 #: src/QueuePage.cxx:379 src/QueuePage.cxx:697
 msgid "Queue"
-msgstr ""
+msgstr "Vico"
 
 #: src/QueuePage.cxx:381
 #, c-format
 msgid "Queue on %s"
-msgstr ""
+msgstr "Vico ĉe %s"
 
 #. query the user for a filename
 #: src/save_playlist.cxx:86
 msgid "Save queue as"
-msgstr ""
+msgstr "Konservi vicon kiel"
 
 #: src/save_playlist.cxx:108
 #, c-format
 msgid "Replace %s?"
-msgstr ""
+msgstr "Ĉu anstataŭigi %s?"
 
 #. success
 #: src/save_playlist.cxx:129
 #, c-format
 msgid "Saved %s"
-msgstr ""
+msgstr "Konserviĝis %s"
 
 #: src/screen_client.cxx:41
-#, fuzzy
 msgid "Database update running"
-msgstr "Ĝisdatigis datumbazon"
+msgstr "Ĝisdatigante datenbankon"
 
 #: src/screen_client.cxx:48
 #, c-format
 msgid "Database update of %s started"
-msgstr ""
+msgstr "Ekĝisdatiĝis datenbanko %s"
 
 #: src/screen_client.cxx:51
 msgid "Database update started"
-msgstr ""
+msgstr "Ekĝisdatiĝis la datenbanko"
 
 #: src/screen.cxx:158
 msgid "Repeat mode is on"
-msgstr ""
+msgstr "Ripeta reĝimo estas aktiva"
 
 #: src/screen.cxx:159
 msgid "Repeat mode is off"
-msgstr ""
+msgstr "Ripeta reĝimo estas neaktiva"
 
 #: src/screen.cxx:163
 msgid "Random mode is on"
-msgstr ""
+msgstr "Hazarda reĝimo estas aktiva"
 
 #: src/screen.cxx:164
 msgid "Random mode is off"
-msgstr ""
+msgstr "Hazarda reĝimo estas neaktiva"
 
 #. "single" mode means
 #. that MPD will
@@ -907,11 +908,11 @@
 #. single song
 #: src/screen.cxx:173
 msgid "Single mode is on"
-msgstr ""
+msgstr "Unuopa reĝimo estas aktiva"
 
 #: src/screen.cxx:174
 msgid "Single mode is off"
-msgstr ""
+msgstr "Unuopa reĝimo estas neaktiva"
 
 #. "consume" mode means
 #. that MPD removes each
@@ -919,16 +920,16 @@
 #. finished playing
 #: src/screen.cxx:182
 msgid "Consume mode is on"
-msgstr ""
+msgstr "Konsuma reĝimo estas aktiva"
 
 #: src/screen.cxx:183
 msgid "Consume mode is off"
-msgstr ""
+msgstr "Konsuma reĝimo estas neaktiva"
 
 #: src/screen.cxx:186
 #, c-format
 msgid "Crossfade %d seconds"
-msgstr ""
+msgstr "%d sekundoj da interfado"
 
 #: src/screen.cxx:198
 msgid "Database updated"
@@ -936,31 +937,31 @@
 
 #: src/screen.cxx:248
 msgid "Find mode: Wrapped"
-msgstr ""
+msgstr "Serĉa reĝimo: Linifalda"
 
 #: src/screen.cxx:249
 msgid "Find mode: Normal"
-msgstr ""
+msgstr "Serĉa reĝimo: Normala"
 
 #: src/screen.cxx:254
 msgid "Auto center mode: On"
-msgstr ""
+msgstr "Aŭtomate centriga reĝimo: Aktiva"
 
 #: src/screen.cxx:255
 msgid "Auto center mode: Off"
-msgstr ""
+msgstr "Aŭtomate centriga reĝimo: Neaktiva"
 
 #: src/screen_find.cxx:33
 msgid "Find"
-msgstr ""
+msgstr "Serĉi"
 
 #: src/screen_find.cxx:34
 msgid "Find backward"
-msgstr ""
+msgstr "Serĉi komencen"
 
 #: src/screen_find.cxx:35
 msgid "Jump"
-msgstr ""
+msgstr "Salti"
 
 #: src/screen_find.cxx:81
 #, c-format
@@ -969,31 +970,31 @@
 
 #: src/screen_utils.cxx:150
 msgid "Password"
-msgstr ""
+msgstr "Pasvorto"
 
 #: src/SearchPage.cxx:51
 msgid "artist"
-msgstr ""
+msgstr "muzikisto"
 
 #: src/SearchPage.cxx:52
 msgid "album"
-msgstr ""
+msgstr "albumo"
 
 #: src/SearchPage.cxx:53
 msgid "title"
-msgstr ""
+msgstr "titolo"
 
 #: src/SearchPage.cxx:54
 msgid "track"
-msgstr ""
+msgstr "trako"
 
 #: src/SearchPage.cxx:55
 msgid "name"
-msgstr ""
+msgstr "nomo"
 
 #: src/SearchPage.cxx:56
 msgid "genre"
-msgstr ""
+msgstr "ĝenro"
 
 #: src/SearchPage.cxx:57
 msgid "date"
@@ -1001,15 +1002,15 @@
 
 #: src/SearchPage.cxx:58
 msgid "composer"
-msgstr ""
+msgstr "komponisto"
 
 #: src/SearchPage.cxx:59
 msgid "performer"
-msgstr ""
+msgstr "interpretisto"
 
 #: src/SearchPage.cxx:60
 msgid "comment"
-msgstr ""
+msgstr "komento"
 
 #: src/SearchPage.cxx:68
 msgid "file"
@@ -1021,11 +1022,11 @@
 
 #: src/SearchPage.cxx:91 src/SongPage.cxx:62
 msgid "Artist"
-msgstr ""
+msgstr "Muzikisto"
 
 #: src/SearchPage.cxx:92 src/SongPage.cxx:64
 msgid "Album"
-msgstr ""
+msgstr "Albumo"
 
 #: src/SearchPage.cxx:93
 msgid "Filename"
@@ -1033,189 +1034,189 @@
 
 #: src/SearchPage.cxx:94
 msgid "Artist + Title"
-msgstr ""
+msgstr "Muzikisto + Titolo"
 
 #: src/SearchPage.cxx:285 src/SearchPage.cxx:289
 msgid "Unrecognized suffix"
-msgstr ""
+msgstr "Nekonata sufikso"
 
 #: src/SearchPage.cxx:337
 #, c-format
 msgid "Bad search tag %s"
-msgstr ""
+msgstr "Nekonata serĉa etikedo %s"
 
 #: src/SearchPage.cxx:351
 #, c-format
 msgid "No argument for search tag %s"
-msgstr ""
+msgstr "Mankas argumento de serĉa etikedo %s"
 
 #: src/SearchPage.cxx:446 src/SearchPage.cxx:479 src/SearchPage.cxx:483
 #: src/SearchPage.cxx:487 src/SearchPage.cxx:546
 msgid "Search"
-msgstr ""
+msgstr "Serĉi"
 
 #: src/SearchPage.cxx:509
 #, c-format
 msgid "Search mode: %s"
-msgstr ""
+msgstr "Serĉa reĝimo: %s"
 
 #: src/SongPage.cxx:65
 msgid "Length"
-msgstr ""
+msgstr "Longo"
 
 #: src/SongPage.cxx:66
 msgid "Position"
-msgstr ""
+msgstr "Pozicio"
 
 #: src/SongPage.cxx:67
 msgid "Composer"
-msgstr ""
+msgstr "Komponisto"
 
 #: src/SongPage.cxx:68
 msgid "Performer"
-msgstr ""
+msgstr "Interpretisto"
 
 #: src/SongPage.cxx:70
 msgid "Disc"
-msgstr ""
+msgstr "Disko"
 
 #: src/SongPage.cxx:71
 msgid "Track"
-msgstr ""
+msgstr "Trako"
 
 #: src/SongPage.cxx:72
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #: src/SongPage.cxx:73
 msgid "Genre"
-msgstr ""
+msgstr "Ĝenro"
 
 #: src/SongPage.cxx:74
 msgid "Comment"
-msgstr ""
+msgstr "Komento"
 
 #: src/SongPage.cxx:75
 msgid "Path"
-msgstr ""
+msgstr "Loko"
 
 #: src/SongPage.cxx:76
 msgid "Bitrate"
-msgstr ""
+msgstr "Bitrapido"
 
 #: src/SongPage.cxx:77
 msgid "Format"
-msgstr ""
+msgstr "Formo"
 
 #: src/SongPage.cxx:94
 msgid "Number of artists"
-msgstr ""
+msgstr "Nombro de muzikistoj"
 
 #: src/SongPage.cxx:95
 msgid "Number of albums"
-msgstr ""
+msgstr "Nombro de albumoj"
 
 #: src/SongPage.cxx:96
 msgid "Number of songs"
-msgstr ""
+msgstr "Nombro de kantoj"
 
 #: src/SongPage.cxx:97
 msgid "Uptime"
-msgstr ""
+msgstr "Daŭro de funkciado"
 
 #: src/SongPage.cxx:98
 msgid "Most recent db update"
-msgstr ""
+msgstr "Lasta ĝisdatigo de datenbanko"
 
 #: src/SongPage.cxx:99
 msgid "Playtime"
-msgstr ""
+msgstr "Daŭro de ludado"
 
 #: src/SongPage.cxx:100
 msgid "DB playtime"
-msgstr ""
+msgstr "Daŭro de datenbanka ludado"
 
 #: src/SongPage.cxx:205
 msgid "Song viewer"
-msgstr ""
+msgstr "Kantovidigilo"
 
 #: src/SongPage.cxx:371
 msgid "MPD statistics"
-msgstr ""
+msgstr "Statistikoj pri MPD"
 
 #: src/SongPage.cxx:457
 msgid "Selected song"
-msgstr ""
+msgstr "Elektita kanto"
 
 #: src/SongPage.cxx:467
 msgid "Currently playing song"
-msgstr ""
+msgstr "Nuntempe ludata kanto"
 
 #: src/SongPage.cxx:472
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kilobitoj/sek"
 
 #: src/SongPage.cxx:556
 msgid "Song"
-msgstr ""
+msgstr "Kanto"
 
 #: src/StatusBar.cxx:165
 msgid "Playing:"
-msgstr ""
+msgstr "Ludanta:"
 
 #: src/StatusBar.cxx:169
 msgid "[Paused]"
-msgstr ""
+msgstr "[Paŭzita]"
 
 #: src/Styles.cxx:252 src/Styles.cxx:313
 msgid "Unknown color"
-msgstr ""
+msgstr "Nekonata koloro"
 
 #: src/Styles.cxx:323
 msgid "Unknown color field"
-msgstr ""
+msgstr "Nekonata kolorkampo"
 
 #: src/Styles.cxx:356
 msgid "Terminal lacks color capabilities"
-msgstr ""
+msgstr "Al la terminalo mankas koloraj kapabloj"
 
 #: src/TagListPage.cxx:71
 msgid "All tracks"
-msgstr ""
+msgstr "Ĉiuj trakoj"
 
 #: src/time_format.cxx:44
 msgid "year"
-msgstr ""
+msgstr "jaro"
 
 #: src/time_format.cxx:46
 msgid "years"
-msgstr ""
+msgstr "jaroj"
 
 #: src/time_format.cxx:54
 msgid "week"
-msgstr ""
+msgstr "semajno"
 
 #: src/time_format.cxx:57
 msgid "weeks"
-msgstr ""
+msgstr "semajnoj"
 
 #: src/time_format.cxx:65
 msgid "day"
-msgstr ""
+msgstr "tago"
 
 #: src/time_format.cxx:68
 msgid "days"
-msgstr ""
+msgstr "tagoj"
 
 #: src/TitleBar.cxx:101
 msgid "Volume n/a"
-msgstr ""
+msgstr "Laŭto n/a"
 
 #: src/TitleBar.cxx:103
 #, c-format
 msgid "Volume %d%%"
-msgstr ""
+msgstr "Laŭto %d%%"
 
 #~ msgid "Connecting to %s...  [Press %s to abort]"
 #~ msgstr "Konektiĝado al %s...  [Premu %s por ĉesigi]"
diff -Nru ncmpc-0.45/po/fa.po ncmpc-0.46/po/fa.po
--- ncmpc-0.45/po/fa.po	1970-01-01 00:00:00.000000000 +0000
+++ ncmpc-0.46/po/fa.po	2021-11-26 15:32:38.000000000 +0000
@@ -0,0 +1,1211 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ncmpc package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ncmpc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:23+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/Bindings.cxx:80 src/Bindings.cxx:86
+#, c-format
+msgid "Key %s assigned to %s and %s"
+msgstr ""
+
+#: src/ChatPage.cxx:64 src/ChatPage.cxx:182
+msgid "Chat"
+msgstr ""
+
+#: src/ChatPage.cxx:163
+msgid "Your message"
+msgstr ""
+
+#: src/ChatPage.cxx:172
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/Command.cxx:30
+msgid "Key configuration screen"
+msgstr ""
+
+#: src/Command.cxx:33
+msgid "Quit"
+msgstr ""
+
+#: src/Command.cxx:37
+msgid "Move cursor up"
+msgstr ""
+
+#: src/Command.cxx:39
+msgid "Move cursor down"
+msgstr ""
+
+#: src/Command.cxx:41
+msgid "Move cursor to the top of screen"
+msgstr ""
+
+#: src/Command.cxx:43
+msgid "Move cursor to the middle of screen"
+msgstr ""
+
+#: src/Command.cxx:45
+msgid "Move cursor to the bottom of screen"
+msgstr ""
+
+#: src/Command.cxx:47
+msgid "Move cursor to the top of the list"
+msgstr ""
+
+#: src/Command.cxx:49
+msgid "Move cursor to the bottom of the list"
+msgstr ""
+
+#: src/Command.cxx:51
+msgid "Page up"
+msgstr ""
+
+#: src/Command.cxx:53
+msgid "Page down"
+msgstr ""
+
+#: src/Command.cxx:55
+msgid "Range selection"
+msgstr ""
+
+#: src/Command.cxx:57
+msgid "Scroll down one line"
+msgstr ""
+
+#: src/Command.cxx:59
+msgid "Scroll up one line"
+msgstr ""
+
+#: src/Command.cxx:61
+msgid "Scroll up half a screen"
+msgstr ""
+
+#: src/Command.cxx:63
+msgid "Scroll down half a screen"
+msgstr ""
+
+#: src/Command.cxx:65
+msgid "Select currently playing song"
+msgstr ""
+
+#: src/Command.cxx:70
+msgid "Help screen"
+msgstr ""
+
+#: src/Command.cxx:72 src/HelpPage.cxx:141
+msgid "Queue screen"
+msgstr ""
+
+#: src/Command.cxx:74 src/HelpPage.cxx:156
+msgid "Browse screen"
+msgstr ""
+
+#: src/Command.cxx:79
+msgid "Play/Enter directory"
+msgstr ""
+
+#: src/Command.cxx:81
+msgid "Pause"
+msgstr ""
+
+#: src/Command.cxx:83
+msgid "Stop"
+msgstr ""
+
+#: src/Command.cxx:85
+msgid "Crop"
+msgstr ""
+
+#: src/Command.cxx:87
+msgid "Next track"
+msgstr ""
+
+#: src/Command.cxx:89
+msgid "Previous track"
+msgstr ""
+
+#: src/Command.cxx:91
+msgid "Seek forward"
+msgstr ""
+
+#: src/Command.cxx:93
+msgid "Seek backward"
+msgstr ""
+
+#: src/Command.cxx:95
+msgid "Increase volume"
+msgstr ""
+
+#: src/Command.cxx:97
+msgid "Decrease volume"
+msgstr ""
+
+#: src/Command.cxx:99
+msgid "Select/deselect song in queue"
+msgstr ""
+
+#: src/Command.cxx:101
+msgid "Select all listed items"
+msgstr ""
+
+#: src/Command.cxx:103
+msgid "Delete song from queue"
+msgstr ""
+
+#: src/Command.cxx:105
+msgid "Shuffle queue"
+msgstr ""
+
+#: src/Command.cxx:107
+msgid "Clear queue"
+msgstr ""
+
+#: src/Command.cxx:109
+msgid "Toggle repeat mode"
+msgstr ""
+
+#: src/Command.cxx:111
+msgid "Toggle random mode"
+msgstr ""
+
+#: src/Command.cxx:113
+msgid "Toggle single mode"
+msgstr ""
+
+#: src/Command.cxx:115
+msgid "Toggle consume mode"
+msgstr ""
+
+#: src/Command.cxx:117
+msgid "Toggle crossfade mode"
+msgstr ""
+
+#: src/Command.cxx:119
+msgid "Start a music database update"
+msgstr ""
+
+#: src/Command.cxx:121
+msgid "Save queue"
+msgstr ""
+
+#: src/Command.cxx:123 src/HelpPage.cxx:175
+msgid "Append song to queue"
+msgstr ""
+
+#: src/Command.cxx:126
+msgid "Go to root directory"
+msgstr ""
+
+#: src/Command.cxx:128
+msgid "Go to parent directory"
+msgstr ""
+
+#: src/Command.cxx:131
+msgid "Locate song in browser"
+msgstr ""
+
+#: src/Command.cxx:135
+msgid "Move item up"
+msgstr ""
+
+#: src/Command.cxx:137
+msgid "Move item down"
+msgstr ""
+
+#: src/Command.cxx:139
+msgid "Refresh screen"
+msgstr ""
+
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/Command.cxx:146
+msgid "Toggle find mode"
+msgstr ""
+
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/Command.cxx:150
+msgid "Toggle auto center mode"
+msgstr ""
+
+#: src/Command.cxx:155
+msgid "Next screen"
+msgstr ""
+
+#: src/Command.cxx:157
+msgid "Previous screen"
+msgstr ""
+
+#: src/Command.cxx:159
+msgid "Swap to most recent screen"
+msgstr ""
+
+#: src/Command.cxx:164
+msgid "Forward find"
+msgstr ""
+
+#: src/Command.cxx:166
+msgid "Forward find next"
+msgstr ""
+
+#: src/Command.cxx:168
+msgid "Backward find"
+msgstr ""
+
+#: src/Command.cxx:170
+msgid "Backward find previous"
+msgstr ""
+
+#. translators: this queries the user for a string
+#. * and jumps directly (while the user is typing)
+#. * to the entry which begins with this string
+#: src/Command.cxx:175
+msgid "Jump to"
+msgstr ""
+
+#: src/Command.cxx:181
+msgid "Library page"
+msgstr ""
+
+#: src/Command.cxx:185 src/HelpPage.cxx:170
+msgid "Search screen"
+msgstr ""
+
+#: src/Command.cxx:187
+msgid "Change search mode"
+msgstr ""
+
+#: src/Command.cxx:191
+msgid "View the selected and the currently playing song"
+msgstr ""
+
+#: src/Command.cxx:195 src/HelpPage.cxx:182
+msgid "Lyrics screen"
+msgstr ""
+
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/Command.cxx:199
+msgid "Interrupt action"
+msgstr ""
+
+#: src/Command.cxx:201
+msgid "Update Lyrics"
+msgstr ""
+
+#: src/Command.cxx:205
+msgid "Edit the current item"
+msgstr ""
+
+#: src/Command.cxx:210 src/HelpPage.cxx:197
+msgid "Outputs screen"
+msgstr ""
+
+#: src/Command.cxx:215 src/HelpPage.cxx:204
+msgid "Chat screen"
+msgstr ""
+
+#: src/ConfigParser.cxx:120
+msgid "Word expected"
+msgstr ""
+
+#: src/ConfigParser.cxx:139
+msgid "Malformed hotkey definition"
+msgstr ""
+
+#. the hotkey configuration
+#. line is incomplete
+#: src/ConfigParser.cxx:158
+msgid "Incomplete hotkey configuration"
+msgstr ""
+
+#. the hotkey configuration
+#. contains an unknown
+#. command
+#: src/ConfigParser.cxx:172
+msgid "Unknown command"
+msgstr ""
+
+#. translators: ncmpc
+#. supports displaying the
+#. "elapsed" or "remaining"
+#. time of a song being
+#. played; in this case, the
+#. configuration file
+#. contained an invalid
+#. setting
+#: src/ConfigParser.cxx:210
+msgid "Bad time display type"
+msgstr ""
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/ConfigParser.cxx:224 src/ConfigParser.cxx:454
+msgid "Missing '='"
+msgstr ""
+
+#: src/ConfigParser.cxx:273
+msgid "Bad color name"
+msgstr ""
+
+#: src/ConfigParser.cxx:282
+msgid "Incomplete color definition"
+msgstr ""
+
+#: src/ConfigParser.cxx:288 src/SearchPage.cxx:244
+msgid "Invalid number"
+msgstr ""
+
+#: src/ConfigParser.cxx:295
+msgid "Malformed color definition"
+msgstr ""
+
+#. an unknown screen
+#. name was specified
+#. in the
+#. configuration
+#. file
+#: src/ConfigParser.cxx:359
+msgid "Unknown screen name"
+msgstr ""
+
+#: src/ConfigParser.cxx:388
+msgid "Unknown MPD tag"
+msgstr ""
+
+#: src/ConfigParser.cxx:415
+msgid "Invalid search mode"
+msgstr ""
+
+#: src/ConfigParser.cxx:433
+msgid "Unknown search mode"
+msgstr ""
+
+#: src/ConfigParser.cxx:621
+msgid "Unknown configuration parameter"
+msgstr ""
+
+#: src/CustomColors.cxx:57
+msgid "Terminal lacks support for changing colors"
+msgstr ""
+
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/FileBrowserPage.cxx:246
+msgid "Deleting this item is not possible"
+msgstr ""
+
+#: src/FileBrowserPage.cxx:254
+#, c-format
+msgid "Delete playlist %s?"
+msgstr ""
+
+#. translators: a dialog was aborted by the user
+#: src/FileBrowserPage.cxx:259 src/KeyDefPage.cxx:182 src/LyricsPage.cxx:388
+#: src/save_playlist.cxx:111
+msgid "Aborted"
+msgstr ""
+
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/FileBrowserPage.cxx:272
+msgid "Playlist deleted"
+msgstr ""
+
+#. translators: caption of the browser screen
+#: src/FileBrowserPage.cxx:299 src/FileBrowserPage.cxx:381
+msgid "Browse"
+msgstr ""
+
+#: src/FileListPage.cxx:125
+#, c-format
+msgid "Loading playlist '%s'"
+msgstr ""
+
+#: src/FileListPage.cxx:165 src/FileListPage.cxx:254 src/FileListPage.cxx:277
+#: src/TagListPage.cxx:184
+#, c-format
+msgid "Adding '%s' to queue"
+msgstr ""
+
+#: src/HelpPage.cxx:61
+msgid "Movement"
+msgstr ""
+
+#: src/HelpPage.cxx:106
+msgid "Global"
+msgstr ""
+
+#: src/HelpPage.cxx:143
+msgid "Play"
+msgstr ""
+
+#: src/HelpPage.cxx:150
+msgid "Center"
+msgstr ""
+
+#: src/HelpPage.cxx:158
+msgid "Enter directory/Select and play song"
+msgstr ""
+
+#: src/HelpPage.cxx:162
+msgid "Delete playlist"
+msgstr ""
+
+#: src/HelpPage.cxx:172
+msgid "New search"
+msgstr ""
+
+#: src/HelpPage.cxx:173
+msgid "Select and play"
+msgstr ""
+
+#: src/HelpPage.cxx:184
+msgid "View Lyrics"
+msgstr ""
+
+#: src/HelpPage.cxx:185
+msgid "(Re)load lyrics"
+msgstr ""
+
+#. to translators: this hotkey aborts the retrieval of lyrics
+#. from the server
+#: src/HelpPage.cxx:188
+msgid "Interrupt retrieval"
+msgstr ""
+
+#: src/HelpPage.cxx:189
+msgid "Download lyrics for currently playing song"
+msgstr ""
+
+#: src/HelpPage.cxx:190
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/HelpPage.cxx:191
+msgid "Save lyrics"
+msgstr ""
+
+#: src/HelpPage.cxx:192
+msgid "Delete saved lyrics"
+msgstr ""
+
+#: src/HelpPage.cxx:199
+msgid "Enable/disable output"
+msgstr ""
+
+#: src/HelpPage.cxx:206
+msgid "Write a message"
+msgstr ""
+
+#: src/HelpPage.cxx:211
+msgid "Keydef screen"
+msgstr ""
+
+#: src/HelpPage.cxx:213
+msgid "Edit keydefs for selected command"
+msgstr ""
+
+#: src/HelpPage.cxx:214
+msgid "Remove selected keydef"
+msgstr ""
+
+#: src/HelpPage.cxx:215
+msgid "Add a keydef"
+msgstr ""
+
+#: src/HelpPage.cxx:216
+msgid "Go up a level"
+msgstr ""
+
+#: src/HelpPage.cxx:217
+msgid "Apply and save changes"
+msgstr ""
+
+#: src/HelpPage.cxx:246 src/HelpPage.cxx:330
+msgid "Help"
+msgstr ""
+
+#: src/i18n.h:43
+msgid "y"
+msgstr ""
+
+#: src/i18n.h:44
+msgid "n"
+msgstr ""
+
+#: src/KeyDefPage.cxx:161
+msgid "Deleted"
+msgstr ""
+
+#: src/KeyDefPage.cxx:177
+#, c-format
+msgid "Enter new key for %s: "
+msgstr ""
+
+#: src/KeyDefPage.cxx:187
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/KeyDefPage.cxx:193
+#, c-format
+msgid "Error: key %s is already used for %s"
+msgstr ""
+
+#: src/KeyDefPage.cxx:203
+#, c-format
+msgid "Assigned %s to %s"
+msgstr ""
+
+#: src/KeyDefPage.cxx:230
+msgid "Add new key"
+msgstr ""
+
+#: src/KeyDefPage.cxx:252
+#, c-format
+msgid "Edit keys for %s"
+msgstr ""
+
+#: src/KeyDefPage.cxx:395
+msgid "You have new key bindings"
+msgstr ""
+
+#: src/KeyDefPage.cxx:397
+msgid "Keybindings unchanged."
+msgstr ""
+
+#: src/KeyDefPage.cxx:407
+msgid "Unable to write configuration"
+msgstr ""
+
+#: src/KeyDefPage.cxx:416 src/KeyDefPage.cxx:425
+msgid "Error"
+msgstr ""
+
+#: src/KeyDefPage.cxx:423
+#, c-format
+msgid "Wrote %s"
+msgstr ""
+
+#: src/KeyDefPage.cxx:436
+msgid "===> Apply key bindings "
+msgstr ""
+
+#: src/KeyDefPage.cxx:438
+msgid "===> Apply & Save key bindings  "
+msgstr ""
+
+#: src/KeyDefPage.cxx:475
+msgid "Edit key bindings"
+msgstr ""
+
+#: src/KeyDefPage.cxx:557
+msgid "Note: Did you forget to 'Apply' your changes?"
+msgstr ""
+
+#: src/KeyDefPage.cxx:607
+msgid "Keys"
+msgstr ""
+
+#: src/KeyName.cxx:115
+msgid "Undefined"
+msgstr ""
+
+#: src/KeyName.cxx:117
+msgid "Space"
+msgstr ""
+
+#: src/KeyName.cxx:119
+msgid "Enter"
+msgstr ""
+
+#: src/KeyName.cxx:121
+msgid "Backspace"
+msgstr ""
+
+#: src/KeyName.cxx:123
+msgid "Delete"
+msgstr ""
+
+#: src/KeyName.cxx:125
+msgid "Up"
+msgstr ""
+
+#: src/KeyName.cxx:127
+msgid "Down"
+msgstr ""
+
+#: src/KeyName.cxx:129
+msgid "Left"
+msgstr ""
+
+#: src/KeyName.cxx:131
+msgid "Right"
+msgstr ""
+
+#: src/KeyName.cxx:133
+msgid "Home"
+msgstr ""
+
+#: src/KeyName.cxx:135
+msgid "End"
+msgstr ""
+
+#: src/KeyName.cxx:137
+msgid "PageDown"
+msgstr ""
+
+#: src/KeyName.cxx:139
+msgid "PageUp"
+msgstr ""
+
+#: src/KeyName.cxx:141
+msgid "Tab"
+msgstr ""
+
+#: src/KeyName.cxx:143
+msgid "Shift+Tab"
+msgstr ""
+
+#: src/KeyName.cxx:145
+msgid "Esc"
+msgstr ""
+
+#: src/KeyName.cxx:147
+msgid "Insert"
+msgstr ""
+
+#. translate "^X" to "Ctrl-X"
+#: src/KeyName.cxx:167
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#. translate "M-X" to "Alt-X"
+#: src/KeyName.cxx:173
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/LibraryPage.cxx:45
+msgid "Artists"
+msgstr ""
+
+#: src/LibraryPage.cxx:48 src/LibraryPage.cxx:175
+msgid "Albums"
+msgstr ""
+
+#: src/LibraryPage.cxx:123
+msgid "All"
+msgstr ""
+
+#: src/LibraryPage.cxx:197
+msgid "Songs"
+msgstr ""
+
+#: src/LibraryPage.cxx:314
+msgid "Library"
+msgstr ""
+
+#: src/ListWindow.cxx:213
+msgid "Range selection disabled"
+msgstr ""
+
+#: src/ListWindow.cxx:216
+msgid "Range selection enabled"
+msgstr ""
+
+#. translators: no lyrics were found for the song
+#: src/LyricsPage.cxx:253
+msgid "No lyrics"
+msgstr ""
+
+#: src/LyricsPage.cxx:270
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/LyricsPage.cxx:353 src/LyricsPage.cxx:361 src/LyricsPage.cxx:371
+#: src/LyricsPage.cxx:507
+msgid "Lyrics"
+msgstr ""
+
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/LyricsPage.cxx:356
+msgid "loading..."
+msgstr ""
+
+#: src/LyricsPage.cxx:378
+msgid "Editor not configured"
+msgstr ""
+
+#: src/LyricsPage.cxx:385
+msgid "Do you really want to start an editor and edit these lyrics?"
+msgstr ""
+
+#: src/LyricsPage.cxx:403 src/LyricsPage.cxx:427
+msgid "Can't start editor"
+msgstr ""
+
+#: src/LyricsPage.cxx:430 src/LyricsPage.cxx:434
+msgid "Editor exited unexpectedly"
+msgstr ""
+
+#. lyrics for the song were saved on hard disk
+#: src/LyricsPage.cxx:456
+msgid "Lyrics saved"
+msgstr ""
+
+#: src/LyricsPage.cxx:462
+msgid "Lyrics deleted"
+msgstr ""
+
+#: src/LyricsPage.cxx:463
+msgid "No saved lyrics"
+msgstr ""
+
+#: src/Main.cxx:133
+#, c-format
+msgid "Connecting to %s"
+msgstr ""
+
+#: src/Main.cxx:149
+#, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
+msgstr ""
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/Options.cxx:216 src/Options.cxx:219
+msgid "translator-credits"
+msgstr ""
+
+#: src/OutputsPage.cxx:168
+#, c-format
+msgid "Switched to partition '%s'"
+msgstr ""
+
+#: src/OutputsPage.cxx:180 src/SongPage.cxx:69
+msgid "Name"
+msgstr ""
+
+#: src/OutputsPage.cxx:230
+#, c-format
+msgid "Output '%s' enabled"
+msgstr ""
+
+#: src/OutputsPage.cxx:241
+#, c-format
+msgid "Output '%s' disabled"
+msgstr ""
+
+#: src/OutputsPage.cxx:371 src/OutputsPage.cxx:480
+msgid "Outputs"
+msgstr ""
+
+#: src/OutputsPage.cxx:383
+msgid "Partition"
+msgstr ""
+
+#: src/OutputsPage.cxx:407
+msgid "Create new partition"
+msgstr ""
+
+#: src/player_command.cxx:94 src/QueuePage.cxx:651
+msgid "Shuffled queue"
+msgstr ""
+
+#: src/player_command.cxx:100
+msgid "Cleared queue"
+msgstr ""
+
+#. get path
+#: src/QueuePage.cxx:314
+msgid "Add"
+msgstr ""
+
+#: src/QueuePage.cxx:379 src/QueuePage.cxx:697
+msgid "Queue"
+msgstr ""
+
+#: src/QueuePage.cxx:381
+#, c-format
+msgid "Queue on %s"
+msgstr ""
+
+#. query the user for a filename
+#: src/save_playlist.cxx:86
+msgid "Save queue as"
+msgstr ""
+
+#: src/save_playlist.cxx:108
+#, c-format
+msgid "Replace %s?"
+msgstr ""
+
+#. success
+#: src/save_playlist.cxx:129
+#, c-format
+msgid "Saved %s"
+msgstr ""
+
+#: src/screen_client.cxx:41
+msgid "Database update running"
+msgstr ""
+
+#: src/screen_client.cxx:48
+#, c-format
+msgid "Database update of %s started"
+msgstr ""
+
+#: src/screen_client.cxx:51
+msgid "Database update started"
+msgstr ""
+
+#: src/screen.cxx:158
+msgid "Repeat mode is on"
+msgstr ""
+
+#: src/screen.cxx:159
+msgid "Repeat mode is off"
+msgstr ""
+
+#: src/screen.cxx:163
+msgid "Random mode is on"
+msgstr ""
+
+#: src/screen.cxx:164
+msgid "Random mode is off"
+msgstr ""
+
+#. "single" mode means
+#. that MPD will
+#. automatically stop
+#. after playing one
+#. single song
+#: src/screen.cxx:173
+msgid "Single mode is on"
+msgstr ""
+
+#: src/screen.cxx:174
+msgid "Single mode is off"
+msgstr ""
+
+#. "consume" mode means
+#. that MPD removes each
+#. song which has
+#. finished playing
+#: src/screen.cxx:182
+msgid "Consume mode is on"
+msgstr ""
+
+#: src/screen.cxx:183
+msgid "Consume mode is off"
+msgstr ""
+
+#: src/screen.cxx:186
+#, c-format
+msgid "Crossfade %d seconds"
+msgstr ""
+
+#: src/screen.cxx:198
+msgid "Database updated"
+msgstr ""
+
+#: src/screen.cxx:248
+msgid "Find mode: Wrapped"
+msgstr ""
+
+#: src/screen.cxx:249
+msgid "Find mode: Normal"
+msgstr ""
+
+#: src/screen.cxx:254
+msgid "Auto center mode: On"
+msgstr ""
+
+#: src/screen.cxx:255
+msgid "Auto center mode: Off"
+msgstr ""
+
+#: src/screen_find.cxx:33
+msgid "Find"
+msgstr ""
+
+#: src/screen_find.cxx:34
+msgid "Find backward"
+msgstr ""
+
+#: src/screen_find.cxx:35
+msgid "Jump"
+msgstr ""
+
+#: src/screen_find.cxx:81
+#, c-format
+msgid "Unable to find '%s'"
+msgstr ""
+
+#: src/screen_utils.cxx:150
+msgid "Password"
+msgstr ""
+
+#: src/SearchPage.cxx:51
+msgid "artist"
+msgstr ""
+
+#: src/SearchPage.cxx:52
+msgid "album"
+msgstr ""
+
+#: src/SearchPage.cxx:53
+msgid "title"
+msgstr ""
+
+#: src/SearchPage.cxx:54
+msgid "track"
+msgstr ""
+
+#: src/SearchPage.cxx:55
+msgid "name"
+msgstr ""
+
+#: src/SearchPage.cxx:56
+msgid "genre"
+msgstr ""
+
+#: src/SearchPage.cxx:57
+msgid "date"
+msgstr ""
+
+#: src/SearchPage.cxx:58
+msgid "composer"
+msgstr ""
+
+#: src/SearchPage.cxx:59
+msgid "performer"
+msgstr ""
+
+#: src/SearchPage.cxx:60
+msgid "comment"
+msgstr ""
+
+#: src/SearchPage.cxx:68
+msgid "file"
+msgstr ""
+
+#: src/SearchPage.cxx:90 src/SongPage.cxx:63
+msgid "Title"
+msgstr ""
+
+#: src/SearchPage.cxx:91 src/SongPage.cxx:62
+msgid "Artist"
+msgstr ""
+
+#: src/SearchPage.cxx:92 src/SongPage.cxx:64
+msgid "Album"
+msgstr ""
+
+#: src/SearchPage.cxx:93
+msgid "Filename"
+msgstr ""
+
+#: src/SearchPage.cxx:94
+msgid "Artist + Title"
+msgstr ""
+
+#: src/SearchPage.cxx:285 src/SearchPage.cxx:289
+msgid "Unrecognized suffix"
+msgstr ""
+
+#: src/SearchPage.cxx:337
+#, c-format
+msgid "Bad search tag %s"
+msgstr ""
+
+#: src/SearchPage.cxx:351
+#, c-format
+msgid "No argument for search tag %s"
+msgstr ""
+
+#: src/SearchPage.cxx:446 src/SearchPage.cxx:479 src/SearchPage.cxx:483
+#: src/SearchPage.cxx:487 src/SearchPage.cxx:546
+msgid "Search"
+msgstr ""
+
+#: src/SearchPage.cxx:509
+#, c-format
+msgid "Search mode: %s"
+msgstr ""
+
+#: src/SongPage.cxx:65
+msgid "Length"
+msgstr ""
+
+#: src/SongPage.cxx:66
+msgid "Position"
+msgstr ""
+
+#: src/SongPage.cxx:67
+msgid "Composer"
+msgstr ""
+
+#: src/SongPage.cxx:68
+msgid "Performer"
+msgstr ""
+
+#: src/SongPage.cxx:70
+msgid "Disc"
+msgstr ""
+
+#: src/SongPage.cxx:71
+msgid "Track"
+msgstr ""
+
+#: src/SongPage.cxx:72
+msgid "Date"
+msgstr ""
+
+#: src/SongPage.cxx:73
+msgid "Genre"
+msgstr ""
+
+#: src/SongPage.cxx:74
+msgid "Comment"
+msgstr ""
+
+#: src/SongPage.cxx:75
+msgid "Path"
+msgstr ""
+
+#: src/SongPage.cxx:76
+msgid "Bitrate"
+msgstr ""
+
+#: src/SongPage.cxx:77
+msgid "Format"
+msgstr ""
+
+#: src/SongPage.cxx:94
+msgid "Number of artists"
+msgstr ""
+
+#: src/SongPage.cxx:95
+msgid "Number of albums"
+msgstr ""
+
+#: src/SongPage.cxx:96
+msgid "Number of songs"
+msgstr ""
+
+#: src/SongPage.cxx:97
+msgid "Uptime"
+msgstr ""
+
+#: src/SongPage.cxx:98
+msgid "Most recent db update"
+msgstr ""
+
+#: src/SongPage.cxx:99
+msgid "Playtime"
+msgstr ""
+
+#: src/SongPage.cxx:100
+msgid "DB playtime"
+msgstr ""
+
+#: src/SongPage.cxx:205
+msgid "Song viewer"
+msgstr ""
+
+#: src/SongPage.cxx:371
+msgid "MPD statistics"
+msgstr ""
+
+#: src/SongPage.cxx:457
+msgid "Selected song"
+msgstr ""
+
+#: src/SongPage.cxx:467
+msgid "Currently playing song"
+msgstr ""
+
+#: src/SongPage.cxx:472
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/SongPage.cxx:556
+msgid "Song"
+msgstr ""
+
+#: src/StatusBar.cxx:165
+msgid "Playing:"
+msgstr ""
+
+#: src/StatusBar.cxx:169
+msgid "[Paused]"
+msgstr ""
+
+#: src/Styles.cxx:252 src/Styles.cxx:313
+msgid "Unknown color"
+msgstr ""
+
+#: src/Styles.cxx:323
+msgid "Unknown color field"
+msgstr ""
+
+#: src/Styles.cxx:356
+msgid "Terminal lacks color capabilities"
+msgstr ""
+
+#: src/TagListPage.cxx:71
+msgid "All tracks"
+msgstr ""
+
+#: src/time_format.cxx:44
+msgid "year"
+msgstr ""
+
+#: src/time_format.cxx:46
+msgid "years"
+msgstr ""
+
+#: src/time_format.cxx:54
+msgid "week"
+msgstr ""
+
+#: src/time_format.cxx:57
+msgid "weeks"
+msgstr ""
+
+#: src/time_format.cxx:65
+msgid "day"
+msgstr ""
+
+#: src/time_format.cxx:68
+msgid "days"
+msgstr ""
+
+#: src/TitleBar.cxx:101
+msgid "Volume n/a"
+msgstr ""
+
+#: src/TitleBar.cxx:103
+#, c-format
+msgid "Volume %d%%"
+msgstr ""
diff -Nru ncmpc-0.45/po/he.po ncmpc-0.46/po/he.po
--- ncmpc-0.45/po/he.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/he.po	2021-11-26 15:32:38.000000000 +0000
@@ -3,7 +3,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-24 15:23+0200\n"
-"PO-Revision-Date: 2020-09-30 11:40+0000\n"
+"PO-Revision-Date: 2021-11-08 13:50+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/ncmpc/"
 "translations/he/>\n"
@@ -13,7 +13,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
 "n % 10 == 0) ? 2 : 3));\n"
-"X-Generator: Weblate 4.3-dev\n"
+"X-Generator: Weblate 4.9-dev\n"
 "X-Launchpad-Export-Date: 2010-09-07 18:28+0000\n"
 
 #: src/Bindings.cxx:80 src/Bindings.cxx:86
@@ -154,26 +154,24 @@
 msgstr "הנמך"
 
 #: src/Command.cxx:99
-#, fuzzy
 msgid "Select/deselect song in queue"
-msgstr "בחר/הסר שיר ברשימת שירים"
+msgstr "בחירת/ביטול שיר בתור"
 
 #: src/Command.cxx:101
 msgid "Select all listed items"
 msgstr "בחר את הכל"
 
 #: src/Command.cxx:103
-#, fuzzy
 msgid "Delete song from queue"
-msgstr "מחק שיר מרשימת השירים"
+msgstr "מחיקת שיר מהתור"
 
 #: src/Command.cxx:105
 msgid "Shuffle queue"
-msgstr ""
+msgstr "ערבוב תור"
 
 #: src/Command.cxx:107
 msgid "Clear queue"
-msgstr ""
+msgstr "פינוי תור"
 
 #: src/Command.cxx:109
 msgid "Toggle repeat mode"
@@ -201,12 +199,11 @@
 
 #: src/Command.cxx:121
 msgid "Save queue"
-msgstr ""
+msgstr "שמירת תור"
 
 #: src/Command.cxx:123 src/HelpPage.cxx:175
-#, fuzzy
 msgid "Append song to queue"
-msgstr "הוסף שיר לרשימת שירים"
+msgstr "הוספת שיר לתור"
 
 #: src/Command.cxx:126
 msgid "Go to root directory"
@@ -281,7 +278,7 @@
 
 #: src/Command.cxx:181
 msgid "Library page"
-msgstr ""
+msgstr "עמוד ספריה"
 
 #: src/Command.cxx:185 src/HelpPage.cxx:170
 msgid "Search screen"
@@ -311,20 +308,19 @@
 
 #: src/Command.cxx:205
 msgid "Edit the current item"
-msgstr ""
+msgstr "עריכת הפריט הנוכחי"
 
 #: src/Command.cxx:210 src/HelpPage.cxx:197
 msgid "Outputs screen"
 msgstr "מסך הפלט"
 
 #: src/Command.cxx:215 src/HelpPage.cxx:204
-#, fuzzy
 msgid "Chat screen"
-msgstr "מסך הבא"
+msgstr "מסך צ׳אט"
 
 #: src/ConfigParser.cxx:120
 msgid "Word expected"
-msgstr ""
+msgstr "מילה צפויה"
 
 #: src/ConfigParser.cxx:139
 msgid "Malformed hotkey definition"
@@ -387,9 +383,8 @@
 msgstr "שם מסך לא ידוע"
 
 #: src/ConfigParser.cxx:388
-#, fuzzy
 msgid "Unknown MPD tag"
-msgstr "פקודה לא ידועה"
+msgstr "תגית MPD בלתי מוכרת"
 
 #: src/ConfigParser.cxx:415
 msgid "Invalid search mode"
@@ -437,15 +432,15 @@
 msgstr "דפדף"
 
 #: src/FileListPage.cxx:125
-#, fuzzy, c-format
+#, c-format
 msgid "Loading playlist '%s'"
-msgstr "טוען רשימת שירים %s...."
+msgstr "רשימת הנגינה ‚%s’ נטענת"
 
 #: src/FileListPage.cxx:165 src/FileListPage.cxx:254 src/FileListPage.cxx:277
 #: src/TagListPage.cxx:184
-#, fuzzy, c-format
+#, c-format
 msgid "Adding '%s' to queue"
-msgstr "מוסיף %s לרשימת השירים"
+msgstr "‚%s’ נוסף לרשימת הנגינה"
 
 #: src/HelpPage.cxx:61
 msgid "Movement"
@@ -472,9 +467,8 @@
 msgstr "מחק רשימת שירים"
 
 #: src/HelpPage.cxx:172
-#, fuzzy
 msgid "New search"
-msgstr "חיפוש"
+msgstr "חיפוש חדש"
 
 #: src/HelpPage.cxx:173
 msgid "Select and play"
@@ -500,7 +494,7 @@
 
 #: src/HelpPage.cxx:190
 msgid "Add or edit lyrics"
-msgstr ""
+msgstr "עריכת או הוספת מילות שיר"
 
 #: src/HelpPage.cxx:191
 msgid "Save lyrics"
@@ -508,15 +502,15 @@
 
 #: src/HelpPage.cxx:192
 msgid "Delete saved lyrics"
-msgstr ""
+msgstr "מחיקת מילות שירים שמורות"
 
 #: src/HelpPage.cxx:199
 msgid "Enable/disable output"
-msgstr "אשר/אסור על פלט"
+msgstr "הפעלת/השבתת פלט"
 
 #: src/HelpPage.cxx:206
 msgid "Write a message"
-msgstr ""
+msgstr "כתיבת הודעה"
 
 #: src/HelpPage.cxx:211
 msgid "Keydef screen"
@@ -566,7 +560,7 @@
 
 #: src/KeyDefPage.cxx:187
 msgid "Ctrl-Space can't be used"
-msgstr ""
+msgstr "אי אפשר להשתמש ב־Ctrl-רווח"
 
 #: src/KeyDefPage.cxx:193
 #, c-format
@@ -576,7 +570,7 @@
 #: src/KeyDefPage.cxx:203
 #, c-format
 msgid "Assigned %s to %s"
-msgstr "הוקצה  %s ל %s"
+msgstr "הוקצה %s אל %s"
 
 #: src/KeyDefPage.cxx:230
 msgid "Add new key"
@@ -596,9 +590,8 @@
 msgstr "תצורת מקשים לא שונתה."
 
 #: src/KeyDefPage.cxx:407
-#, fuzzy
 msgid "Unable to write configuration"
-msgstr "הגדרת המקשים החמים חסרה"
+msgstr "לא ניתן לכתוב את ההגדרות"
 
 #: src/KeyDefPage.cxx:416 src/KeyDefPage.cxx:425
 msgid "Error"
@@ -627,7 +620,7 @@
 
 #: src/KeyDefPage.cxx:607
 msgid "Keys"
-msgstr ""
+msgstr "מקשים"
 
 #: src/KeyName.cxx:115
 msgid "Undefined"
@@ -701,35 +694,33 @@
 #: src/KeyName.cxx:167
 #, c-format
 msgid "Ctrl-%c"
-msgstr ""
+msgstr "Ctrl-%c"
 
 #. translate "M-X" to "Alt-X"
 #: src/KeyName.cxx:173
 #, c-format
 msgid "Alt-%c"
-msgstr ""
+msgstr "Alt-%c"
 
 #: src/LibraryPage.cxx:45
-#, fuzzy
 msgid "Artists"
-msgstr "אומן"
+msgstr "אומנים"
 
 #: src/LibraryPage.cxx:48 src/LibraryPage.cxx:175
-#, fuzzy
 msgid "Albums"
-msgstr "אלבום"
+msgstr "אלבומים"
 
 #: src/LibraryPage.cxx:123
 msgid "All"
-msgstr ""
+msgstr "הכול"
 
 #: src/LibraryPage.cxx:197
 msgid "Songs"
-msgstr ""
+msgstr "שירים"
 
 #: src/LibraryPage.cxx:314
 msgid "Library"
-msgstr ""
+msgstr "ספרייה"
 
 #: src/ListWindow.cxx:213
 msgid "Range selection disabled"
@@ -747,7 +738,7 @@
 #: src/LyricsPage.cxx:270
 #, c-format
 msgid "Lyrics timeout occurred after %d seconds"
-msgstr ""
+msgstr "אירעה שגיאת תום זמן המתנה לאחר %d שניות"
 
 #: src/LyricsPage.cxx:353 src/LyricsPage.cxx:361 src/LyricsPage.cxx:371
 #: src/LyricsPage.cxx:507
@@ -762,19 +753,19 @@
 
 #: src/LyricsPage.cxx:378
 msgid "Editor not configured"
-msgstr ""
+msgstr "העורך לא מוגדר"
 
 #: src/LyricsPage.cxx:385
 msgid "Do you really want to start an editor and edit these lyrics?"
-msgstr ""
+msgstr "להפעיל את העורך ולערוך את מילות השירים האלה?"
 
 #: src/LyricsPage.cxx:403 src/LyricsPage.cxx:427
 msgid "Can't start editor"
-msgstr ""
+msgstr "אי אפשר להפעיל את העורך"
 
 #: src/LyricsPage.cxx:430 src/LyricsPage.cxx:434
 msgid "Editor exited unexpectedly"
-msgstr ""
+msgstr "העורך נעצר באופן פתאומי"
 
 #. lyrics for the song were saved on hard disk
 #: src/LyricsPage.cxx:456
@@ -783,21 +774,21 @@
 
 #: src/LyricsPage.cxx:462
 msgid "Lyrics deleted"
-msgstr ""
+msgstr "מילות השירים נמחקו"
 
 #: src/LyricsPage.cxx:463
 msgid "No saved lyrics"
-msgstr ""
+msgstr "אין מילות שירים שנשמרו"
 
 #: src/Main.cxx:133
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s"
-msgstr "מתחבר ל %s"
+msgstr "מתבצעת התחברות אל %s"
 
 #: src/Main.cxx:149
-#, fuzzy, c-format
+#, c-format
 msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
-msgstr "שגיאה: גרסת התוכנה %d.%d.%d ישנה מדי (צריך %s)"
+msgstr "שגיאה: גרסת ה־MPD‏ %d.%d.%d ישנה מדי (צריך %s)"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
@@ -819,33 +810,32 @@
 #: src/OutputsPage.cxx:230
 #, c-format
 msgid "Output '%s' enabled"
-msgstr "פלט  '%s' אפשרי"
+msgstr "הפלט ‚%s’ מופעל"
 
 #: src/OutputsPage.cxx:241
 #, c-format
 msgid "Output '%s' disabled"
-msgstr "פלט  '%s' אינו אפשרי"
+msgstr "הפלט ‚%s’ מושבת"
 
 #: src/OutputsPage.cxx:371 src/OutputsPage.cxx:480
 msgid "Outputs"
 msgstr "פלטים"
 
 #: src/OutputsPage.cxx:383
-#, fuzzy
 msgid "Partition"
-msgstr "אומן"
+msgstr "מחיצה"
 
 #: src/OutputsPage.cxx:407
 msgid "Create new partition"
-msgstr ""
+msgstr "יצירת מחיצה חדשה"
 
 #: src/player_command.cxx:94 src/QueuePage.cxx:651
 msgid "Shuffled queue"
-msgstr ""
+msgstr "תור מעורבב"
 
 #: src/player_command.cxx:100
 msgid "Cleared queue"
-msgstr ""
+msgstr "התור התפנה"
 
 #. get path
 #: src/QueuePage.cxx:314
@@ -854,17 +844,17 @@
 
 #: src/QueuePage.cxx:379 src/QueuePage.cxx:697
 msgid "Queue"
-msgstr ""
+msgstr "תור"
 
 #: src/QueuePage.cxx:381
 #, c-format
 msgid "Queue on %s"
-msgstr ""
+msgstr "תור על %s"
 
 #. query the user for a filename
 #: src/save_playlist.cxx:86
 msgid "Save queue as"
-msgstr ""
+msgstr "שמירת התור בשם"
 
 #: src/save_playlist.cxx:108
 #, c-format
@@ -878,9 +868,8 @@
 msgstr "שמירת %s"
 
 #: src/screen_client.cxx:41
-#, fuzzy
 msgid "Database update running"
-msgstr "עדכון בסיס הנתנונים פועל...."
+msgstr "עדכון מסד נתונים פעיל"
 
 #: src/screen_client.cxx:48
 #, c-format
@@ -1044,7 +1033,7 @@
 
 #: src/SearchPage.cxx:285 src/SearchPage.cxx:289
 msgid "Unrecognized suffix"
-msgstr ""
+msgstr "סיומת לא מוכרת"
 
 #: src/SearchPage.cxx:337
 #, c-format
@@ -1068,18 +1057,17 @@
 
 #: src/SongPage.cxx:65
 msgid "Length"
-msgstr ""
+msgstr "משך"
 
 #: src/SongPage.cxx:66
 msgid "Position"
-msgstr ""
+msgstr "מיקום"
 
 #: src/SongPage.cxx:67
 msgid "Composer"
 msgstr "מלחון"
 
 #: src/SongPage.cxx:68
-#, fuzzy
 msgid "Performer"
 msgstr "מבצע"
 
@@ -1113,7 +1101,7 @@
 
 #: src/SongPage.cxx:77
 msgid "Format"
-msgstr ""
+msgstr "תצורה"
 
 #: src/SongPage.cxx:94
 msgid "Number of artists"
@@ -1166,7 +1154,7 @@
 
 #: src/SongPage.cxx:556
 msgid "Song"
-msgstr ""
+msgstr "שיר"
 
 #: src/StatusBar.cxx:165
 msgid "Playing:"
@@ -1177,9 +1165,8 @@
 msgstr "[הפסקה]"
 
 #: src/Styles.cxx:252 src/Styles.cxx:313
-#, fuzzy
 msgid "Unknown color"
-msgstr "פקודה לא ידועה"
+msgstr "צבע לא ידוע"
 
 #: src/Styles.cxx:323
 msgid "Unknown color field"
@@ -1187,7 +1174,7 @@
 
 #: src/Styles.cxx:356
 msgid "Terminal lacks color capabilities"
-msgstr "המסוף ללא  יכולת תמיכה בצבעים"
+msgstr "למסוף אין תמיכה בצבעים"
 
 #: src/TagListPage.cxx:71
 msgid "All tracks"
@@ -1195,27 +1182,27 @@
 
 #: src/time_format.cxx:44
 msgid "year"
-msgstr ""
+msgstr "שנה"
 
 #: src/time_format.cxx:46
 msgid "years"
-msgstr ""
+msgstr "שנים"
 
 #: src/time_format.cxx:54
 msgid "week"
-msgstr ""
+msgstr "שבוע"
 
 #: src/time_format.cxx:57
 msgid "weeks"
-msgstr ""
+msgstr "שבועות"
 
 #: src/time_format.cxx:65
 msgid "day"
-msgstr ""
+msgstr "יום"
 
 #: src/time_format.cxx:68
 msgid "days"
-msgstr ""
+msgstr "ימים"
 
 #: src/TitleBar.cxx:101
 msgid "Volume n/a"
diff -Nru ncmpc-0.45/po/LINGUAS ncmpc-0.46/po/LINGUAS
--- ncmpc-0.45/po/LINGUAS	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/LINGUAS	2021-11-26 15:32:38.000000000 +0000
@@ -4,6 +4,7 @@
 en
 eo
 es
+fa
 fi
 fr
 gl
@@ -12,6 +13,7 @@
 ie
 it
 ja
+lt
 ko
 nb
 nl
diff -Nru ncmpc-0.45/po/lt.po ncmpc-0.46/po/lt.po
--- ncmpc-0.45/po/lt.po	1970-01-01 00:00:00.000000000 +0000
+++ ncmpc-0.46/po/lt.po	2021-11-26 15:32:38.000000000 +0000
@@ -0,0 +1,1216 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the ncmpc package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ncmpc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-08-24 15:23+0200\n"
+"PO-Revision-Date: 2021-08-27 09:34+0000\n"
+"Last-Translator: Gediminas Murauskas <muziejusinfo@gmail.com>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/ncmpc/"
+"translations/lt/>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
+"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
+"1 : 2);\n"
+"X-Generator: Weblate 4.8.1-dev\n"
+
+#: src/Bindings.cxx:80 src/Bindings.cxx:86
+#, c-format
+msgid "Key %s assigned to %s and %s"
+msgstr "Klavišas %s priskirtas %s ir %s"
+
+#: src/ChatPage.cxx:64 src/ChatPage.cxx:182
+msgid "Chat"
+msgstr "Pokalbiai"
+
+#: src/ChatPage.cxx:163
+msgid "Your message"
+msgstr "Tavo žinutė"
+
+#: src/ChatPage.cxx:172
+msgid "Message could not be sent"
+msgstr "Žinutės nepavyko išsiųsti"
+
+#: src/Command.cxx:30
+msgid "Key configuration screen"
+msgstr "Klavišų konfigūracijos ekranas"
+
+#: src/Command.cxx:33
+msgid "Quit"
+msgstr "Išeiti"
+
+#: src/Command.cxx:37
+msgid "Move cursor up"
+msgstr "Perkelti žymeklį aukštyn"
+
+#: src/Command.cxx:39
+msgid "Move cursor down"
+msgstr "Perkelti žymeklį žemyn"
+
+#: src/Command.cxx:41
+msgid "Move cursor to the top of screen"
+msgstr "Perkelti žymeklį į ekrano viršų"
+
+#: src/Command.cxx:43
+msgid "Move cursor to the middle of screen"
+msgstr "Perkelti žymeklį į ekrano vidurį"
+
+#: src/Command.cxx:45
+msgid "Move cursor to the bottom of screen"
+msgstr "Perkelti žymeklį į ekrano apačią"
+
+#: src/Command.cxx:47
+msgid "Move cursor to the top of the list"
+msgstr "Perkelti žymeklį į sąrašo viršų"
+
+#: src/Command.cxx:49
+msgid "Move cursor to the bottom of the list"
+msgstr "Perkelti žymeklį į sąrašo apačią"
+
+#: src/Command.cxx:51
+msgid "Page up"
+msgstr "Puslapis aukštyn"
+
+#: src/Command.cxx:53
+msgid "Page down"
+msgstr "Puslapis žemyn"
+
+#: src/Command.cxx:55
+msgid "Range selection"
+msgstr "Diapazono pasirinkimas"
+
+#: src/Command.cxx:57
+msgid "Scroll down one line"
+msgstr "Slinkti viena eilute žemyn"
+
+#: src/Command.cxx:59
+msgid "Scroll up one line"
+msgstr "Slinkti viena eilute aukštyn"
+
+#: src/Command.cxx:61
+msgid "Scroll up half a screen"
+msgstr "Slinkti aukštyn pusę ekrano"
+
+#: src/Command.cxx:63
+msgid "Scroll down half a screen"
+msgstr "Slinkti žemyn pusę ekrano"
+
+#: src/Command.cxx:65
+msgid "Select currently playing song"
+msgstr "Pasirinkti šiuo metu leidžiamą dainą"
+
+#: src/Command.cxx:70
+msgid "Help screen"
+msgstr "Žinyno ekranas"
+
+#: src/Command.cxx:72 src/HelpPage.cxx:141
+msgid "Queue screen"
+msgstr "Eilės ekranas"
+
+#: src/Command.cxx:74 src/HelpPage.cxx:156
+msgid "Browse screen"
+msgstr "Naršymo ekranas"
+
+#: src/Command.cxx:79
+msgid "Play/Enter directory"
+msgstr "Groti/eiti į katalogą"
+
+#: src/Command.cxx:81
+msgid "Pause"
+msgstr "Pauzė"
+
+#: src/Command.cxx:83
+msgid "Stop"
+msgstr "Sustabdyti"
+
+#: src/Command.cxx:85
+msgid "Crop"
+msgstr "Apkarpyti"
+
+#: src/Command.cxx:87
+msgid "Next track"
+msgstr "Kitas kūrinys"
+
+#: src/Command.cxx:89
+msgid "Previous track"
+msgstr "Ankstesnis kūrinys"
+
+#: src/Command.cxx:91
+msgid "Seek forward"
+msgstr "Persukti pirmyn"
+
+#: src/Command.cxx:93
+msgid "Seek backward"
+msgstr "Persukti atgal"
+
+#: src/Command.cxx:95
+msgid "Increase volume"
+msgstr "Padidinti garsą"
+
+#: src/Command.cxx:97
+msgid "Decrease volume"
+msgstr "Sumažinti garsą"
+
+#: src/Command.cxx:99
+msgid "Select/deselect song in queue"
+msgstr "Pasirinkti/panaikinti dainos pasirinkimą eilėje"
+
+#: src/Command.cxx:101
+msgid "Select all listed items"
+msgstr "Pasirinkti visus išvardintus elementus"
+
+#: src/Command.cxx:103
+msgid "Delete song from queue"
+msgstr "Ištrinti dainą iš eilės"
+
+#: src/Command.cxx:105
+msgid "Shuffle queue"
+msgstr "Maišyti eilę"
+
+#: src/Command.cxx:107
+msgid "Clear queue"
+msgstr "Išvalyti eilę"
+
+#: src/Command.cxx:109
+msgid "Toggle repeat mode"
+msgstr "Perjungti kartojimo režimą"
+
+#: src/Command.cxx:111
+msgid "Toggle random mode"
+msgstr "Perjungti atsitiktinį režimą"
+
+#: src/Command.cxx:113
+msgid "Toggle single mode"
+msgstr "Perjungti vienos dainos režimą"
+
+#: src/Command.cxx:115
+msgid "Toggle consume mode"
+msgstr "Perjungti panaikinimo iš eilės po perklausimo režimą"
+
+#: src/Command.cxx:117
+msgid "Toggle crossfade mode"
+msgstr "Perjungti kryžminimo režimą"
+
+#: src/Command.cxx:119
+msgid "Start a music database update"
+msgstr "Pradėti muzikos duomenų bazės atnaujinimą"
+
+#: src/Command.cxx:121
+msgid "Save queue"
+msgstr "Išsaugoti eilę"
+
+#: src/Command.cxx:123 src/HelpPage.cxx:175
+msgid "Append song to queue"
+msgstr "Įtraukti dainą į eilę"
+
+#: src/Command.cxx:126
+msgid "Go to root directory"
+msgstr "Eiti į šakninį katalogą"
+
+#: src/Command.cxx:128
+msgid "Go to parent directory"
+msgstr "Eiti į pirminį katalogą"
+
+#: src/Command.cxx:131
+msgid "Locate song in browser"
+msgstr "Surasti dainą naršyklėje"
+
+#: src/Command.cxx:135
+msgid "Move item up"
+msgstr "Perkelti elementą aukštyn"
+
+#: src/Command.cxx:137
+msgid "Move item down"
+msgstr "Perkelti elementą žemyn"
+
+#: src/Command.cxx:139
+msgid "Refresh screen"
+msgstr "Atnaujinti ekraną"
+
+#. translators: toggle between wrapping and non-wrapping
+#. search
+#: src/Command.cxx:146
+msgid "Toggle find mode"
+msgstr "Perjungti paieškos režimą"
+
+#. translators: the auto center mode always centers the song
+#. currently being played
+#: src/Command.cxx:150
+msgid "Toggle auto center mode"
+msgstr "Perjungti automatinio centravimo režimą"
+
+#: src/Command.cxx:155
+msgid "Next screen"
+msgstr "Kitas ekranas"
+
+#: src/Command.cxx:157
+msgid "Previous screen"
+msgstr "Ankstesnis ekranas"
+
+#: src/Command.cxx:159
+msgid "Swap to most recent screen"
+msgstr "Perjungti į paskiausią ekraną"
+
+#: src/Command.cxx:164
+msgid "Forward find"
+msgstr "Rasti toliau"
+
+#: src/Command.cxx:166
+msgid "Forward find next"
+msgstr "Rasti toliau sekantį"
+
+#: src/Command.cxx:168
+msgid "Backward find"
+msgstr "Rasti prieš tai"
+
+#: src/Command.cxx:170
+msgid "Backward find previous"
+msgstr "Rasti prieš tai sekantį"
+
+#. translators: this queries the user for a string
+#. * and jumps directly (while the user is typing)
+#. * to the entry which begins with this string
+#: src/Command.cxx:175
+msgid "Jump to"
+msgstr "Pereiti prie"
+
+#: src/Command.cxx:181
+msgid "Library page"
+msgstr "Bibliotekos puslapis"
+
+#: src/Command.cxx:185 src/HelpPage.cxx:170
+msgid "Search screen"
+msgstr "Paieškos ekranas"
+
+#: src/Command.cxx:187
+msgid "Change search mode"
+msgstr "Pakeiskite paieškos režimą"
+
+#: src/Command.cxx:191
+msgid "View the selected and the currently playing song"
+msgstr "Peržiūrėti pasirinktą ir šiuo metu grojamą dainą"
+
+#: src/Command.cxx:195 src/HelpPage.cxx:182
+msgid "Lyrics screen"
+msgstr "Dainos teksto ekranas"
+
+#. translators: interrupt the current background action,
+#. e.g. stop loading lyrics from the internet
+#: src/Command.cxx:199
+msgid "Interrupt action"
+msgstr "Nutraukti veiksmą"
+
+#: src/Command.cxx:201
+msgid "Update Lyrics"
+msgstr "Atnaujinti dainos tekstą"
+
+#: src/Command.cxx:205
+msgid "Edit the current item"
+msgstr "Redaguoti dabartinį elementą"
+
+#: src/Command.cxx:210 src/HelpPage.cxx:197
+msgid "Outputs screen"
+msgstr "Išvesties ekranas"
+
+#: src/Command.cxx:215 src/HelpPage.cxx:204
+msgid "Chat screen"
+msgstr "Pokalbių ekranas"
+
+#: src/ConfigParser.cxx:120
+msgid "Word expected"
+msgstr "Laukiamas žodis"
+
+#: src/ConfigParser.cxx:139
+msgid "Malformed hotkey definition"
+msgstr "Netinkamai suformuota sparčiojo klavišo apibrėžtis"
+
+#. the hotkey configuration
+#. line is incomplete
+#: src/ConfigParser.cxx:158
+msgid "Incomplete hotkey configuration"
+msgstr "Nebaigta sparčiųjų klavišų konfigūracija"
+
+#. the hotkey configuration
+#. contains an unknown
+#. command
+#: src/ConfigParser.cxx:172
+msgid "Unknown command"
+msgstr "Nežinoma komanda"
+
+#. translators: ncmpc
+#. supports displaying the
+#. "elapsed" or "remaining"
+#. time of a song being
+#. played; in this case, the
+#. configuration file
+#. contained an invalid
+#. setting
+#: src/ConfigParser.cxx:210
+msgid "Bad time display type"
+msgstr "Netinkamas laiko rodymo tipas"
+
+#. an equals sign '=' was expected while parsing a
+#. configuration file line
+#: src/ConfigParser.cxx:224 src/ConfigParser.cxx:454
+msgid "Missing '='"
+msgstr "Trūksta „=“"
+
+#: src/ConfigParser.cxx:273
+msgid "Bad color name"
+msgstr "Blogas spalvos pavadinimas"
+
+#: src/ConfigParser.cxx:282
+msgid "Incomplete color definition"
+msgstr "Nebaigtas spalvos apibrėžimas"
+
+#: src/ConfigParser.cxx:288 src/SearchPage.cxx:244
+msgid "Invalid number"
+msgstr "Netinkamas skaičius"
+
+#: src/ConfigParser.cxx:295
+msgid "Malformed color definition"
+msgstr "Netinkamai suformuotas spalvos apibrėžimas"
+
+#. an unknown screen
+#. name was specified
+#. in the
+#. configuration
+#. file
+#: src/ConfigParser.cxx:359
+msgid "Unknown screen name"
+msgstr "Nežinomas ekrano pavadinimas"
+
+#: src/ConfigParser.cxx:388
+msgid "Unknown MPD tag"
+msgstr "Nežinoma MPD žyma"
+
+#: src/ConfigParser.cxx:415
+msgid "Invalid search mode"
+msgstr "Netinkamas paieškos režimas"
+
+#: src/ConfigParser.cxx:433
+msgid "Unknown search mode"
+msgstr "Nežinomas paieškos režimas"
+
+#: src/ConfigParser.cxx:621
+msgid "Unknown configuration parameter"
+msgstr "Nežinomas konfigūracijos parametras"
+
+#: src/CustomColors.cxx:57
+msgid "Terminal lacks support for changing colors"
+msgstr "Terminale nėra spalvų keitimo palaikymo"
+
+#. translators: the "delete" command is only possible
+#. for playlists; the user attempted to delete a song
+#. or a directory or something else
+#: src/FileBrowserPage.cxx:246
+msgid "Deleting this item is not possible"
+msgstr "Šio elemento ištrinti neįmanoma"
+
+#: src/FileBrowserPage.cxx:254
+#, c-format
+msgid "Delete playlist %s?"
+msgstr "Ištrinti grojaraštį %s?"
+
+#. translators: a dialog was aborted by the user
+#: src/FileBrowserPage.cxx:259 src/KeyDefPage.cxx:182 src/LyricsPage.cxx:388
+#: src/save_playlist.cxx:111
+msgid "Aborted"
+msgstr "Nutraukta"
+
+#. translators: MPD deleted the playlist, as requested by the
+#. user
+#: src/FileBrowserPage.cxx:272
+msgid "Playlist deleted"
+msgstr "Grojaraštis ištrintas"
+
+#. translators: caption of the browser screen
+#: src/FileBrowserPage.cxx:299 src/FileBrowserPage.cxx:381
+msgid "Browse"
+msgstr "Naršyti"
+
+#: src/FileListPage.cxx:125
+#, c-format
+msgid "Loading playlist '%s'"
+msgstr "Įkeliamas grojaraštis „%s“"
+
+#: src/FileListPage.cxx:165 src/FileListPage.cxx:254 src/FileListPage.cxx:277
+#: src/TagListPage.cxx:184
+#, c-format
+msgid "Adding '%s' to queue"
+msgstr "„%s“ įtraukiama į eilę"
+
+#: src/HelpPage.cxx:61
+msgid "Movement"
+msgstr "Judėjimas"
+
+#: src/HelpPage.cxx:106
+msgid "Global"
+msgstr "Visuotiniai"
+
+#: src/HelpPage.cxx:143
+msgid "Play"
+msgstr "Groti"
+
+#: src/HelpPage.cxx:150
+msgid "Center"
+msgstr "Centruoti"
+
+#: src/HelpPage.cxx:158
+msgid "Enter directory/Select and play song"
+msgstr "Įeiti į katalogą/pasirinkti ir paleisti dainą"
+
+#: src/HelpPage.cxx:162
+msgid "Delete playlist"
+msgstr "Ištrinti grojaraštį"
+
+#: src/HelpPage.cxx:172
+msgid "New search"
+msgstr "Nauja paieška"
+
+#: src/HelpPage.cxx:173
+msgid "Select and play"
+msgstr "Pasirinkti ir groti"
+
+#: src/HelpPage.cxx:184
+msgid "View Lyrics"
+msgstr "Peržiūrėti dainos tekstą"
+
+#: src/HelpPage.cxx:185
+msgid "(Re)load lyrics"
+msgstr "(Iš naujo) įkelti dainos žodžius"
+
+#. to translators: this hotkey aborts the retrieval of lyrics
+#. from the server
+#: src/HelpPage.cxx:188
+msgid "Interrupt retrieval"
+msgstr "Nutraukti gavimą"
+
+#: src/HelpPage.cxx:189
+msgid "Download lyrics for currently playing song"
+msgstr "Atsisiųsti šiuo metu grojamos dainos žodžius"
+
+#: src/HelpPage.cxx:190
+msgid "Add or edit lyrics"
+msgstr "Pridėti arba redaguoti dainos tekstą"
+
+#: src/HelpPage.cxx:191
+msgid "Save lyrics"
+msgstr "Išsaugoti dainos žodžius"
+
+#: src/HelpPage.cxx:192
+msgid "Delete saved lyrics"
+msgstr "Ištrinti išsaugotus dainų tekstus"
+
+#: src/HelpPage.cxx:199
+msgid "Enable/disable output"
+msgstr "Įjungti/išjungti išvestį"
+
+#: src/HelpPage.cxx:206
+msgid "Write a message"
+msgstr "Rašyti žinutę"
+
+#: src/HelpPage.cxx:211
+msgid "Keydef screen"
+msgstr "Klavišų priskyrimo ekranas"
+
+#: src/HelpPage.cxx:213
+msgid "Edit keydefs for selected command"
+msgstr "Redaguoti pasirinktos komandos klavišų nustatymus"
+
+#: src/HelpPage.cxx:214
+msgid "Remove selected keydef"
+msgstr "Pašalinti pasirinktą klaviatūros klavišo nustatymą"
+
+#: src/HelpPage.cxx:215
+msgid "Add a keydef"
+msgstr "Pridėti klavišo nustatymą"
+
+#: src/HelpPage.cxx:216
+msgid "Go up a level"
+msgstr "Pakilti vienu lygiu"
+
+#: src/HelpPage.cxx:217
+msgid "Apply and save changes"
+msgstr "Taikyti ir išsaugoti pakeitimus"
+
+#: src/HelpPage.cxx:246 src/HelpPage.cxx:330
+msgid "Help"
+msgstr "Pagalba"
+
+#: src/i18n.h:43
+msgid "y"
+msgstr "t"
+
+#: src/i18n.h:44
+msgid "n"
+msgstr "n"
+
+#: src/KeyDefPage.cxx:161
+msgid "Deleted"
+msgstr "Ištrinta"
+
+#: src/KeyDefPage.cxx:177
+#, c-format
+msgid "Enter new key for %s: "
+msgstr "Įveskite naują %s klavišą: "
+
+#: src/KeyDefPage.cxx:187
+msgid "Ctrl-Space can't be used"
+msgstr "Ctrl-Space negalima naudoti"
+
+#: src/KeyDefPage.cxx:193
+#, c-format
+msgid "Error: key %s is already used for %s"
+msgstr "Klaida: klavišas %s jau naudojamas %s"
+
+#: src/KeyDefPage.cxx:203
+#, c-format
+msgid "Assigned %s to %s"
+msgstr "%s priskirta %s"
+
+#: src/KeyDefPage.cxx:230
+msgid "Add new key"
+msgstr "Pridėti naują klavišą"
+
+#: src/KeyDefPage.cxx:252
+#, c-format
+msgid "Edit keys for %s"
+msgstr "Redaguoti %s klavišus"
+
+#: src/KeyDefPage.cxx:395
+msgid "You have new key bindings"
+msgstr "Turite naujus klavišų susiejimus"
+
+#: src/KeyDefPage.cxx:397
+msgid "Keybindings unchanged."
+msgstr "Klavišų sąsajos nepakeistos."
+
+#: src/KeyDefPage.cxx:407
+msgid "Unable to write configuration"
+msgstr "Nepavyksta įrašyti konfigūracijos"
+
+#: src/KeyDefPage.cxx:416 src/KeyDefPage.cxx:425
+msgid "Error"
+msgstr "Klaida"
+
+#: src/KeyDefPage.cxx:423
+#, c-format
+msgid "Wrote %s"
+msgstr "Parašė %s"
+
+#: src/KeyDefPage.cxx:436
+msgid "===> Apply key bindings "
+msgstr "===> Taikyti klavišų susiejimus "
+
+#: src/KeyDefPage.cxx:438
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Taikyti ir išsaugoti klavišų susiejimus  "
+
+#: src/KeyDefPage.cxx:475
+msgid "Edit key bindings"
+msgstr "Redaguoti klavišų susiejimus"
+
+#: src/KeyDefPage.cxx:557
+msgid "Note: Did you forget to 'Apply' your changes?"
+msgstr "Pastaba: ar pamiršote „Taikyti“ pakeitimus?"
+
+#: src/KeyDefPage.cxx:607
+msgid "Keys"
+msgstr "Klavišai"
+
+#: src/KeyName.cxx:115
+msgid "Undefined"
+msgstr "Neapibrėžta"
+
+#: src/KeyName.cxx:117
+msgid "Space"
+msgstr "Tarpas"
+
+#: src/KeyName.cxx:119
+msgid "Enter"
+msgstr "Enter"
+
+#: src/KeyName.cxx:121
+msgid "Backspace"
+msgstr "Backspace"
+
+#: src/KeyName.cxx:123
+msgid "Delete"
+msgstr "Delete"
+
+#: src/KeyName.cxx:125
+msgid "Up"
+msgstr "Rodyklė aukštyn"
+
+#: src/KeyName.cxx:127
+msgid "Down"
+msgstr "Rodyklė žemyn"
+
+#: src/KeyName.cxx:129
+msgid "Left"
+msgstr "Rodyklė kairėn"
+
+#: src/KeyName.cxx:131
+msgid "Right"
+msgstr "Rodyklė dešinėn"
+
+#: src/KeyName.cxx:133
+msgid "Home"
+msgstr "Home"
+
+#: src/KeyName.cxx:135
+msgid "End"
+msgstr "End"
+
+#: src/KeyName.cxx:137
+msgid "PageDown"
+msgstr "Puslapis žemyn"
+
+#: src/KeyName.cxx:139
+msgid "PageUp"
+msgstr "Puslapis aukštyn"
+
+#: src/KeyName.cxx:141
+msgid "Tab"
+msgstr "Tab"
+
+#: src/KeyName.cxx:143
+msgid "Shift+Tab"
+msgstr "Shift+Tab"
+
+#: src/KeyName.cxx:145
+msgid "Esc"
+msgstr "Esc"
+
+#: src/KeyName.cxx:147
+msgid "Insert"
+msgstr "Insert"
+
+#. translate "^X" to "Ctrl-X"
+#: src/KeyName.cxx:167
+#, c-format
+msgid "Ctrl-%c"
+msgstr "Ctrl-%c"
+
+#. translate "M-X" to "Alt-X"
+#: src/KeyName.cxx:173
+#, c-format
+msgid "Alt-%c"
+msgstr "Alt-%c"
+
+#: src/LibraryPage.cxx:45
+msgid "Artists"
+msgstr "Atlikėjai"
+
+#: src/LibraryPage.cxx:48 src/LibraryPage.cxx:175
+msgid "Albums"
+msgstr "Albumai"
+
+#: src/LibraryPage.cxx:123
+msgid "All"
+msgstr "Viskas"
+
+#: src/LibraryPage.cxx:197
+msgid "Songs"
+msgstr "Dainos"
+
+#: src/LibraryPage.cxx:314
+msgid "Library"
+msgstr "Biblioteka"
+
+#: src/ListWindow.cxx:213
+msgid "Range selection disabled"
+msgstr "Diapazono pasirinkimas išjungtas"
+
+#: src/ListWindow.cxx:216
+msgid "Range selection enabled"
+msgstr "Diapazono pasirinkimas įjungtas"
+
+#. translators: no lyrics were found for the song
+#: src/LyricsPage.cxx:253
+msgid "No lyrics"
+msgstr "Nėra dainų žodžių"
+
+#: src/LyricsPage.cxx:270
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr "Dainų žodžiams skirtasis laikas baigėsi po %d sekundžių"
+
+#: src/LyricsPage.cxx:353 src/LyricsPage.cxx:361 src/LyricsPage.cxx:371
+#: src/LyricsPage.cxx:507
+msgid "Lyrics"
+msgstr "Dainos žodžiai"
+
+#. translators: this message is displayed
+#. while data is retrieved
+#: src/LyricsPage.cxx:356
+msgid "loading..."
+msgstr "įkeliama…"
+
+#: src/LyricsPage.cxx:378
+msgid "Editor not configured"
+msgstr "Redaktorius nesukonfigūruotas"
+
+#: src/LyricsPage.cxx:385
+msgid "Do you really want to start an editor and edit these lyrics?"
+msgstr "Ar tikrai norite paleisti redaktorių ir redaguoti šiuos dainos žodžius?"
+
+#: src/LyricsPage.cxx:403 src/LyricsPage.cxx:427
+msgid "Can't start editor"
+msgstr "Nepavyksta paleisti redaktoriaus"
+
+#: src/LyricsPage.cxx:430 src/LyricsPage.cxx:434
+msgid "Editor exited unexpectedly"
+msgstr "Redaktorius išsijungė netikėtai"
+
+#. lyrics for the song were saved on hard disk
+#: src/LyricsPage.cxx:456
+msgid "Lyrics saved"
+msgstr "Dainos žodžiai išsaugoti"
+
+#: src/LyricsPage.cxx:462
+msgid "Lyrics deleted"
+msgstr "Dainos žodžiai ištrinti"
+
+#: src/LyricsPage.cxx:463
+msgid "No saved lyrics"
+msgstr "Nėra išsaugotų dainų žodžių"
+
+#: src/Main.cxx:133
+#, c-format
+msgid "Connecting to %s"
+msgstr "Jungiamasi prie %s"
+
+#: src/Main.cxx:149
+#, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
+msgstr "Klaida: MPD versija %d.%d.%d yra per sena (reikalinga %s)"
+
+#. To translators: these credits are shown
+#. when ncmpc is started with "--version"
+#: src/Options.cxx:216 src/Options.cxx:219
+msgid "translator-credits"
+msgstr "Gediminas Murauskas"
+
+#: src/OutputsPage.cxx:168
+#, c-format
+msgid "Switched to partition '%s'"
+msgstr "Perjungta į skaidinį „%s“"
+
+#: src/OutputsPage.cxx:180 src/SongPage.cxx:69
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: src/OutputsPage.cxx:230
+#, c-format
+msgid "Output '%s' enabled"
+msgstr "Išvestis „%s“ įjungta"
+
+#: src/OutputsPage.cxx:241
+#, c-format
+msgid "Output '%s' disabled"
+msgstr "Išvestis „%s“ išjungta"
+
+#: src/OutputsPage.cxx:371 src/OutputsPage.cxx:480
+msgid "Outputs"
+msgstr "Išvestys"
+
+#: src/OutputsPage.cxx:383
+msgid "Partition"
+msgstr "Skaidinys"
+
+#: src/OutputsPage.cxx:407
+msgid "Create new partition"
+msgstr "Sukurti naują skaidinį"
+
+#: src/player_command.cxx:94 src/QueuePage.cxx:651
+msgid "Shuffled queue"
+msgstr "Eilė sumaišyta"
+
+#: src/player_command.cxx:100
+msgid "Cleared queue"
+msgstr "Eilė išvalyta"
+
+#. get path
+#: src/QueuePage.cxx:314
+msgid "Add"
+msgstr "Pridėti"
+
+#: src/QueuePage.cxx:379 src/QueuePage.cxx:697
+msgid "Queue"
+msgstr "Eilė"
+
+#: src/QueuePage.cxx:381
+#, c-format
+msgid "Queue on %s"
+msgstr "Eilė ties %s"
+
+#. query the user for a filename
+#: src/save_playlist.cxx:86
+msgid "Save queue as"
+msgstr "Išsaugoti eilę kaip"
+
+#: src/save_playlist.cxx:108
+#, c-format
+msgid "Replace %s?"
+msgstr "Pakeisti %s?"
+
+#. success
+#: src/save_playlist.cxx:129
+#, c-format
+msgid "Saved %s"
+msgstr "%s išsaugota"
+
+#: src/screen_client.cxx:41
+msgid "Database update running"
+msgstr "Vykdomas duomenų bazės atnaujinimas"
+
+#: src/screen_client.cxx:48
+#, c-format
+msgid "Database update of %s started"
+msgstr "Pradėtas duomenų bazės %s atnaujinimas"
+
+#: src/screen_client.cxx:51
+msgid "Database update started"
+msgstr "Duomenų bazės atnaujinimas pradėtas"
+
+#: src/screen.cxx:158
+msgid "Repeat mode is on"
+msgstr "Kartojimo režimas įjungtas"
+
+#: src/screen.cxx:159
+msgid "Repeat mode is off"
+msgstr "Kartojimo režimas išjungtas"
+
+#: src/screen.cxx:163
+msgid "Random mode is on"
+msgstr "Atsitiktinis režimas įjungtas"
+
+#: src/screen.cxx:164
+msgid "Random mode is off"
+msgstr "Atsitiktinis režimas išjungtas"
+
+#. "single" mode means
+#. that MPD will
+#. automatically stop
+#. after playing one
+#. single song
+#: src/screen.cxx:173
+msgid "Single mode is on"
+msgstr "Vienos dainos rėžimas įjungtas"
+
+#: src/screen.cxx:174
+msgid "Single mode is off"
+msgstr "Vienos dainos rėžimas išjungtas"
+
+#. "consume" mode means
+#. that MPD removes each
+#. song which has
+#. finished playing
+#: src/screen.cxx:182
+msgid "Consume mode is on"
+msgstr "Panaikinimo iš eilės po perklausimo rėžimas įjungtas"
+
+#: src/screen.cxx:183
+msgid "Consume mode is off"
+msgstr "Panaikinimo iš eilės po perklausimo rėžimas išjungtas"
+
+#: src/screen.cxx:186
+#, c-format
+msgid "Crossfade %d seconds"
+msgstr "Kryžminis perėjimas %d sekundžių"
+
+#: src/screen.cxx:198
+msgid "Database updated"
+msgstr "Duomenų bazė atnaujinta"
+
+#: src/screen.cxx:248
+msgid "Find mode: Wrapped"
+msgstr "Paieškos režimas: ciklinis"
+
+#: src/screen.cxx:249
+msgid "Find mode: Normal"
+msgstr "Radimo režimas: įprastas"
+
+#: src/screen.cxx:254
+msgid "Auto center mode: On"
+msgstr "Automatinio centravimo režimas: įjungtas"
+
+#: src/screen.cxx:255
+msgid "Auto center mode: Off"
+msgstr "Automatinio centravimo režimas: išjungtas"
+
+#: src/screen_find.cxx:33
+msgid "Find"
+msgstr "Rasti"
+
+#: src/screen_find.cxx:34
+msgid "Find backward"
+msgstr "Rasti atgal"
+
+#: src/screen_find.cxx:35
+msgid "Jump"
+msgstr "Peršokti"
+
+#: src/screen_find.cxx:81
+#, c-format
+msgid "Unable to find '%s'"
+msgstr "Nepavyko rasti „%s“"
+
+#: src/screen_utils.cxx:150
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: src/SearchPage.cxx:51
+msgid "artist"
+msgstr "atlikėjas"
+
+#: src/SearchPage.cxx:52
+msgid "album"
+msgstr "albumas"
+
+#: src/SearchPage.cxx:53
+msgid "title"
+msgstr "pavadinimas"
+
+#: src/SearchPage.cxx:54
+msgid "track"
+msgstr "kūrinys"
+
+#: src/SearchPage.cxx:55
+msgid "name"
+msgstr "pavadinimas"
+
+#: src/SearchPage.cxx:56
+msgid "genre"
+msgstr "žanras"
+
+#: src/SearchPage.cxx:57
+msgid "date"
+msgstr "data"
+
+#: src/SearchPage.cxx:58
+msgid "composer"
+msgstr "kompozitorius"
+
+#: src/SearchPage.cxx:59
+msgid "performer"
+msgstr "atlikėjas"
+
+#: src/SearchPage.cxx:60
+msgid "comment"
+msgstr "komentaras"
+
+#: src/SearchPage.cxx:68
+msgid "file"
+msgstr "failas"
+
+#: src/SearchPage.cxx:90 src/SongPage.cxx:63
+msgid "Title"
+msgstr "Pavadinimas"
+
+#: src/SearchPage.cxx:91 src/SongPage.cxx:62
+msgid "Artist"
+msgstr "Atlikėjas"
+
+#: src/SearchPage.cxx:92 src/SongPage.cxx:64
+msgid "Album"
+msgstr "Albumas"
+
+#: src/SearchPage.cxx:93
+msgid "Filename"
+msgstr "Failo pavadinimas"
+
+#: src/SearchPage.cxx:94
+msgid "Artist + Title"
+msgstr "Atlikėjas + pavadinimas"
+
+#: src/SearchPage.cxx:285 src/SearchPage.cxx:289
+msgid "Unrecognized suffix"
+msgstr "Neatpažinta priesaga"
+
+#: src/SearchPage.cxx:337
+#, c-format
+msgid "Bad search tag %s"
+msgstr "Bloga paieškos žyma %s"
+
+#: src/SearchPage.cxx:351
+#, c-format
+msgid "No argument for search tag %s"
+msgstr "Nėra paieškos žymos argumento %s"
+
+#: src/SearchPage.cxx:446 src/SearchPage.cxx:479 src/SearchPage.cxx:483
+#: src/SearchPage.cxx:487 src/SearchPage.cxx:546
+msgid "Search"
+msgstr "Ieškoti"
+
+#: src/SearchPage.cxx:509
+#, c-format
+msgid "Search mode: %s"
+msgstr "Paieškos režimas: %s"
+
+#: src/SongPage.cxx:65
+msgid "Length"
+msgstr "Ilgis"
+
+#: src/SongPage.cxx:66
+msgid "Position"
+msgstr "Pozicija"
+
+#: src/SongPage.cxx:67
+msgid "Composer"
+msgstr "Kompozitorius"
+
+#: src/SongPage.cxx:68
+msgid "Performer"
+msgstr "Atlikėjas"
+
+#: src/SongPage.cxx:70
+msgid "Disc"
+msgstr "Diskas"
+
+#: src/SongPage.cxx:71
+msgid "Track"
+msgstr "Kūrinys"
+
+#: src/SongPage.cxx:72
+msgid "Date"
+msgstr "Data"
+
+#: src/SongPage.cxx:73
+msgid "Genre"
+msgstr "Žanras"
+
+#: src/SongPage.cxx:74
+msgid "Comment"
+msgstr "Komentaras"
+
+#: src/SongPage.cxx:75
+msgid "Path"
+msgstr "Kelias"
+
+#: src/SongPage.cxx:76
+msgid "Bitrate"
+msgstr "Bitų dažnis"
+
+#: src/SongPage.cxx:77
+msgid "Format"
+msgstr "Formatas"
+
+#: src/SongPage.cxx:94
+msgid "Number of artists"
+msgstr "Atlikėjų skaičius"
+
+#: src/SongPage.cxx:95
+msgid "Number of albums"
+msgstr "Albumų skaičius"
+
+#: src/SongPage.cxx:96
+msgid "Number of songs"
+msgstr "Dainų skaičius"
+
+#: src/SongPage.cxx:97
+msgid "Uptime"
+msgstr "Veikimo laikas"
+
+#: src/SongPage.cxx:98
+msgid "Most recent db update"
+msgstr "Vėliausias db atnaujinimas"
+
+#: src/SongPage.cxx:99
+msgid "Playtime"
+msgstr "Grojimo laikas"
+
+#: src/SongPage.cxx:100
+msgid "DB playtime"
+msgstr "DB grojimo laikas"
+
+#: src/SongPage.cxx:205
+msgid "Song viewer"
+msgstr "Dainų peržiūra"
+
+#: src/SongPage.cxx:371
+msgid "MPD statistics"
+msgstr "MPD statistika"
+
+#: src/SongPage.cxx:457
+msgid "Selected song"
+msgstr "Pasirinkta daina"
+
+#: src/SongPage.cxx:467
+msgid "Currently playing song"
+msgstr "Šiuo metu grojama daina"
+
+#: src/SongPage.cxx:472
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/SongPage.cxx:556
+msgid "Song"
+msgstr "Daina"
+
+#: src/StatusBar.cxx:165
+msgid "Playing:"
+msgstr "Grojama:"
+
+#: src/StatusBar.cxx:169
+msgid "[Paused]"
+msgstr "[Pristabdyta]"
+
+#: src/Styles.cxx:252 src/Styles.cxx:313
+msgid "Unknown color"
+msgstr "Nežinoma spalva"
+
+#: src/Styles.cxx:323
+msgid "Unknown color field"
+msgstr "Nežinomas spalvos laukas"
+
+#: src/Styles.cxx:356
+msgid "Terminal lacks color capabilities"
+msgstr "Terminalas neturi spalvinimo galimybių"
+
+#: src/TagListPage.cxx:71
+msgid "All tracks"
+msgstr "Visi kūriniai"
+
+#: src/time_format.cxx:44
+msgid "year"
+msgstr "metai"
+
+#: src/time_format.cxx:46
+msgid "years"
+msgstr "m."
+
+#: src/time_format.cxx:54
+msgid "week"
+msgstr "savaitė"
+
+#: src/time_format.cxx:57
+msgid "weeks"
+msgstr "sav."
+
+#: src/time_format.cxx:65
+msgid "day"
+msgstr "diena"
+
+#: src/time_format.cxx:68
+msgid "days"
+msgstr "d."
+
+#: src/TitleBar.cxx:101
+msgid "Volume n/a"
+msgstr "Garsas n/a"
+
+#: src/TitleBar.cxx:103
+#, c-format
+msgid "Volume %d%%"
+msgstr "Garsas %d%%"
diff -Nru ncmpc-0.45/po/pl.po ncmpc-0.46/po/pl.po
--- ncmpc-0.45/po/pl.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/pl.po	2021-11-26 15:32:38.000000000 +0000
@@ -9,8 +9,8 @@
 "Project-Id-Version: ncmpc 0.19\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-24 15:23+0200\n"
-"PO-Revision-Date: 2020-05-05 15:11+0000\n"
-"Last-Translator: Mirosław Borodeńko <myros@outlook.com>\n"
+"PO-Revision-Date: 2021-08-11 22:34+0000\n"
+"Last-Translator: Matthaiks <kitynska@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/ncmpc/"
 "translations/pl/>\n"
 "Language: pl\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.1-dev\n"
+"X-Generator: Weblate 4.8-dev\n"
 
 #: src/Bindings.cxx:80 src/Bindings.cxx:86
 #, c-format
@@ -803,7 +803,7 @@
 #: src/OutputsPage.cxx:168
 #, c-format
 msgid "Switched to partition '%s'"
-msgstr ""
+msgstr "Przełączono na sekcję '%s'"
 
 #: src/OutputsPage.cxx:180 src/SongPage.cxx:69
 msgid "Name"
@@ -824,13 +824,12 @@
 msgstr "Wyjścia"
 
 #: src/OutputsPage.cxx:383
-#, fuzzy
 msgid "Partition"
-msgstr "Pozycja"
+msgstr "Sekcja"
 
 #: src/OutputsPage.cxx:407
 msgid "Create new partition"
-msgstr ""
+msgstr "Utwórz nową sekcję"
 
 #: src/player_command.cxx:94 src/QueuePage.cxx:651
 msgid "Shuffled queue"
@@ -1036,7 +1035,7 @@
 
 #: src/SearchPage.cxx:285 src/SearchPage.cxx:289
 msgid "Unrecognized suffix"
-msgstr ""
+msgstr "Nierozpoznany sufiks"
 
 #: src/SearchPage.cxx:337
 #, c-format
@@ -1071,9 +1070,8 @@
 msgstr "Kompozytor"
 
 #: src/SongPage.cxx:68
-#, fuzzy
 msgid "Performer"
-msgstr "wykonawca"
+msgstr "Wykonawca"
 
 #: src/SongPage.cxx:70
 msgid "Disc"
diff -Nru ncmpc-0.45/po/pt.po ncmpc-0.46/po/pt.po
--- ncmpc-0.45/po/pt.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/pt.po	2021-11-26 15:32:38.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-08 17:59+0200\n"
-"PO-Revision-Date: 2020-08-24 13:21+0000\n"
+"PO-Revision-Date: 2021-05-10 16:33+0000\n"
 "Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/ncmpc/"
 "translations/pt/>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.2.1-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: src/Bindings.cxx:81 src/Bindings.cxx:87
 #, c-format
@@ -567,7 +567,7 @@
 #: src/KeyDefPage.cxx:192
 #, c-format
 msgid "Error: key %s is already used for %s"
-msgstr "Erro: tecla %s já está sendo usada para %s"
+msgstr "Erro: tecla %s já está a ser usada para %s"
 
 #: src/KeyDefPage.cxx:202
 #, c-format
diff -Nru ncmpc-0.45/po/ru.po ncmpc-0.46/po/ru.po
--- ncmpc-0.45/po/ru.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/ru.po	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 # Russian
-# Copyright (C) 2004 Kalle Wallin 
+# Copyright (C) 2004 Kalle Wallin
 # This file is distributed under the same license as the ncmpc package.
 # Original translation by Nikolay Pavlov <quetzal@roks.biz>, 2004.
 # Currently maintained by Max Arnold <lwarxx@gmail.com>, 2009.
@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-24 15:23+0200\n"
-"PO-Revision-Date: 2020-11-18 21:28+0000\n"
+"PO-Revision-Date: 2021-04-11 19:43+0700\n"
 "Last-Translator: Artem <KovalevArtem.ru@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/ncmpc/"
 "translations/ru/>\n"
@@ -387,9 +387,8 @@
 msgstr "Неизвестное название экрана"
 
 #: src/ConfigParser.cxx:388
-#, fuzzy
 msgid "Unknown MPD tag"
-msgstr "Неизвестная команда"
+msgstr "Неизвестный тег MPD"
 
 #: src/ConfigParser.cxx:415
 msgid "Invalid search mode"
@@ -719,9 +718,8 @@
 msgstr "Всё"
 
 #: src/LibraryPage.cxx:197
-#, fuzzy
 msgid "Songs"
-msgstr "Композиция"
+msgstr "Композиции"
 
 #: src/LibraryPage.cxx:314
 msgid "Library"
@@ -804,7 +802,7 @@
 #: src/OutputsPage.cxx:168
 #, c-format
 msgid "Switched to partition '%s'"
-msgstr ""
+msgstr "Переключено на раздел '%s'"
 
 #: src/OutputsPage.cxx:180 src/SongPage.cxx:69
 msgid "Name"
@@ -825,13 +823,12 @@
 msgstr "Аудиовыходы"
 
 #: src/OutputsPage.cxx:383
-#, fuzzy
 msgid "Partition"
-msgstr "Позиция"
+msgstr "Раздел"
 
 #: src/OutputsPage.cxx:407
 msgid "Create new partition"
-msgstr ""
+msgstr "Создать новый раздел"
 
 #: src/player_command.cxx:94 src/QueuePage.cxx:651
 msgid "Shuffled queue"
@@ -1037,7 +1034,7 @@
 
 #: src/SearchPage.cxx:285 src/SearchPage.cxx:289
 msgid "Unrecognized suffix"
-msgstr ""
+msgstr "Неизвестный суффикс"
 
 #: src/SearchPage.cxx:337
 #, c-format
@@ -1072,9 +1069,8 @@
 msgstr "Композитор"
 
 #: src/SongPage.cxx:68
-#, fuzzy
 msgid "Performer"
-msgstr "performer"
+msgstr "Исполнитель"
 
 #: src/SongPage.cxx:70
 msgid "Disc"
diff -Nru ncmpc-0.45/po/sv.po ncmpc-0.46/po/sv.po
--- ncmpc-0.45/po/sv.po	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/po/sv.po	2021-11-26 15:32:38.000000000 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-24 15:23+0200\n"
-"PO-Revision-Date: 2020-12-24 02:29+0000\n"
+"PO-Revision-Date: 2021-08-18 10:35+0000\n"
 "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/ncmpc/"
 "translations/sv/>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4.1-dev\n"
+"X-Generator: Weblate 4.8-dev\n"
 "X-Launchpad-Export-Date: 2010-06-19 15:12+0000\n"
 
 #: src/Bindings.cxx:80 src/Bindings.cxx:86
@@ -282,7 +282,7 @@
 
 #: src/Command.cxx:181
 msgid "Library page"
-msgstr ""
+msgstr "Bibliotekssida"
 
 #: src/Command.cxx:185 src/HelpPage.cxx:170
 msgid "Search screen"
@@ -294,7 +294,7 @@
 
 #: src/Command.cxx:191
 msgid "View the selected and the currently playing song"
-msgstr ""
+msgstr "Visa den valda och den låt som spelas just nu"
 
 #: src/Command.cxx:195 src/HelpPage.cxx:182
 msgid "Lyrics screen"
@@ -312,7 +312,7 @@
 
 #: src/Command.cxx:205
 msgid "Edit the current item"
-msgstr ""
+msgstr "Redigera det aktuella objektet"
 
 #: src/Command.cxx:210 src/HelpPage.cxx:197
 msgid "Outputs screen"
@@ -387,9 +387,8 @@
 msgstr "Skärmnamn okänt"
 
 #: src/ConfigParser.cxx:388
-#, fuzzy
 msgid "Unknown MPD tag"
-msgstr "Okänt kommando"
+msgstr "Okänd MPD tagg"
 
 #: src/ConfigParser.cxx:415
 msgid "Invalid search mode"
@@ -879,9 +878,8 @@
 msgstr "%s sparad"
 
 #: src/screen_client.cxx:41
-#, fuzzy
 msgid "Database update running"
-msgstr "Databasen uppdateras..."
+msgstr "Databasuppdatering körs"
 
 #: src/screen_client.cxx:48
 #, c-format
@@ -1045,7 +1043,7 @@
 
 #: src/SearchPage.cxx:285 src/SearchPage.cxx:289
 msgid "Unrecognized suffix"
-msgstr ""
+msgstr "Okänt suffix"
 
 #: src/SearchPage.cxx:337
 #, c-format
@@ -1142,7 +1140,7 @@
 
 #: src/SongPage.cxx:100
 msgid "DB playtime"
-msgstr ""
+msgstr "DB speltid"
 
 #: src/SongPage.cxx:205
 msgid "Song viewer"
diff -Nru ncmpc-0.45/README.rst ncmpc-0.46/README.rst
--- ncmpc-0.45/README.rst	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/README.rst	2021-11-26 15:32:38.000000000 +0000
@@ -15,7 +15,6 @@
 
 - a C++17 compliant compiler (e.g. gcc or clang)
 - `libmpdclient <https://www.musicpd.org/libs/libmpdclient/>`__ 2.9
-- `Boost 1.62 <https://www.boost.org/>`__
 - `ncurses <https://www.gnu.org/software/ncurses/>`__
 - `Meson 0.47 <http://mesonbuild.com/>`__ and `Ninja <https://ninja-build.org/>`__
 
@@ -30,7 +29,7 @@
 
 Run ``meson``::
 
- meson . output
+ meson . output --buildtype=debugoptimized -Db_ndebug=true
 
 Compile and install::
 
diff -Nru ncmpc-0.45/src/AsyncUserInput.cxx ncmpc-0.46/src/AsyncUserInput.cxx
--- ncmpc-0.45/src/AsyncUserInput.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/AsyncUserInput.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -23,7 +23,6 @@
 #include "GlobalBindings.hxx"
 #include "ncmpc.hxx"
 #include "Point.hxx"
-#include "util/Compiler.h"
 
 static bool
 ignore_key(int key)
@@ -31,7 +30,7 @@
 	return key == ERR || key == '\0';
 }
 
-gcc_pure
+[[gnu::pure]]
 static Command
 translate_key(int key)
 {
@@ -79,7 +78,7 @@
 
 AsyncUserInput::AsyncUserInput(EventLoop &event_loop, WINDOW &_w) noexcept
 	:socket_event(event_loop, BIND_THIS_METHOD(OnSocketReady),
-		      SocketDescriptor(STDIN_FILENO)),
+		      FileDescriptor{STDIN_FILENO}),
 	 w(_w)
 {
 	socket_event.ScheduleRead();
diff -Nru ncmpc-0.45/src/AsyncUserInput.hxx ncmpc-0.46/src/AsyncUserInput.hxx
--- ncmpc-0.45/src/AsyncUserInput.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/AsyncUserInput.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,12 +19,12 @@
 #ifndef ASYNC_USER_INPUT_HXX
 #define ASYNC_USER_INPUT_HXX
 
-#include "event/SocketEvent.hxx"
+#include "event/PipeEvent.hxx"
 
 #include <curses.h>
 
 class AsyncUserInput {
-	SocketEvent socket_event;
+	PipeEvent socket_event;
 
 	WINDOW &w;
 
diff -Nru ncmpc-0.45/src/BasicColors.hxx ncmpc-0.46/src/BasicColors.hxx
--- ncmpc-0.45/src/BasicColors.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/BasicColors.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,14 +19,12 @@
 #ifndef BASIC_COLORS_HXX
 #define BASIC_COLORS_HXX
 
-#include "util/Compiler.h"
-
 /**
  * Parse an ncurses color name.
  *
  * @return the COLOR_* integer value or -1 on error
  */
-gcc_pure
+[[gnu::pure]]
 short
 ParseBasicColorName(const char *name) noexcept;
 
@@ -35,7 +33,7 @@
  *
  * @return the color integer value or -1 on error
  */
-gcc_pure
+[[gnu::pure]]
 short
 ParseColorNameOrNumber(const char *s) noexcept;
 
diff -Nru ncmpc-0.45/src/BasicMarquee.hxx ncmpc-0.46/src/BasicMarquee.hxx
--- ncmpc-0.45/src/BasicMarquee.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/BasicMarquee.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef BASIC_MARQUEE_HXX
 #define BASIC_MARQUEE_HXX
 
-#include "util/Compiler.h"
-
 #include <string>
 #include <utility>
 
@@ -91,7 +89,7 @@
 			offset = 0;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	std::pair<const char *, size_t> ScrollString() const noexcept;
 };
 
diff -Nru ncmpc-0.45/src/Bindings.hxx ncmpc-0.46/src/Bindings.hxx
--- ncmpc-0.45/src/Bindings.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Bindings.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -21,7 +21,6 @@
 
 #include "config.h" // IWYU pragma: keep
 #include "Command.hxx"
-#include "util/Compiler.h"
 
 #include <array>
 #include <algorithm>
@@ -45,12 +44,12 @@
 	constexpr KeyBinding(int a, int b=0, int c=0) noexcept
 		:keys{{a, b, c}} {}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool HasKey(int key) const noexcept {
 		return std::find(keys.begin(), keys.end(), key) != keys.end();
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	size_t GetKeyCount() const noexcept {
 		return std::distance(keys.begin(),
 				     std::find(keys.begin(), keys.end(), 0));
@@ -72,17 +71,17 @@
 struct KeyBindings {
 	std::array<KeyBinding, size_t(Command::NONE)> key_bindings;
 
-	gcc_pure
+	[[gnu::pure]]
 	Command FindKey(int key) const noexcept;
 
 	/**
 	 * Returns the name of the first key bound to the given
 	 * command, or nullptr if there is no key binding.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const char *GetFirstKeyName(Command command) const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	std::string GetKeyNames(Command command) const noexcept;
 
 	void SetKey(Command command,
diff -Nru ncmpc-0.45/src/charset.cxx ncmpc-0.46/src/charset.cxx
--- ncmpc-0.45/src/charset.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/charset.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -116,7 +116,7 @@
 	return Iconv(i, dest, dest_size, src, src_length);
 }
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 Iconv(iconv_t i,
       const char *src, size_t src_length) noexcept
@@ -163,7 +163,7 @@
 	return dest;
 }
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 Iconv(const char *tocode, const char *fromcode,
       const char *src, size_t src_length) noexcept
@@ -177,7 +177,7 @@
 	return Iconv(i, src, src_length);
 }
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 utf8_to_locale(const char *src, size_t length) noexcept
 {
@@ -229,7 +229,7 @@
 
 #ifdef HAVE_ICONV
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 locale_to_utf8(const char *src) noexcept
 {
diff -Nru ncmpc-0.45/src/charset.hxx ncmpc-0.46/src/charset.hxx
--- ncmpc-0.45/src/charset.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/charset.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -20,7 +20,6 @@
 #define CHARSET_H
 
 #include "config.h"
-#include "util/Compiler.h"
 
 #include <string>
 
@@ -38,7 +37,7 @@
 CopyUtf8ToLocale(char *dest, size_t dest_size,
 		 const char *src, size_t src_length) noexcept;
 
-gcc_pure
+[[gnu::pure]]
 const char *
 utf8_to_locale(const char *src, char *buffer, size_t size) noexcept;
 
diff -Nru ncmpc-0.45/src/ChatPage.cxx ncmpc-0.46/src/ChatPage.cxx
--- ncmpc-0.45/src/ChatPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/ChatPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -49,7 +49,7 @@
 
 	void ProcessMessage(const struct mpd_message &message);
 
-	gcc_pure
+	[[gnu::pure]]
 	const std::string &GetPrefix() noexcept;
 
 	void SendMessage(struct mpdclient &c, const char *msg) noexcept;
diff -Nru ncmpc-0.45/src/Command.hxx ncmpc-0.46/src/Command.hxx
--- ncmpc-0.45/src/Command.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Command.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -20,7 +20,6 @@
 #define COMMAND_H
 
 #include "config.h"
-#include "util/Compiler.h"
 
 #include <stddef.h>
 
@@ -142,17 +141,17 @@
 const command_definition_t *
 get_command_definitions();
 
-gcc_const
+[[gnu::const]]
 size_t
 get_cmds_max_name_width();
 
-gcc_pure
+[[gnu::pure]]
 const char *get_key_description(Command command);
 
-gcc_pure
+[[gnu::pure]]
 const char *get_key_command_name(Command command);
 
-gcc_pure
+[[gnu::pure]]
 Command
 get_key_command_from_name(const char *name);
 
diff -Nru ncmpc-0.45/src/ConfigFile.cxx ncmpc-0.46/src/ConfigFile.cxx
--- ncmpc-0.45/src/ConfigFile.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/ConfigFile.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "Options.hxx"
 #include "io/Path.hxx"
-#include "util/Compiler.h"
 
 #include <sys/stat.h>
 
@@ -39,7 +38,7 @@
 #define KEYS_FILENAME "keys"
 #endif
 
-gcc_pure
+[[gnu::pure]]
 static bool
 IsFile(const char *path) noexcept
 {
@@ -97,7 +96,7 @@
 
 #ifndef _WIN32
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 GetHomeKeysPath() noexcept
 {
@@ -110,7 +109,7 @@
 
 #endif
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 GetUserKeysPath() noexcept
 {
@@ -121,7 +120,7 @@
 	return BuildPath(dir, PACKAGE, KEYS_FILENAME);
 }
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 GetSystemKeysPath() noexcept
 {
diff -Nru ncmpc-0.45/src/ConfigParser.cxx ncmpc-0.46/src/ConfigParser.cxx
--- ncmpc-0.45/src/ConfigParser.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/ConfigParser.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -31,7 +31,6 @@
 #include "PageMeta.hxx"
 #include "Options.hxx"
 #include "util/CharUtil.hxx"
-#include "util/Compiler.h"
 #include "util/PrintException.hxx"
 #include "util/RuntimeError.hxx"
 #include "util/ScopeExit.hxx"
@@ -97,7 +96,7 @@
 #define CONF_CHAT_PREFIX "chat-prefix"
 #define CONF_SECOND_COLUMN "second-column"
 
-gcc_pure
+[[gnu::pure]]
 static bool
 str2bool(char *str) noexcept
 {
diff -Nru ncmpc-0.45/src/event/FineTimerEvent.hxx ncmpc-0.46/src/event/FineTimerEvent.hxx
--- ncmpc-0.45/src/event/FineTimerEvent.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/FineTimerEvent.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -33,9 +33,14 @@
 #pragma once
 
 #include "Chrono.hxx"
+#include "event/Features.h"
 #include "util/BindMethod.hxx"
 
+#ifdef NO_BOOST
+#include "util/IntrusiveList.hxx"
+#else
 #include <boost/intrusive/set_hook.hpp>
+#endif
 
 class EventLoop;
 
@@ -50,10 +55,17 @@
  * thread that runs the #EventLoop, except where explicitly documented
  * as thread-safe.
  */
-class FineTimerEvent final
-	: public boost::intrusive::set_base_hook<boost::intrusive::link_mode<boost::intrusive::auto_unlink>>
+class FineTimerEvent final :
+#ifdef NO_BOOST
+	AutoUnlinkIntrusiveListHook
+#else
+	public boost::intrusive::set_base_hook<boost::intrusive::link_mode<boost::intrusive::auto_unlink>>
+#endif
 {
 	friend class TimerList;
+#ifdef NO_BOOST
+	friend class IntrusiveList<FineTimerEvent>;
+#endif
 
 	EventLoop &loop;
 
@@ -91,7 +103,10 @@
 	void ScheduleEarlier(Event::Duration d) noexcept;
 
 	void Cancel() noexcept {
-		unlink();
+#ifdef NO_BOOST
+		if (IsPending())
+#endif
+			unlink();
 	}
 
 private:
diff -Nru ncmpc-0.45/src/event/Loop.cxx ncmpc-0.46/src/event/Loop.cxx
--- ncmpc-0.45/src/event/Loop.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/Loop.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -52,6 +52,13 @@
 
 EventLoop::~EventLoop() noexcept
 {
+#if defined(HAVE_URING) && !defined(NDEBUG)
+	/* if Run() was never called (maybe because startup failed and
+	   an exception is pending), we need to destruct the
+	   Uring::Manager here or else the assertions below fail */
+	uring.reset();
+#endif
+
 	assert(defer.empty());
 	assert(idle.empty());
 #ifdef HAVE_THREADED_EVENT_LOOP
@@ -145,7 +152,7 @@
 void
 EventLoop::Insert(CoarseTimerEvent &t) noexcept
 {
-	coarse_timers.Insert(t);
+	coarse_timers.Insert(t, SteadyNow());
 	again = true;
 }
 
@@ -175,6 +182,10 @@
 void
 EventLoop::AddDefer(DeferEvent &d) noexcept
 {
+#ifdef HAVE_THREADED_EVENT_LOOP
+	assert(!IsAlive() || IsInside());
+#endif
+
 	defer.push_back(d);
 	again = true;
 }
@@ -298,6 +309,8 @@
 			break;
 
 		RunDeferred();
+		if (quit)
+			break;
 
 		if (RunOneIdle())
 			/* check for other new events after each
@@ -310,7 +323,7 @@
 		/* try to handle DeferEvents without WakeFD
 		   overhead */
 		{
-			const std::lock_guard<Mutex> lock(mutex);
+			const std::scoped_lock<Mutex> lock(mutex);
 			HandleInject();
 #endif
 
@@ -333,7 +346,7 @@
 
 #ifdef HAVE_THREADED_EVENT_LOOP
 		{
-			const std::lock_guard<Mutex> lock(mutex);
+			const std::scoped_lock<Mutex> lock(mutex);
 			busy = true;
 		}
 #endif
@@ -365,7 +378,7 @@
 	bool must_wake;
 
 	{
-		const std::lock_guard<Mutex> lock(mutex);
+		const std::scoped_lock<Mutex> lock(mutex);
 		if (d.IsPending())
 			return;
 
@@ -384,7 +397,7 @@
 void
 EventLoop::RemoveInject(InjectEvent &d) noexcept
 {
-	const std::lock_guard<Mutex> protect(mutex);
+	const std::scoped_lock<Mutex> protect(mutex);
 
 	if (d.IsPending())
 		inject.erase(inject.iterator_to(d));
@@ -411,7 +424,7 @@
 
 	wake_fd.Read();
 
-	const std::lock_guard<Mutex> lock(mutex);
+	const std::scoped_lock<Mutex> lock(mutex);
 	HandleInject();
 }
 
diff -Nru ncmpc-0.45/src/event/Loop.hxx ncmpc-0.46/src/event/Loop.hxx
--- ncmpc-0.45/src/event/Loop.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/Loop.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -33,10 +33,9 @@
 #include "WakeFD.hxx"
 #include "thread/Id.hxx"
 #include "thread/Mutex.hxx"
-#endif
 
-#include <boost/intrusive/set.hpp>
 #include <boost/intrusive/list.hpp>
+#endif
 
 #include <atomic>
 #include <cassert>
diff -Nru ncmpc-0.45/src/event/meson.build ncmpc-0.46/src/event/meson.build
--- ncmpc-0.45/src/event/meson.build	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/meson.build	2021-11-26 15:32:38.000000000 +0000
@@ -2,6 +2,7 @@
 event_features.set('USE_EVENTFD', is_linux and get_option('eventfd'))
 event_features.set('USE_SIGNALFD', is_linux and get_option('signalfd'))
 event_features.set('USE_EPOLL', is_linux and get_option('epoll'))
+event_features.set('NO_BOOST', true)
 configure_file(output: 'Features.h', configuration: event_features)
 
 event_sources = []
@@ -28,7 +29,6 @@
   event_sources,
   include_directories: inc,
   dependencies: [
-    boost_dep,
   ],
 )
 
@@ -38,6 +38,5 @@
     thread_dep,
     net_dep,
     system_dep,
-    boost_dep,
   ],
 )
diff -Nru ncmpc-0.45/src/event/PipeEvent.hxx ncmpc-0.46/src/event/PipeEvent.hxx
--- ncmpc-0.45/src/event/PipeEvent.hxx	1970-01-01 00:00:00.000000000 +0000
+++ ncmpc-0.46/src/event/PipeEvent.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2007-2021 CM4all GmbH
+ * All rights reserved.
+ *
+ * author: Max Kellermann <mk@cm4all.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "SocketEvent.hxx"
+#include "io/FileDescriptor.hxx"
+
+/**
+ * A variant of #SocketEvent for pipes (and other kinds of
+ * #FileDescriptor which can be used with epoll).
+ */
+class PipeEvent final {
+	SocketEvent event;
+
+public:
+	template<typename C>
+	PipeEvent(EventLoop &event_loop, C callback,
+		  FileDescriptor fd=FileDescriptor::Undefined()) noexcept
+		:event(event_loop, callback,
+		       SocketDescriptor::FromFileDescriptor(fd)) {}
+
+	EventLoop &GetEventLoop() const noexcept {
+		return event.GetEventLoop();
+	}
+
+	bool IsDefined() const noexcept {
+		return event.IsDefined();
+	}
+
+	FileDescriptor GetFileDescriptor() const noexcept {
+		return event.GetSocket().ToFileDescriptor();
+	}
+
+	FileDescriptor ReleaseFileDescriptor() noexcept {
+		return event.ReleaseSocket().ToFileDescriptor();
+	}
+
+	void Open(FileDescriptor fd) noexcept {
+		event.Open(SocketDescriptor::FromFileDescriptor(fd));
+	}
+
+	void Close() noexcept {
+		event.Close();
+	}
+
+	bool Schedule(unsigned flags) noexcept {
+		return event.Schedule(flags);
+	}
+
+	void Cancel() noexcept {
+		event.Cancel();
+	}
+
+	bool ScheduleRead() noexcept {
+		return event.ScheduleRead();
+	}
+
+	bool ScheduleWrite() noexcept {
+		return event.ScheduleWrite();
+	}
+
+	void CancelRead() noexcept {
+		event.CancelRead();
+	}
+
+	void CancelWrite() noexcept {
+		event.CancelWrite();
+	}
+
+	void ScheduleImplicit() noexcept {
+		event.ScheduleImplicit();
+	}
+};
diff -Nru ncmpc-0.45/src/event/SignalMonitor.cxx ncmpc-0.46/src/event/SignalMonitor.cxx
--- ncmpc-0.45/src/event/SignalMonitor.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/SignalMonitor.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -37,6 +37,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <cassert>
 #include <csignal>
 
@@ -62,7 +63,7 @@
 #endif
 	}
 
-	auto &GetEventLoop() const noexcept {
+	[[nodiscard]] auto &GetEventLoop() const noexcept {
 		return event.GetEventLoop();
 	}
 
@@ -90,12 +91,12 @@
 /* this should be enough - is it? */
 static constexpr unsigned MAX_SIGNAL = 64;
 
-static SignalHandler signal_handlers[MAX_SIGNAL];
+static std::array<SignalHandler, MAX_SIGNAL> signal_handlers;
 
 #ifdef USE_SIGNALFD
 static sigset_t signal_mask;
 #else
-static std::atomic_bool signal_pending[MAX_SIGNAL];
+static std::array<std::atomic_bool, MAX_SIGNAL> signal_pending;
 #endif
 
 static Manual<SignalMonitor> monitor;
@@ -153,7 +154,7 @@
 SignalMonitorFinish() noexcept
 {
 #ifdef USE_SIGNALFD
-	std::fill_n(signal_handlers, MAX_SIGNAL, nullptr);
+	signal_handlers = {};
 #else
 	struct sigaction sa;
 	sa.sa_flags = 0;
@@ -167,7 +168,7 @@
 		}
 	}
 
-	std::fill_n(signal_pending, MAX_SIGNAL, false);
+	std::fill(signal_pending.begin(), signal_pending.end(), false);
 #endif
 
 	monitor.Destruct();
diff -Nru ncmpc-0.45/src/event/TimerList.cxx ncmpc-0.46/src/event/TimerList.cxx
--- ncmpc-0.45/src/event/TimerList.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/TimerList.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -33,6 +33,10 @@
 #include "Loop.hxx"
 #include "FineTimerEvent.hxx"
 
+#ifdef NO_BOOST
+#include <algorithm>
+#endif
+
 constexpr bool
 TimerList::Compare::operator()(const FineTimerEvent &a,
 			       const FineTimerEvent &b) const noexcept
@@ -50,7 +54,15 @@
 void
 TimerList::Insert(FineTimerEvent &t) noexcept
 {
+#ifdef NO_BOOST
+	auto i = std::find_if(timers.begin(), timers.end(), [due = t.GetDue()](const auto &other){
+		return other.GetDue() >= due;
+	});
+
+	timers.insert(i, t);
+#else
 	timers.insert(t);
+#endif
 }
 
 Event::Duration
@@ -66,7 +78,11 @@
 		if (timeout > timeout.zero())
 			return timeout;
 
+#ifdef NO_BOOST
+		t.Cancel();
+#else
 		timers.erase(i);
+#endif
 
 		t.Run();
 	}
diff -Nru ncmpc-0.45/src/event/TimerList.hxx ncmpc-0.46/src/event/TimerList.hxx
--- ncmpc-0.45/src/event/TimerList.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/TimerList.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -33,9 +33,12 @@
 #pragma once
 
 #include "Chrono.hxx"
+#include "event/Features.h"
 #include "util/IntrusiveList.hxx"
 
+#ifndef NO_BOOST
 #include <boost/intrusive/set.hpp>
+#endif
 
 class FineTimerEvent;
 
@@ -48,10 +51,17 @@
 					  const FineTimerEvent &b) const noexcept;
 	};
 
+#ifdef NO_BOOST
+	/* when building without Boost, then this is just a sorted
+	   doubly-linked list - this doesn't scale well, but is good
+	   enough for most programs */
+	IntrusiveList<FineTimerEvent> timers;
+#else
 	boost::intrusive::multiset<FineTimerEvent,
 				   boost::intrusive::base_hook<boost::intrusive::set_base_hook<boost::intrusive::link_mode<boost::intrusive::auto_unlink>>>,
 				   boost::intrusive::compare<Compare>,
 				   boost::intrusive::constant_time_size<false>> timers;
+#endif
 
 public:
 	TimerList();
diff -Nru ncmpc-0.45/src/event/TimerWheel.cxx ncmpc-0.46/src/event/TimerWheel.cxx
--- ncmpc-0.45/src/event/TimerWheel.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/TimerWheel.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -46,14 +46,20 @@
 TimerWheel::~TimerWheel() noexcept = default;
 
 void
-TimerWheel::Insert(CoarseTimerEvent &t) noexcept
+TimerWheel::Insert(CoarseTimerEvent &t,
+		   Event::TimePoint now) noexcept
 {
-	/* if this timer's due time is already in the past, don't
-	   insert it into an older bucket because Run() won't look at
-	   it in this iteration */
-	const auto due = std::max(t.GetDue(), last_time);
+	assert(now >= last_time);
 
-	buckets[BucketIndexAt(due)].push_back(t);
+	auto &list = t.GetDue() > now
+		? buckets[BucketIndexAt(t.GetDue())]
+		/* if this timer is already due, insert it into the
+		   "ready" list to be invoked without delay */
+		: ready;
+
+	list.push_back(t);
+
+	empty = false;
 }
 
 void
@@ -99,10 +105,19 @@
 inline Event::Duration
 TimerWheel::GetSleep(Event::TimePoint now) const noexcept
 {
+	/* note: not checking the "ready" list here because this
+	   method gets called only from Run() after the "ready" list
+	   has been processed already */
+
+	if (empty)
+		return Event::Duration(-1);
+
 	auto t = GetNextDue(BucketIndexAt(now), GetBucketStartTime(now));
 	assert(t > now);
-	if (t == Event::TimePoint::max())
+	if (t == Event::TimePoint::max()) {
+		empty = true;
 		return Event::Duration(-1);
+	}
 
 	return t - now;
 }
@@ -110,6 +125,11 @@
 Event::Duration
 TimerWheel::Run(const Event::TimePoint now) noexcept
 {
+	/* invoke the "ready" list unconditionally */
+	ready.clear_and_dispose([&](auto *t){
+		t->Run();
+	});
+
 	/* check all buckets between the last time we were invoked and
 	   now */
 	const std::size_t start_bucket = BucketIndexAt(last_time);
diff -Nru ncmpc-0.45/src/event/TimerWheel.hxx ncmpc-0.46/src/event/TimerWheel.hxx
--- ncmpc-0.45/src/event/TimerWheel.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/TimerWheel.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -65,6 +65,13 @@
 	std::array<List, N_BUCKETS> buckets;
 
 	/**
+	 * A list of timers which are already ready.  This can happen
+	 * if they are scheduled with a zero duration or scheduled in
+	 * the past.
+	 */
+	List ready;
+
+	/**
 	 * The last time Run() was invoked.  This is needed to
 	 * determine the range of buckets to be checked, because we
 	 * can't rely on getting a caller for every bucket; there may
@@ -72,18 +79,30 @@
 	 */
 	Event::TimePoint last_time{};
 
+	/**
+	 * If this flag is true, then all buckets are guaranteed to be
+	 * empty.  If it is false, the buckets may or may not be
+	 * empty; if so, the next full scan will set it back to true.
+	 *
+	 * This field is "mutable" so the "const" method GetSleep()
+	 * can update it.
+	 */
+	mutable bool empty = true;
+
 public:
 	TimerWheel() noexcept;
 	~TimerWheel() noexcept;
 
 	bool IsEmpty() const noexcept {
-		return std::all_of(buckets.begin(), buckets.end(),
-				   [](const auto &list){
-					   return list.empty();
-				   });
+		return ready.empty() &&
+			std::all_of(buckets.begin(), buckets.end(),
+				    [](const auto &list){
+					    return list.empty();
+				    });
 	}
 
-	void Insert(CoarseTimerEvent &t) noexcept;
+	void Insert(CoarseTimerEvent &t,
+		    Event::TimePoint now) noexcept;
 
 	/**
 	 * Invoke all expired #CoarseTimerEvent instances and return
diff -Nru ncmpc-0.45/src/event/WinSelectBackend.cxx ncmpc-0.46/src/event/WinSelectBackend.cxx
--- ncmpc-0.45/src/event/WinSelectBackend.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/event/WinSelectBackend.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -160,10 +160,10 @@
 	ApplyReady(write_set, WinSelectEvents::WRITE);
 	ApplyReady(except_set, WinSelectEvents::WRITE);
 
-	for (auto &i : items)
-		if (i.second.events != 0) {
-			result.Add(i.second.events, i.second.obj);
-			i.second.events = 0;
+	for (auto &[key, item] : items)
+		if (item.events != 0) {
+			result.Add(item.events, item.obj);
+			item.events = 0;
 		}
 
 	return result;
diff -Nru ncmpc-0.45/src/filelist.cxx ncmpc-0.46/src/filelist.cxx
--- ncmpc-0.45/src/filelist.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/filelist.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -32,7 +32,7 @@
 		mpd_entity_free(entity);
 }
 
-gcc_pure
+[[gnu::pure]]
 static bool
 Less(const struct mpd_entity &a, struct mpd_entity &b) noexcept
 {
@@ -60,7 +60,7 @@
 	return false;
 }
 
-gcc_pure
+[[gnu::pure]]
 static bool
 Less(const struct mpd_entity *a, struct mpd_entity *b) noexcept
 {
@@ -116,7 +116,7 @@
 	}
 }
 
-gcc_pure
+[[gnu::pure]]
 static bool
 same_song(const struct mpd_song *a, const struct mpd_song *b) noexcept
 {
diff -Nru ncmpc-0.45/src/filelist.hxx ncmpc-0.46/src/filelist.hxx
--- ncmpc-0.45/src/filelist.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/filelist.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef FILELIST_H
 #define FILELIST_H
 
-#include "util/Compiler.h"
-
 #include <memory>
 #include <vector>
 #include <utility>
@@ -47,7 +45,7 @@
 		return *this;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool operator<(const FileListEntry &other) const noexcept;
 };
 
@@ -95,10 +93,10 @@
 	 */
 	void RemoveDuplicateSongs() noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	int FindSong(const struct mpd_song &song) const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	int FindDirectory(const char *name) const noexcept;
 
 	/**
diff -Nru ncmpc-0.45/src/FileListPage.cxx ncmpc-0.46/src/FileListPage.cxx
--- ncmpc-0.45/src/FileListPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/FileListPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -237,7 +237,7 @@
 
 static bool
 browser_select_entry(struct mpdclient &c, FileListEntry &entry,
-		     gcc_unused bool toggle)
+		     [[maybe_unused]] bool toggle)
 {
 	assert(entry.entity != nullptr);
 
@@ -399,10 +399,6 @@
 		return true;
 
 	switch (cmd) {
-#if defined(ENABLE_SONG_SCREEN) || defined(ENABLE_LYRICS_SCREEN)
-		const struct mpd_song *song;
-#endif
-
 	case Command::LIST_FIND:
 	case Command::LIST_RFIND:
 	case Command::LIST_FIND_NEXT:
@@ -417,22 +413,22 @@
 
 #ifdef ENABLE_SONG_SCREEN
 	case Command::SCREEN_SONG:
-		song = GetSelectedSong();
-		if (song == nullptr)
+		if (const auto *song = GetSelectedSong()) {
+			screen_song_switch(screen, c, *song);
+			return true;
+		} else
 			return false;
 
-		screen_song_switch(screen, c, *song);
-		return true;
 #endif
 
 #ifdef ENABLE_LYRICS_SCREEN
 	case Command::SCREEN_LYRICS:
-		song = GetSelectedSong();
-		if (song == nullptr)
+		if (const auto *song = GetSelectedSong()) {
+			screen_lyrics_switch(screen, c, *song, false);
+			return true;
+		} else
 			return false;
 
-		screen_lyrics_switch(screen, c, *song, false);
-		return true;
 #endif
 	case Command::SCREEN_SWAP:
 		screen.Swap(c, GetSelectedSong());
@@ -446,8 +442,6 @@
 		return false;
 
 	switch (cmd) {
-		const struct mpd_song *song;
-
 	case Command::PLAY:
 		HandleEnter(c);
 		return true;
@@ -476,12 +470,12 @@
 		return true;
 
 	case Command::LOCATE:
-		song = GetSelectedSong();
-		if (song == nullptr)
+		if (const auto *song = GetSelectedSong()) {
+			screen_file_goto_song(screen, c, *song);
+			return true;
+		} else
 			return false;
 
-		screen_file_goto_song(screen, c, *song);
-		return true;
 
 	default:
 		break;
@@ -533,16 +527,13 @@
 #endif
 
 	switch (mpd_entity_get_type(entity)) {
-		const struct mpd_directory *directory;
-		const struct mpd_playlist *playlist;
-		const char *name;
-
-	case MPD_ENTITY_TYPE_DIRECTORY:
-		directory = mpd_entity_get_directory(entity);
-		name = GetUriFilename(mpd_directory_get_path(directory));
+	case MPD_ENTITY_TYPE_DIRECTORY: {
+		const auto *directory = mpd_entity_get_directory(entity);
+		const char *name = GetUriFilename(mpd_directory_get_path(directory));
 		screen_browser_paint_directory(w, width, selected,
 					       Utf8ToLocale(name).c_str());
 		break;
+	}
 
 	case MPD_ENTITY_TYPE_SONG:
 		paint_song_row(w, y, width, selected, highlight,
@@ -550,12 +541,13 @@
 			       song_format);
 		break;
 
-	case MPD_ENTITY_TYPE_PLAYLIST:
-		playlist = mpd_entity_get_playlist(entity);
-		name = GetUriFilename(mpd_playlist_get_path(playlist));
+	case MPD_ENTITY_TYPE_PLAYLIST: {
+		const auto *playlist = mpd_entity_get_playlist(entity);
+		const char *name = GetUriFilename(mpd_playlist_get_path(playlist));
 		screen_browser_paint_playlist(w, width, selected,
 					      Utf8ToLocale(name).c_str());
 		break;
+	}
 
 	default:
 		row_paint_text(w, width,
diff -Nru ncmpc-0.45/src/FileListPage.hxx ncmpc-0.46/src/FileListPage.hxx
--- ncmpc-0.45/src/FileListPage.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/FileListPage.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -49,13 +49,13 @@
 	~FileListPage() noexcept override;
 
 protected:
-	gcc_pure
+	[[gnu::pure]]
 	FileListEntry *GetSelectedEntry() const;
 
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_entity *GetSelectedEntity() const;
 
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_song *GetSelectedSong() const;
 
 	FileListEntry *GetIndex(unsigned i) const;
diff -Nru ncmpc-0.45/src/GlobalBindings.hxx ncmpc-0.46/src/GlobalBindings.hxx
--- ncmpc-0.45/src/GlobalBindings.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/GlobalBindings.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,11 +19,9 @@
 #ifndef GLOBAL_BINDINGS_HXX
 #define GLOBAL_BINDINGS_HXX
 
-#include "util/Compiler.h"
-
 struct KeyBindings;
 
-gcc_const
+[[gnu::const]]
 KeyBindings &
 GetGlobalKeyBindings() noexcept;
 
diff -Nru ncmpc-0.45/src/io/FileDescriptor.cxx ncmpc-0.46/src/io/FileDescriptor.cxx
--- ncmpc-0.45/src/io/FileDescriptor.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/io/FileDescriptor.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -172,7 +172,15 @@
 #endif
 }
 
-#ifndef _WIN32
+#ifdef _WIN32
+
+void
+FileDescriptor::SetBinaryMode() noexcept
+{
+	_setmode(fd, _O_BINARY);
+}
+
+#else // !_WIN32
 
 bool
 FileDescriptor::CreatePipeNonBlock(FileDescriptor &r,
diff -Nru ncmpc-0.45/src/io/FileDescriptor.hxx ncmpc-0.46/src/io/FileDescriptor.hxx
--- ncmpc-0.45/src/io/FileDescriptor.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/io/FileDescriptor.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,8 +30,6 @@
 #ifndef FILE_DESCRIPTOR_HXX
 #define FILE_DESCRIPTOR_HXX
 
-#include "util/Compiler.h"
-
 #include <cstddef>
 #include <utility>
 
@@ -76,25 +74,25 @@
 	/**
 	 * Ask the kernel whether this is a valid file descriptor.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsValid() const noexcept;
 
 	/**
 	 * Ask the kernel whether this is a regular file.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsRegularFile() const noexcept;
 
 	/**
 	 * Ask the kernel whether this is a pipe.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsPipe() const noexcept;
 
 	/**
 	 * Ask the kernel whether this is a socket descriptor.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsSocket() const noexcept;
 #endif
 
@@ -149,10 +147,13 @@
 #ifdef _WIN32
 	void EnableCloseOnExec() noexcept {}
 	void DisableCloseOnExec() noexcept {}
+	void SetBinaryMode() noexcept;
 #else
 	static bool CreatePipeNonBlock(FileDescriptor &r,
 				       FileDescriptor &w) noexcept;
 
+	void SetBinaryMode() noexcept {}
+
 	/**
 	 * Enable non-blocking mode on this file descriptor.
 	 */
@@ -219,7 +220,7 @@
 		return lseek(Get(), offset, SEEK_CUR);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	off_t Tell() const noexcept {
 		return lseek(Get(), 0, SEEK_CUR);
 	}
@@ -227,7 +228,7 @@
 	/**
 	 * Returns the size of the file in bytes, or -1 on error.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	off_t GetSize() const noexcept;
 
 	ssize_t Read(void *buffer, std::size_t length) noexcept {
@@ -256,7 +257,7 @@
 	int WaitReadable(int timeout) const noexcept;
 	int WaitWritable(int timeout) const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool IsReadyForWriting() const noexcept;
 #endif
 };
diff -Nru ncmpc-0.45/src/io/Path.hxx ncmpc-0.46/src/io/Path.hxx
--- ncmpc-0.45/src/io/Path.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/io/Path.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef IO_PATH_HXX
 #define IO_PATH_HXX
 
-#include "util/Compiler.h"
-
 #include <string>
 
 #include <string.h>
@@ -33,14 +31,14 @@
 static constexpr char SEPARATOR = '/';
 #endif
 
-gcc_pure
+[[gnu::pure]]
 inline size_t
 GetLength(const char *s) noexcept
 {
 	return strlen(s);
 }
 
-gcc_pure
+[[gnu::pure]]
 inline size_t
 GetLength(const std::string &s) noexcept
 {
diff -Nru ncmpc-0.45/src/KeyDefPage.cxx ncmpc-0.46/src/KeyDefPage.cxx
--- ncmpc-0.45/src/KeyDefPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/KeyDefPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -31,7 +31,6 @@
 #include "GlobalBindings.hxx"
 #include "screen_utils.hxx"
 #include "Options.hxx"
-#include "util/Compiler.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -73,20 +72,20 @@
 	}
 
 	/** The position of the "add a key" item */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned GetAddPosition() const noexcept {
 		return n_keys + 1;
 	}
 
 	/** The number of items in the list_window, if there's a command being edited */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned CalculateListLength() const noexcept {
 		/* show "add key" only if there is room for more keys */
 		return GetAddPosition() + (n_keys < MAX_COMMAND_KEYS);
 	}
 
 	/** Check whether a given item is a key */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsKeyPosition(unsigned i) const noexcept {
 		return (i > GetLeavePosition() && i < GetAddPosition());
 	}
@@ -240,7 +239,7 @@
 }
 
 void
-CommandKeysPage::OnOpen(gcc_unused struct mpdclient &c) noexcept
+CommandKeysPage::OnOpen([[maybe_unused]] struct mpdclient &c) noexcept
 {
 	// TODO
 }
@@ -347,7 +346,7 @@
 	}
 
 	/** the number of items in the "command" view */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned command_length() const {
 		return command_item_save() + 1;
 	}
@@ -460,7 +459,7 @@
 }
 
 void
-CommandListPage::OnOpen(gcc_unused struct mpdclient &c) noexcept
+CommandListPage::OnOpen([[maybe_unused]] struct mpdclient &c) noexcept
 {
 	if (bindings == nullptr)
 		bindings = new KeyBindings(GetGlobalKeyBindings());
diff -Nru ncmpc-0.45/src/KeyName.hxx ncmpc-0.46/src/KeyName.hxx
--- ncmpc-0.45/src/KeyName.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/KeyName.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef KEY_NAME_HXX
 #define KEY_NAME_HXX
 
-#include "util/Compiler.h"
-
 #include <utility>
 
 /**
@@ -29,7 +27,7 @@
  * @return the keycode and the first unparsed character; -1 indicates
  * error
  */
-gcc_pure
+[[gnu::pure]]
 std::pair<int, const char *>
 ParseKeyName(const char *s) noexcept;
 
@@ -39,7 +37,7 @@
  *
  * The returned pointer is invalidated by the next call.
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 GetKeyName(int key) noexcept;
 
@@ -48,7 +46,7 @@
  *
  * The returned pointer is invalidated by the next call.
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 GetLocalizedKeyName(int key) noexcept;
 
diff -Nru ncmpc-0.45/src/LibraryPage.cxx ncmpc-0.46/src/LibraryPage.cxx
--- ncmpc-0.45/src/LibraryPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/LibraryPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -35,7 +35,7 @@
 #include <assert.h>
 #include <string.h>
 
-gcc_const
+[[gnu::const]]
 static const char *
 GetTagPlural(enum mpd_tag_type tag) noexcept
 {
diff -Nru ncmpc-0.45/src/ListCursor.hxx ncmpc-0.46/src/ListCursor.hxx
--- ncmpc-0.45/src/ListCursor.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/ListCursor.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef LIST_CURSOR_HXX
 #define LIST_CURSOR_HXX
 
-#include "util/Compiler.h"
-
 #include <algorithm>
 
 /**
@@ -270,11 +268,11 @@
 	 * range selection is disabled, it returns the cursor position (range
 	 * length is 1).
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	ListWindowRange GetRange() const noexcept;
 
 	template<typename ItemList>
-	gcc_pure
+	[[gnu::pure]]
 	auto GetCursorHash(const ItemList &items) const noexcept -> decltype(items.front().GetHash()) {
 		if (IsSingleCursor())
 			return items[GetCursorIndex()].GetHash();
@@ -314,7 +312,7 @@
 			: std::max(height / 2, 1U) - 1;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	unsigned ValidateIndex(unsigned i) const noexcept;
 
 	void CheckSelected() noexcept;
diff -Nru ncmpc-0.45/src/ListText.hxx ncmpc-0.46/src/ListText.hxx
--- ncmpc-0.45/src/ListText.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/ListText.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef LIST_TEXT_HXX
 #define LIST_TEXT_HXX
 
-#include "util/Compiler.h"
-
 #include <stddef.h>
 
 class ListText {
@@ -28,7 +26,7 @@
 	/**
 	 * @return the text in the locale charset
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	virtual const char *GetListItemText(char *buffer, size_t size,
 					    unsigned i) const noexcept = 0;
 };
diff -Nru ncmpc-0.45/src/LyricsCache.cxx ncmpc-0.46/src/LyricsCache.cxx
--- ncmpc-0.45/src/LyricsCache.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/LyricsCache.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -96,7 +96,7 @@
 	return path;
 }
 
-gcc_pure
+[[gnu::pure]]
 static bool
 ExistsFile(const std::string &path) noexcept
 {
@@ -114,7 +114,7 @@
 		ExistsFile(::MakePath(legacy_directory, artist, title));
 }
 
-gcc_pure
+[[gnu::pure]]
 static std::string
 LoadFile(const std::string &path) noexcept
 {
diff -Nru ncmpc-0.45/src/LyricsCache.hxx ncmpc-0.46/src/LyricsCache.hxx
--- ncmpc-0.45/src/LyricsCache.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/LyricsCache.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef LYRICS_CACHE_HXX
 #define LYRICS_CACHE_HXX
 
-#include "util/Compiler.h"
-
 #include <string>
 
 #include <stddef.h>
@@ -41,7 +39,7 @@
 	std::string MakePath(const char *artist,
 			     const char *title) const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool Exists(const char *artist, const char *title) const noexcept;
 
 	std::string Load(const char *artist, const char *title) const noexcept;
diff -Nru ncmpc-0.45/src/Main.cxx ncmpc-0.46/src/Main.cxx
--- ncmpc-0.45/src/Main.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Main.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -36,7 +36,6 @@
 #include "util/PrintException.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/StringUTF8.hxx"
-#include "util/Compiler.h"
 
 #ifndef NCMPC_MINI
 #include "ConfigFile.hxx"
@@ -178,7 +177,7 @@
  * idle event (or when the connection dies).
  */
 void
-mpdclient_idle_callback(gcc_unused unsigned events) noexcept
+mpdclient_idle_callback([[maybe_unused]] unsigned events) noexcept
 {
 #ifndef NCMPC_MINI
 	if (options.enable_xterm_title)
diff -Nru ncmpc-0.45/src/Match.cxx ncmpc-0.46/src/Match.cxx
--- ncmpc-0.45/src/Match.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Match.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "Match.hxx"
+#include "util/ScopeExit.hxx"
 
 #include <assert.h>
 #include <string.h>
@@ -24,7 +25,7 @@
 MatchExpression::~MatchExpression() noexcept
 {
 #ifdef HAVE_PCRE
-	pcre_free(re);
+	pcre2_code_free_8(re);
 #endif
 }
 
@@ -40,13 +41,14 @@
 #else
 	assert(re == nullptr);
 
-	int options = PCRE_CASELESS|PCRE_DOTALL|PCRE_NO_AUTO_CAPTURE;
+	int options = PCRE2_CASELESS|PCRE2_DOTALL|PCRE2_NO_AUTO_CAPTURE;
 	if (anchor)
-		options |= PCRE_ANCHORED;
+		options |= PCRE2_ANCHORED;
 
-	const char *error_string;
-	int error_offset;
-	re = pcre_compile(src, options, &error_string, &error_offset, nullptr);
+	int error_number;
+	PCRE2_SIZE error_offset;
+	re = pcre2_compile_8(PCRE2_SPTR8(src), PCRE2_ZERO_TERMINATED,
+			     options, &error_number, &error_offset, nullptr);
 	return re != nullptr;
 #endif
 }
@@ -63,7 +65,13 @@
 #else
 	assert(re != nullptr);
 
-	return pcre_exec(re, nullptr, line, strlen(line),
-			 0, 0, nullptr, 0) >= 0;
+	const auto match_data =
+		pcre2_match_data_create_from_pattern_8(re, nullptr);
+	AtScopeExit(match_data) {
+		pcre2_match_data_free_8(match_data);
+	};
+
+	return pcre2_match_8(re, (PCRE2_SPTR8)line, strlen(line),
+			     0, 0, match_data, nullptr) >= 0;
 #endif
 }
diff -Nru ncmpc-0.45/src/Match.hxx ncmpc-0.46/src/Match.hxx
--- ncmpc-0.45/src/Match.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Match.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -20,10 +20,9 @@
 #define MATCH_H
 
 #include "config.h"
-#include "util/Compiler.h"
 
 #ifdef HAVE_PCRE
-#include <pcre.h>
+#include <pcre2.h>
 #else
 #include <stddef.h>
 #endif
@@ -34,7 +33,7 @@
 	size_t length;
 	bool anchored;
 #else
-	pcre *re = nullptr;
+	pcre2_code_8 *re = nullptr;
 #endif
 
 public:
@@ -46,7 +45,7 @@
 
 	bool Compile(const char *src, bool anchor) noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool operator()(const char *line) const noexcept;
 };
 
diff -Nru ncmpc-0.45/src/mpdclient.cxx ncmpc-0.46/src/mpdclient.cxx
--- ncmpc-0.45/src/mpdclient.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/mpdclient.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -77,7 +77,7 @@
 
 void
 mpdclient::OnIdleError(enum mpd_error error,
-		       gcc_unused enum mpd_server_error server_error,
+		       enum mpd_server_error,
 		       const char *message) noexcept
 {
 	assert(IsConnected());
diff -Nru ncmpc-0.45/src/mpdclient.hxx ncmpc-0.46/src/mpdclient.hxx
--- ncmpc-0.45/src/mpdclient.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/mpdclient.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "Queue.hxx"
 #include "gidle.hxx"
-#include "util/Compiler.h"
 #include "event/FineTimerEvent.hxx"
 
 #ifdef ENABLE_ASYNC_CONNECT
@@ -192,7 +191,7 @@
 	 * Is this object "dead"?  i.e. not connected and not
 	 * currently doing anything to connect.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsDead() const {
 		return connection == nullptr
 #ifdef ENABLE_ASYNC_CONNECT
@@ -201,14 +200,14 @@
 			;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	int GetCurrentSongId() const noexcept {
 		return status != nullptr
 			? mpd_status_get_song_id(status)
 			: -1;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	int GetCurrentSongPos() const noexcept {
 		return status != nullptr
 			? mpd_status_get_song_pos(status)
@@ -219,12 +218,12 @@
 	 * Returns the song that is "current".  This can be valid even
 	 * if MPD is not playing.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_song *GetCurrentSong() const {
 		return current_song;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	int GetPlayingSongId() const noexcept {
 		return playing_or_paused
 			? GetCurrentSongId()
@@ -235,7 +234,7 @@
 	 * Returns the song that is currently being played (or
 	 * paused).
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_song *GetPlayingSong() const {
 		return playing_or_paused
 			? GetCurrentSong()
diff -Nru ncmpc-0.45/src/net/AddressInfo.cxx ncmpc-0.46/src/net/AddressInfo.cxx
--- ncmpc-0.45/src/net/AddressInfo.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/AddressInfo.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2016-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,9 +30,10 @@
 #include "AddressInfo.hxx"
 #include "Features.hxx"
 
+#include <array>
 #include <cassert>
 
-static constexpr int address_family_ranking[] = {
+static constexpr auto address_family_ranking = std::array {
 #ifdef HAVE_UN
 	AF_LOCAL,
 #endif
diff -Nru ncmpc-0.45/src/net/AddressInfo.hxx ncmpc-0.46/src/net/AddressInfo.hxx
--- ncmpc-0.45/src/net/AddressInfo.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/AddressInfo.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2016-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,6 @@
 #define NET_ADDRESS_INFO_HXX
 
 #include "SocketAddress.hxx"
-#include "util/Compiler.h"
 
 #include <utility>
 
@@ -109,7 +108,7 @@
 	 * to an IPv6 wildcard address also allows accepting IPv4
 	 * connections.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const AddressInfo &GetBest() const;
 
 	class const_iterator {
diff -Nru ncmpc-0.45/src/net/AllocatedSocketAddress.cxx ncmpc-0.46/src/net/AllocatedSocketAddress.cxx
--- ncmpc-0.45/src/net/AllocatedSocketAddress.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/AllocatedSocketAddress.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -Nru ncmpc-0.45/src/net/AllocatedSocketAddress.hxx ncmpc-0.46/src/net/AllocatedSocketAddress.hxx
--- ncmpc-0.45/src/net/AllocatedSocketAddress.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/AllocatedSocketAddress.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,6 @@
 
 #include "SocketAddress.hxx" // IWYU pragma: export
 #include "Features.hxx"
-#include "util/Compiler.h"
 
 #include <utility>
 
@@ -87,18 +86,18 @@
 	}
 
 	template<typename T>
-	gcc_pure
+	[[gnu::pure]]
 	bool operator==(T &&other) const noexcept {
 		return (SocketAddress)*this == std::forward<T>(other);
 	}
 
 	template<typename T>
-	gcc_pure
+	[[gnu::pure]]
 	bool operator!=(T &&other) const noexcept {
 		return !(*this == std::forward<T>(other));
 	}
 
-	gcc_const
+	[[gnu::const]]
 	static AllocatedSocketAddress Null() noexcept {
 		return AllocatedSocketAddress(nullptr, 0);
 	}
@@ -145,13 +144,13 @@
 	/**
 	 * @see SocketAddress::GetLocalRaw()
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	StringView GetLocalRaw() const noexcept;
 
 	/**
 	 * @see SocketAddress::GetLocalPath()
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const char *GetLocalPath() const noexcept {
 		return ((SocketAddress)*this).GetLocalPath();
 	}
@@ -176,7 +175,7 @@
 	/**
 	 * Extract the port number.  Returns 0 if not applicable.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned GetPort() const noexcept {
 		return ((SocketAddress)*this).GetPort();
 	}
diff -Nru ncmpc-0.45/src/net/HostParser.hxx ncmpc-0.46/src/net/HostParser.hxx
--- ncmpc-0.45/src/net/HostParser.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/HostParser.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -34,7 +34,6 @@
 #define NET_HOST_PARSER_HXX
 
 #include "util/StringView.hxx"
-#include "util/Compiler.h"
 
 /**
  * Result type for ExtractHost().
@@ -69,7 +68,7 @@
  *
  * @param src the input string
  */
-gcc_pure
+[[gnu::pure]]
 ExtractHostResult
 ExtractHost(const char *src) noexcept;
 
diff -Nru ncmpc-0.45/src/net/IPv4Address.hxx ncmpc-0.46/src/net/IPv4Address.hxx
--- ncmpc-0.45/src/net/IPv4Address.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/IPv4Address.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -188,10 +188,17 @@
 	}
 
 	/**
+	 * @return the port number in network byte order
+	 */
+	constexpr uint16_t GetPortBE() const noexcept {
+		return address.sin_port;
+	}
+
+	/**
 	 * @return the port number in host byte order
 	 */
 	constexpr uint16_t GetPort() const noexcept {
-		return FromBE16(address.sin_port);
+		return FromBE16(GetPortBE());
 	}
 
 	/**
diff -Nru ncmpc-0.45/src/net/IPv6Address.hxx ncmpc-0.46/src/net/IPv6Address.hxx
--- ncmpc-0.45/src/net/IPv6Address.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/IPv6Address.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -32,7 +32,6 @@
 
 #include "SocketAddress.hxx"
 #include "util/ByteOrder.hxx"
-#include "util/Compiler.h"
 
 #include <cstdint>
 
@@ -179,7 +178,7 @@
 	/**
 	 * Is this the IPv6 wildcard address (in6addr_any)?
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsAny() const noexcept;
 
 	/**
@@ -195,14 +194,14 @@
 	/**
 	 * Convert "::ffff:127.0.0.1" to "127.0.0.1".
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	IPv4Address UnmapV4() const noexcept;
 
 	/**
 	 * Bit-wise AND of two addresses.  This is useful for netmask
 	 * calculations.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	IPv6Address operator&(const IPv6Address &other) const;
 
 private:
diff -Nru ncmpc-0.45/src/net/Resolver.cxx ncmpc-0.46/src/net/Resolver.cxx
--- ncmpc-0.45/src/net/Resolver.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/Resolver.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -44,7 +44,6 @@
 #include <net/if.h>
 #endif
 
-#include <cerrno>
 #include <cstring>
 
 #include <stdio.h>
diff -Nru ncmpc-0.45/src/net/SocketAddress.cxx ncmpc-0.46/src/net/SocketAddress.cxx
--- ncmpc-0.45/src/net/SocketAddress.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/SocketAddress.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -Nru ncmpc-0.45/src/net/SocketAddress.hxx ncmpc-0.46/src/net/SocketAddress.hxx
--- ncmpc-0.45/src/net/SocketAddress.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/SocketAddress.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,7 +31,6 @@
 #define SOCKET_ADDRESS_HXX
 
 #include "Features.hxx"
-#include "util/Compiler.h"
 
 #include <cstddef>
 
@@ -118,14 +117,14 @@
 	 * "size" attribute includes the null terminator.  Returns
 	 * nullptr if not applicable.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	StringView GetLocalRaw() const noexcept;
 
 	/**
 	 * Returns the local socket path or nullptr if not applicable
 	 * (or if the path is corrupt).
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	const char *GetLocalPath() const noexcept;
 #endif
 
@@ -133,25 +132,25 @@
 	/**
 	 * Is this the IPv6 wildcard address (in6addr_any)?
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsV6Any() const noexcept;
 
 	/**
 	 * Is this an IPv4 address mapped inside struct sockaddr_in6?
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsV4Mapped() const noexcept;
 
 	/**
 	 * Convert "::ffff:127.0.0.1" to "127.0.0.1".
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	IPv4Address UnmapV4() const noexcept;
 
 	/**
 	 * Extract the port number.  Returns 0 if not applicable.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned GetPort() const noexcept;
 #endif
 
@@ -162,10 +161,10 @@
 	 * much for anything else.  Returns nullptr if the address is
 	 * not supported.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	ConstBuffer<void> GetSteadyPart() const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool operator==(const SocketAddress other) const noexcept;
 
 	bool operator!=(const SocketAddress other) const noexcept {
diff -Nru ncmpc-0.45/src/net/SocketDescriptor.cxx ncmpc-0.46/src/net/SocketDescriptor.cxx
--- ncmpc-0.45/src/net/SocketDescriptor.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/SocketDescriptor.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -225,9 +225,9 @@
 		: errno;
 }
 
-size_t
+std::size_t
 SocketDescriptor::GetOption(int level, int name,
-			    void *value, size_t size) const noexcept
+			    void *value, std::size_t size) const noexcept
 {
 	assert(IsDefined());
 
@@ -264,7 +264,7 @@
 
 bool
 SocketDescriptor::SetOption(int level, int name,
-			    const void *value, size_t size) noexcept
+			    const void *value, std::size_t size) noexcept
 {
 	assert(IsDefined());
 
@@ -431,7 +431,7 @@
 }
 
 ssize_t
-SocketDescriptor::Read(void *buffer, size_t length) noexcept
+SocketDescriptor::Read(void *buffer, std::size_t length) noexcept
 {
 	int flags = 0;
 #ifndef _WIN32
@@ -442,7 +442,7 @@
 }
 
 ssize_t
-SocketDescriptor::Write(const void *buffer, size_t length) noexcept
+SocketDescriptor::Write(const void *buffer, std::size_t length) noexcept
 {
 	int flags = 0;
 #ifdef __linux__
@@ -495,7 +495,7 @@
 #endif
 
 ssize_t
-SocketDescriptor::Read(void *buffer, size_t length,
+SocketDescriptor::Read(void *buffer, std::size_t length,
 		       StaticSocketAddress &address) noexcept
 {
 	int flags = 0;
@@ -513,7 +513,7 @@
 }
 
 ssize_t
-SocketDescriptor::Write(const void *buffer, size_t length,
+SocketDescriptor::Write(const void *buffer, std::size_t length,
 			SocketAddress address) noexcept
 {
 	int flags = 0;
diff -Nru ncmpc-0.45/src/net/SocketDescriptor.hxx ncmpc-0.46/src/net/SocketDescriptor.hxx
--- ncmpc-0.45/src/net/SocketDescriptor.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/SocketDescriptor.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -90,13 +90,13 @@
 	 * Determine the socket type, i.e. SOCK_STREAM, SOCK_DGRAM or
 	 * SOCK_SEQPACKET.  Returns -1 on error.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	int GetType() const noexcept;
 
 	/**
 	 * Is this a stream socket?
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	bool IsStream() const noexcept;
 
 	using FileDescriptor::Get;
@@ -159,20 +159,20 @@
 	/**
 	 * @return the value size or 0 on error
 	 */
-	size_t GetOption(int level, int name,
-			 void *value, size_t size) const noexcept;
+	std::size_t GetOption(int level, int name,
+			      void *value, std::size_t size) const noexcept;
 
 #ifdef HAVE_STRUCT_UCRED
 	/**
 	 * Receive peer credentials (SO_PEERCRED).  On error, the pid
 	 * is -1.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	struct ucred GetPeerCredentials() const noexcept;
 #endif
 
 	bool SetOption(int level, int name,
-		       const void *value, size_t size) noexcept;
+		       const void *value, std::size_t size) noexcept;
 
 	bool SetBoolOption(int level, int name, bool _value) noexcept {
 		const int value = _value;
@@ -226,14 +226,14 @@
 
 	bool Connect(SocketAddress address) noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	StaticSocketAddress GetLocalAddress() const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	StaticSocketAddress GetPeerAddress() const noexcept;
 
-	ssize_t Read(void *buffer, size_t length) noexcept;
-	ssize_t Write(const void *buffer, size_t length) noexcept;
+	ssize_t Read(void *buffer, std::size_t length) noexcept;
+	ssize_t Write(const void *buffer, std::size_t length) noexcept;
 
 #ifdef _WIN32
 	int WaitReadable(int timeout_ms) const noexcept;
@@ -247,13 +247,13 @@
 	/**
 	 * Receive a datagram and return the source address.
 	 */
-	ssize_t Read(void *buffer, size_t length,
+	ssize_t Read(void *buffer, std::size_t length,
 		     StaticSocketAddress &address) noexcept;
 
 	/**
 	 * Send a datagram to the specified address.
 	 */
-	ssize_t Write(const void *buffer, size_t length,
+	ssize_t Write(const void *buffer, std::size_t length,
 		      SocketAddress address) noexcept;
 
 #ifndef _WIN32
diff -Nru ncmpc-0.45/src/net/SocketError.hxx ncmpc-0.46/src/net/SocketError.hxx
--- ncmpc-0.45/src/net/SocketError.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/SocketError.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,7 +30,6 @@
 #ifndef SOCKET_ERROR_HXX
 #define SOCKET_ERROR_HXX
 
-#include "util/Compiler.h"
 #include "system/Error.hxx"
 
 #ifdef _WIN32
@@ -41,7 +40,7 @@
 typedef int socket_error_t;
 #endif
 
-gcc_pure
+[[gnu::pure]]
 static inline socket_error_t
 GetSocketError() noexcept
 {
@@ -128,8 +127,7 @@
 #endif
 }
 
-gcc_const
-static inline bool
+constexpr bool
 IsSocketErrorInterruped(socket_error_t code) noexcept
 {
 #ifdef _WIN32
@@ -139,8 +137,7 @@
 #endif
 }
 
-gcc_const
-static inline bool
+constexpr bool
 IsSocketErrorClosed(socket_error_t code) noexcept
 {
 #ifdef _WIN32
@@ -171,8 +168,8 @@
 	}
 };
 
-gcc_const
-static inline std::system_error
+[[gnu::pure]]
+static inline auto
 MakeSocketError(socket_error_t code, const char *msg) noexcept
 {
 #ifdef _WIN32
@@ -182,8 +179,8 @@
 #endif
 }
 
-gcc_pure
-static inline std::system_error
+[[gnu::pure]]
+static inline auto
 MakeSocketError(const char *msg) noexcept
 {
 	return MakeSocketError(GetSocketError(), msg);
diff -Nru ncmpc-0.45/src/net/StaticSocketAddress.hxx ncmpc-0.46/src/net/StaticSocketAddress.hxx
--- ncmpc-0.45/src/net/StaticSocketAddress.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/StaticSocketAddress.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2012-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,6 @@
 
 #include "SocketAddress.hxx" // IWYU pragma: export
 #include "Features.hxx"
-#include "util/Compiler.h"
 
 #include <cassert>
 
@@ -120,7 +119,7 @@
 	/**
 	 * @see SocketAddress::GetLocalRaw()
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	StringView GetLocalRaw() const noexcept;
 #endif
 
@@ -128,7 +127,7 @@
 	/**
 	 * Extract the port number.  Returns 0 if not applicable.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned GetPort() const noexcept {
 		return ((SocketAddress)*this).GetPort();
 	}
@@ -140,7 +139,7 @@
 	bool SetPort(unsigned port) noexcept;
 #endif
 
-	gcc_pure
+	[[gnu::pure]]
 	bool operator==(SocketAddress other) const noexcept {
 		return (SocketAddress)*this == other;
 	}
diff -Nru ncmpc-0.45/src/net/UniqueSocketDescriptor.hxx ncmpc-0.46/src/net/UniqueSocketDescriptor.hxx
--- ncmpc-0.45/src/net/UniqueSocketDescriptor.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/net/UniqueSocketDescriptor.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -32,7 +32,6 @@
 
 #include "SocketDescriptor.hxx"
 
-#include <algorithm>
 #include <utility>
 
 class StaticSocketAddress;
diff -Nru ncmpc-0.45/src/Options.cxx ncmpc-0.46/src/Options.cxx
--- ncmpc-0.45/src/Options.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Options.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -62,7 +62,7 @@
 #endif
 };
 
-gcc_pure
+[[gnu::pure]]
 static const OptionDefinition *
 FindOption(int s) noexcept
 {
@@ -262,7 +262,6 @@
 		GetGlobalKeyBindings().WriteToFile(stdout,
 						   KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
 		exit(EXIT_SUCCESS);
-		break;
 #endif
 	default:
 		fprintf(stderr,"Unknown Option %c = %s\n", c, arg);
diff -Nru ncmpc-0.45/src/OutputsPage.cxx ncmpc-0.46/src/OutputsPage.cxx
--- ncmpc-0.45/src/OutputsPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/OutputsPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -39,14 +39,14 @@
 
 #if LIBMPDCLIENT_CHECK_VERSION(2,18,0)
 
-gcc_pure
+[[gnu::pure]]
 static uint64_t
 PartitionNameHash(const char *name) noexcept
 {
 	return FNV1aHash64(name) ^ 0x1;
 }
 
-gcc_pure
+[[gnu::pure]]
 static uint64_t
 GetActivePartitionNameHash(const struct mpd_status *status) noexcept
 {
@@ -91,7 +91,7 @@
 			:partition(_partition) {}
 #endif
 
-		gcc_pure
+		[[gnu::pure]]
 		uint64_t GetHash() const noexcept {
 #if LIBMPDCLIENT_CHECK_VERSION(2,18,0)
 			switch (special) {
@@ -389,7 +389,7 @@
 
 void
 OutputsPage::PaintListItem(WINDOW *w, unsigned i,
-			   gcc_unused unsigned y, unsigned width,
+			   [[maybe_unused]] unsigned y, unsigned width,
 			   bool selected) const noexcept
 {
 	assert(i < items.size());
diff -Nru ncmpc-0.45/src/Page.hxx ncmpc-0.46/src/Page.hxx
--- ncmpc-0.45/src/Page.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Page.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -22,7 +22,6 @@
 #include "config.h"
 #include "Point.hxx"
 #include "Size.hxx"
-#include "util/Compiler.h"
 
 #include <curses.h>
 
@@ -121,14 +120,14 @@
 	 * @return true if the event was handled (and should not be
 	 * handled by the ncmpc core)
 	 */
-	virtual bool OnMouse(gcc_unused struct mpdclient &c,
-			     gcc_unused Point position,
-			     gcc_unused mmask_t bstate) {
+	virtual bool OnMouse([[maybe_unused]] struct mpdclient &c,
+			     [[maybe_unused]] Point position,
+			     [[maybe_unused]] mmask_t bstate) {
 		return false;
 	}
 #endif
 
-	gcc_pure
+	[[gnu::pure]]
 	virtual const char *GetTitle(char *s, size_t size) const noexcept = 0;
 };
 
diff -Nru ncmpc-0.45/src/player_command.cxx ncmpc-0.46/src/player_command.cxx
--- ncmpc-0.45/src/player_command.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/player_command.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -34,27 +34,20 @@
 	seek.Cancel();
 
 	switch(cmd) {
-		struct mpd_connection *connection;
-
 		/*
 	case Command::PLAY:
 		mpdclient_cmd_play(c, MPD_PLAY_AT_BEGINNING);
 		break;
 		*/
 	case Command::PAUSE:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_pause(connection, c.state != MPD_STATE_PAUSE))
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_pause(connection, c.state != MPD_STATE_PAUSE))
 			c.HandleError();
 		break;
 	case Command::STOP:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_stop(connection))
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr && !mpd_run_stop(connection))
 			c.HandleError();
 		break;
 	case Command::CROP:
@@ -65,11 +58,8 @@
 		break;
 
 	case Command::TRACK_NEXT:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_next(connection))
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr && !mpd_run_next(connection))
 			c.HandleError();
 		break;
 	case Command::SEEK_BACKWARD:
@@ -77,69 +67,55 @@
 		break;
 
 	case Command::TRACK_PREVIOUS:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_previous(connection))
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr && !mpd_run_previous(connection))
 			c.HandleError();
 		break;
 	case Command::SHUFFLE:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
+		if (auto *connection = c.GetConnection()) {
+			if (mpd_run_shuffle(connection))
+				screen_status_message(_("Shuffled queue"));
+			else
+				c.HandleError();
+		}
 
-		if (mpd_run_shuffle(connection))
-			screen_status_message(_("Shuffled queue"));
-		else
-			c.HandleError();
 		break;
 	case Command::CLEAR:
 		if (c.RunClearQueue())
 			screen_status_message(_("Cleared queue"));
 		break;
 	case Command::REPEAT:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_repeat(connection,
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_repeat(connection,
 				    !mpd_status_get_repeat(c.status)))
 			c.HandleError();
 		break;
 	case Command::RANDOM:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_random(connection,
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_random(connection,
 				    !mpd_status_get_random(c.status)))
 			c.HandleError();
 		break;
 	case Command::SINGLE:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_single(connection,
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_single(connection,
 				    !mpd_status_get_single(c.status)))
 			c.HandleError();
 		break;
 	case Command::CONSUME:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_consume(connection,
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_consume(connection,
 				     !mpd_status_get_consume(c.status)))
 			c.HandleError();
 		break;
 	case Command::CROSSFADE:
-		connection = c.GetConnection();
-		if (connection == nullptr)
-			break;
-
-		if (!mpd_run_crossfade(connection,
+		if (auto *connection = c.GetConnection();
+		    connection != nullptr &&
+		    !mpd_run_crossfade(connection,
 				       mpd_status_get_crossfade(c.status) > 0
 				       ? 0 : options.crossfade_time))
 			c.HandleError();
diff -Nru ncmpc-0.45/src/plugin.cxx ncmpc-0.46/src/plugin.cxx
--- ncmpc-0.45/src/plugin.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/plugin.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,7 +19,7 @@
 #include "plugin.hxx"
 #include "io/Path.hxx"
 #include "io/UniqueFileDescriptor.hxx"
-#include "event/SocketEvent.hxx"
+#include "event/PipeEvent.hxx"
 #include "event/CoarseTimerEvent.hxx"
 #include "util/ScopeExit.hxx"
 #include "util/UriUtil.hxx"
@@ -41,7 +41,7 @@
 	PluginCycle &cycle;
 
 	/** the pipe to the plugin process */
-	SocketEvent socket_event;
+	PipeEvent socket_event;
 
 	/** the output of the current plugin */
 	std::string data;
@@ -57,7 +57,7 @@
 	}
 
 	void Start(UniqueFileDescriptor &&fd) noexcept {
-		socket_event.Open(SocketDescriptor::FromFileDescriptor(fd.Release()));
+		socket_event.Open(fd.Release());
 		socket_event.ScheduleRead();
 	}
 
@@ -215,8 +215,8 @@
 PluginPipe::OnRead(unsigned) noexcept
 {
 	char buffer[256];
-	ssize_t nbytes = read(socket_event.GetSocket().Get(),
-			      buffer, sizeof(buffer));
+	ssize_t nbytes = socket_event.GetFileDescriptor().Read(buffer,
+							       sizeof(buffer));
 	if (nbytes <= 0) {
 		socket_event.Close();
 		cycle.OnEof();
diff -Nru ncmpc-0.45/src/Queue.hxx ncmpc-0.46/src/Queue.hxx
--- ncmpc-0.45/src/Queue.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Queue.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,7 +19,6 @@
 #ifndef QUEUE_HXX
 #define QUEUE_HXX
 
-#include "util/Compiler.h"
 #include "SongPtr.hxx"
 
 #include <mpd/client.h>
@@ -62,7 +61,7 @@
 		return *items[i];
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_song *GetChecked(int i) const noexcept;
 
 	void push_back(const struct mpd_song &song) noexcept {
@@ -86,7 +85,7 @@
 	 *
 	 * @return the song position
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	size_type FindByReference(const struct mpd_song &song) const noexcept;
 
 	/**
@@ -94,7 +93,7 @@
 	 *
 	 * @return the song position
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	int FindById(unsigned id) const noexcept;
 
 	/**
@@ -102,7 +101,7 @@
 	 *
 	 * @return the song position
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	int FindByUri(const char *uri) const noexcept;
 
 	/**
@@ -110,7 +109,7 @@
 	 *
 	 * @return the song id
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	int FindIdByUri(const char *uri) const noexcept {
 		int i = FindByUri(uri);
 		if (i >= 0)
@@ -118,7 +117,7 @@
 		return i;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool ContainsUri(const char *uri) const noexcept {
 		return FindByUri(uri) >= 0;
 	}
diff -Nru ncmpc-0.45/src/QueuePage.cxx ncmpc-0.46/src/QueuePage.cxx
--- ncmpc-0.45/src/QueuePage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/QueuePage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -42,7 +42,6 @@
 #include "LyricsPage.hxx"
 #include "db_completion.hxx"
 #include "event/CoarseTimerEvent.hxx"
-#include "util/Compiler.h"
 
 #ifndef NCMPC_MINI
 #include "hscroll.hxx"
@@ -90,7 +89,7 @@
 	}
 
 private:
-	gcc_pure
+	[[gnu::pure]]
 	const struct mpd_song *GetSelectedSong() const;
 
 	void SaveSelection();
@@ -214,7 +213,7 @@
 	lw.FetchCursor();
 }
 
-gcc_pure
+[[gnu::pure]]
 static int
 get_current_song_id(const struct mpd_status *status)
 {
@@ -529,22 +528,19 @@
 	}
 
 	switch(cmd) {
-		int pos;
-
 	case Command::SCREEN_UPDATE:
 		CenterPlayingItem(c.status, prev_cmd == Command::SCREEN_UPDATE);
 		SetDirty();
 		return false;
 	case Command::SELECT_PLAYING:
-		pos = c.GetCurrentSongPos();
-		if (pos < 0)
+		if (int pos = c.GetCurrentSongPos(); pos >= 0) {
+			lw.SetCursor(pos);
+			SaveSelection();
+			SetDirty();
+			return true;
+		} else
 			return false;
 
-		lw.SetCursor(pos);
-		SaveSelection();
-		SetDirty();
-		return true;
-
 	case Command::LIST_FIND:
 	case Command::LIST_RFIND:
 	case Command::LIST_FIND_NEXT:
@@ -599,27 +595,24 @@
 		return false;
 
 	switch(cmd) {
-		const struct mpd_song *song;
-		ListWindowRange range;
-
 	case Command::PLAY:
-		song = GetSelectedSong();
-		if (song == nullptr)
-			return false;
-
-		connection = c.GetConnection();
-		if (connection != nullptr &&
-		    !mpd_run_play_id(connection, mpd_song_get_id(song)))
-			c.HandleError();
+		if (const auto *song = GetSelectedSong()) {
+			if (connection = c.GetConnection();
+			    connection != nullptr &&
+			    !mpd_run_play_id(connection, mpd_song_get_id(song)))
+				c.HandleError();
 
-		return true;
+			return true;
+		} else
+			return false;
 
-	case Command::DELETE:
-		range = lw.GetRange();
+	case Command::DELETE: {
+		const auto range = lw.GetRange();
 		c.RunDeleteRange(range.start_index, range.end_index);
 
 		lw.SetCursor(range.start_index);
 		return true;
+	}
 
 	case Command::SAVE_PLAYLIST:
 		playlist_save(&c, nullptr, nullptr);
@@ -629,8 +622,8 @@
 		handle_add_to_playlist(&c);
 		return true;
 
-	case Command::SHUFFLE:
-		range = lw.GetRange();
+	case Command::SHUFFLE: {
+		const auto range = lw.GetRange();
 		if (range.end_index <= range.start_index + 1)
 			/* No range selection, shuffle all list. */
 			break;
@@ -645,9 +638,10 @@
 		else
 			c.HandleError();
 		return true;
+	}
 
-	case Command::LIST_MOVE_UP:
-		range = lw.GetRange();
+	case Command::LIST_MOVE_UP: {
+		const auto range = lw.GetRange();
 		if (range.start_index == 0 || range.empty())
 			return false;
 
@@ -657,9 +651,10 @@
 		lw.SelectionMovedUp();
 		SaveSelection();
 		return true;
+	}
 
-	case Command::LIST_MOVE_DOWN:
-		range = lw.GetRange();
+	case Command::LIST_MOVE_DOWN: {
+		const auto range = lw.GetRange();
 		if (range.end_index >= playlist->size())
 			return false;
 
@@ -669,6 +664,7 @@
 		lw.SelectionMovedDown();
 		SaveSelection();
 		return true;
+	}
 
 	case Command::LOCATE:
 		if (GetSelectedSong() != nullptr) {
diff -Nru ncmpc-0.45/src/save_playlist.cxx ncmpc-0.46/src/save_playlist.cxx
--- ncmpc-0.45/src/save_playlist.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/save_playlist.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -25,7 +25,6 @@
 #include "mpdclient.hxx"
 #include "Completion.hxx"
 #include "screen_utils.hxx"
-#include "util/Compiler.h"
 
 #include <mpd/client.h>
 
@@ -47,7 +46,7 @@
 };
 
 void
-PlaylistNameCompletion::Pre(gcc_unused const char *value) noexcept
+PlaylistNameCompletion::Pre([[maybe_unused]] const char *value) noexcept
 {
 	if (empty()) {
 		/* create completion list */
@@ -56,7 +55,7 @@
 }
 
 void
-PlaylistNameCompletion::Post(gcc_unused const char *value,
+PlaylistNameCompletion::Post([[maybe_unused]] const char *value,
 			     Range range) noexcept
 {
 	if (range.begin() != range.end() &&
diff -Nru ncmpc-0.45/src/screen.cxx ncmpc-0.46/src/screen.cxx
--- ncmpc-0.45/src/screen.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/screen.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -95,7 +95,7 @@
 		Switch(*mode_fn_prev, c);
 }
 
-gcc_pure
+[[gnu::pure]]
 static int
 find_configured_screen(const char *name) noexcept
 {
diff -Nru ncmpc-0.45/src/screen.hxx ncmpc-0.46/src/screen.hxx
--- ncmpc-0.45/src/screen.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/screen.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -27,7 +27,6 @@
 #include "History.hxx"
 #include "Point.hxx"
 #include "event/IdleEvent.hxx"
-#include "util/Compiler.h"
 
 #include <curses.h>
 
@@ -128,7 +127,7 @@
 
 	void OnResize() noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool IsVisible(const Page &page) const noexcept {
 		return &page == current_page->second.get();
 	}
diff -Nru ncmpc-0.45/src/screen_list.hxx ncmpc-0.46/src/screen_list.hxx
--- ncmpc-0.45/src/screen_list.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/screen_list.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,20 +19,18 @@
 #ifndef SCREEN_LIST_H
 #define SCREEN_LIST_H
 
-#include "util/Compiler.h"
-
 enum class Command : unsigned;
 struct PageMeta;
 
-gcc_const
+[[gnu::const]]
 const PageMeta *
 GetPageMeta(unsigned i) noexcept;
 
-gcc_pure
+[[gnu::pure]]
 const PageMeta *
 screen_lookup_name(const char *name) noexcept;
 
-gcc_const
+[[gnu::const]]
 const PageMeta *
 PageByCommand(Command cmd) noexcept;
 
diff -Nru ncmpc-0.45/src/SongPage.cxx ncmpc-0.46/src/SongPage.cxx
--- ncmpc-0.45/src/SongPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/SongPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -207,7 +207,8 @@
 }
 
 const char *
-SongPage::GetTitle(gcc_unused char *str, gcc_unused size_t size) const noexcept
+SongPage::GetTitle([[maybe_unused]] char *str,
+		   [[maybe_unused]] size_t size) const noexcept
 {
 	return _("Song viewer");
 }
@@ -275,7 +276,7 @@
 	}
 }
 
-gcc_pure
+[[gnu::pure]]
 static const char *
 get_tag_label(unsigned tag) noexcept
 {
diff -Nru ncmpc-0.45/src/SongRowPaint.cxx ncmpc-0.46/src/SongRowPaint.cxx
--- ncmpc-0.45/src/SongRowPaint.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/SongRowPaint.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -29,9 +29,9 @@
 #include <string.h>
 
 void
-paint_song_row(WINDOW *w, gcc_unused unsigned y, unsigned width,
+paint_song_row(WINDOW *w, [[maybe_unused]] unsigned y, unsigned width,
 	       bool selected, bool highlight, const struct mpd_song *song,
-	       gcc_unused class hscroll *hscroll, const char *format)
+	       [[maybe_unused]] class hscroll *hscroll, const char *format)
 {
 	char buffer[1024];
 
diff -Nru ncmpc-0.45/src/strfsong.cxx ncmpc-0.46/src/strfsong.cxx
--- ncmpc-0.45/src/strfsong.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/strfsong.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -28,7 +28,7 @@
 
 #include <string.h>
 
-gcc_pure
+[[gnu::pure]]
 static const char *
 skip(const char *p) noexcept
 {
diff -Nru ncmpc-0.45/src/strfsong.hxx ncmpc-0.46/src/strfsong.hxx
--- ncmpc-0.45/src/strfsong.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/strfsong.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef STRFSONG_H
 #define STRFSONG_H
 
-#include "util/Compiler.h"
-
 #include <stddef.h>
 
 struct mpd_song;
@@ -33,7 +31,7 @@
 /**
  * Check which tags are referenced by the given song format.
  */
-gcc_pure
+[[gnu::pure]]
 TagMask
 SongFormatToTagMask(const char *format) noexcept;
 
diff -Nru ncmpc-0.45/src/Styles.cxx ncmpc-0.46/src/Styles.cxx
--- ncmpc-0.45/src/Styles.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/Styles.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -22,7 +22,6 @@
 #include "i18n.h"
 #include "util/RuntimeError.hxx"
 #include "util/StringStrip.hxx"
-#include "util/Compiler.h"
 
 #ifdef ENABLE_COLORS
 #include "Options.hxx"
@@ -194,7 +193,7 @@
 
 #ifdef ENABLE_COLORS
 
-gcc_pure
+[[gnu::pure]]
 static Style
 StyleByName(const char *name) noexcept
 {
diff -Nru ncmpc-0.45/src/system/Error.hxx ncmpc-0.46/src/system/Error.hxx
--- ncmpc-0.45/src/system/Error.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/system/Error.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,8 +30,6 @@
 #ifndef SYSTEM_ERROR_HXX
 #define SYSTEM_ERROR_HXX
 
-#include "util/Compiler.h"
-
 #include <system_error> // IWYU pragma: export
 #include <utility>
 
@@ -49,7 +47,9 @@
 
 #ifdef _WIN32
 
-#include <windows.h>
+#include <errhandlingapi.h> // for GetLastError()
+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for FormatMessageA()
 
 static inline std::system_error
 MakeLastError(DWORD code, const char *msg) noexcept
@@ -160,7 +160,7 @@
 #endif
 }
 
-gcc_pure
+[[gnu::pure]]
 inline bool
 IsErrno(const std::system_error &e, int code) noexcept
 {
@@ -168,7 +168,7 @@
 		e.code().value() == code;
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 IsFileNotFound(const std::system_error &e) noexcept
 {
@@ -180,7 +180,7 @@
 #endif
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 IsPathNotFound(const std::system_error &e) noexcept
 {
@@ -192,7 +192,7 @@
 #endif
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 IsAccessDenied(const std::system_error &e) noexcept
 {
diff -Nru ncmpc-0.45/src/system/EventFD.cxx ncmpc-0.46/src/system/EventFD.cxx
--- ncmpc-0.45/src/system/EventFD.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/system/EventFD.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -29,7 +29,6 @@
 
 #include "EventFD.hxx"
 #include "system/Error.hxx"
-#include "util/Compiler.h"
 
 #include <cassert>
 
diff -Nru ncmpc-0.45/src/system/EventPipe.cxx ncmpc-0.46/src/system/EventPipe.cxx
--- ncmpc-0.45/src/system/EventPipe.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/system/EventPipe.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -20,7 +20,6 @@
 #include "EventPipe.hxx"
 #include "io/FileDescriptor.hxx"
 #include "system/Error.hxx"
-#include "util/Compiler.h"
 
 #include <cassert>
 
diff -Nru ncmpc-0.45/src/TagFilter.hxx ncmpc-0.46/src/TagFilter.hxx
--- ncmpc-0.45/src/TagFilter.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/TagFilter.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef NCMPC_TAG_FILTER_HXX
 #define NCMPC_TAG_FILTER_HXX
 
-#include "util/Compiler.h"
-
 #include <mpd/tag.h>
 
 #include <string>
@@ -30,7 +28,7 @@
 
 using TagFilter = std::forward_list<std::pair<enum mpd_tag_type, std::string>>;
 
-gcc_pure
+[[gnu::pure]]
 const char *
 FindTag(const TagFilter &filter, enum mpd_tag_type tag) noexcept;
 
@@ -38,7 +36,7 @@
 AddConstraints(struct mpd_connection *connection,
 	       const TagFilter &filter) noexcept;
 
-gcc_pure
+[[gnu::pure]]
 std::string
 ToString(const TagFilter &filter) noexcept;
 
diff -Nru ncmpc-0.45/src/TagListPage.cxx ncmpc-0.46/src/TagListPage.cxx
--- ncmpc-0.45/src/TagListPage.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/TagListPage.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -48,7 +48,7 @@
 	return new_filter;
 }
 
-gcc_pure
+[[gnu::pure]]
 static bool
 CompareUTF8(const std::string &a, const std::string &b)
 {
@@ -122,7 +122,7 @@
  */
 void
 TagListPage::PaintListItem(WINDOW *w, unsigned i,
-			     gcc_unused unsigned y, unsigned width,
+			     [[maybe_unused]] unsigned y, unsigned width,
 			     bool selected) const noexcept
 {
 	if (parent != nullptr) {
diff -Nru ncmpc-0.45/src/TagListPage.hxx ncmpc-0.46/src/TagListPage.hxx
--- ncmpc-0.45/src/TagListPage.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/TagListPage.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -73,12 +73,12 @@
 	 */
 	TagFilter MakeCursorFilter() const noexcept;
 
-	gcc_pure
+	[[gnu::pure]]
 	bool HasMultipleValues() const noexcept {
 		return values.size() > 1;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	const char *GetSelectedValue() const {
 		unsigned i = lw.GetCursorIndex();
 
diff -Nru ncmpc-0.45/src/time/ClockCache.hxx ncmpc-0.46/src/time/ClockCache.hxx
--- ncmpc-0.45/src/time/ClockCache.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/time/ClockCache.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -47,7 +47,7 @@
 	ClockCache(const ClockCache &) = delete;
 	ClockCache &operator=(const ClockCache &) = delete;
 
-	gcc_pure
+	[[gnu::pure]]
 	const auto &now() const noexcept {
 		if (value <= value_type())
 			value = Clock::now();
diff -Nru ncmpc-0.45/src/util/BindMethod.hxx ncmpc-0.46/src/util/BindMethod.hxx
--- ncmpc-0.45/src/util/BindMethod.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/BindMethod.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,8 +30,6 @@
 #ifndef BIND_METHOD_HXX
 #define BIND_METHOD_HXX
 
-#include "Compiler.h"
-
 #include <type_traits>
 #include <utility>
 
@@ -45,21 +43,11 @@
 template<typename S=void()>
 class BoundMethod;
 
-#if GCC_OLDER_THAN(7,0)
-static constexpr bool NoExcept = false;
-#endif
-
 template<typename R,
-#if !GCC_OLDER_THAN(7,0)
 	bool NoExcept,
-#endif
 	typename... Args>
 class BoundMethod<R(Args...) noexcept(NoExcept)> {
-	typedef R (*function_pointer)(void *instance, Args... args)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+	typedef R (*function_pointer)(void *instance, Args... args) noexcept(NoExcept);
 
 	void *instance_;
 	function_pointer function;
@@ -106,20 +94,10 @@
 struct MethodWithSignature;
 
 template<typename T,
-#if !GCC_OLDER_THAN(7,0)
 	 bool NoExcept,
-#endif
 	 typename R, typename... Args>
-struct MethodWithSignature<T, R(Args...)
-#if !GCC_OLDER_THAN(7,0)
-			   noexcept(NoExcept)
-#endif
-			   > {
-	typedef R (T::*method_pointer)(Args...)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+struct MethodWithSignature<T, R(Args...) noexcept(NoExcept)> {
+	typedef R (T::*method_pointer)(Args...) noexcept(NoExcept);
 };
 
 /**
@@ -130,11 +108,7 @@
 template<typename M>
 struct MethodSignatureHelper;
 
-template<typename R,
-#if !GCC_OLDER_THAN(7,0)
-	 bool NoExcept,
-#endif
-	 typename T, typename... Args>
+template<typename R, bool NoExcept, typename T, typename... Args>
 struct MethodSignatureHelper<R (T::*)(Args...) noexcept(NoExcept)> {
 	/**
 	 * The class which contains the given method (signature).
@@ -145,11 +119,7 @@
 	 * A function type which describes the "plain" function
 	 * signature.
 	 */
-	typedef R plain_signature(Args...)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+	typedef R plain_signature(Args...) noexcept(NoExcept);
 };
 
 /**
@@ -159,17 +129,10 @@
 template<typename S>
 struct MethodWrapperWithSignature;
 
-template<typename R,
-#if !GCC_OLDER_THAN(7,0)
-	 bool NoExcept,
-#endif
-	 typename... Args>
+template<typename R, bool NoExcept, typename... Args>
 struct MethodWrapperWithSignature<R(Args...) noexcept(NoExcept)> {
-	typedef R (*function_pointer)(void *instance, Args...)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+	typedef R (*function_pointer)(void *instance,
+				      Args...) noexcept(NoExcept);
 };
 
 /**
@@ -201,10 +164,7 @@
 template<typename T, typename M, M method, typename S>
 struct BindMethodWrapperGenerator;
 
-template<typename T,
-#if !GCC_OLDER_THAN(7,0)
-	 bool NoExcept,
-#endif
+template<typename T, bool NoExcept,
 	 typename M, M method, typename R, typename... Args>
 struct BindMethodWrapperGenerator<T, M, method, R(Args...) noexcept(NoExcept)>
 	: BindMethodWrapperGenerator2<T, NoExcept, M, method, R, Args...> {
@@ -226,31 +186,19 @@
 template<typename S>
 struct FunctionTraits;
 
-template<typename R,
-#if !GCC_OLDER_THAN(7,0)
-	 bool NoExcept,
-#endif
-	 typename... Args>
+template<typename R, bool NoExcept, typename... Args>
 struct FunctionTraits<R(Args...) noexcept(NoExcept)> {
 	/**
 	 * A function type which describes the "plain" function
 	 * signature.
 	 */
-	typedef R function_type(Args...)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+	typedef R function_type(Args...) noexcept(NoExcept);
 
 	/**
 	 * A function pointer type which describes the "plain"
 	 * function signature.
 	 */
-	typedef R (*pointer)(Args...)
-#if !GCC_OLDER_THAN(7,0)
-		noexcept(NoExcept)
-#endif
-		;
+	typedef R (*pointer)(Args...) noexcept(NoExcept);
 };
 
 /**
@@ -280,11 +228,7 @@
 template<typename S, typename P, P function>
 struct BindFunctionWrapperGenerator;
 
-template<typename P, P function,
-#if !GCC_OLDER_THAN(7,0)
-	 bool NoExcept,
-#endif
-	 typename R, typename... Args>
+template<typename P, P function, bool NoExcept, typename R, typename... Args>
 struct BindFunctionWrapperGenerator<R(Args...) noexcept(NoExcept), P, function>
 	: BindFunctionWrapperGenerator2<NoExcept, P, function, R, Args...> {
 };
diff -Nru ncmpc-0.45/src/util/Exception.hxx ncmpc-0.46/src/util/Exception.hxx
--- ncmpc-0.45/src/util/Exception.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/Exception.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2016-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -84,8 +84,29 @@
 }
 
 /**
+ * Find an instance of #T in the nested exception chain, and return a
+ * pointer.  Returns nullptr if no such instance was found.
+ */
+template<typename T>
+[[gnu::pure]]
+inline const T *
+FindNested(std::exception_ptr ep) noexcept
+{
+	try {
+		std::rethrow_exception(ep);
+	} catch (const T &t) {
+		return &t;
+	} catch (const std::nested_exception &ne) {
+		return FindNested<T>(ne.nested_ptr());
+	} catch (...) {
+	}
+
+	return nullptr;
+}
+
+/**
  * Find an instance of #T in the nested exception chain, and rethrow
- * it.  Does nothing of no such instance was found.
+ * it.  Does nothing if no such instance was found.
  */
 template<typename T>
 inline void
@@ -95,12 +116,6 @@
 		std::rethrow_exception(ep);
 	} catch (const T &t) {
 		throw;
-	} catch (const std::exception &e) {
-		try {
-			std::rethrow_if_nested(e);
-		} catch (...) {
-			FindRetrowNested<T>(std::current_exception());
-		}
 	} catch (const std::nested_exception &ne) {
 		FindRetrowNested<T>(ne.nested_ptr());
 	} catch (...) {
diff -Nru ncmpc-0.45/src/util/FNVHash.hxx ncmpc-0.46/src/util/FNVHash.hxx
--- ncmpc-0.45/src/util/FNVHash.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/FNVHash.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -37,8 +37,6 @@
 #ifndef FNV_HASH_HXX
 #define FNV_HASH_HXX
 
-#include "Compiler.h"
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -68,12 +66,12 @@
 	typedef typename Traits::value_type value_type;
 	typedef typename Traits::fast_type fast_type;
 
-	gcc_hot
+	[[gnu::hot]]
 	static constexpr fast_type Update(fast_type hash, uint8_t b) noexcept {
 		return (hash ^ b) * Traits::PRIME;
 	}
 
-	gcc_pure gcc_hot
+	[[gnu::pure]] [[gnu::hot]]
 	static value_type StringHash(const char *s) noexcept {
 		using Algorithm = FNV1aAlgorithm<Traits>;
 
@@ -85,7 +83,7 @@
 	}
 };
 
-gcc_pure gcc_hot
+[[gnu::pure]] [[gnu::hot]]
 inline uint32_t
 FNV1aHash32(const char *s) noexcept
 {
@@ -94,7 +92,7 @@
 	return Algorithm::StringHash(s);
 }
 
-gcc_pure gcc_hot
+[[gnu::pure]] [[gnu::hot]]
 inline uint64_t
 FNV1aHash64(const char *s) noexcept
 {
@@ -103,7 +101,7 @@
 	return Algorithm::StringHash(s);
 }
 
-gcc_pure gcc_hot
+[[gnu::pure]] [[gnu::hot]]
 inline uint32_t
 FNV1aHashFold32(const char *s) noexcept
 {
diff -Nru ncmpc-0.45/src/util/IntrusiveList.hxx ncmpc-0.46/src/util/IntrusiveList.hxx
--- ncmpc-0.45/src/util/IntrusiveList.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/IntrusiveList.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -65,21 +65,15 @@
 };
 
 /**
- * A variant of #IntrusiveListHook which auto-unlinks itself from the
- * list upon destruction.  As a side effect, it has an is_linked()
- * method.
+ * A variant of #IntrusiveListHook which keeps track of whether it is
+ * currently in a list.
  */
-class AutoUnlinkIntrusiveListHook : public IntrusiveListHook {
+class SafeLinkIntrusiveListHook : public IntrusiveListHook {
 public:
-	AutoUnlinkIntrusiveListHook() noexcept {
+	SafeLinkIntrusiveListHook() noexcept {
 		siblings.next = nullptr;
 	}
 
-	~AutoUnlinkIntrusiveListHook() noexcept {
-		if (is_linked())
-			unlink();
-	}
-
 	void unlink() noexcept {
 		IntrusiveListHook::unlink();
 		siblings.next = nullptr;
@@ -90,30 +84,57 @@
 	}
 };
 
+/**
+ * A variant of #IntrusiveListHook which auto-unlinks itself from the
+ * list upon destruction.  As a side effect, it has an is_linked()
+ * method.
+ */
+class AutoUnlinkIntrusiveListHook : public SafeLinkIntrusiveListHook {
+public:
+	~AutoUnlinkIntrusiveListHook() noexcept {
+		if (is_linked())
+			unlink();
+	}
+};
+
 template<typename T>
 class IntrusiveList {
+	/**
+	 * Detect the hook type; this is important because
+	 * SafeLinkIntrusiveListHook::unlink() needs to clear the
+	 * "next" pointer.  This is a template to postpone the type
+	 * checks, to allow forward-declared types.
+	 */
+	template<typename U>
+	struct HookDetection {
+		static_assert(std::is_base_of_v<IntrusiveListHook, U>);
+
+		using type = std::conditional_t<std::is_base_of_v<SafeLinkIntrusiveListHook, U>,
+						SafeLinkIntrusiveListHook,
+						IntrusiveListHook>;
+	};
+
+	template<typename U>
+	using Hook = typename HookDetection<U>::type;
+
 	IntrusiveListNode head{&head, &head};
 
 	static constexpr T *Cast(IntrusiveListNode *node) noexcept {
-		static_assert(std::is_base_of<IntrusiveListHook, T>::value);
-		auto *hook = &IntrusiveListHook::Cast(*node);
+		auto *hook = &Hook<T>::Cast(*node);
 		return static_cast<T *>(hook);
 	}
 
 	static constexpr const T *Cast(const IntrusiveListNode *node) noexcept {
-		static_assert(std::is_base_of<IntrusiveListHook, T>::value);
-		const auto *hook = &IntrusiveListHook::Cast(*node);
+		const auto *hook = &Hook<T>::Cast(*node);
 		return static_cast<const T *>(hook);
 	}
 
-	static constexpr IntrusiveListHook &ToHook(T &t) noexcept {
-		static_assert(std::is_base_of<IntrusiveListHook, T>::value);
-		return t;
+	static constexpr auto &ToHook(T &t) noexcept {
+		return static_cast<Hook<T> &>(t);
 	}
 
-	static constexpr const IntrusiveListHook &ToHook(const T &t) noexcept {
-		static_assert(std::is_base_of<IntrusiveListHook, T>::value);
-		return t;
+	static constexpr const auto &ToHook(const T &t) noexcept {
+		return static_cast<const Hook<T> &>(t);
 	}
 
 	static constexpr IntrusiveListNode &ToNode(T &t) noexcept {
@@ -125,7 +146,7 @@
 	}
 
 public:
-	IntrusiveList() noexcept = default;
+	constexpr IntrusiveList() noexcept = default;
 
 	IntrusiveList(IntrusiveList &&src) noexcept {
 		if (src.empty())
@@ -140,19 +161,42 @@
 	}
 
 	~IntrusiveList() noexcept {
-		if (std::is_base_of<AutoUnlinkIntrusiveListHook, T>::value)
+		if constexpr (std::is_base_of<SafeLinkIntrusiveListHook, T>::value)
 			clear();
 	}
 
 	IntrusiveList &operator=(IntrusiveList &&) = delete;
 
+	friend void swap(IntrusiveList &a, IntrusiveList &b) noexcept {
+		using std::swap;
+
+		if (a.empty()) {
+			if (b.empty())
+				return;
+
+			a.head = b.head;
+			a.head.next->prev = &a.head;
+			a.head.prev->next = &a.head;
+
+			b.head = {&b.head, &b.head};
+		} else {
+			swap(a.head, b.head);
+
+			a.head.next->prev = &a.head;
+			a.head.prev->next = &a.head;
+
+			b.head.next->prev = &b.head;
+			b.head.prev->next = &b.head;
+		}
+	}
+
 	constexpr bool empty() const noexcept {
 		return head.next == &head;
 	}
 
 	void clear() noexcept {
-		if (std::is_base_of<AutoUnlinkIntrusiveListHook, T>::value) {
-			/* for AutoUnlinkIntrusiveListHook, we need to
+		if constexpr (std::is_base_of<SafeLinkIntrusiveListHook, T>::value) {
+			/* for SafeLinkIntrusiveListHook, we need to
 			   remove each item manually, or else its
 			   is_linked() method will not work */
 			while (!empty())
@@ -214,9 +258,7 @@
 
 	class const_iterator;
 
-	class iterator final
-		: public std::iterator<std::forward_iterator_tag, T> {
-
+	class iterator final {
 		friend IntrusiveList;
 		friend const_iterator;
 
@@ -226,7 +268,13 @@
 			:cursor(_cursor) {}
 
 	public:
-		iterator() = default;
+		using iterator_category = std::forward_iterator_tag;
+		using value_type = T;
+		using difference_type = std::ptrdiff_t;
+		using pointer = value_type *;
+		using reference = value_type &;
+
+		iterator() noexcept = default;
 
 		constexpr bool operator==(const iterator &other) const noexcept {
 			return cursor == other.cursor;
@@ -259,12 +307,10 @@
 	}
 
 	static constexpr iterator iterator_to(T &t) noexcept {
-		return {&t};
+		return {&ToNode(t)};
 	}
 
-	class const_iterator final
-		: public std::iterator<std::forward_iterator_tag, const T> {
-
+	class const_iterator final {
 		friend IntrusiveList;
 
 		const IntrusiveListNode *cursor;
@@ -273,7 +319,13 @@
 			:cursor(_cursor) {}
 
 	public:
-		const_iterator() = default;
+		using iterator_category = std::forward_iterator_tag;
+		using value_type = const T;
+		using difference_type = std::ptrdiff_t;
+		using pointer = value_type *;
+		using reference = value_type &;
+
+		const_iterator() noexcept = default;
 
 		const_iterator(iterator src) noexcept
 			:cursor(src.cursor) {}
@@ -309,22 +361,37 @@
 	}
 
 	static constexpr iterator iterator_to(const T &t) noexcept {
-		return {&t};
+		return {&ToNode(t)};
+	}
+
+	iterator erase(iterator i) noexcept {
+		auto result = std::next(i);
+		ToHook(*i).unlink();
+		return result;
+	}
+
+	template<typename D>
+	iterator erase_and_dispose(iterator i, D &&disposer) noexcept {
+		auto result = erase(i);
+		disposer(&*i);
+		return result;
 	}
 
 	void push_front(T &t) noexcept {
-		auto &new_node = ToNode(t);
-		head.next->prev = &new_node;
-		new_node.next = head.next;
-		head.next = &new_node;
-		new_node.prev = &head;
+		insert(begin(), t);
 	}
 
 	void push_back(T &t) noexcept {
+		insert(end(), t);
+	}
+
+	void insert(iterator p, T &t) noexcept {
+		auto &existing_node = ToNode(*p);
 		auto &new_node = ToNode(t);
-		head.prev->next = &new_node;
-		new_node.prev = head.prev;
-		head.prev = &new_node;
-		new_node.next = &head;
+
+		existing_node.prev->next = &new_node;
+		new_node.prev = existing_node.prev;
+		existing_node.prev = &new_node;
+		new_node.next = &existing_node;
 	}
 };
diff -Nru ncmpc-0.45/src/util/LocaleString.hxx ncmpc-0.46/src/util/LocaleString.hxx
--- ncmpc-0.45/src/util/LocaleString.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/LocaleString.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,14 +30,12 @@
 #ifndef LOCALE_STRING_HXX
 #define LOCALE_STRING_HXX
 
-#include "Compiler.h"
-
 #include <cstddef>
 
 /**
  * Is the given character incomplete?
  */
-gcc_pure
+[[gnu::pure]]
 bool
 IsIncompleteCharMB(const char *s, size_t n) noexcept;
 
@@ -45,7 +43,7 @@
  * Returns the length of the given locale (multi-byte) string in
  * characters.
  */
-gcc_pure
+[[gnu::pure]]
 std::size_t
 StringLengthMB(const char *s, size_t n) noexcept;
 
@@ -53,7 +51,7 @@
  * Wrapper for std::mbrlen() which attempts to recover with a best
  * effort from invalid or incomplete sequences.
  */
-gcc_pure
+[[gnu::pure]]
 std::size_t
 CharSizeMB(const char *s, size_t n) noexcept;
 
@@ -62,7 +60,7 @@
  *
  * @param s the start of the string
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 PrevCharMB(const char *start, const char *reference) noexcept;
 
@@ -72,7 +70,7 @@
  *
  * @param s the start of the string
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 AtCharMB(const char *s, size_t length, size_t i) noexcept;
 
@@ -80,11 +78,11 @@
  * Returns the number of terminal cells occupied by this multi-byte
  * string.
  */
-gcc_pure
+[[gnu::pure]]
 size_t
 StringWidthMB(const char *s, size_t length) noexcept;
 
-gcc_pure
+[[gnu::pure]]
 size_t
 StringWidthMB(const char *s) noexcept;
 
@@ -93,7 +91,7 @@
  *
  * @param s the start of the string
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 AtWidthMB(const char *s, size_t length, size_t width) noexcept;
 
diff -Nru ncmpc-0.45/src/util/RuntimeError.hxx ncmpc-0.46/src/util/RuntimeError.hxx
--- ncmpc-0.45/src/util/RuntimeError.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/RuntimeError.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -35,6 +35,12 @@
 
 #include <stdio.h>
 
+#if defined(__clang__) || defined(__GNUC__)
+#pragma GCC diagnostic push
+// TODO: fix this warning properly
+#pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
 template<typename... Args>
 static inline std::runtime_error
 FormatRuntimeError(const char *fmt, Args&&... args) noexcept
@@ -53,4 +59,8 @@
 	return std::invalid_argument(buffer);
 }
 
+#if defined(__clang__) || defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
 #endif
diff -Nru ncmpc-0.45/src/util/StringAPI.hxx ncmpc-0.46/src/util/StringAPI.hxx
--- ncmpc-0.45/src/util/StringAPI.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringAPI.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2010-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,71 +30,69 @@
 #ifndef STRING_API_HXX
 #define STRING_API_HXX
 
-#include "Compiler.h"
-
 #include <cstring>
 
 #ifdef _UNICODE
 #include "WStringAPI.hxx"
 #endif
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline size_t
 StringLength(const char *p) noexcept
 {
 	return strlen(p);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFind(const char *haystack, const char *needle) noexcept
 {
 	return strstr(haystack, needle);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline char *
 StringFind(char *haystack, char needle, size_t size) noexcept
 {
 	return (char *)std::memchr(haystack, needle, size);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFind(const char *haystack, char needle, size_t size) noexcept
 {
 	return (const char *)std::memchr(haystack, needle, size);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFind(const char *haystack, char needle) noexcept
 {
 	return std::strchr(haystack, needle);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline char *
 StringFind(char *haystack, char needle) noexcept
 {
 	return std::strchr(haystack, needle);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFindLast(const char *haystack, char needle) noexcept
 {
 	return std::strrchr(haystack, needle);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline char *
 StringFindLast(char *haystack, char needle) noexcept
 {
 	return std::strrchr(haystack, needle);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFindLast(const char *haystack, char needle, size_t size) noexcept
 {
@@ -115,7 +113,7 @@
 #endif
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringFindAny(const char *haystack, const char *accept) noexcept
 {
@@ -128,14 +126,14 @@
 	return strtok(str, delim);
 }
 
-gcc_nonnull_all
+[[gnu::nonnull]]
 static inline void
 UnsafeCopyString(char *dest, const char *src) noexcept
 {
 	strcpy(dest, src);
 }
 
-gcc_returns_nonnull gcc_nonnull_all
+[[gnu::returns_nonnull]] [[gnu::nonnull]]
 static inline char *
 UnsafeCopyStringP(char *dest, const char *src) noexcept
 {
@@ -148,14 +146,14 @@
 #endif
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline int
 StringCompare(const char *a, const char *b) noexcept
 {
 	return strcmp(a, b);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline int
 StringCompare(const char *a, const char *b, size_t n) noexcept
 {
@@ -165,7 +163,7 @@
 /**
  * Checks whether #a and #b are equal.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringIsEqual(const char *a, const char *b) noexcept
 {
@@ -175,28 +173,28 @@
 /**
  * Checks whether #a and #b are equal.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringIsEqual(const char *a, const char *b, size_t length) noexcept
 {
 	return strncmp(a, b, length) == 0;
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringIsEqualIgnoreCase(const char *a, const char *b) noexcept
 {
 	return strcasecmp(a, b) == 0;
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringIsEqualIgnoreCase(const char *a, const char *b, size_t size) noexcept
 {
 	return strncasecmp(a, b, size) == 0;
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline int
 StringCollate(const char *a, const char *b) noexcept
 {
@@ -207,7 +205,7 @@
  * Copy the string to a new allocation.  The return value must be
  * freed with free().
  */
-gcc_malloc gcc_returns_nonnull gcc_nonnull_all
+[[gnu::malloc]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 static inline char *
 DuplicateString(const char *p) noexcept
 {
diff -Nru ncmpc-0.45/src/util/StringCompare.hxx ncmpc-0.46/src/util/StringCompare.hxx
--- ncmpc-0.45/src/util/StringCompare.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringCompare.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2013-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,7 +32,6 @@
 
 #include "StringView.hxx"
 #include "StringAPI.hxx"
-#include "Compiler.h"
 
 #ifdef _UNICODE
 #include "WStringCompare.hxx"
@@ -40,14 +39,14 @@
 
 #include <string_view>
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringIsEmpty(const char *string) noexcept
 {
 	return *string == 0;
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 StringIsEqual(std::string_view a, std::string_view b) noexcept
 {
@@ -55,7 +54,7 @@
 		StringIsEqual(a.data(), b.data(), b.size());
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 StringIsEqualIgnoreCase(std::string_view a, std::string_view b) noexcept
 {
@@ -63,18 +62,18 @@
 		StringIsEqualIgnoreCase(a.data(), b.data(), b.size());
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringStartsWith(const char *haystack, StringView needle) noexcept
 {
 	return StringIsEqual(haystack, needle.data, needle.size);
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 bool
 StringEndsWith(const char *haystack, const char *needle) noexcept;
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 bool
 StringEndsWithIgnoreCase(const char *haystack, const char *needle) noexcept;
 
@@ -83,7 +82,7 @@
  * does not begin with the specified prefix, this function returns
  * nullptr.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringAfterPrefix(const char *haystack, StringView needle) noexcept
 {
@@ -92,14 +91,14 @@
 		: nullptr;
 }
 
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline bool
 StringStartsWithIgnoreCase(const char *haystack, StringView needle) noexcept
 {
 	return StringIsEqualIgnoreCase(haystack, needle.data, needle.size);
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline bool
 StringStartsWithIgnoreCase(StringView haystack, StringView needle) noexcept
 {
@@ -113,7 +112,7 @@
  * nullptr.
  * This function is case-independent.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 static inline const char *
 StringAfterPrefixIgnoreCase(const char *haystack, StringView needle) noexcept
 {
@@ -122,7 +121,7 @@
 		: nullptr;
 }
 
-gcc_pure
+[[gnu::pure]]
 static inline StringView
 StringAfterPrefixIgnoreCase(StringView haystack,
 			    StringView needle) noexcept
@@ -136,7 +135,7 @@
  * Check if the given string ends with the specified suffix.  If yes,
  * returns the position of the suffix, and nullptr otherwise.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 const char *
 FindStringSuffix(const char *p, const char *suffix) noexcept;
 
diff -Nru ncmpc-0.45/src/util/StringStrip.hxx ncmpc-0.46/src/util/StringStrip.hxx
--- ncmpc-0.45/src/util/StringStrip.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringStrip.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -30,8 +30,6 @@
 #ifndef STRING_STRIP_HXX
 #define STRING_STRIP_HXX
 
-#include "Compiler.h"
-
 #include <cstddef>
 
 /**
@@ -40,11 +38,11 @@
  * non-whitespace characters, then a pointer to the NULL terminator is
  * returned.
  */
-gcc_pure gcc_returns_nonnull gcc_nonnull_all
+[[gnu::pure]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 const char *
 StripLeft(const char *p) noexcept;
 
-gcc_pure gcc_returns_nonnull gcc_nonnull_all
+[[gnu::pure]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 static inline char *
 StripLeft(char *p) noexcept
 {
@@ -55,21 +53,21 @@
  * Skips whitespace at the beginning of the string, and returns the
  * first non-whitespace character or the end pointer.
  */
-gcc_pure gcc_returns_nonnull gcc_nonnull_all
+[[gnu::pure]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 const char *
 StripLeft(const char *p, const char *end) noexcept;
 
 /**
  * Determine the string's end as if it was stripped on the right side.
  */
-gcc_pure gcc_returns_nonnull gcc_nonnull_all
+[[gnu::pure]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 const char *
 StripRight(const char *p, const char *end) noexcept;
 
 /**
  * Determine the string's end as if it was stripped on the right side.
  */
-gcc_pure gcc_returns_nonnull gcc_nonnull_all
+[[gnu::pure]] [[gnu::returns_nonnull]] [[gnu::nonnull]]
 static inline char *
 StripRight(char *p, char *end) noexcept
 {
@@ -81,14 +79,14 @@
  * Determine the string's length as if it was stripped on the right
  * side.
  */
-gcc_pure gcc_nonnull_all
+[[gnu::pure]] [[gnu::nonnull]]
 std::size_t
 StripRight(const char *p, std::size_t length) noexcept;
 
 /**
  * Strip trailing whitespace by null-terminating the string.
  */
-gcc_nonnull_all
+[[gnu::nonnull]]
 void
 StripRight(char *p) noexcept;
 
@@ -96,7 +94,7 @@
  * Skip whitespace at the beginning and terminate the string after the
  * last non-whitespace character.
  */
-gcc_returns_nonnull gcc_nonnull_all
+[[gnu::returns_nonnull]] [[gnu::nonnull]]
 char *
 Strip(char *p) noexcept;
 
diff -Nru ncmpc-0.45/src/util/StringUTF8.cxx ncmpc-0.46/src/util/StringUTF8.cxx
--- ncmpc-0.45/src/util/StringUTF8.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringUTF8.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -57,7 +57,7 @@
 
 #endif
 
-gcc_pure
+[[gnu::pure]]
 int
 CollateUTF8(const char *a, const char *b)
 {
diff -Nru ncmpc-0.45/src/util/StringUTF8.hxx ncmpc-0.46/src/util/StringUTF8.hxx
--- ncmpc-0.45/src/util/StringUTF8.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringUTF8.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -20,7 +20,6 @@
 #define STRING_UTF8_HXX
 
 #include "config.h"
-#include "Compiler.h"
 
 class ScopeInitUTF8 {
 #ifdef HAVE_LOCALE_T
@@ -33,7 +32,7 @@
 #endif
 };
 
-gcc_pure
+[[gnu::pure]]
 int
 CollateUTF8(const char *a, const char *b);
 
diff -Nru ncmpc-0.45/src/util/StringView.hxx ncmpc-0.46/src/util/StringView.hxx
--- ncmpc-0.45/src/util/StringView.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/StringView.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright 2013-2021 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +32,10 @@
 
 #include "ConstBuffer.hxx"
 #include "StringAPI.hxx"
-#include "Compiler.h"
 
-#include <utility>
 #include <cstddef>
-
-#if __cplusplus >= 201703L && !GCC_OLDER_THAN(7,0)
 #include <string_view>
-#endif
+#include <utility>
 
 template<typename T>
 struct BasicStringView : ConstBuffer<T> {
@@ -72,14 +68,12 @@
 	constexpr BasicStringView(std::nullptr_t n) noexcept
 		:ConstBuffer<T>(n) {}
 
-#if __cplusplus >= 201703L && !GCC_OLDER_THAN(7,0)
 	constexpr BasicStringView(std::basic_string_view<T> src) noexcept
 		:ConstBuffer<T>(src.data(), src.size()) {}
 
 	constexpr operator std::basic_string_view<T>() const noexcept {
 		return {data, size};
 	}
-#endif
 
 	using ConstBuffer<T>::empty;
 	using ConstBuffer<T>::begin;
@@ -103,12 +97,12 @@
 		return {start, size_t(data + size - start)};
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	pointer Find(value_type ch) const noexcept {
 		return StringFind(data, ch, this->size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	pointer FindLast(value_type ch) const noexcept {
 		return StringFindLast(data, ch, size);
 	}
@@ -118,7 +112,7 @@
 	 * character.  If the character is not found, then the first
 	 * value is the whole string and the second value is nullptr.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	std::pair<BasicStringView<T>, BasicStringView<T>> Split(value_type ch) const noexcept {
 		const auto separator = Find(ch);
 		if (separator == nullptr)
@@ -132,7 +126,7 @@
 	 * character.  If the character is not found, then the first
 	 * value is the whole string and the second value is nullptr.
 	 */
-	gcc_pure
+	[[gnu::pure]]
 	std::pair<BasicStringView<T>, BasicStringView<T>> SplitLast(value_type ch) const noexcept {
 		const auto separator = FindLast(ch);
 		if (separator == nullptr)
@@ -141,30 +135,30 @@
 		return {{begin(), separator}, {separator + 1, end()}};
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool StartsWith(BasicStringView<T> needle) const noexcept {
 		return this->size >= needle.size &&
 			StringIsEqual(data, needle.data, needle.size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool EndsWith(BasicStringView<T> needle) const noexcept {
 		return this->size >= needle.size &&
 			StringIsEqual(data + this->size - needle.size,
 				      needle.data, needle.size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool StartsWith(value_type ch) const noexcept {
 		return !empty() && front() == ch;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool EndsWith(value_type ch) const noexcept {
 		return !empty() && back() == ch;
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	int Compare(BasicStringView<T> other) const noexcept {
 		if (size < other.size) {
 			int result = StringCompare(data, other.data, size);
@@ -181,26 +175,26 @@
 			return StringCompare(data, other.data, size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool Equals(BasicStringView<T> other) const noexcept {
 		return this->size == other.size &&
 			StringIsEqual(data, other.data, this->size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool StartsWithIgnoreCase(BasicStringView<T> needle) const noexcept {
 		return this->size >= needle.size &&
 			StringIsEqualIgnoreCase(data, needle.data, needle.size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool EndsWithIgnoreCase(BasicStringView<T> needle) const noexcept {
 		return this->size >= needle.size &&
 			StringIsEqualIgnoreCase(data + this->size - needle.size,
 						needle.data, needle.size);
 	}
 
-	gcc_pure
+	[[gnu::pure]]
 	bool EqualsIgnoreCase(BasicStringView<T> other) const noexcept {
 		return this->size == other.size &&
 			StringIsEqualIgnoreCase(data, other.data, this->size);
diff -Nru ncmpc-0.45/src/util/UriUtil.hxx ncmpc-0.46/src/util/UriUtil.hxx
--- ncmpc-0.45/src/util/UriUtil.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/util/UriUtil.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,8 +19,6 @@
 #ifndef URI_UTIL_HXX
 #define URI_UTIL_HXX
 
-#include "Compiler.h"
-
 #include <string>
 
 /**
@@ -28,7 +26,7 @@
  * after the last slash.  May return an empty string if the URI ends
  * with a slash.
  */
-gcc_pure
+[[gnu::pure]]
 const char *
 GetUriFilename(const char *uri);
 
@@ -37,7 +35,7 @@
  * portion up to the last (forward) slash.  Returns an empty string if
  * there is no parent.
  */
-gcc_pure
+[[gnu::pure]]
 std::string
 GetParentUri(const char *uri);
 
diff -Nru ncmpc-0.45/src/wreadln.cxx ncmpc-0.46/src/wreadln.cxx
--- ncmpc-0.45/src/wreadln.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/wreadln.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -80,7 +80,7 @@
 	void Paint() const noexcept;
 
 	/** returns the screen column where the cursor is located */
-	gcc_pure
+	[[gnu::pure]]
 	unsigned GetCursorColumn() const noexcept;
 
 	/** move the cursor one step to the right */
@@ -103,7 +103,7 @@
 static constexpr std::size_t wrln_max_history_length = 32;
 
 /** converts a byte position to a screen column */
-gcc_pure
+[[gnu::pure]]
 static unsigned
 byte_to_screen(const char *data, size_t x) noexcept
 {
@@ -119,7 +119,7 @@
 }
 
 /** finds the first character which doesn't fit on the screen */
-gcc_pure
+[[gnu::pure]]
 static size_t
 screen_to_bytes(const char *data, unsigned width) noexcept
 {
@@ -148,7 +148,7 @@
 
 /** returns the offset in the string to align it at the right border
     of the screen */
-gcc_pure
+[[gnu::pure]]
 static inline size_t
 right_align_bytes(const char *data, size_t right, unsigned width) noexcept
 {
diff -Nru ncmpc-0.45/src/XdgBaseDirectory.cxx ncmpc-0.46/src/XdgBaseDirectory.cxx
--- ncmpc-0.45/src/XdgBaseDirectory.cxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/XdgBaseDirectory.cxx	2021-11-26 15:32:38.000000000 +0000
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-gcc_pure
+[[gnu::pure]]
 static bool
 IsDirectory(const char *path) noexcept
 {
diff -Nru ncmpc-0.45/src/XdgBaseDirectory.hxx ncmpc-0.46/src/XdgBaseDirectory.hxx
--- ncmpc-0.45/src/XdgBaseDirectory.hxx	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/src/XdgBaseDirectory.hxx	2021-11-26 15:32:38.000000000 +0000
@@ -19,19 +19,17 @@
 #ifndef XDG_BASE_DIRECTORY_HXX
 #define XDG_BASE_DIRECTORY_HXX
 
-#include "util/Compiler.h"
-
 #include <string>
 
-gcc_const
+[[gnu::const]]
 const char *
 GetHomeDirectory() noexcept;
 
-gcc_const
+[[gnu::const]]
 std::string
 GetHomeConfigDirectory() noexcept;
 
-gcc_pure
+[[gnu::pure]]
 std::string
 GetHomeConfigDirectory(const char *package) noexcept;
 
@@ -44,11 +42,11 @@
 std::string
 MakeUserConfigPath(const char *filename) noexcept;
 
-gcc_const
+[[gnu::const]]
 std::string
 GetHomeCacheDirectory() noexcept;
 
-gcc_pure
+[[gnu::pure]]
 std::string
 GetHomeCacheDirectory(const char *package) noexcept;
 
diff -Nru ncmpc-0.45/.travis.yml ncmpc-0.46/.travis.yml
--- ncmpc-0.45/.travis.yml	2021-02-12 09:53:25.000000000 +0000
+++ ncmpc-0.46/.travis.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-language: cpp
-
-jobs:
-  include:
-    # Ubuntu Bionic (18.04) with GCC 7
-    - os: linux
-      dist: bionic
-      addons:
-        apt:
-          sources:
-            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
-          packages:
-            - python3.6
-            - python3-urllib3
-            - ninja-build
-            - libboost-dev
-            - libncursesw5-dev
-            - libmpdclient-dev
-      before_install:
-        - wget https://bootstrap.pypa.io/get-pip.py
-        - /usr/bin/python3.6 get-pip.py --user
-      install:
-        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
-
-    - os: osx
-      osx_image: xcode9.4
-      addons:
-        homebrew:
-          packages:
-            - ccache
-            - meson
-            - ninja
-            - ncurses
-            - libmpdclient
-          update: true
-
-cache:
-  apt: true
-  ccache: true
-  directories:
-    - $HOME/Library/Caches/Homebrew
-
-before_cache:
-  - test "$TRAVIS_OS_NAME" != "osx" || brew cleanup
-
-before_install:
-  - test "$TRAVIS_OS_NAME" != "linux" || export PATH="$HOME/.local/bin:$PATH"
-  - test "$TRAVIS_OS_NAME" != "osx" || export PATH="/usr/local/opt/ccache/libexec:$PATH"
-  - test "$TRAVIS_OS_NAME" != "osx" || export HOMEBREW_NO_ANALYTICS=1
-
-install:
-
-before_script:
-  - ccache -s
-
-script:
-  - OPTIONS="-Dlyrics_screen=true -Dchat_screen=true"
-  - test "$TRAVIS_OS_NAME" != "osx" || export PKG_CONFIG_PATH=/usr/local/opt/ncurses/lib/pkgconfig
-  - meson . output $OPTIONS
-  - ninja -v -C output
-  - ccache -s