New upstream version 4.0.4

28 files changed, 587 insertions, 487 deletions

diff --git a/audacious.desktop b/audacious.desktop
index 799a50f..804b27c 100644
--- a/audacious.desktop
+++ b/audacious.desktop
@@ -5,10 +5,10 @@ Name=Audacious
 GenericName=Music Player
 Comment=Listen to music
 Icon=audacious
-Categories=AudioVideo;Audio;Player;GTK;
+Categories=AudioVideo;Audio;Player;
 Exec=audacious %U
 TryExec=audacious
-StartupNotify=true
+StartupNotify=false
 Terminal=false
 MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/aac;audio/flac;audio/midi;audio/mp3;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/wav;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;x-content/audio-cdda;
 
diff --git a/config.h.in b/config.h.in
index 7b294bd..a13f35b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -19,10 +19,6 @@
 /* target GLib 2.32 */
 #undef GLIB_VERSION_MIN_REQUIRED
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
 /* Define to 1 if you have the Mac OS X function
    CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
diff --git a/configure b/configure
index 9852c31..e0a8f5b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacious 4.0.2.
+# Generated by GNU Autoconf 2.69 for audacious 4.0.4.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='audacious'
 PACKAGE_TARNAME='audacious'
-PACKAGE_VERSION='4.0.2'
-PACKAGE_STRING='audacious 4.0.2'
+PACKAGE_VERSION='4.0.4'
+PACKAGE_STRING='audacious 4.0.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1369,7 +1369,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures audacious 4.0.2 to adapt to many kinds of systems.
+\`configure' configures audacious 4.0.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1435,7 +1435,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of audacious 4.0.2:";;
+     short | recursive ) echo "Configuration of audacious 4.0.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1568,7 +1568,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-audacious configure 4.0.2
+audacious configure 4.0.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2036,7 +2036,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious $as_me 4.0.2, which was
+It was created by audacious $as_me 4.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -7320,13 +7320,41 @@ else
        case "$gl_cv_host_cpu_c_abi" in
          i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
            gl_cv_host_cpu_c_abi_32bit=yes ;;
-         *)
+         x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
            gl_cv_host_cpu_c_abi_32bit=no ;;
+         *)
+           gl_cv_host_cpu_c_abi_32bit=unknown ;;
        esac
      else
        case "$host_cpu" in
 
-         i[4567]86 )
+         # CPUs that only support a 32-bit ABI.
+         arc \
+         | bfin \
+         | cris* \
+         | csky \
+         | epiphany \
+         | ft32 \
+         | h8300 \
+         | m68k \
+         | microblaze | microblazeel \
+         | nds32 | nds32le | nds32be \
+         | nios2 | nios2eb | nios2el \
+         | or1k* \
+         | or32 \
+         | sh | sh1234 | sh1234elb \
+         | tic6x \
+         | xtensa* )
+           gl_cv_host_cpu_c_abi_32bit=yes
+           ;;
+
+         # CPUs that only support a 64-bit ABI.
+         alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
+         | mmix )
+           gl_cv_host_cpu_c_abi_32bit=no
+           ;;
+
+         i[34567]86 )
            gl_cv_host_cpu_c_abi_32bit=yes
            ;;
 
@@ -7530,7 +7558,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
            ;;
 
          *)
-           gl_cv_host_cpu_c_abi_32bit=no
+           gl_cv_host_cpu_c_abi_32bit=unknown
            ;;
        esac
      fi
@@ -7545,90 +7573,150 @@ $as_echo "$gl_cv_host_cpu_c_abi_32bit" >&6; }
 
 
 
-  case "$host_os" in
-    solaris*)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+$as_echo_n "checking for ELF binary format... " >&6; }
+if ${gl_cv_elf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifdef _LP64
-                 int ok;
-                #else
-                 error fail
-                #endif
+#ifdef __ELF__
+        Extensible Linking Format
+        #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  gl_cv_solaris_64bit=yes
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "Extensible Linking Format" >/dev/null 2>&1; then :
+  gl_cv_elf=yes
 else
-  gl_cv_solaris_64bit=no
+  gl_cv_elf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest*
+
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; };;
-  esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+$as_echo "$gl_cv_elf" >&6; }
+  if test $gl_cv_elf; then
+    # Extract the ELF class of a file (5th byte) in decimal.
+    # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+    if od -A x < /dev/null >/dev/null 2>/dev/null; then
+      # Use POSIX od.
+      func_elfclass ()
+      {
+        od -A n -t d1 -j 4 -N 1
+      }
+    else
+      # Use BSD hexdump.
+      func_elfclass ()
+      {
+        dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
+        echo
+      }
+    fi
+    case $HOST_CPU_C_ABI_32BIT in
+      yes)
+        # 32-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 1
+        }
+        ;;
+      no)
+        # 64-bit ABI.
+        acl_is_expected_elfclass ()
+        {
+          test "`func_elfclass | sed -e 's/[ 	]//g'`" = 2
+        }
+        ;;
+      *)
+        # Unknown.
+        acl_is_expected_elfclass ()
+        {
+          :
+        }
+        ;;
+    esac
+  else
+    acl_is_expected_elfclass ()
+    {
+      :
+    }
+  fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
 $as_echo_n "checking for the common suffixes of directories in the library search path... " >&6; }
 if ${acl_cv_libdirstems+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  acl_libdirstem=lib
+            acl_libdirstem=lib
      acl_libdirstem2=
+     acl_libdirstem3=
      case "$host_os" in
        solaris*)
-                                                      if test $gl_cv_solaris_64bit = yes; then
-           acl_libdirstem=lib/64
+                                                      if test $HOST_CPU_C_ABI_32BIT = no; then
+           acl_libdirstem2=lib/64
            case "$host_cpu" in
-             sparc*)        acl_libdirstem2=lib/sparcv9 ;;
-             i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
+             sparc*)        acl_libdirstem3=lib/sparcv9 ;;
+             i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
            esac
          fi
          ;;
        *)
-                           if test "$HOST_CPU_C_ABI_32BIT" != yes; then
-                                            searchpath=`(if test -f /usr/bin/gcc \
-                           && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
-                          LC_ALL=C /usr/bin/gcc -print-search-dirs; \
-                        else \
-                          LC_ALL=C $CC -print-search-dirs; \
-                        fi) 2>/dev/null \
-                       | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
-           if test -n "$searchpath"; then
-             acl_save_IFS="${IFS= 	}"; IFS=":"
-             for searchdir in $searchpath; do
-               if test -d "$searchdir"; then
-                 case "$searchdir" in
-                   */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-                   */../ | */.. )
-                     # Better ignore directories of this form. They are misleading.
-                     ;;
-                   *) searchdir=`cd "$searchdir" && pwd`
-                      case "$searchdir" in
-                        */lib64 ) acl_libdirstem=lib64 ;;
-                      esac ;;
-                 esac
-               fi
-             done
-             IFS="$acl_save_IFS"
+                                                                                 searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
+                     | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+         if test $HOST_CPU_C_ABI_32BIT != no; then
+           # 32-bit or unknown ABI.
+           if test -d /usr/lib32; then
+             acl_libdirstem2=lib32
+           fi
+         fi
+         if test $HOST_CPU_C_ABI_32BIT != yes; then
+           # 64-bit or unknown ABI.
+           if test -d /usr/lib64; then
+             acl_libdirstem3=lib64
+           fi
+         fi
+         if test -n "$searchpath"; then
+           acl_save_IFS="${IFS= 	}"; IFS=":"
+           for searchdir in $searchpath; do
+             if test -d "$searchdir"; then
+               case "$searchdir" in
+                 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
+                 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
+                 */../ | */.. )
+                   # Better ignore directories of this form. They are misleading.
+                   ;;
+                 *) searchdir=`cd "$searchdir" && pwd`
+                    case "$searchdir" in
+                      */lib32 ) acl_libdirstem2=lib32 ;;
+                      */lib64 ) acl_libdirstem3=lib64 ;;
+                    esac ;;
+               esac
+             fi
+           done
+           IFS="$acl_save_IFS"
+           if test $HOST_CPU_C_ABI_32BIT = yes; then
+             # 32-bit ABI.
+             acl_libdirstem3=
+           fi
+           if test $HOST_CPU_C_ABI_32BIT = no; then
+             # 64-bit ABI.
+             acl_libdirstem2=
            fi
          fi
          ;;
      esac
      test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
+     test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
+     acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
 $as_echo "$acl_cv_libdirstems" >&6; }
-  # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
-  acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
-  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
+      acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+  acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
+  acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
 
 
 
@@ -7649,6 +7737,8 @@ $as_echo "$acl_cv_libdirstems" >&6; }
 
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
+    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
@@ -7669,6 +7759,8 @@ if test "${with_libiconv_prefix+set}" = set; then :
 
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
+          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
@@ -7676,15 +7768,19 @@ if test "${with_libiconv_prefix+set}" = set; then :
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && test ! -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
+        additional_libdir2="$withval/$acl_libdirstem2"
+        additional_libdir3="$withval/$acl_libdirstem3"
       fi
     fi
 
 fi
 
+  if test "X$additional_libdir2" = "X$additional_libdir"; then
+    additional_libdir2=
+  fi
+  if test "X$additional_libdir3" = "X$additional_libdir"; then
+    additional_libdir3=
+  fi
       LIBICONV=
   LTLIBICONV=
   INCICONV=
@@ -7730,45 +7826,51 @@ fi
             shrext=
           fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
+            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+              if test "X$found_dir" = "X"; then
+                eval dir=\$$additional_libdir_variable
+                if test -n "$dir"; then
+                                                      if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
                   fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
                       found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
+                      found_a="$dir/$libname.$acl_libext"
                     fi
-                  done
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                 fi
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
+            done
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBICONV; do
@@ -7785,7 +7887,7 @@ fi
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
                                     if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
                       found_dir="$dir"
                       found_so="$dir/$libname$shrext"
                     else
@@ -7795,14 +7897,14 @@ fi
                               | sed -e "s,^$libname$shrext\\\\.,," \
                               | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
                               | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
                           found_dir="$dir"
                           found_so="$dir/$libname$shrext.$ver"
                         fi
                       else
                         eval library_names=\"$acl_library_names_spec\"
                         for f in $library_names; do
-                          if test -f "$dir/$f"; then
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
                             found_dir="$dir"
                             found_so="$dir/$f"
                             break
@@ -7812,7 +7914,7 @@ fi
                     fi
                   fi
                                     if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
                       found_dir="$dir"
                       found_a="$dir/$libname.$acl_libext"
                     fi
@@ -7834,7 +7936,8 @@ fi
             if test "X$found_so" != "X"; then
                                                         if test "$enable_rpath" = no \
                  || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
                                 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
               else
                                                                                 haveit=
@@ -7913,6 +8016,13 @@ fi
                 fi
                 additional_includedir="$basedir/include"
                 ;;
+              */$acl_libdirstem3 | */$acl_libdirstem3/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+                if test "$name" = 'iconv'; then
+                  LIBICONV_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
             esac
             if test "X$additional_includedir" != "X"; then
                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then
@@ -7958,12 +8068,14 @@ fi
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -7982,14 +8094,14 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                          if test "X$x" = "X-L$additional_libdir"; then
+                          if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
                             break
                           fi
                         done
                         if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+                          if test -d "$dependency_libdir"; then
+                                                        LIBICONV="${LIBICONV}${LIBICONV:+ }-L$dependency_libdir"
                           fi
                         fi
                         haveit=
@@ -8003,14 +8115,14 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                          if test "X$x" = "X-L$additional_libdir"; then
+                          if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
                             break
                           fi
                         done
                         if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+                          if test -d "$dependency_libdir"; then
+                                                        LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$dependency_libdir"
                           fi
                         fi
                       fi
@@ -9013,41 +9125,7 @@ $as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
 $as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
   fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <CoreFoundation/CFLocale.h>
-int
-main ()
-{
-CFLocaleCopyCurrent();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  gt_cv_func_CFLocaleCopyCurrent=yes
-else
-  gt_cv_func_CFLocaleCopyCurrent=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     LIBS="$gt_save_LIBS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
-
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
 $as_echo_n "checking for CFLocaleCopyPreferredLanguages... " >&6; }
 if ${gt_cv_func_CFLocaleCopyPreferredLanguages+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -9083,7 +9161,6 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
   fi
   INTL_MACOSX_LIBS=
   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
-     || test $gt_cv_func_CFLocaleCopyCurrent = yes \
      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
     INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
   fi
@@ -9454,6 +9531,8 @@ $as_echo "$LIBICONV" >&6; }
 
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
+    eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+    eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
@@ -9474,6 +9553,8 @@ if test "${with_libintl_prefix+set}" = set; then :
 
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
+          eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+          eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
@@ -9481,15 +9562,19 @@ if test "${with_libintl_prefix+set}" = set; then :
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/$acl_libdirstem"
-        if test "$acl_libdirstem2" != "$acl_libdirstem" \
-           && test ! -d "$withval/$acl_libdirstem"; then
-          additional_libdir="$withval/$acl_libdirstem2"
-        fi
+        additional_libdir2="$withval/$acl_libdirstem2"
+        additional_libdir3="$withval/$acl_libdirstem3"
       fi
     fi
 
 fi
 
+  if test "X$additional_libdir2" = "X$additional_libdir"; then
+    additional_libdir2=
+  fi
+  if test "X$additional_libdir3" = "X$additional_libdir"; then
+    additional_libdir3=
+  fi
       LIBINTL=
   LTLIBINTL=
   INCINTL=
@@ -9535,45 +9620,51 @@ fi
             shrext=
           fi
           if test $use_additional = yes; then
-            dir="$additional_libdir"
-                                    if test -n "$acl_shlibext"; then
-              if test -f "$dir/$libname$shrext"; then
-                found_dir="$dir"
-                found_so="$dir/$libname$shrext"
-              else
-                if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
-                  ver=`(cd "$dir" && \
-                        for f in "$libname$shrext".*; do echo "$f"; done \
-                        | sed -e "s,^$libname$shrext\\\\.,," \
-                        | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
-                        | sed 1q ) 2>/dev/null`
-                  if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
-                    found_dir="$dir"
-                    found_so="$dir/$libname$shrext.$ver"
+            for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+              if test "X$found_dir" = "X"; then
+                eval dir=\$$additional_libdir_variable
+                if test -n "$dir"; then
+                                                      if test -n "$acl_shlibext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
+                      found_dir="$dir"
+                      found_so="$dir/$libname$shrext"
+                    else
+                      if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
+                        ver=`(cd "$dir" && \
+                              for f in "$libname$shrext".*; do echo "$f"; done \
+                              | sed -e "s,^$libname$shrext\\\\.,," \
+                              | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
+                              | sed 1q ) 2>/dev/null`
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
+                          found_dir="$dir"
+                          found_so="$dir/$libname$shrext.$ver"
+                        fi
+                      else
+                        eval library_names=\"$acl_library_names_spec\"
+                        for f in $library_names; do
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
+                            found_dir="$dir"
+                            found_so="$dir/$f"
+                            break
+                          fi
+                        done
+                      fi
+                    fi
                   fi
-                else
-                  eval library_names=\"$acl_library_names_spec\"
-                  for f in $library_names; do
-                    if test -f "$dir/$f"; then
+                                    if test "X$found_dir" = "X"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
                       found_dir="$dir"
-                      found_so="$dir/$f"
-                      break
+                      found_a="$dir/$libname.$acl_libext"
                     fi
-                  done
+                  fi
+                  if test "X$found_dir" != "X"; then
+                    if test -f "$dir/$libname.la"; then
+                      found_la="$dir/$libname.la"
+                    fi
+                  fi
                 fi
               fi
-            fi
-                        if test "X$found_dir" = "X"; then
-              if test -f "$dir/$libname.$acl_libext"; then
-                found_dir="$dir"
-                found_a="$dir/$libname.$acl_libext"
-              fi
-            fi
-            if test "X$found_dir" != "X"; then
-              if test -f "$dir/$libname.la"; then
-                found_la="$dir/$libname.la"
-              fi
-            fi
+            done
           fi
           if test "X$found_dir" = "X"; then
             for x in $LDFLAGS $LTLIBINTL; do
@@ -9590,7 +9681,7 @@ fi
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
                                     if test -n "$acl_shlibext"; then
-                    if test -f "$dir/$libname$shrext"; then
+                    if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
                       found_dir="$dir"
                       found_so="$dir/$libname$shrext"
                     else
@@ -9600,14 +9691,14 @@ fi
                               | sed -e "s,^$libname$shrext\\\\.,," \
                               | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
                               | sed 1q ) 2>/dev/null`
-                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
+                        if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
                           found_dir="$dir"
                           found_so="$dir/$libname$shrext.$ver"
                         fi
                       else
                         eval library_names=\"$acl_library_names_spec\"
                         for f in $library_names; do
-                          if test -f "$dir/$f"; then
+                          if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
                             found_dir="$dir"
                             found_so="$dir/$f"
                             break
@@ -9617,7 +9708,7 @@ fi
                     fi
                   fi
                                     if test "X$found_dir" = "X"; then
-                    if test -f "$dir/$libname.$acl_libext"; then
+                    if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
                       found_dir="$dir"
                       found_a="$dir/$libname.$acl_libext"
                     fi
@@ -9639,7 +9730,8 @@ fi
             if test "X$found_so" != "X"; then
                                                         if test "$enable_rpath" = no \
                  || test "X$found_dir" = "X/usr/$acl_libdirstem" \
-                 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+                 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
                                 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
               else
                                                                                 haveit=
@@ -9718,6 +9810,13 @@ fi
                 fi
                 additional_includedir="$basedir/include"
                 ;;
+              */$acl_libdirstem3 | */$acl_libdirstem3/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+                if test "$name" = 'intl'; then
+                  LIBINTL_PREFIX="$basedir"
+                fi
+                additional_includedir="$basedir/include"
+                ;;
             esac
             if test "X$additional_includedir" != "X"; then
                                                                                                                 if test "X$additional_includedir" != "X/usr/include"; then
@@ -9763,12 +9862,14 @@ fi
                             for dep in $dependency_libs; do
                 case "$dep" in
                   -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                                                                                                                                                                if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
-                       && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+                    dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                                                                                                                                                                if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+                       && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
                       haveit=
-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
-                         || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+                      if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+                         || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
                         if test -n "$GCC"; then
                           case $host_os in
                             linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -9787,14 +9888,14 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                          if test "X$x" = "X-L$additional_libdir"; then
+                          if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
                             break
                           fi
                         done
                         if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+                          if test -d "$dependency_libdir"; then
+                                                        LIBINTL="${LIBINTL}${LIBINTL:+ }-L$dependency_libdir"
                           fi
                         fi
                         haveit=
@@ -9808,14 +9909,14 @@ fi
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 
-                          if test "X$x" = "X-L$additional_libdir"; then
+                          if test "X$x" = "X-L$dependency_libdir"; then
                             haveit=yes
                             break
                           fi
                         done
                         if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+                          if test -d "$dependency_libdir"; then
+                                                        LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$dependency_libdir"
                           fi
                         fi
                       fi
@@ -10851,7 +10952,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious $as_me 4.0.2, which was
+This file was extended by audacious $as_me 4.0.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10917,7 +11018,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious config.status 4.0.2
+audacious config.status 4.0.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 16ab934..20065d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl Initialize
 dnl ==========
 
 AC_PREREQ([2.59])
-AC_INIT([audacious], [4.0.2])
+AC_INIT([audacious], [4.0.4])
 AC_COPYRIGHT([Copyright (C) 2001-2020 Audacious developers and others])
 
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Name of package])
diff --git a/po/cs.po b/po/cs.po
index 9665c54..61b44ed 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,6 +12,7 @@
 # Jiří Vírava <appukonrad@gmail.com>, 2012
 # Jiří Vírava <appukonrad@gmail.com>, 2012
 # hpsoft <liborsustr.ml@seznam.cz>, 2014
+# Lukáš Kotek <lkotek@suse.com>, 2020
 # IAmNotImportant, 2016
 # Andy Andy <nd76er@gmail.com>, 2014-2015
 # fri, 2013-2014
@@ -24,8 +25,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 12:21+0000\n"
-"Last-Translator: John Lindgren <john@jlindgren.net>\n"
+"PO-Revision-Date: 2020-04-02 15:37+0000\n"
+"Last-Translator: Lukáš Kotek <lkotek@suse.com>\n"
 "Language-Team: Czech (http://www.transifex.com/audacious/audacious/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,7 +96,7 @@ msgstr "Zobrazit zprávy o ladění (může být použito dvakrát)"
 
 #: src/audacious/main.cc:81
 msgid "Run in GTK mode"
-msgstr ""
+msgstr "Spustit v režimu GTK"
 
 #: src/audacious/main.cc:138
 #, c-format
@@ -207,7 +208,7 @@ msgstr "Nemohu nahrát %s: nepodporovaná přípona souboru."
 #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309
 #, c-format
 msgid "Error saving %s."
-msgstr ""
+msgstr "Chyba během ukládání %s."
 
 #: src/libaudcore/playlist-files.cc:167
 #, c-format
@@ -325,7 +326,7 @@ msgstr "Přejmenovat seznam skladeb"
 
 #: src/libaudgui/eq-preset.cc:153
 msgid "Please select one preset to export."
-msgstr ""
+msgstr "Prosím vyberte předvolbu pro export."
 
 #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261
 msgid "Preset File ..."
@@ -694,7 +695,7 @@ msgstr "Číslo stopy"
 
 #: src/libaudgui/infowin.cc:397
 msgid "_Auto-fill empty fields"
-msgstr ""
+msgstr "_Automaticky vyplnit prázdná pole"
 
 #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183
 msgid "_Save"
@@ -702,7 +703,7 @@ msgstr "_Ulozit"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr ""
+msgstr "_Předchozí"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -899,7 +900,7 @@ msgstr "Datum"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Popis"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -1095,15 +1096,15 @@ msgstr "Použít ověřování pomocí proxy serveru"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "Použít SOCKS proxy"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
-msgstr ""
+msgstr "SOCKS v4a"
 
 #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292
 msgid "Auto character encoding detector for:"
@@ -1243,7 +1244,7 @@ msgstr "<b>Různé</b>"
 
 #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364
 msgid "Step forward/backward by:"
-msgstr ""
+msgstr "Krok vpřed/zpět pomocí:"
 
 #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365
 msgid "seconds"
@@ -1251,11 +1252,11 @@ msgstr "sekund"
 
 #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366
 msgid "Adjust volume by:"
-msgstr ""
+msgstr "Přizpůsobit hlasitost pomocí:"
 
 #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367
 msgid "percent"
-msgstr ""
+msgstr "procento"
 
 #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384
 msgid "TITLE"
@@ -1398,7 +1399,7 @@ msgstr "\n(Další zprávy jsou skryty.)"
 
 #: src/libaudqt/eq-preset-qt.cc:249
 msgid "Preset files (*.preset *.eqf *.q1)"
-msgstr ""
+msgstr "Soubory s předvolbami (*.preset *.eqf *.q1)"
 
 #: src/libaudqt/eq-preset-qt.cc:348
 msgid "Close"
@@ -1422,11 +1423,11 @@ msgstr "Přidat"
 
 #: src/libaudqt/font-entry.cc:39
 msgid "Set Font"
-msgstr ""
+msgstr "Nastavit písmo"
 
 #: src/libaudqt/info-widget.cc:44
 msgid "<various>"
-msgstr ""
+msgstr "<various>"
 
 #: src/libaudqt/info-widget.cc:47
 msgid "Metadata"
@@ -1458,23 +1459,23 @@ msgstr "Datový tok"
 
 #: src/libaudqt/info-widget.cc:67
 msgid "MusicBrainz ID"
-msgstr ""
+msgstr "MusicBrainz ID"
 
 #: src/libaudqt/infowin-qt.cc:156
 msgid "_Revert"
-msgstr ""
+msgstr "_Vrátit"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Chyba během zapisování tagu (tagů)."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
-msgstr ""
+msgstr "%1 souborů vybráno"
 
 #: src/libaudqt/infowin-qt.cc:193
 msgid "_Save %1 files"
-msgstr ""
+msgstr "_Uložit %1 souborů"
 
 #: src/libaudqt/log-inspector.cc:150
 msgid "Level"
diff --git a/po/da.po b/po/da.po
index 27cfe2f..1029315 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the Audacious package.
 # 
 # Translators:
-# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014,2016
+# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014,2016,2020
 # scootergrisen, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 12:21+0000\n"
+"PO-Revision-Date: 2020-05-12 10:00+0000\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish (http://www.transifex.com/audacious/audacious/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr "Udskriv fejlsøgningsbeskeder (kan bruges to gange)"
 
 #: src/audacious/main.cc:81
 msgid "Run in GTK mode"
-msgstr ""
+msgstr "Kør i GTK-tilstand"
 
 #: src/audacious/main.cc:138
 #, c-format
@@ -191,7 +191,7 @@ msgstr "Kan ikke indlæse %s: navnet på filendelsen er ikke understøttet."
 #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309
 #, c-format
 msgid "Error saving %s."
-msgstr ""
+msgstr "Kunne ikke gemme %s."
 
 #: src/libaudcore/playlist-files.cc:167
 #, c-format
@@ -307,7 +307,7 @@ msgstr "Omdøb afspilningsliste"
 
 #: src/libaudgui/eq-preset.cc:153
 msgid "Please select one preset to export."
-msgstr ""
+msgstr "Vælg venligst en forhåndsindstilling at eksportere"
 
 #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261
 msgid "Preset File ..."
@@ -676,7 +676,7 @@ msgstr "Spornummer"
 
 #: src/libaudgui/infowin.cc:397
 msgid "_Auto-fill empty fields"
-msgstr ""
+msgstr "_Udfyld automatisk tomme felter"
 
 #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183
 msgid "_Save"
@@ -684,7 +684,7 @@ msgstr "_Gem"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr ""
+msgstr "_Forrige"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -881,7 +881,7 @@ msgstr "Dato"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -1077,15 +1077,15 @@ msgstr "Brug godkendelse med proxy"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "Brug SOCKS-proxy"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
-msgstr ""
+msgstr "SOCKS v4a"
 
 #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292
 msgid "Auto character encoding detector for:"
@@ -1225,7 +1225,7 @@ msgstr "<b>Diverse</b>"
 
 #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364
 msgid "Step forward/backward by:"
-msgstr ""
+msgstr "Trin fremad/tilbage med:"
 
 #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365
 msgid "seconds"
@@ -1233,11 +1233,11 @@ msgstr "sekunder"
 
 #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366
 msgid "Adjust volume by:"
-msgstr ""
+msgstr "Juster lydstyrke med:"
 
 #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367
 msgid "percent"
-msgstr ""
+msgstr "procent"
 
 #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384
 msgid "TITLE"
@@ -1380,7 +1380,7 @@ msgstr "\n(Yderligere beskeder er blevet skjult)."
 
 #: src/libaudqt/eq-preset-qt.cc:249
 msgid "Preset files (*.preset *.eqf *.q1)"
-msgstr ""
+msgstr "Forhåndsindstillingsfiler (*.preset *.eqf *.q1)"
 
 #: src/libaudqt/eq-preset-qt.cc:348
 msgid "Close"
@@ -1404,11 +1404,11 @@ msgstr "Tilføj"
 
 #: src/libaudqt/font-entry.cc:39
 msgid "Set Font"
-msgstr ""
+msgstr "Angiv skrifttype"
 
 #: src/libaudqt/info-widget.cc:44
 msgid "<various>"
-msgstr ""
+msgstr "<various>"
 
 #: src/libaudqt/info-widget.cc:47
 msgid "Metadata"
@@ -1440,23 +1440,23 @@ msgstr "Bithastighed"
 
 #: src/libaudqt/info-widget.cc:67
 msgid "MusicBrainz ID"
-msgstr ""
+msgstr "MusicBrainz-id"
 
 #: src/libaudqt/infowin-qt.cc:156
 msgid "_Revert"
-msgstr ""
+msgstr "_Fortryd"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Kunne ikke skrive mærker."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
-msgstr ""
+msgstr "%1 filer valgt"
 
 #: src/libaudqt/infowin-qt.cc:193
 msgid "_Save %1 files"
-msgstr ""
+msgstr "_Gem %1 filer"
 
 #: src/libaudqt/log-inspector.cc:150
 msgid "Level"
diff --git a/po/el.po b/po/el.po
index ceb7aea..4d2a001 100644
--- a/po/el.po
+++ b/po/el.po
@@ -22,7 +22,7 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-03-25 09:08+0000\n"
+"PO-Revision-Date: 2020-04-19 07:34+0000\n"
 "Last-Translator: Ioannis LM\n"
 "Language-Team: Greek (http://www.transifex.com/audacious/audacious/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@ msgstr "Προσθήκη αρχείων στη λίστα αναπαραγωγή
 
 #: src/audacious/main.cc:74
 msgid "Add files to a temporary playlist"
-msgstr "Προσθήκη αρχείων σε μια προσωρινή λίστα αναπαραγωγής"
+msgstr "Προσθήκη αρχείων σε προσωρινή λίστα αναπαραγωγής"
 
 #: src/audacious/main.cc:75
 msgid "Display the main window"
@@ -157,7 +157,7 @@ msgstr "(χαρακτήρας σφάλμα κωδικοποίησης)"
 #: src/libaudcore/drct.cc:96
 msgid ""
 "Stream recording must be configured in Audio Settings before it can be used."
-msgstr "Πρέπει να ενεργοποιήσετε τη καταγραφή ηχητικής ροής στις ρυθμίσεις Ήχου, πριν τη χρησιμοποιήσετε."
+msgstr "Πρέπει να ενεργοποιήσετε τη εγγραφή ηχητικής ροής στις ρυθμίσεις του ήχου, πριν τη χρησιμοποιήσετε."
 
 #: src/libaudcore/output.cc:289
 msgid "Error opening output stream"
@@ -165,7 +165,7 @@ msgstr "Σφάλμα στο άνοιγμα της ηχητικής ροής"
 
 #: src/libaudcore/output.cc:341
 msgid "Error recording output stream"
-msgstr "Σφάλμα στην καταγραφή της ηχητικής ροής"
+msgstr "Σφάλμα στην εγγραφή της ηχητικής ροής"
 
 #: src/libaudcore/playback.cc:379
 #, c-format
@@ -295,7 +295,7 @@ msgstr "_Να μην ερωτηθώ ξανά"
 #: src/libaudgui/confirm.cc:70 src/libaudqt/playlist-management.cc:64
 #, c-format
 msgid "Do you want to permanently remove “%s”?"
-msgstr "Θέλετε να αφαιρέσετε οριστικά τη «%s;"
+msgstr "Θέλετε να αφαιρέσετε οριστικά την “%s”;"
 
 #: src/libaudgui/confirm.cc:73 src/libaudqt/playlist-management.cc:58
 msgid "_Remove"
@@ -967,15 +967,15 @@ msgstr "Όπως αποκωδικοποιείται"
 
 #: src/libaudgui/prefs-window.cc:142 src/libaudqt/prefs-window-qt.cc:199
 msgid "After applying ReplayGain"
-msgstr "Μετά την εφαρμογή ReplayGain"
+msgstr "Μετά από την εφαρμογή ReplayGain"
 
 #: src/libaudgui/prefs-window.cc:143 src/libaudqt/prefs-window-qt.cc:201
 msgid "After applying effects"
-msgstr "Μετά την εφαρμογή δράσεων"
+msgstr "Μετά από την εφαρμογή ενεργειών"
 
 #: src/libaudgui/prefs-window.cc:144 src/libaudqt/prefs-window-qt.cc:202
 msgid "After applying equalization"
-msgstr "Μετά την εφαρμογή εξισορρόπησης"
+msgstr "Μετά από την εφαρμογή εξισορρόπησης"
 
 #: src/libaudgui/prefs-window.cc:150 src/libaudqt/prefs-window-qt.cc:208
 msgid "Based on shuffle"
@@ -1000,7 +1000,7 @@ msgstr "dB"
 
 #: src/libaudgui/prefs-window.cc:205 src/libaudqt/prefs-window-qt.cc:242
 msgid "Amplify untagged files:"
-msgstr "Ενίσχυση αρχείων χωρίς ετικέτες:"
+msgstr "Ενίσχυση αρχείων χωρίς tags:"
 
 #: src/libaudgui/prefs-window.cc:211 src/libaudqt/prefs-window-qt.cc:246
 msgid "<b>Output Settings</b>"
@@ -1021,7 +1021,7 @@ msgstr "ms"
 
 #: src/libaudgui/prefs-window.cc:219 src/libaudqt/prefs-window-qt.cc:253
 msgid "Soft clipping"
-msgstr "Μαλακή αποκοπή"
+msgstr "Soft clipping"
 
 #: src/libaudgui/prefs-window.cc:221 src/libaudqt/prefs-window-qt.cc:254
 msgid "Use software volume control (not recommended)"
@@ -1029,11 +1029,11 @@ msgstr "Χρήση λογισμικού ελέγχου έντασης (δεν σ
 
 #: src/libaudgui/prefs-window.cc:223 src/libaudqt/prefs-window-qt.cc:256
 msgid "<b>Recording Settings</b>"
-msgstr "<b>Ρυθμίσεις καταγραφής</b>"
+msgstr "<b>Ρυθμίσεις εγγραφής</b>"
 
 #: src/libaudgui/prefs-window.cc:227 src/libaudqt/prefs-window-qt.cc:259
 msgid "Record stream:"
-msgstr "Καταγραφή ροής:"
+msgstr "Εγγραφή ροής:"
 
 #: src/libaudgui/prefs-window.cc:230 src/libaudqt/prefs-window-qt.cc:261
 msgid "<b>ReplayGain</b>"
@@ -1133,7 +1133,7 @@ msgstr "Άνοιγμα αρχείων σε μια προσωρινή λίστα
 
 #: src/libaudgui/prefs-window.cc:309 src/libaudqt/prefs-window-qt.cc:313
 msgid "<b>Song Display</b>"
-msgstr "<b>Προβολή τραγουδιού</b>"
+msgstr "<b>Εμφάνιση</b>"
 
 #: src/libaudgui/prefs-window.cc:310 src/libaudqt/prefs-window-qt.cc:314
 msgid "Show song numbers"
@@ -1153,7 +1153,7 @@ msgstr "<b>Εξαγωγή</b>"
 
 #: src/libaudgui/prefs-window.cc:318 src/libaudqt/prefs-window-qt.cc:322
 msgid "Use relative paths when possible"
-msgstr "Χρήση των σχετικών διαδρομών, όταν αυτό είναι δυνατόν"
+msgstr "Χρήση των αντίστοιχων διαδρομών, όταν είναι δυνατόν"
 
 #: src/libaudgui/prefs-window.cc:323 src/libaudqt/prefs-window-qt.cc:326
 msgid "<b>Album Art</b>"
@@ -1185,11 +1185,11 @@ msgstr "<b>Αναδυόμενες πληροφορίες</b>"
 
 #: src/libaudgui/prefs-window.cc:337 src/libaudqt/prefs-window-qt.cc:338
 msgid "Show popup information"
-msgstr "Εμφάνιση πληροφοριών σε αναδυόμενο παράθυρο"
+msgstr "Εμφάνιση πληροφοριών στο αναδυόμενο παράθυρο"
 
 #: src/libaudgui/prefs-window.cc:339 src/libaudqt/prefs-window-qt.cc:340
 msgid "Popup delay (tenths of a second):"
-msgstr "Αναδυόμενη καθυστέρηση (σε δέκατα του δευτερολέπτου):"
+msgstr "Καθυστέρηση (σε δέκατα του δευτερολέπτου):"
 
 #: src/libaudgui/prefs-window.cc:343 src/libaudqt/prefs-window-qt.cc:342
 msgid "Show time scale for current song"
@@ -1213,7 +1213,7 @@ msgstr "Αναδρομική προσθήκη φακέλων"
 
 #: src/libaudgui/prefs-window.cc:356 src/libaudqt/prefs-window-qt.cc:353
 msgid "Add folders nested within playlist files"
-msgstr "Προσθήκη των ενσωματωμένων φακέλων στα αρχεία της λίστας αναπαραγωγής"
+msgstr "Προσθήκη φακέλων που περιέχουν τα αρχεία της λίστας αναπαραγωγής"
 
 #: src/libaudgui/prefs-window.cc:358 src/libaudqt/prefs-window-qt.cc:355
 msgid "<b>Metadata</b>"
@@ -1302,11 +1302,11 @@ msgstr "Προσαρμοσμένο αλφαριθμητικό:"
 #: src/libaudgui/prefs-window.cc:774 src/libaudqt/prefs-window-qt.cc:705
 #, c-format
 msgid "Enable audio stream recording with %s"
-msgstr "Ενεργοποίηση ηχητικής ροής με το %s"
+msgstr "Ενεργοποίηση εγγραφής ηχητικής ροής με το %s"
 
 #: src/libaudgui/prefs-window.cc:783 src/libaudqt/prefs-window-qt.cc:718
 msgid "No audio recording plugin available"
-msgstr "Δεν είναι διαθέσιμο κανένα πρόσθετο ηχητικής καταγραφής"
+msgstr "Δεν είναι διαθέσιμο κανένα πρόσθετο εγγραφής ήχου"
 
 #: src/libaudgui/prefs-window.cc:843 src/libaudqt/prefs-window-qt.cc:593
 msgid "Audacious Settings"
@@ -1460,7 +1460,7 @@ msgstr "_Επαναφορά"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr "Σφάλμα εγγραφής ετικέτας(ών)."
+msgstr "Σφάλμα εγγραφής tag(s)."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
@@ -1484,7 +1484,7 @@ msgstr "Μήνυμα"
 
 #: src/libaudqt/log-inspector.cc:209
 msgid "Log Inspector"
-msgstr "Επιθεώριση καταγραφής"
+msgstr "Καταγραφές"
 
 #: src/libaudqt/log-inspector.cc:220
 msgid "Debug"
diff --git a/po/fi.po b/po/fi.po
index fcf2f24..6307a19 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -17,7 +17,7 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-03-24 10:46+0000\n"
+"PO-Revision-Date: 2020-05-07 17:08+0000\n"
 "Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>\n"
 "Language-Team: Finnish (http://www.transifex.com/audacious/audacious/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -1284,7 +1284,7 @@ msgstr "Luokka"
 
 #: src/libaudgui/prefs-window.cc:553 src/libaudqt/prefs-window-qt.cc:408
 msgid "Custom"
-msgstr "Mukautettu..."
+msgstr "Mukautettu"
 
 #: src/libaudgui/prefs-window.cc:571 src/libaudqt/prefs-window-qt.cc:400
 msgid "Title format:"
diff --git a/po/fr.po b/po/fr.po
index 68fb029..024090a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-02-18 17:05+0000\n"
+"PO-Revision-Date: 2020-04-30 18:49+0000\n"
 "Last-Translator: AO <ao@localizationlab.org>\n"
 "Language-Team: French (http://www.transifex.com/audacious/audacious/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,7 @@ msgstr "(erreur d’encodage de caractère)"
 #: src/libaudcore/drct.cc:96
 msgid ""
 "Stream recording must be configured in Audio Settings before it can be used."
-msgstr "L’enregistrement des flux doit être configuré dans les paramètres audio avant de pouvoir être utilisé."
+msgstr "L’enregistrement des flux doit être configuré dans les paramètres du son avant de pouvoir être utilisé."
 
 #: src/libaudcore/output.cc:289
 msgid "Error opening output stream"
@@ -173,7 +173,7 @@ msgstr "Erreur en lisant %s :\n%s"
 
 #: src/libaudcore/playback.cc:510
 msgid "Invalid audio format"
-msgstr "Format audio invalide"
+msgstr "Le format son est invalide"
 
 #: src/libaudcore/playlist.cc:82
 msgid "Now Playing"
@@ -827,7 +827,7 @@ msgstr "Apparence"
 
 #: src/libaudgui/prefs-window.cc:83 src/libaudqt/prefs-window-qt.cc:156
 msgid "Audio"
-msgstr "Audio"
+msgstr "Son"
 
 #: src/libaudgui/prefs-window.cc:84 src/libaudqt/prefs-window-qt.cc:157
 msgid "Network"
@@ -1303,7 +1303,7 @@ msgstr "Activer l’enregistrement des flux audio avec le %s"
 
 #: src/libaudgui/prefs-window.cc:783 src/libaudqt/prefs-window-qt.cc:718
 msgid "No audio recording plugin available"
-msgstr "Aucun greffon d’enregistrement audio n’est proposé"
+msgstr "Aucun greffon d’enregistrement de son n’est proposé"
 
 #: src/libaudgui/prefs-window.cc:843 src/libaudqt/prefs-window-qt.cc:593
 msgid "Audacious Settings"
diff --git a/po/it.po b/po/it.po
index 9712599..b50336e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,6 +10,7 @@
 # Federico <federico421@hotmail.it>, 2013
 # Gaetano Ingrasciotta <gaetanoingrasciotta@gmail.com>, 2012
 # Gaetano Ingrasciotta <gaetanoingrasciotta@gmail.com>, 2012
+# eagleman <giacomomargarito@yahoo.it>, 2020
 # Giosuè Sulipano <sulipano.gs@gmail.com>, 2020
 # Giuseppe D. B. <giuped@gmail.com>, 2012
 # Jacopo Lorenzetti <jacopol@cyan.xubiq.com>, 2011, 2012
@@ -22,8 +23,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-03-22 21:13+0000\n"
-"Last-Translator: Giosuè Sulipano <sulipano.gs@gmail.com>\n"
+"PO-Revision-Date: 2020-04-25 14:36+0000\n"
+"Last-Translator: eagleman <giacomomargarito@yahoo.it>\n"
 "Language-Team: Italian (http://www.transifex.com/audacious/audacious/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +70,7 @@ msgstr "Aggiunge file alla playlist"
 
 #: src/audacious/main.cc:74
 msgid "Add files to a temporary playlist"
-msgstr "Aggiungi files a playlist temporanea"
+msgstr "Aggiungi files alla playlist temporanea"
 
 #: src/audacious/main.cc:75
 msgid "Display the main window"
@@ -157,15 +158,15 @@ msgstr "(errore codifica carattere)"
 #: src/libaudcore/drct.cc:96
 msgid ""
 "Stream recording must be configured in Audio Settings before it can be used."
-msgstr ""
+msgstr "La registrazione del flusso deve essere configurata nelle Impostazion Audio prima di poter essere usata."
 
 #: src/libaudcore/output.cc:289
 msgid "Error opening output stream"
-msgstr ""
+msgstr "Errore in apertura del flusso in uscita"
 
 #: src/libaudcore/output.cc:341
 msgid "Error recording output stream"
-msgstr ""
+msgstr "Errore nella registrazione del flusso in uscita"
 
 #: src/libaudcore/playback.cc:379
 #, c-format
@@ -688,7 +689,7 @@ msgstr "Numero di brano"
 
 #: src/libaudgui/infowin.cc:397
 msgid "_Auto-fill empty fields"
-msgstr ""
+msgstr "_Compilazione automatica dei campi vuoti"
 
 #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183
 msgid "_Save"
@@ -696,7 +697,7 @@ msgstr "_Salva"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr ""
+msgstr "_Precedente"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -802,7 +803,7 @@ msgstr "Impostazioni di %s"
 
 #: src/libaudgui/plugin-prefs.cc:159 src/libaudqt/prefs-plugin.cc:134
 msgid "_Set"
-msgstr "_Setta"
+msgstr "_Imposta"
 
 #: src/libaudgui/plugin-view.cc:235 src/libaudgui/prefs-window.cc:708
 #: src/libaudgui/prefs-window.cc:748 src/libaudqt/prefs-window-qt.cc:580
@@ -818,7 +819,7 @@ msgstr "Informazioni"
 
 #: src/libaudgui/prefs-widget.cc:277 src/libaudqt/prefs-widget-qt.cc:235
 msgid "Choose File"
-msgstr ""
+msgstr "Seleziona file"
 
 #: src/libaudgui/prefs-widget.cc:281 src/libaudqt/prefs-widget-qt.cc:239
 msgid "Choose Folder"
@@ -848,7 +849,7 @@ msgstr "Plugin"
 
 #: src/libaudgui/prefs-window.cc:88 src/libaudqt/prefs-window-qt.cc:161
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzate"
 
 #: src/libaudgui/prefs-window.cc:92 src/libaudqt/prefs-pluginlist-model.cc:39
 msgid "General"
@@ -893,7 +894,7 @@ msgstr "Data"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -955,7 +956,7 @@ msgstr "Turca"
 
 #: src/libaudgui/prefs-window.cc:133 src/libaudqt/prefs-window-qt.cc:194
 msgid "Automatic"
-msgstr ""
+msgstr "Automatica"
 
 #: src/libaudgui/prefs-window.cc:137 src/libaudqt/prefs-window-qt.cc:195
 msgid "Floating point"
@@ -963,27 +964,27 @@ msgstr "Virgola mobile"
 
 #: src/libaudgui/prefs-window.cc:141 src/libaudqt/prefs-window-qt.cc:198
 msgid "As decoded"
-msgstr ""
+msgstr "Come decodificata"
 
 #: src/libaudgui/prefs-window.cc:142 src/libaudqt/prefs-window-qt.cc:199
 msgid "After applying ReplayGain"
-msgstr ""
+msgstr "Dopo l'applicazione di ReplayGain"
 
 #: src/libaudgui/prefs-window.cc:143 src/libaudqt/prefs-window-qt.cc:201
 msgid "After applying effects"
-msgstr ""
+msgstr "Dopo l'applicazione degli effetti"
 
 #: src/libaudgui/prefs-window.cc:144 src/libaudqt/prefs-window-qt.cc:202
 msgid "After applying equalization"
-msgstr ""
+msgstr "Dopo l'applicazione dell'equalizzazione"
 
 #: src/libaudgui/prefs-window.cc:150 src/libaudqt/prefs-window-qt.cc:208
 msgid "Based on shuffle"
-msgstr ""
+msgstr "Basata sula casualità"
 
 #: src/libaudgui/prefs-window.cc:162 src/libaudqt/prefs-window-qt.cc:219
 msgid "Interface:"
-msgstr ""
+msgstr "Interfaccia:"
 
 #: src/libaudgui/prefs-window.cc:181 src/libaudqt/prefs-window-qt.cc:227
 msgid "Output plugin:"
@@ -1029,23 +1030,23 @@ msgstr "Utilizza controllo volume software (non raccomandato)"
 
 #: src/libaudgui/prefs-window.cc:223 src/libaudqt/prefs-window-qt.cc:256
 msgid "<b>Recording Settings</b>"
-msgstr ""
+msgstr "Impostazioni di registrazione"
 
 #: src/libaudgui/prefs-window.cc:227 src/libaudqt/prefs-window-qt.cc:259
 msgid "Record stream:"
-msgstr ""
+msgstr "Registra flusso:"
 
 #: src/libaudgui/prefs-window.cc:230 src/libaudqt/prefs-window-qt.cc:261
 msgid "<b>ReplayGain</b>"
-msgstr ""
+msgstr "<b>ReplayGain</b>"
 
 #: src/libaudgui/prefs-window.cc:231 src/libaudqt/prefs-window-qt.cc:262
 msgid "Enable ReplayGain"
-msgstr ""
+msgstr "Abilita ReplayGain"
 
 #: src/libaudgui/prefs-window.cc:233 src/libaudqt/prefs-window-qt.cc:263
 msgid "Mode:"
-msgstr ""
+msgstr "Modalità:"
 
 #: src/libaudgui/prefs-window.cc:237 src/libaudqt/prefs-window-qt.cc:265
 msgid "Prevent clipping (recommended)"
@@ -1089,15 +1090,15 @@ msgstr "Usa autenticazione con il proxy"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "Usa proxy SOCKS"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
-msgstr ""
+msgstr "SOCKS v4a"
 
 #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292
 msgid "Auto character encoding detector for:"
@@ -1141,19 +1142,19 @@ msgstr "Mostra numeri dei brani"
 
 #: src/libaudgui/prefs-window.cc:312 src/libaudqt/prefs-window-qt.cc:316
 msgid "Show leading zeroes (02:00 vs. 2:00)"
-msgstr ""
+msgstr "Visualizza zero iniziali (02:00 contro 2:00)"
 
 #: src/libaudgui/prefs-window.cc:314 src/libaudqt/prefs-window-qt.cc:318
 msgid "Show hours separately (1:30:00 vs. 90:00)"
-msgstr ""
+msgstr "Visualizza ore saparatamentey (1:30:00 contro 90:00)"
 
 #: src/libaudgui/prefs-window.cc:317 src/libaudqt/prefs-window-qt.cc:321
 msgid "<b>Export</b>"
-msgstr ""
+msgstr "Esporta"
 
 #: src/libaudgui/prefs-window.cc:318 src/libaudqt/prefs-window-qt.cc:322
 msgid "Use relative paths when possible"
-msgstr ""
+msgstr "Usa i percorsi relativi quando possibile"
 
 #: src/libaudgui/prefs-window.cc:323 src/libaudqt/prefs-window-qt.cc:326
 msgid "<b>Album Art</b>"
@@ -1205,15 +1206,15 @@ msgstr "Interpreta\\ (backslash) come un delimitatore di cartella"
 
 #: src/libaudgui/prefs-window.cc:353 src/libaudqt/prefs-window-qt.cc:350
 msgid "<b>Playlist</b>"
-msgstr ""
+msgstr "<b>Playlist</b>"
 
 #: src/libaudgui/prefs-window.cc:354 src/libaudqt/prefs-window-qt.cc:351
 msgid "Add folders recursively"
-msgstr ""
+msgstr "Aggiungi cartelle ricorsivamente"
 
 #: src/libaudgui/prefs-window.cc:356 src/libaudqt/prefs-window-qt.cc:353
 msgid "Add folders nested within playlist files"
-msgstr ""
+msgstr "Aggiungi cartelle annidate nei file delle playlist"
 
 #: src/libaudgui/prefs-window.cc:358 src/libaudqt/prefs-window-qt.cc:355
 msgid "<b>Metadata</b>"
@@ -1237,7 +1238,7 @@ msgstr "<b>Varie</b>"
 
 #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364
 msgid "Step forward/backward by:"
-msgstr ""
+msgstr "Vai avanti/indietro al:"
 
 #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365
 msgid "seconds"
@@ -1245,11 +1246,11 @@ msgstr "secondi"
 
 #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366
 msgid "Adjust volume by:"
-msgstr ""
+msgstr "Regola il volume al:"
 
 #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367
 msgid "percent"
-msgstr ""
+msgstr "percento"
 
 #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384
 msgid "TITLE"
@@ -1302,11 +1303,11 @@ msgstr "Stringa personalizzata:"
 #: src/libaudgui/prefs-window.cc:774 src/libaudqt/prefs-window-qt.cc:705
 #, c-format
 msgid "Enable audio stream recording with %s"
-msgstr ""
+msgstr "Abilta la registrazione di flusso audio con%s"
 
 #: src/libaudgui/prefs-window.cc:783 src/libaudqt/prefs-window-qt.cc:718
 msgid "No audio recording plugin available"
-msgstr ""
+msgstr "Nessun plugin di registrazione audio disponibile"
 
 #: src/libaudgui/prefs-window.cc:843 src/libaudqt/prefs-window-qt.cc:593
 msgid "Audacious Settings"
@@ -1358,11 +1359,11 @@ msgstr "Errore"
 
 #: src/libaudgui/status.cc:90
 msgid "Information"
-msgstr ""
+msgstr "Informazioni"
 
 #: src/libaudgui/url-opener.cc:55 src/libaudqt/url-opener-qt.cc:40
 msgid "_Save to history"
-msgstr ""
+msgstr "_Salva nella cronologia"
 
 #: src/libaudgui/url-opener.cc:63 src/libaudqt/url-opener-qt.cc:46
 msgid "Open URL"
@@ -1374,7 +1375,7 @@ msgstr "Aggiungi URL"
 
 #: src/libaudgui/url-opener.cc:92 src/libaudqt/url-opener-qt.cc:68
 msgid "C_lear history"
-msgstr ""
+msgstr "S_vuota cronologia"
 
 #: src/libaudgui/url-opener.cc:104 src/libaudqt/url-opener-qt.cc:61
 msgid "Enter URL:"
@@ -1392,7 +1393,7 @@ msgstr "\n(Ulteriori messaggi sono stati nascosti.)"
 
 #: src/libaudqt/eq-preset-qt.cc:249
 msgid "Preset files (*.preset *.eqf *.q1)"
-msgstr ""
+msgstr "File Preset (*.preset *.eqf *.q1)"
 
 #: src/libaudqt/eq-preset-qt.cc:348
 msgid "Close"
@@ -1416,11 +1417,11 @@ msgstr "Aggiungi"
 
 #: src/libaudqt/font-entry.cc:39
 msgid "Set Font"
-msgstr ""
+msgstr "Imposta carattere"
 
 #: src/libaudqt/info-widget.cc:44
 msgid "<various>"
-msgstr ""
+msgstr "<various>"
 
 #: src/libaudqt/info-widget.cc:47
 msgid "Metadata"
@@ -1452,23 +1453,23 @@ msgstr "Bitrate"
 
 #: src/libaudqt/info-widget.cc:67
 msgid "MusicBrainz ID"
-msgstr ""
+msgstr "ID MusicBrainz"
 
 #: src/libaudqt/infowin-qt.cc:156
 msgid "_Revert"
-msgstr ""
+msgstr "_Inverti"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Errore nella scrittura dei tag(s)"
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
-msgstr ""
+msgstr "%1 file selezionati"
 
 #: src/libaudqt/infowin-qt.cc:193
 msgid "_Save %1 files"
-msgstr ""
+msgstr "_Salva %1 file"
 
 #: src/libaudqt/log-inspector.cc:150
 msgid "Level"
@@ -1500,7 +1501,7 @@ msgstr "Attenzione"
 
 #: src/libaudqt/log-inspector.cc:234
 msgid "Cl_ear"
-msgstr ""
+msgstr "Sv_uota"
 
 #: src/libaudqt/log-inspector.cc:247
 msgid "Log Level:"
diff --git a/po/pl.po b/po/pl.po
index 7afe21a..b8641ff 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,7 +17,8 @@
 # Marco Oliver Grunwald <m@mgrvnwald.com>, 2013
 # Marco Oliver Grunwald <m@mgrvnwald.com>, 2013
 # mkkot <marcin2006@gmail.com>, 2013-2014
-# M_, 2018,2020
+# No Ne, 2020
+# No Ne, 2018,2020
 # Piotr Sokół <psokol.l10n@gmail.com>, 2012
 # Piotr Strębski <strebski@gmail.com>, 2017
 # Piotr Strębski <strebski@gmail.com>, 2014-2016
@@ -27,8 +28,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 15:14+0000\n"
-"Last-Translator: M_\n"
+"PO-Revision-Date: 2020-03-27 19:54+0000\n"
+"Last-Translator: No Ne\n"
 "Language-Team: Polish (http://www.transifex.com/audacious/audacious/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -705,7 +706,7 @@ msgstr "_Zapisz"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr "_Poprzedni"
+msgstr "_Poprzednie"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -802,7 +803,7 @@ msgstr "_Wtyczki..."
 #: src/libaudgui/plugin-prefs.cc:109 src/libaudqt/prefs-plugin.cc:57
 #, c-format
 msgid "About %s"
-msgstr "O Audaciousie %s"
+msgstr "Informacje o %s"
 
 #: src/libaudgui/plugin-prefs.cc:155 src/libaudqt/prefs-plugin.cc:122
 #, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02c04e9..e0f9f29 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,6 +11,7 @@
 # Cleiton Lima <cleitoncfl@yahoo.com.br>, 2011
 # edu engler <eduengler@gmail.com>, 2012
 # F Marcelo O Amarante <marcelo.amarante@hotmail.com>, 2015
+# Fúlvio Alves <fga.fulvio@gmail.com>, 2020
 # Habner Costa <habnertc@msn.com>, 2013
 # Habner Costa <habnertc@msn.com>, 2013
 # Iuri Suzano <isuzano@netkings.cc>, 2017
@@ -34,8 +35,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 12:21+0000\n"
-"Last-Translator: Alexandro Casanova <shorterfire@gmail.com>\n"
+"PO-Revision-Date: 2020-05-01 16:16+0000\n"
+"Last-Translator: Fúlvio Alves <fga.fulvio@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/audacious/audacious/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,7 +106,7 @@ msgstr "Imprimir mensagens de depuração (pode ser usado duas vezes)"
 
 #: src/audacious/main.cc:81
 msgid "Run in GTK mode"
-msgstr ""
+msgstr "Executar no modo GTK"
 
 #: src/audacious/main.cc:138
 #, c-format
@@ -215,7 +216,7 @@ msgstr "Não foi possível carregar  %s: extensão do nome do arquivo não supor
 #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309
 #, c-format
 msgid "Error saving %s."
-msgstr ""
+msgstr "Erro ao salvar %s."
 
 #: src/libaudcore/playlist-files.cc:167
 #, c-format
@@ -331,7 +332,7 @@ msgstr "Renomear Lista de Reprodução"
 
 #: src/libaudgui/eq-preset.cc:153
 msgid "Please select one preset to export."
-msgstr ""
+msgstr "Selecione uma predefinição para exportar."
 
 #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261
 msgid "Preset File ..."
@@ -700,7 +701,7 @@ msgstr "Número da faixa"
 
 #: src/libaudgui/infowin.cc:397
 msgid "_Auto-fill empty fields"
-msgstr ""
+msgstr "_Auto-preencher espaços vazios"
 
 #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183
 msgid "_Save"
@@ -708,7 +709,7 @@ msgstr "_Salvar"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr ""
+msgstr "_Anterior"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -905,7 +906,7 @@ msgstr "Data"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -1101,15 +1102,15 @@ msgstr "Usar autenticação do proxy"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "Usar proxy SOCKS"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
-msgstr ""
+msgstr "SOCKS v4a"
 
 #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292
 msgid "Auto character encoding detector for:"
@@ -1249,7 +1250,7 @@ msgstr "<b>Diversos</b>"
 
 #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364
 msgid "Step forward/backward by:"
-msgstr ""
+msgstr "Avançar/retroceder por:"
 
 #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365
 msgid "seconds"
@@ -1257,11 +1258,11 @@ msgstr "segundos"
 
 #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366
 msgid "Adjust volume by:"
-msgstr ""
+msgstr "Ajustar volume em:"
 
 #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367
 msgid "percent"
-msgstr ""
+msgstr "por cento"
 
 #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384
 msgid "TITLE"
@@ -1404,11 +1405,11 @@ msgstr "\n(Demais mensagens foram escondidas.)"
 
 #: src/libaudqt/eq-preset-qt.cc:249
 msgid "Preset files (*.preset *.eqf *.q1)"
-msgstr ""
+msgstr "Arquivos de predefinição (*.preset *.eqf *.q1)"
 
 #: src/libaudqt/eq-preset-qt.cc:348
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #: src/libaudqt/file-entry.cc:40
 msgid "Browse"
@@ -1428,11 +1429,11 @@ msgstr "Adicionar"
 
 #: src/libaudqt/font-entry.cc:39
 msgid "Set Font"
-msgstr ""
+msgstr "Definir fonte"
 
 #: src/libaudqt/info-widget.cc:44
 msgid "<various>"
-msgstr ""
+msgstr "<various>"
 
 #: src/libaudqt/info-widget.cc:47
 msgid "Metadata"
@@ -1464,23 +1465,23 @@ msgstr "Bitrate"
 
 #: src/libaudqt/info-widget.cc:67
 msgid "MusicBrainz ID"
-msgstr ""
+msgstr "ID do MusicBrainz"
 
 #: src/libaudqt/infowin-qt.cc:156
 msgid "_Revert"
-msgstr ""
+msgstr "_Reverter"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Erro ao gravar marcador(es)."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
-msgstr ""
+msgstr "%1 arquivos selecionados"
 
 #: src/libaudqt/infowin-qt.cc:193
 msgid "_Save %1 files"
-msgstr ""
+msgstr "_Salvar %1 arquivos"
 
 #: src/libaudqt/log-inspector.cc:150
 msgid "Level"
diff --git a/po/ru.po b/po/ru.po
index 4dc7c4f..bf2c1eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -38,6 +38,7 @@
 # Someonefree <drag-sasha@mail.ru>, 2014
 # Oleg <kvantarium@gmail.com>, 2012
 # Vitaly Lipatov <lav@etersoft.ru>, 2007
+# Виктор Голованенко <drygdryg2014@yandex.ru>, 2020
 # Денис <alpi_bel@mail.ru>, 2014-2015
 # Денис Локтев <den32ds@gmail.com>, 2017
 msgid ""
@@ -45,8 +46,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 12:21+0000\n"
-"Last-Translator: chingis\n"
+"PO-Revision-Date: 2020-04-18 06:48+0000\n"
+"Last-Translator: Виктор Голованенко <drygdryg2014@yandex.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/audacious/audacious/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -116,7 +117,7 @@ msgstr "Выводить отладочные сообщения (может и�
 
 #: src/audacious/main.cc:81
 msgid "Run in GTK mode"
-msgstr ""
+msgstr "Запустить в режиме GTK"
 
 #: src/audacious/main.cc:138
 #, c-format
@@ -228,7 +229,7 @@ msgstr "Невозможно загрузить %s: расширение фай�
 #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309
 #, c-format
 msgid "Error saving %s."
-msgstr ""
+msgstr "Ошибка сохранения %s."
 
 #: src/libaudcore/playlist-files.cc:167
 #, c-format
@@ -875,7 +876,7 @@ msgstr "Модули"
 
 #: src/libaudgui/prefs-window.cc:88 src/libaudqt/prefs-window-qt.cc:161
 msgid "Advanced"
-msgstr "Продвинутый"
+msgstr "Продвинутые"
 
 #: src/libaudgui/prefs-window.cc:92 src/libaudqt/prefs-pluginlist-model.cc:39
 msgid "General"
@@ -920,7 +921,7 @@ msgstr "Дата"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -1116,7 +1117,7 @@ msgstr "Использовать авторизацию с прокси"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "Использовать SOCKS-прокси"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
@@ -1487,7 +1488,7 @@ msgstr ""
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Ошибка записи тэга(ов)."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
diff --git a/po/sv.po b/po/sv.po
index 1160da0..549b4e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,8 +9,8 @@
 # Bo Serrander <bserrander@gmail.com>, 2013
 # Fredrik Ismyren <fredrik@ismyren.se>, 2014
 # cb445fb3dfd1fe3c2b9f58ac5638f478, 2015-2016
-# Jonatan Nyberg, 2018-2020
-# Jonatan Nyberg, 2017-2018
+# Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>, 2018-2020
+# Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>, 2017-2018
 # Luna Jernberg <bittin@cafe8bitar.se>, 2015
 # Luna Jernberg <bittin@cafe8bitar.se>, 2014
 # Martin Persenius <martin@persenius.net>, 2004
@@ -19,8 +19,8 @@ msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-02-15 03:23+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"PO-Revision-Date: 2020-03-28 05:05+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/audacious/audacious/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1114,7 +1114,7 @@ msgstr "Fortsätt uppspelning vid start"
 
 #: src/libaudgui/prefs-window.cc:300 src/libaudqt/prefs-window-qt.cc:305
 msgid "Pause instead of resuming immediately"
-msgstr "Pausa istället för att direkt fortsätta"
+msgstr "Pausa istället för att fortsätta direkt"
 
 #: src/libaudgui/prefs-window.cc:303 src/libaudqt/prefs-window-qt.cc:307
 msgid "Advance when the current song is deleted"
diff --git a/po/tr.po b/po/tr.po
index 5f18e93..0bbce15 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,6 +6,7 @@
 # Önder Yıldırım <onder.y@msn.com>, 2013
 # aamet <aaydin159@gmail.com>, 2012
 # aamet <aaydin159@gmail.com>, 2012
+# abc Def <hdogan1974@gmail.com>, 2020
 # Imnune <alikoc@hush.ai>, 2012
 # Ali Orhun Akkirman <the.alorak@gmail.com>, 2013
 # hsngrms <dead-bodies-everywhere@hotmail.com>, 2012
@@ -29,14 +30,15 @@
 # tarkan255 <t.oguzman@hotmail.com>, 2012
 # Volkan Gezer <volkangezer@gmail.com>, 2014-2015
 # Yaşar Çiv <yasarciv@protonmail.com>, 2018
+# Yaşar Çiv <yasarciv@protonmail.com>, 2020
 # Zekeriya Cihan <zekeriya.cihan@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious\n"
 "Report-Msgid-Bugs-To: https://redmine.audacious-media-player.org/\n"
 "POT-Creation-Date: 2020-01-26 13:17+0100\n"
-"PO-Revision-Date: 2020-01-26 12:21+0000\n"
-"Last-Translator: John Lindgren <john@jlindgren.net>\n"
+"PO-Revision-Date: 2020-04-28 08:51+0000\n"
+"Last-Translator: Yaşar Çiv <yasarciv@protonmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/audacious/audacious/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -106,7 +108,7 @@ msgstr "Hata ayıklama iletilerini yazdır (iki kez kullanılabilir)"
 
 #: src/audacious/main.cc:81
 msgid "Run in GTK mode"
-msgstr ""
+msgstr "GTK modunda çalıştır"
 
 #: src/audacious/main.cc:138
 #, c-format
@@ -216,7 +218,7 @@ msgstr "%s yüklenemiyor: bilinmeyen dosya uzantısı."
 #: src/libaudcore/playlist-files.cc:161 src/libaudqt/eq-preset-qt.cc:309
 #, c-format
 msgid "Error saving %s."
-msgstr ""
+msgstr "%s kaydedilirken hata oluştu."
 
 #: src/libaudcore/playlist-files.cc:167
 #, c-format
@@ -332,7 +334,7 @@ msgstr "Listeyi Yeniden Adlandır"
 
 #: src/libaudgui/eq-preset.cc:153
 msgid "Please select one preset to export."
-msgstr ""
+msgstr "Lütfen dışa aktarmak için bir ön ayar seçin."
 
 #: src/libaudgui/eq-preset.cc:256 src/libaudgui/eq-preset.cc:261
 msgid "Preset File ..."
@@ -701,7 +703,7 @@ msgstr "Parça Numarası"
 
 #: src/libaudgui/infowin.cc:397
 msgid "_Auto-fill empty fields"
-msgstr ""
+msgstr "_Boş alanları otomatik doldur"
 
 #: src/libaudgui/infowin.cc:411 src/libaudqt/infowin-qt.cc:183
 msgid "_Save"
@@ -709,7 +711,7 @@ msgstr "_Kaydet"
 
 #: src/libaudgui/infowin.cc:417
 msgid "_Previous"
-msgstr ""
+msgstr "_Önceki"
 
 #: src/libaudgui/infowin.cc:420
 msgid "_Next"
@@ -906,7 +908,7 @@ msgstr "Tarih"
 #: src/libaudgui/prefs-window.cc:110 src/libaudqt/info-widget.cc:55
 #: src/libaudqt/prefs-window-qt.cc:173
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #: src/libaudgui/prefs-window.cc:113 src/libaudqt/info-widget.cc:64
 #: src/libaudqt/prefs-window-qt.cc:176
@@ -1102,15 +1104,15 @@ msgstr "Vekil sunucu doğrulaması kullan"
 
 #: src/libaudgui/prefs-window.cc:273 src/libaudqt/prefs-window-qt.cc:287
 msgid "Use SOCKS proxy"
-msgstr ""
+msgstr "SOCKS vekil kullan"
 
 #: src/libaudgui/prefs-window.cc:275 src/libaudqt/prefs-window-qt.cc:288
 msgid "SOCKS v4a"
-msgstr ""
+msgstr "SOCKS v4a"
 
 #: src/libaudgui/prefs-window.cc:279 src/libaudqt/prefs-window-qt.cc:289
 msgid "SOCKS v5"
-msgstr ""
+msgstr "SOCKS v5"
 
 #: src/libaudgui/prefs-window.cc:286 src/libaudqt/prefs-window-qt.cc:292
 msgid "Auto character encoding detector for:"
@@ -1250,7 +1252,7 @@ msgstr "<b>Karışık</b>"
 
 #: src/libaudgui/prefs-window.cc:366 src/libaudqt/prefs-window-qt.cc:364
 msgid "Step forward/backward by:"
-msgstr ""
+msgstr "İleri/geri adım:"
 
 #: src/libaudgui/prefs-window.cc:368 src/libaudqt/prefs-window-qt.cc:365
 msgid "seconds"
@@ -1258,11 +1260,11 @@ msgstr "saniye"
 
 #: src/libaudgui/prefs-window.cc:369 src/libaudqt/prefs-window-qt.cc:366
 msgid "Adjust volume by:"
-msgstr ""
+msgstr "Ses düzeyini şuna göre ayarlayın:"
 
 #: src/libaudgui/prefs-window.cc:371 src/libaudqt/prefs-window-qt.cc:367
 msgid "percent"
-msgstr ""
+msgstr "yüzde"
 
 #: src/libaudgui/prefs-window.cc:388 src/libaudqt/prefs-window-qt.cc:384
 msgid "TITLE"
@@ -1405,7 +1407,7 @@ msgstr "\n(Devam eden iletiler gizlendi.)"
 
 #: src/libaudqt/eq-preset-qt.cc:249
 msgid "Preset files (*.preset *.eqf *.q1)"
-msgstr ""
+msgstr "Ön ayarlı dosyalar (* .preset * .eqf * .q1)"
 
 #: src/libaudqt/eq-preset-qt.cc:348
 msgid "Close"
@@ -1429,11 +1431,11 @@ msgstr "Ekle"
 
 #: src/libaudqt/font-entry.cc:39
 msgid "Set Font"
-msgstr ""
+msgstr "Yazı Tipini Ayarla"
 
 #: src/libaudqt/info-widget.cc:44
 msgid "<various>"
-msgstr ""
+msgstr "<various>"
 
 #: src/libaudqt/info-widget.cc:47
 msgid "Metadata"
@@ -1465,23 +1467,23 @@ msgstr "Bit oranı"
 
 #: src/libaudqt/info-widget.cc:67
 msgid "MusicBrainz ID"
-msgstr ""
+msgstr "MusicBrainz Kimliği"
 
 #: src/libaudqt/infowin-qt.cc:156
 msgid "_Revert"
-msgstr ""
+msgstr "_Geri Al"
 
 #: src/libaudqt/infowin-qt.cc:167
 msgid "Error writing tag(s)."
-msgstr ""
+msgstr "Etiket(leri) yazma hatası."
 
 #: src/libaudqt/infowin-qt.cc:189
 msgid "%1 files selected"
-msgstr ""
+msgstr "%1 dosya seçildi"
 
 #: src/libaudqt/infowin-qt.cc:193
 msgid "_Save %1 files"
-msgstr ""
+msgstr "%1 dosyayı _kaydet"
 
 #: src/libaudqt/log-inspector.cc:150
 msgid "Level"
diff --git a/src/libaudcore/tuple.cc b/src/libaudcore/tuple.cc
index f699e7d..7d710b4 100644
--- a/src/libaudcore/tuple.cc
+++ b/src/libaudcore/tuple.cc
@@ -80,7 +80,7 @@ struct TupleData
 
     bool is_set(int field) const { return (setmask & bitmask(field)); }
 
-    bool is_same(const TupleData & other);
+    bool is_same(const TupleData & other) const;
 
     TupleVal * lookup(int field, bool add, bool remove);
     void set_int(int field, int x);
@@ -350,7 +350,7 @@ TupleData::~TupleData()
     delete[] subtunes;
 }
 
-bool TupleData::is_same(const TupleData & other)
+bool TupleData::is_same(const TupleData & other) const
 {
     if (state != other.state || setmask != other.setmask ||
         nsubtunes != other.nsubtunes || (!subtunes) != (!other.subtunes))
@@ -368,7 +368,7 @@ bool TupleData::is_same(const TupleData & other)
             if (field_info[f].type == Tuple::String)
                 same = (a->str == b->str);
             else
-                same = (a->x = b->x);
+                same = (a->x == b->x);
 
             if (!same)
                 return false;
diff --git a/src/libaudqt/about-qt.cc b/src/libaudqt/about-qt.cc
index 4496e59..a80fd33 100644
--- a/src/libaudqt/about-qt.cc
+++ b/src/libaudqt/about-qt.cc
@@ -20,6 +20,7 @@
 #include <QDialog>
 #include <QLabel>
 #include <QPlainTextEdit>
+#include <QPointer>
 #include <QTabWidget>
 #include <QVBoxLayout>
 
@@ -85,7 +86,7 @@ static QDialog * buildAboutWindow()
     return window;
 }
 
-static QDialog * s_aboutwin = nullptr;
+static QPointer<QDialog> s_aboutwin;
 
 namespace audqt
 {
@@ -96,18 +97,11 @@ EXPORT void aboutwindow_show()
     {
         s_aboutwin = buildAboutWindow();
         s_aboutwin->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_aboutwin, &QObject::destroyed,
-                         []() { s_aboutwin = nullptr; });
     }
 
     window_bring_to_front(s_aboutwin);
 }
 
-EXPORT void aboutwindow_hide()
-{
-    if (s_aboutwin)
-        delete s_aboutwin;
-}
+EXPORT void aboutwindow_hide() { delete s_aboutwin; }
 
 } // namespace audqt
diff --git a/src/libaudqt/equalizer-qt.cc b/src/libaudqt/equalizer-qt.cc
index e603c94..5458bf4 100644
--- a/src/libaudqt/equalizer-qt.cc
+++ b/src/libaudqt/equalizer-qt.cc
@@ -23,6 +23,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPainter>
+#include <QPointer>
 #include <QPushButton>
 #include <QSlider>
 #include <QStyle>
@@ -198,7 +199,7 @@ void EqualizerWindow::updateBands()
         m_sliders[i]->slider.setValue(values[i]);
 }
 
-static EqualizerWindow * s_equalizer = nullptr;
+static QPointer<EqualizerWindow> s_equalizer;
 
 namespace audqt
 {
@@ -209,9 +210,6 @@ EXPORT void equalizer_show()
     {
         s_equalizer = new EqualizerWindow;
         s_equalizer->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_equalizer, &QObject::destroyed,
-                         []() { s_equalizer = nullptr; });
     }
 
     window_bring_to_front(s_equalizer);
diff --git a/src/libaudqt/fileopener.cc b/src/libaudqt/fileopener.cc
index 1ab1e29..d1af3df 100644
--- a/src/libaudqt/fileopener.cc
+++ b/src/libaudqt/fileopener.cc
@@ -18,6 +18,7 @@
  */
 
 #include <QFileDialog>
+#include <QPointer>
 
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
@@ -29,7 +30,7 @@
 namespace audqt
 {
 
-static aud::array<FileMode, QFileDialog *> s_dialogs;
+static aud::array<FileMode, QPointer<QFileDialog>> s_dialogs;
 
 static void import_playlist(Playlist playlist, const String & filename)
 {
@@ -50,7 +51,7 @@ static void export_playlist(Playlist playlist, const String & filename)
 
 EXPORT void fileopener_show(FileMode mode)
 {
-    QFileDialog *& dialog = s_dialogs[mode];
+    QPointer<QFileDialog> & dialog = s_dialogs[mode];
 
     if (!dialog)
     {
@@ -114,9 +115,6 @@ EXPORT void fileopener_show(FileMode mode)
                     break;
                 }
             });
-
-        QObject::connect(dialog, &QObject::destroyed,
-                         [&dialog]() { dialog = nullptr; });
     }
 
     window_bring_to_front(dialog);
diff --git a/src/libaudqt/infopopup-qt.cc b/src/libaudqt/infopopup-qt.cc
index 30c1e39..a8c6f7a 100644
--- a/src/libaudqt/infopopup-qt.cc
+++ b/src/libaudqt/infopopup-qt.cc
@@ -30,6 +30,7 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QPainter>
+#include <QPointer>
 
 namespace audqt
 {
@@ -103,6 +104,9 @@ void InfoPopup::add_fields(const Tuple & tuple)
         add_field(row++, _("Track"), int_to_str(track));
     if (length > 0)
         add_field(row++, _("Length"), str_format_time(length));
+
+    if (row > 0)
+        m_grid.setRowStretch(row - 1, 1);
 }
 
 void InfoPopup::add_field(int row, const char * field, const char * value)
@@ -111,13 +115,13 @@ void InfoPopup::add_field(int row, const char * field, const char * value)
     header->setTextFormat(Qt::RichText);
     header->setText(
         QString("<i><font color=\"#a0a0a0\">%1</font></i>").arg(field));
-    m_grid.addWidget(header, row, 0, Qt::AlignRight);
+    m_grid.addWidget(header, row, 0, Qt::AlignRight | Qt::AlignTop);
 
     auto label = new QLabel(this);
     header->setTextFormat(Qt::RichText);
     auto html = QString(value).toHtmlEscaped();
     label->setText(QString("<font color=\"#ffffff\">%1</font>").arg(html));
-    m_grid.addWidget(label, row, 1, Qt::AlignLeft);
+    m_grid.addWidget(label, row, 1, Qt::AlignLeft | Qt::AlignTop);
 }
 
 void InfoPopup::art_ready(const char * filename)
@@ -150,7 +154,7 @@ void InfoPopup::paintEvent(QPaintEvent *)
     p.fillRect(rect(), grad);
 }
 
-static InfoPopup * s_infopopup;
+static QPointer<InfoPopup> s_infopopup;
 
 static void infopopup_show(const String & filename, const Tuple & tuple)
 {
@@ -158,9 +162,6 @@ static void infopopup_show(const String & filename, const Tuple & tuple)
         s_infopopup->deleteLater();
 
     s_infopopup = new InfoPopup(filename, tuple);
-
-    QObject::connect(s_infopopup, &QObject::destroyed,
-                     []() { s_infopopup = nullptr; });
 }
 
 EXPORT void infopopup_show(Playlist playlist, int entry)
diff --git a/src/libaudqt/infowin-qt.cc b/src/libaudqt/infowin-qt.cc
index 853e0cc..02781f9 100644
--- a/src/libaudqt/infowin-qt.cc
+++ b/src/libaudqt/infowin-qt.cc
@@ -28,6 +28,7 @@
 #include <QLabel>
 #include <QPainter>
 #include <QPixmap>
+#include <QPointer>
 #include <QPushButton>
 #include <QTextDocument>
 #include <QVBoxLayout>
@@ -203,7 +204,7 @@ void InfoWindow::displayImage(const char * filename)
             art_request(filename, 2 * sizes.OneInch, 2 * sizes.OneInch));
 }
 
-static InfoWindow * s_infowin = nullptr;
+static QPointer<InfoWindow> s_infowin;
 
 static void show_infowin(Index<PlaylistAddItem> && items, bool can_write)
 {
@@ -211,9 +212,6 @@ static void show_infowin(Index<PlaylistAddItem> && items, bool can_write)
     {
         s_infowin = new InfoWindow;
         s_infowin->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_infowin, &QObject::destroyed,
-                         []() { s_infowin = nullptr; });
     }
 
     s_infowin->fillInfo(std::move(items), can_write);
diff --git a/src/libaudqt/log-inspector.cc b/src/libaudqt/log-inspector.cc
index 460c178..a5d5440 100644
--- a/src/libaudqt/log-inspector.cc
+++ b/src/libaudqt/log-inspector.cc
@@ -25,6 +25,7 @@
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QPointer>
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
@@ -255,7 +256,7 @@ LogEntryInspector::LogEntryInspector(QWidget * parent) : QDialog(parent)
     resize(6 * sizes.OneInch, 3 * sizes.OneInch);
 }
 
-static LogEntryInspector * s_inspector = nullptr;
+static QPointer<LogEntryInspector> s_inspector;
 
 void LogEntryInspector::setLogLevel(audlog::Level level)
 {
@@ -273,9 +274,6 @@ EXPORT void log_inspector_show()
     {
         s_inspector = new LogEntryInspector;
         s_inspector->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_inspector, &QObject::destroyed,
-                         []() { s_inspector = nullptr; });
     }
 
     window_bring_to_front(s_inspector);
diff --git a/src/libaudqt/prefs-window-qt.cc b/src/libaudqt/prefs-window-qt.cc
index 8f72ba4..96ef3ab 100644
--- a/src/libaudqt/prefs-window-qt.cc
+++ b/src/libaudqt/prefs-window-qt.cc
@@ -338,9 +338,7 @@ static const PreferencesWidget song_info_page_widgets[] = {
     WidgetCheck(N_("Show popup information"),
                 WidgetBool(0, "show_filepopup_for_tuple")),
     WidgetSpin(N_("Popup delay (tenths of a second):"),
-               WidgetInt(0, "filepopup_delay"), {0, 100, 1}, WIDGET_CHILD),
-    WidgetCheck(N_("Show time scale for current song"),
-                WidgetBool(0, "filepopup_showprogressbar"), WIDGET_CHILD)};
+               WidgetInt(0, "filepopup_delay"), {0, 100, 1}, WIDGET_CHILD)};
 
 static const PreferencesWidget advanced_page_widgets[] = {
     WidgetLabel(N_("<b>Compatibility</b>")),
diff --git a/src/libaudqt/queue-manager-qt.cc b/src/libaudqt/queue-manager-qt.cc
index 8c5176b..2cf53bd 100644
--- a/src/libaudqt/queue-manager-qt.cc
+++ b/src/libaudqt/queue-manager-qt.cc
@@ -24,6 +24,7 @@
 #include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QItemSelectionModel>
+#include <QPointer>
 #include <QPushButton>
 #include <QTreeView>
 #include <QVBoxLayout>
@@ -206,7 +207,7 @@ void QueueManagerDialog::removeSelected()
     }
 }
 
-static QueueManagerDialog * s_queuemgr = nullptr;
+static QPointer<QueueManagerDialog> s_queuemgr;
 
 EXPORT void queue_manager_show()
 {
@@ -214,9 +215,6 @@ EXPORT void queue_manager_show()
     {
         s_queuemgr = new QueueManagerDialog;
         s_queuemgr->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_queuemgr, &QObject::destroyed,
-                         []() { s_queuemgr = nullptr; });
     }
 
     window_bring_to_front(s_queuemgr);
diff --git a/src/libaudqt/treeview.cc b/src/libaudqt/treeview.cc
index 188175d..add19ab 100644
--- a/src/libaudqt/treeview.cc
+++ b/src/libaudqt/treeview.cc
@@ -19,6 +19,7 @@
 
 #include "treeview.h"
 
+#include <QApplication>
 #include <QKeyEvent>
 #include <QMouseEvent>
 #include <QProxyStyle>
@@ -41,8 +42,14 @@ namespace audqt
 class TreeViewStyleOverrides : public QProxyStyle
 {
 public:
-    int styleHint(StyleHint hint,
-                  const QStyleOption * option = nullptr,
+    TreeViewStyleOverrides()
+    {
+        // detect and respond to application-wide style change
+        connect(qApp->style(), &QObject::destroyed, this,
+                &TreeViewStyleOverrides::resetBaseStyle);
+    }
+
+    int styleHint(StyleHint hint, const QStyleOption * option = nullptr,
                   const QWidget * widget = nullptr,
                   QStyleHintReturn * returnData = nullptr) const override
     {
@@ -51,12 +58,20 @@ public:
 
         return QProxyStyle::styleHint(hint, option, widget, returnData);
     }
+
+private:
+    void resetBaseStyle()
+    {
+        setBaseStyle(nullptr);
+        connect(qApp->style(), &QObject::destroyed, this,
+                &TreeViewStyleOverrides::resetBaseStyle);
+    }
 };
 
 EXPORT TreeView::TreeView(QWidget * parent) : QTreeView(parent)
 {
     auto style = new TreeViewStyleOverrides;
-    connect(this, &QObject::destroyed, [style]() { delete style; });
+    style->setParent(this);
     setStyle(style);
 
     // activate() is perhaps a bit redundant with activated()
diff --git a/src/libaudqt/url-opener-qt.cc b/src/libaudqt/url-opener-qt.cc
index 2ea837a..1542142 100644
--- a/src/libaudqt/url-opener-qt.cc
+++ b/src/libaudqt/url-opener-qt.cc
@@ -21,6 +21,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QPointer>
 #include <QPushButton>
 #include <QVBoxLayout>
 
@@ -126,7 +127,7 @@ static QDialog * buildUrlDialog(bool open)
     return dialog;
 }
 
-static QDialog * s_dialog = nullptr;
+static QPointer<QDialog> s_dialog;
 
 EXPORT void urlopener_show(bool open)
 {
@@ -134,9 +135,6 @@ EXPORT void urlopener_show(bool open)
     {
         s_dialog = buildUrlDialog(open);
         s_dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-        QObject::connect(s_dialog, &QObject::destroyed,
-                         []() { s_dialog = nullptr; });
     }
 
     window_bring_to_front(s_dialog);
diff --git a/src/libaudtag/id3/id3v22.cc b/src/libaudtag/id3/id3v22.cc
index f850cfa..f5e950c 100644
--- a/src/libaudtag/id3/id3v22.cc
+++ b/src/libaudtag/id3/id3v22.cc
@@ -72,7 +72,7 @@ static const char * id3_frames[ID3_TAGS_NO] = {
 
 #pragma pack(push) /* must be byte-aligned */
 #pragma pack(1)
-struct ID3v2Header {
+struct ID3v22Header {
     char magic[3];
     unsigned char version;
     unsigned char revision;
@@ -80,7 +80,7 @@ struct ID3v2Header {
     uint32_t size;
 };
 
-struct ID3v2FrameHeader {
+struct ID3v22FrameHeader {
     char key[3];
     unsigned char size[3];
 };
@@ -95,7 +95,7 @@ struct GenericFrame : public Index<char> {
 
 namespace audtag {
 
-static bool validate_header (ID3v2Header * header)
+static bool validate_header (ID3v22Header * header)
 {
     if (memcmp (header->magic, "ID3", 3))
         return false;
@@ -117,20 +117,20 @@ static bool validate_header (ID3v2Header * header)
 static bool read_header (VFSFile & handle, int * version, bool *
  syncsafe, int64_t * offset, int * header_size, int * data_size)
 {
-    ID3v2Header header;
+    ID3v22Header header;
 
     if (handle.fseek (0, VFS_SEEK_SET))
         return false;
 
-    if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof
-     (ID3v2Header))
+    if (handle.fread (& header, 1, sizeof (ID3v22Header)) != sizeof
+     (ID3v22Header))
         return false;
 
     if (validate_header (& header))
     {
         * offset = 0;
         * version = header.version;
-        * header_size = sizeof (ID3v2Header);
+        * header_size = sizeof (ID3v22Header);
         * data_size = header.size;
     }
     else
@@ -147,14 +147,14 @@ static bool read_header (VFSFile & handle, int * version, bool *
 static bool read_frame (VFSFile & handle, int max_size, int version,
  bool syncsafe, int * frame_size, GenericFrame & frame)
 {
-    ID3v2FrameHeader header;
+    ID3v22FrameHeader header;
     uint32_t hdrsz = 0;
 
-    if ((max_size -= sizeof (ID3v2FrameHeader)) < 0)
+    if ((max_size -= sizeof (ID3v22FrameHeader)) < 0)
         return false;
 
-    if (handle.fread (& header, 1, sizeof (ID3v2FrameHeader)) != sizeof
-     (ID3v2FrameHeader))
+    if (handle.fread (& header, 1, sizeof (ID3v22FrameHeader)) != sizeof
+     (ID3v22FrameHeader))
         return false;
 
     if (! header.key[0]) /* padding */
@@ -173,7 +173,7 @@ static bool read_frame (VFSFile & handle, int max_size, int version,
     AUDDBG (" key = %.3s\n", header.key);
     AUDDBG (" size = %d\n", (int) hdrsz);
 
-    * frame_size = sizeof (ID3v2FrameHeader) + hdrsz;
+    * frame_size = sizeof (ID3v22FrameHeader) + hdrsz;
 
     frame.key = String (str_copy (header.key, 3));
     frame.clear ();
diff --git a/src/libaudtag/id3/id3v24.cc b/src/libaudtag/id3/id3v24.cc
index be558c9..b27163f 100644
--- a/src/libaudtag/id3/id3v24.cc
+++ b/src/libaudtag/id3/id3v24.cc
@@ -80,7 +80,7 @@ static const char * id3_frames[ID3_TAGS_NO] = {
 
 #pragma pack(push) /* must be byte-aligned */
 #pragma pack(1)
-struct ID3v2Header {
+struct ID3v24Header {
     char magic[3];
     unsigned char version;
     unsigned char revision;
@@ -88,7 +88,7 @@ struct ID3v2Header {
     uint32_t size;
 };
 
-struct ID3v2FrameHeader {
+struct ID3v24FrameHeader {
     char key[4];
     uint32_t size;
     uint16_t flags;
@@ -150,7 +150,7 @@ static bool skip_extended_header_4 (VFSFile & handle, int * _size)
     return true;
 }
 
-static bool validate_header (ID3v2Header * header, bool is_footer)
+static bool validate_header (ID3v24Header * header, bool is_footer)
 {
     if (memcmp (header->magic, is_footer ? "3DI" : "ID3", 3))
         return false;
@@ -175,19 +175,19 @@ static bool read_header (VFSFile & handle, int * version, bool *
  syncsafe, int64_t * offset, int * header_size, int * data_size, int *
  footer_size)
 {
-    ID3v2Header header, footer;
+    ID3v24Header header, footer;
 
     if (handle.fseek (0, VFS_SEEK_SET))
         return false;
 
-    if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header))
+    if (handle.fread (& header, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header))
         return false;
 
     if (validate_header (& header, false))
     {
         * offset = 0;
         * version = header.version;
-        * header_size = sizeof (ID3v2Header);
+        * header_size = sizeof (ID3v24Header);
         * data_size = header.size;
 
         if (header.flags & ID3_HEADER_HAS_FOOTER)
@@ -195,16 +195,16 @@ static bool read_header (VFSFile & handle, int * version, bool *
             if (handle.fseek (header.size, VFS_SEEK_CUR))
                 return false;
 
-            if (handle.fread (& footer, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header))
+            if (handle.fread (& footer, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header))
                 return false;
 
             if (! validate_header (& footer, true))
                 return false;
 
-            if (handle.fseek (sizeof (ID3v2Header), VFS_SEEK_SET))
+            if (handle.fseek (sizeof (ID3v24Header), VFS_SEEK_SET))
                 return false;
 
-            * footer_size = sizeof (ID3v2Header);
+            * footer_size = sizeof (ID3v24Header);
         }
         else
             * footer_size = 0;
@@ -216,26 +216,26 @@ static bool read_header (VFSFile & handle, int * version, bool *
         if (end < 0)
             return false;
 
-        if (handle.fseek (end - sizeof (ID3v2Header), VFS_SEEK_SET))
+        if (handle.fseek (end - sizeof (ID3v24Header), VFS_SEEK_SET))
             return false;
 
-        if (handle.fread (& footer, 1, sizeof (ID3v2Header)) != sizeof (ID3v2Header))
+        if (handle.fread (& footer, 1, sizeof (ID3v24Header)) != sizeof (ID3v24Header))
             return false;
 
         if (! validate_header (& footer, true))
             return false;
 
-        * offset = end - 2 * sizeof (ID3v2Header) - footer.size;
+        * offset = end - 2 * sizeof (ID3v24Header) - footer.size;
         * version = footer.version;
-        * header_size = sizeof (ID3v2Header);
+        * header_size = sizeof (ID3v24Header);
         * data_size = footer.size;
-        * footer_size = sizeof (ID3v2Header);
+        * footer_size = sizeof (ID3v24Header);
 
         if (handle.fseek (* offset, VFS_SEEK_SET))
             return false;
 
-        if (handle.fread (& header, 1, sizeof (ID3v2Header)) != sizeof
-         (ID3v2Header))
+        if (handle.fread (& header, 1, sizeof (ID3v24Header)) != sizeof
+         (ID3v24Header))
             return false;
 
         if (! validate_header (& header, false))
@@ -312,14 +312,14 @@ static Index<char> read_tag_data (VFSFile & handle, int size, bool syncsafe)
 static bool read_frame (const char * data, int max_size, int version,
  int * frame_size, GenericFrame & frame)
 {
-    ID3v2FrameHeader header;
+    ID3v24FrameHeader header;
     unsigned skip = 0;
 
-    if ((max_size -= sizeof (ID3v2FrameHeader)) < 0)
+    if ((max_size -= sizeof (ID3v24FrameHeader)) < 0)
         return false;
 
-    memcpy (& header, data, sizeof (ID3v2FrameHeader));
-    data += sizeof (ID3v2FrameHeader);
+    memcpy (& header, data, sizeof (ID3v24FrameHeader));
+    data += sizeof (ID3v24FrameHeader);
 
     if (! header.key[0]) /* padding */
         return false;
@@ -349,7 +349,7 @@ static bool read_frame (const char * data, int max_size, int version,
     if (skip >= header.size)
         return false;
 
-    * frame_size = sizeof (ID3v2FrameHeader) + header.size;
+    * frame_size = sizeof (ID3v24FrameHeader) + header.size;
 
     frame.key = String (str_copy (header.key, 4));
     frame.clear ();
@@ -386,7 +386,7 @@ static bool write_frame (VFSFile & file, const GenericFrame & frame, int version
 {
     AUDDBG ("Writing frame %s, size %d\n", (const char *) frame.key, frame.len ());
 
-    ID3v2FrameHeader header;
+    ID3v24FrameHeader header;
 
     strncpy (header.key, frame.key, 4);
 
@@ -397,13 +397,13 @@ static bool write_frame (VFSFile & file, const GenericFrame & frame, int version
     header.size = TO_BE32 (size);
     header.flags = 0;
 
-    if (file.fwrite (& header, 1, sizeof (ID3v2FrameHeader)) != sizeof (ID3v2FrameHeader))
+    if (file.fwrite (& header, 1, sizeof (ID3v24FrameHeader)) != sizeof (ID3v24FrameHeader))
         return false;
 
     if (file.fwrite (& frame[0], 1, frame.len ()) != frame.len ())
         return false;
 
-    * frame_size = sizeof (ID3v2FrameHeader) + frame.len ();
+    * frame_size = sizeof (ID3v24FrameHeader) + frame.len ();
     return true;
 }
 
@@ -427,7 +427,7 @@ static int write_all_frames (VFSFile & file, FrameDict & dict, int version)
 
 static bool write_header (VFSFile & file, int version, int size)
 {
-    ID3v2Header header;
+    ID3v24Header header;
 
     memcpy (header.magic, "ID3", 3);
     header.version = version;
@@ -435,7 +435,7 @@ static bool write_header (VFSFile & file, int version, int size)
     header.flags = 0;
     header.size = TO_BE32 (syncsafe32 (size));
 
-    return file.fwrite (& header, 1, sizeof (ID3v2Header)) == sizeof (ID3v2Header);
+    return file.fwrite (& header, 1, sizeof (ID3v24Header)) == sizeof (ID3v24Header);
 }
 
 static int get_frame_id (const char * key)