[SCM] easytag/master: Imported Upstream version 2.2.4

amigadave-guest at users.alioth.debian.org amigadave-guest at users.alioth.debian.org
Sat Sep 27 19:13:57 UTC 2014


The following commit has been merged in the master branch:
commit 959b91f12f2029362c8639b20ce66edc764a6857
Author: David King <amigadave at amigadave.com>
Date:   Sat Sep 27 20:13:22 2014 +0100

    Imported Upstream version 2.2.4

diff --git a/ChangeLog b/ChangeLog
index d548e2f..8daaf10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,157 @@
+commit 21704fcd1996c87fc0a140f07c18db6dabf3a146
+Author: David King <amigadave at amigadave.com>
+Date:   Sat Sep 27 02:00:02 2014 +0100
+
+    Update NEWS for 2.2.4 release
+
+M	NEWS
+M	configure.ac
+
+commit d849d3692f3dc03ce90486d7c1976494dcc6fc47
+Author: David King <amigadave at amigadave.com>
+Date:	Sat Sep 27 01:28:40 2014 +0100
+
+    Update Windows installer script
+
+    Include complete Adwaita icon theme. Include winpthread DLL.
+
+M	SOURCES
+M	easytag-win32-installer.nsi.in
+
+commit 7ab8317800d8fbe597bef480389c0f2811ec3554
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Sep 26 08:38:28 2014 +0100
+
+    Fix memory leak in id3lib buggy check
+
+    Free the result string.
+
+M	src/id3_tag.c
+
+commit b86a305e841d4ee1dd5bc61d15ac5dcdb88e192c
+Author: David King <amigadave at amigadave.com>
+Date:	Thu Sep 25 18:18:18 2014 +0100
+
+    Handle renaming on case-insensitive filesystems
+
+    A rename will fail on a filesystem that is case-insensitive, if the
+    filenames only differ by case. Work around this by moving to
+    a temporary
+    file first, in the case that a rename fails because the target exists.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=737302
+
+M	src/easytag.c
+
+commit d9c2b6096c863063b4fbdfde4f3b3b86ccfab6c6
+Author: Piotr Drąg <piotrdrag at gmail.com>
+Date:	Sun Sep 7 01:01:45 2014 +0200
+
+    Updated Polish translation
+
+M	po/pl.po
+
+commit 69428c77a8951a61411a832b9158730d3cb3eab2
+Author: Andika Triwidada <andika at gmail.com>
+Date:	Fri Sep 5 16:14:37 2014 +0000
+
+    Updated Indonesian translation
+
+M	po/id.po
+
+commit 57152f6af96d7c3eb5becb9d68fa5170b28858f7
+Author: Marek Černocký <marek at manet.cz>
+Date:	Tue Aug 26 09:30:07 2014 +0200
+
+    Fixed format specifiers order
+
+M	help/C/scanner.page
+
+commit 3bc950f9ddd9ba1fa2499395808d89a2c8d72c31
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Aug 15 18:45:57 2014 +0100
+
+    Use updated license tags in AppData
+
+M	data/easytag.appdata.xml.in
+
+commit 930158e964b57e123fedb8fe37fc8a1f4eb56250
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Jul 30 14:41:49 2014 +0200
+
+    Fix delays when clearing the CDDB models
+
+    Avoid accessing deleted rows in the tree view selection changed
+    handlers, by blocking the handlers when clearing the
+    models. Otherwise,
+    each release in the list of search results being deleted would be
+    fetched from the server and then immediately discarded.
+
+M	src/cddb.c
+
+commit 77347d26ad6ed0f08f93742f0abb4871d95407f8
+Author: David King <amigadave at amigadave.com>
+Date:	Sun Aug 10 12:32:43 2014 +0100
+
+    Fix scanner help for renaming files
+
+M	help/C/file-rename.page
+
+commit 4288ddf6c7c5b09d352cdce784088e263d332501
+Author: David King <amigadave at amigadave.com>
+Date:	Fri Aug 1 17:34:24 2014 +0100
+
+    Provide a useful error when failing to write files
+
+    Pass an error back from ET_Save_File_Tag_To_HD() to ensure that
+    a useful
+    error message is presented to the user. Provide a sane fallback if the
+    tag writing function does not provide a GError API (currently all
+    non-Ogg formats).
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=733929
+
+M	src/easytag.c
+M	src/et_core.c
+M	src/et_core.h
+
+commit 4e75b922da6bac1c60cb1f4965d4eaf2a34e8aac
+Author: David King <amigadave at amigadave.com>
+Date:	Wed Jul 30 11:58:38 2014 +0200
+
+    Fix crash when reloading the directory tree
+
+    As the directory is cleared during reloading, the selection changes
+    and
+    this leads to a crash when a directory in the tree is deleted
+    outside of
+    EasyTAG. Avoid the changed signal being emitted by clearing the
+    directory tree only when the signal is blocked.
+
+    https://bugzilla.redhat.com/show_bug.cgi?id=1121142
+
+M	src/browser.c
+
+commit c392b0b4500ae6b4dbf1fb3c302b7e0ae19bbfaf
+Author: Daniel Mustieles <dnaiel.mustieles at gmail.com>
+Date:	Fri Jul 4 13:09:08 2014 +0200
+
+    Updated Spanish translation
+
+M	help/es/es.po
+
+commit c60601952180de9cec72bbeace1b0846da263313
+Author: Daniel Mustieles <dnaiel.mustieles at gmail.com>
+Date:	Fri Jul 4 12:39:12 2014 +0200
+
+    Updated Spanish Translation
+
+M	help/Makefile.am
+A	help/es/es.po
+
 commit 3f9cc8f08f426701f055ae49b0bc32f25f2f6dbd
 Author: David King <amigadave at amigadave.com>
-Date:   Sun Jun 22 22:21:42 2014 +0100
+Date:	Sun Jun 22 22:21:42 2014 +0100
 
     Update NEWS for 2.2.3 release
 
diff --git a/NEWS b/NEWS
index 0d29152..05df52e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+2.2.4 - 2014-09-27 :
+====================
+
+    * Fix a crash when reloading the directory tree
+    * Fix delays, and a possible crash, when running CDDB searches
+    * Handle renaming on case-insensitive filesystems
+    * Provide a useful error message when failing to write files
+    * Fix memory leak in check for buggy id3lib version
+    * Improvements to scanner help
+    * Marek Černocký’s scanner help fixes
+    * Piotr Drąg’s Polish translation updates
+    * Andika Triwidada’s Indonesian translation
+    * Daniel Mustieles’ Spanish help translation
+
 2.2.3 - 2014-06-22 :
 ====================
 
diff --git a/build-aux/config.guess b/build-aux/config.guess
index 9afd676..1f5c50c 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-11-29'
+timestamp='2014-03-23'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -149,7 +149,7 @@ Linux|GNU|GNU/*)
 	LIBC=gnu
 	#endif
 	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 	;;
 esac
 
@@ -826,7 +826,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +969,10 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
 	exit ;;
-    or32:Linux:*:*)
+    or32:Linux:*:* | or1k*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
@@ -1371,154 +1371,6 @@ EOF
 	exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/build-aux/config.sub b/build-aux/config.sub
index ece8142..66c5074 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-10-01'
+timestamp='2014-07-28'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -283,8 +283,10 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -296,8 +298,7 @@ case $basic_machine in
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -402,8 +403,10 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -415,6 +418,7 @@ case $basic_machine in
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -824,6 +828,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1369,14 +1377,14 @@ case $os in
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1594,9 +1602,6 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/configure b/configure
index d49c162..c6b8cd4 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 EasyTAG 2.2.3.
+# Generated by GNU Autoconf 2.69 for EasyTAG 2.2.4.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=easytag>.
 #
@@ -581,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='EasyTAG'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='2.2.3'
-PACKAGE_STRING='EasyTAG 2.2.3'
+PACKAGE_VERSION='2.2.4'
+PACKAGE_STRING='EasyTAG 2.2.4'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=easytag'
 PACKAGE_URL='https://wiki.gnome.org/Apps/EasyTAG'
 
@@ -1386,7 +1386,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 EasyTAG 2.2.3 to adapt to many kinds of systems.
+\`configure' configures EasyTAG 2.2.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1456,7 +1456,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of EasyTAG 2.2.3:";;
+     short | recursive ) echo "Configuration of EasyTAG 2.2.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1591,7 +1591,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-EasyTAG configure 2.2.3
+EasyTAG configure 2.2.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +1998,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 EasyTAG $as_me 2.2.3, which was
+It was created by EasyTAG $as_me 2.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2867,7 +2867,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='easytag'
- VERSION='2.2.3'
+ VERSION='2.2.4'
 
 
 # Some tools Automake needs.
@@ -9001,7 +9001,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 EasyTAG $as_me 2.2.3, which was
+This file was extended by EasyTAG $as_me 2.2.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9068,7 +9068,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="\\
-EasyTAG config.status 2.2.3
+EasyTAG config.status 2.2.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 39130fb..a242986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_PREREQ([2.64])
 
 dnl To set also in config.h.mingw
 dnl defines ($PACKAGE_NAME, $PACKAGE_VERSION, etc.)
-AC_INIT([EasyTAG], [2.2.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
+AC_INIT([EasyTAG], [2.2.4], [https://bugzilla.gnome.org/enter_bug.cgi?product=easytag], [easytag], [https://wiki.gnome.org/Apps/EasyTAG])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])
diff --git a/data/easytag.appdata.xml.in b/data/easytag.appdata.xml.in
index e3bac37..d8ce76c 100644
--- a/data/easytag.appdata.xml.in
+++ b/data/easytag.appdata.xml.in
@@ -2,7 +2,8 @@
 <!-- Copyright 2014 David King <amigadave at amigadave.com> -->
 <application>
     <id type="desktop">easytag.desktop</id>
-    <licence>CC0</licence>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-2.0+ and LGPL-2.1+</project_license>
 <!-- Both taken from the desktop file.
     <name>EasyTAG</name>
     <summary></summary>
diff --git a/easytag-win32-installer.nsi.in b/easytag-win32-installer.nsi.in
index 0e5bf2e..f65d22b 100644
--- a/easytag-win32-installer.nsi.in
+++ b/easytag-win32-installer.nsi.in
@@ -197,8 +197,10 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   File "${PREFIX}/bin/libvorbis-0.dll"
   File "${PREFIX}/bin/libvorbisfile-3.dll"
   File "${PREFIX}/bin/libwavpack-1.dll"
+  File "${PREFIX}/bin/libwinpthread-1.dll"
   File "${PREFIX}/bin/glib-compile-schemas.exe"
   File "${PREFIX}/bin/gspawn-win32-helper.exe"
+  File "${PREFIX}/bin/gtk-update-icon-cache.exe"
   File "${PREFIX}/bin/pango-querymodules.exe"
   File "${PREFIX}/bin/zlib1.dll"
 
@@ -215,25 +217,15 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   SetOutPath "$INSTDIR\etc\gtk-3.0"
   FileOpen $0 settings.ini w
   FileWrite $0 "gtk-theme-name = $\"win32$\" $\r$\n"
-  FileWrite $0 "gtk-icon-theme-name = $\"hicolor$\" $\r$\n"
   FileWrite $0 "gtk-toolbar-style = GTK_TOOLBAR_ICONS$\r$\n"
   FileClose $0
 
   SetOutPath "$INSTDIR\share\icons\hicolor"
   File "/usr/share/icons/hicolor/index.theme"
 
-  SetOutPath "$INSTDIR\share\icons\hicolor\8x8\emblems"
-  File "/usr/share/icons/gnome/8x8/emblems/emblem-unreadable.png"
-  SetOutPath "$INSTDIR\share\icons\hicolor\16x16\actions"
-  File "/usr/share/icons/gnome/16x16/actions/insert-image.png"
-  File "/usr/share/icons/gnome/16x16/actions/insert-text.png"
-  File "/usr/share/icons/gnome/16x16/devices/media-optical-cd-audio.png"
-  SetOutPath "$INSTDIR\share\icons\hicolor\16x16\mimetypes"
-  File "/usr/share/icons/gnome/16x16/mimetypes/audio-x-generic.png"
-  SetOutPath "$INSTDIR\share\icons\hicolor\16x16\places"
-  File "/usr/share/icons/gnome/16x16/places/folder.png"
-  SetOutPath "$INSTDIR\share\icons\hicolor\16x16\status"
-  File "/usr/share/icons/gnome/16x16/status/folder-open.png"
+  SetOutPath "$INSTDIR\share\icons"
+  File /r "/usr/share/icons/Adwaita"
+
   SetOutPath "$INSTDIR\share\icons\hicolor\32x32\apps"
   File "${DESTDIR}${PREFIX}/share/icons/hicolor/32x32/apps/easytag.png"
   SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps"
@@ -249,6 +241,8 @@ Section "Core ${PRODUCT_NAME} Files" SecProgram
   SetOutPath "$INSTDIR"
   nsExec::ExecToLog '"$0" /C bin\pango-querymodules.exe > etc\pango\pango.modules'
   nsExec::ExecToLog '"$0" /C bin\glib-compile-schemas.exe share\glib-2.0\schemas'
+  nsExec::ExecToLog '"$0" /C bin\gtk-update-icon-cache.exe share\icons\Adwaita'
+  nsExec::ExecToLog '"$0" /C bin\gtk-update-icon-cache.exe share\icons\hicolor'
 
   ; FIXME: ChangeLog should come from the dist dir, otherwise it does not
   ; contain the generated changelog.
@@ -401,8 +395,10 @@ Section Uninstall
 
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
   Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
+  Delete /rebootok "$INSTDIR\bin\gtk-update-icon-cache.exe"
   Delete /rebootok "$INSTDIR\bin\gspawn-win32-helper.exe"
   Delete /rebootok "$INSTDIR\bin\glib-compile-schemas.exe"
+  Delete /rebootok "$INSTDIR\bin\libwinpthread-1.dll"
   Delete /rebootok "$INSTDIR\bin\libwavpack-1.dll"
   Delete /rebootok "$INSTDIR\bin\libvorbisfile-3.dll"
   Delete /rebootok "$INSTDIR\bin\libvorbis-0.dll"
diff --git a/help/C/file-rename.page b/help/C/file-rename.page
index 923198a..9a08fc0 100644
--- a/help/C/file-rename.page
+++ b/help/C/file-rename.page
@@ -27,8 +27,11 @@
       rename in the file view.</p>
     </item>
     <item>
-      <p>Select <guiseq><gui style="menu">Scanner</gui>
-      <gui style="menuitem">Rename Files and Directories…</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">View</gui>
+      <gui style="menuitem">Show Scanner</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the <gui>Rename File and Directory</gui> scanner.</p>
     </item>
     <item>
       <p>Using the <gui xref="format-specifier">Legend</gui>, type in the
@@ -38,12 +41,11 @@
       into the renaming field.</p>
     </item>
     <item>
-      <p>To apply the changes to all files, select
-      <guiseq><gui style="menu">File</gui>
-      <gui style="menuitem">Scan Files…</gui></guiseq>.</p>
+      <p>To apply the changes to the selected files, click
+      <gui style="button">Scan Files</gui>.</p>
     </item>
     <item>
-      <p>Close the <gui style="dialog">Tag and Filename scan</gui> dialog.</p>
+      <p>Close the <gui style="dialog">Tag and Filename Scan</gui> dialog.</p>
     </item>
     <item>
       <p>To save the applied changes, select
diff --git a/help/C/scanner.page b/help/C/scanner.page
index e860d5f..549a02e 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -40,7 +40,7 @@
 
   <p>For example, if you keep your audio files using the
   <file>artist/album/01 track title.flac</file> directory structure and
-  filenames, use the <input>%a/%b/%t %n</input> <em>format string</em> to
+  filenames, use the <input>%a/%b/%n %t</input> <em>format string</em> to
   extract the track number and title from the filename, the album title from
   the parent directory and the artist from the grandparent directory.</p>
 
@@ -58,7 +58,7 @@
   the directory where the file is currently located.</p>
 
   <p>For example, if you have a tagged file inside the <file>Music</file>
-  directory, you can use the <input>%a/%b/%t %n</input> <em>format string</em>,
+  directory, you can use the <input>%a/%b/%n %t</input> <em>format string</em>,
   it will create the <file>Music/artist/album/01 track title.flac</file> file
   structure and filename. You will see a preview of the naming scheme below
   your specified format string.</p>
diff --git a/help/Makefile.am b/help/Makefile.am
index d11092d..1bc5dee 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -25,4 +25,4 @@ HELP_FILES = \
 HELP_MEDIA = \
 	media/icon.png
 
-HELP_LINGUAS = el
+HELP_LINGUAS = el es
diff --git a/help/Makefile.in b/help/Makefile.in
index 58c412c..bae0194 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -280,7 +280,7 @@ HELP_FILES = \
 HELP_MEDIA = \
 	media/icon.png
 
-HELP_LINGUAS = el
+HELP_LINGUAS = el es
 all: all-am
 
 .SUFFIXES:
diff --git a/help/el/file-rename.page b/help/el/file-rename.page
index 893bcde..64c3d7b 100644
--- a/help/el/file-rename.page
+++ b/help/el/file-rename.page
@@ -30,16 +30,21 @@
       <p><link xref="file-select">Επιλέξτε τα αρχεία</link> που θέλετε να μετονομάσετε στην προβολή αρχείων.</p>
     </item>
     <item>
-      <p>Επιλέξτε <guiseq><gui style="menu">Σαρωτής</gui> <gui style="menuitem">Μετονομασία αρχείων και καταλόγων…</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">View</gui>
+      <gui style="menuitem">Show Scanner</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the <gui>Rename File and Directory</gui> scanner.</p>
     </item>
     <item>
       <p>Χρησιμοποιώντας το <gui xref="format-specifier">υπόμνημα</gui>, πληκτρολογήστε στη διάρθρωση που θα θέλατε να χρησιμοποιήσετε την ονομασία του αρχείου. Για παράδειγμα, αν θέλετε τα αρχεία σας να ονομαστούν <file>[καλλιτέχνης] - [τίτλος]. [επέκταση]</file>, εισάγετε <input>%a - %t</input> στο πεδίο μετονομασίας.</p>
     </item>
     <item>
-      <p>Για να εφαρμόσετε τις αλλαγές σε όλα τα αρχεία, επιλέξτε <guiseq><gui style="menu">Αρχείο</gui> <gui style="menuitem">Σάρωση αρχείων…</gui></guiseq>.</p>
+      <p>To apply the changes to the selected files, click
+      <gui style="button">Scan Files</gui>.</p>
     </item>
     <item>
-      <p>Κλείστε τον διάλογο <gui style="dialog">Ετικέτες και σάρωση ονόματος αρχείου</gui>.</p>
+      <p>Close the <gui style="dialog">Tag and Filename Scan</gui> dialog.</p>
     </item>
     <item>
       <p>Για να αποθηκεύσετε τις εφαρμοζόμενες αλλαγές, επιλέξτε <guiseq><gui style="menu">Αρχείο</gui> <gui style="menuitem">Αποθήκευση αρχείων</gui></guiseq>.</p>
diff --git a/help/el/scanner.page b/help/el/scanner.page
index c7238e8..41c524d 100644
--- a/help/el/scanner.page
+++ b/help/el/scanner.page
@@ -33,7 +33,11 @@
 
   <p>Χρησιμοποιήστε τα <em xref="format-specifier">προσδιοριστικά μορφής</em> και <em>διαχωριστικών</em> για να διαιρέσετε το όνομα του αρχείου και των γονικών καταλόγων σε διαφορετικά πεδία ετικετών. Τα <em>προσδιοριστικά μορφής</em>, όπως <input>%t</input> για τίτλο κομματιού, που χρησιμοποιούνται για να δείξουν τα διαφορετικά πεδία ετικετών, καταχωρίζονται στο <gui>Υπόμνημα</gui>. Τα <em>Διαχωριστικά</em> μπορούν να είναι οποιοδήποτε μέρος του ονόματος του αρχείου ή των γονικών καταλόγων. Χρησιμοποιήστε <key>/</key> για να προσθέσετε το <em>διαχωριστικό</em> για έναν γονικό κατάλογο.</p>
 
-  <p>Για παράδειγμα, αν κρατήσετε τα αρχεία ήχου σας χρησιμοποιώντας τη δομή καταλόγου και τα ονόματα αρχείων του <file>artist/album/01 track title.flac</file>, χρησιμοποιήστε το <input>%a/%b/%t %n</input> της <em>συμβολοσειράς μορφής</em> για να εξάγετε τον αριθμό κομματιού και τον τίτλο από το όνομα του αρχείου, τον τίτλο δίσκου από τον γονικό κατάλογο και τον καλλιτέχνη από τον προγονικό κατάλογο.</p>
+  <p>For example, if you keep your audio files using the
+  <file>artist/album/01 track title.flac</file> directory structure and
+  filenames, use the <input>%a/%b/%n %t</input> <em>format string</em> to
+  extract the track number and title from the filename, the album title from
+  the parent directory and the artist from the grandparent directory.</p>
 
   <p>Συμπληρώστε τα πεδία ετικετών για τα επιλεγμένα αρχεία χρησιμοποιώντας το πλήκτρο <gui style="button">Σάρωση αρχείων</gui>.</p>
 
@@ -44,7 +48,11 @@
 
   <p>Το <gui xref="file-rename">Μετονομασία αρχείου και καταλόγου</gui> μπορεί να χρησιμοποιηθεί για να δημιουργήσετε μια ιεραρχία καταλόγου και να ενημερώσετε τα ονόματα αρχείων χρησιμοποιώντας τα συμπληρωμένα πεδία ετικέτας. Αν οριστεί μια νέα ιεραρχία καταλόγων, θα δημιουργηθεί μέσα στον κατάλογο όπου είναι προς το παρόν τοποθετημένο το αρχείο.</p>
 
-  <p>Για παράδειγμα, αν έχετε ένα αρχείο με ετικέτα μέσα στον κατάλογο <file>μουσική</file>, μπορείτε να χρησιμοποιήσετε το <input>%a/%b/%t %n</input> της <em>συμβολοσειράς μορφής</em>, που θα δημιουργήσει τη δομή αρχείου και το όνομα αρχείου <file>Music/artist/album/01 track title.flac</file>. Θα δείτε μια προεπισκόπηση του σχήματος ονομασίας κάτω από την καθορισμένη συμβολοσειρά μορφής.</p>
+  <p>For example, if you have a tagged file inside the <file>Music</file>
+  directory, you can use the <input>%a/%b/%n %t</input> <em>format string</em>,
+  it will create the <file>Music/artist/album/01 track title.flac</file> file
+  structure and filename. You will see a preview of the naming scheme below
+  your specified format string.</p>
 
   <p>Για να προετοιμάστε τα αρχεία για μετακίνηση και μετονομασία, πατήστε το πλήκτρο <gui style="button">Σάρωση αρχείων</gui>.</p>
 
diff --git a/help/C/cddb-search.page b/help/es/cddb-search.page
similarity index 86%
copy from help/C/cddb-search.page
copy to help/es/cddb-search.page
index 52cb93f..dddeafe 100644
--- a/help/C/cddb-search.page
+++ b/help/es/cddb-search.page
@@ -1,23 +1,21 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="guide"
-      id="cddb-search">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="cddb-search" xml:lang="es">
 
   <info>
     <link type="guide" style="2column" xref="index#main"/>
-    <revision pkgversion="2.1.9" date="2013-10-07" status="review" />
+    <revision pkgversion="2.1.9" date="2013-10-07" status="review"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc>Fill tags using information from a CD database</desc>
+    <desc>Rellenar las etiquetas usando información de una base de datos de CD</desc>
   </info>
 
-  <title>Search CDDB</title>
+  <title>Buscar CDDB</title>
 
   <p>If your music is organized by album, <app>EasyTAG</app> can search online
   databases using the <sys>CDDB</sys> protocol and automatically fill in
diff --git a/help/es/es.po b/help/es/es.po
new file mode 100644
index 0000000..c131439
--- /dev/null
+++ b/help/es/es.po
@@ -0,0 +1,1077 @@
+# Spanish translation for easytag.
+# Copyright (C) 2014 easytag's COPYRIGHT HOLDER
+# This file is distributed under the same license as the easytag package.
+# Daniel Mustieles <daniel.mustieles at gmail.com>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: easytag master\n"
+"POT-Creation-Date: 2014-07-04 10:40+0000\n"
+"PO-Revision-Date: 2014-07-04 12:47+0200\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles at gmail.com>\n"
+"Language-Team: Español; Castellano <gnome-es-list at gnome.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Daniel Mustieles, <daniel.mustieles at gmail.com>"
+
+#. (itstool) path: credit/name
+#: C/cddb-search.page:11 C/file-rename.page:10 C/file-select.page:11
+#: C/format-specifier.page:11 C/image-delete.page:13 C/image-export.page:13
+#: C/image.page:15 C/index.page:11 C/introduction.page:12
+#: C/keyboard-shortcuts.page:11 C/playlist-generate.page:11
+#: C/problems-ogg-split.page:17 C/scanner.page:11 C/starting.page:10
+#: C/tag-field.page:14 C/tag.page:13
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#. (itstool) path: info/desc
+#: C/cddb-search.page:17
+msgid "Fill tags using information from a CD database"
+msgstr "Rellenar las etiquetas usando información de una base de datos de CD"
+
+#. (itstool) path: page/title
+#: C/cddb-search.page:20
+msgid "Search CDDB"
+msgstr "Buscar CDDB"
+
+#. (itstool) path: page/p
+#: C/cddb-search.page:22
+msgid ""
+"If your music is organized by album, <app>EasyTAG</app> can search online "
+"databases using the <sys>CDDB</sys> protocol and automatically fill in "
+"several tag fields."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:28
+msgid ""
+"<link xref=\"file-select\">Select all the files</link> in the album that you "
+"want to search for. The ordering of the files must match the track order on "
+"the album."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:33
+msgid ""
+"Select <guiseq><gui style=\"menu\">Miscellaneous</gui> <gui style=\"menuitem"
+"\">CDDB Search…</gui></guiseq>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:37
+msgid ""
+"Press <gui style=\"button\">Find</gui> and wait for the search to finish."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:43
+msgid ""
+"Select an album from the list of results, and the track information will be "
+"shown to the right. If the album is not the one that you wanted, try "
+"selecting another result in the list."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:46
+msgid ""
+"If there are no results which match the tracks that you selected, select "
+"<gui style=\"tab\">Manual Search</gui> and enter the name of the album in "
+"the search field. Press <gui style=\"button\">Find</gui> and wait for the "
+"search to finish, and check the results again to see if you can find an "
+"album which matches the tracks that you selected."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:53
+msgid ""
+"Choose the tag fields to fill in by selecting either <gui style=\"checkbox"
+"\">All</gui> or a combination of <gui style=\"checkbox\">Filename</gui>, "
+"<gui style=\"checkbox\">Title</gui>, <gui style=\"checkbox\">Artist</gui>, "
+"<gui style=\"checkbox\">Album</gui>, <gui style=\"checkbox\">Year</gui>, "
+"<gui style=\"checkbox\">Track #</gui>, <gui style=\"checkbox\"># Tracks</"
+"gui> and <gui style=\"checkbox\">Genre</gui>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/cddb-search.page:64
+msgid ""
+"To fill in the tags of the selected files using the details in the search "
+"result, press <gui style=\"button\">Apply</gui>."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/cddb-search.page:69
+msgid ""
+"If you wish to tag only specific files, you can change your selection after "
+"the search is complete."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/file-rename.page:16
+msgid "Change the file names using tags"
+msgstr "Cambiar los nombres de los archivos usando etiquetas"
+
+#. (itstool) path: page/title
+#: C/file-rename.page:19
+msgid "Rename files"
+msgstr "Renombrar archivos"
+
+#. (itstool) path: page/p
+#: C/file-rename.page:21
+msgid ""
+"You can rename your music files using the tags from within <app>EasyTAG</"
+"app>:"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/file-rename.page:26
+msgid ""
+"<link xref=\"file-select\">Select the files</link> that you wish to rename "
+"in the file view."
+msgstr ""
+"<link xref=\"file-select\">Seleccione los archivos</link> que quiere "
+"renombrar en la vista de archivos."
+
+#. (itstool) path: item/p
+#: C/file-rename.page:30
+msgid ""
+"Select <guiseq><gui style=\"menu\">Scanner</gui> <gui style=\"menuitem"
+"\">Rename Files and Directories…</gui></guiseq>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/file-rename.page:34
+msgid ""
+"Using the <gui xref=\"format-specifier\">Legend</gui>, type in the structure "
+"that you would like to use for the file naming. For example, if you wish "
+"your files to be named <file>[artist] - [title].[extension]</file>, "
+"enter <input>%a - %t</input> into the renaming field."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/file-rename.page:41
+msgid ""
+"To apply the changes to all files, select <guiseq><gui style=\"menu\">File</"
+"gui> <gui style=\"menuitem\">Scan Files…</gui></guiseq>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/file-rename.page:46
+msgid "Close the <gui style=\"dialog\">Tag and Filename scan</gui> dialog."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/file-rename.page:49
+msgid ""
+"To save the applied changes, select <guiseq><gui style=\"menu\">File</gui> "
+"<gui style=\"menuitem\">Save Files</gui></guiseq>."
+msgstr ""
+
+#. (itstool) path: note/p
+#: C/file-rename.page:56
+msgid "If you close the application without saving, your changes will be lost."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/file-select.page:17
+msgid "Choose files in the file list"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/file-select.page:20
+msgid "Select files"
+msgstr "Seleccionar archivos"
+
+#. (itstool) path: page/p
+#: C/file-select.page:22
+msgid ""
+"<app>EasyTAG</app> has several features which operate on the files that are "
+"currently selected in the file list. To select multiple files, you can "
+"either hold down <key>Ctrl</key> while you click on the files that you wish "
+"to select or you can select a file then hold down <key>Shift</key> and click "
+"another file to select all the files between the two, including the first "
+"and last file."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/format-specifier.page:17
+msgid "What is a format-specifier and which ones can I use?"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/format-specifier.page:21
+msgid "Format specifiers"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/format-specifier.page:23
+msgid ""
+"<em>Format specifiers</em> can be used to split a file name into tags and to "
+"name a file or playlist based on existing tags using <link xref=\"scanner"
+"\">the scanner</link>."
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:31
+msgid "Format specifier"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:34
+msgid "Corresponding tag field"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:41
+msgid "%a"
+msgstr "%a"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:44
+msgid ""
+"Artist: this is the artist or artists who created the track, this field may "
+"contact a featured artist as well as the album artist"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:50
+msgid "%z"
+msgstr "%z"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:53
+msgid "Album artist"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:58
+msgid "%b"
+msgstr "%b"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:61
+msgid "Album title"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:66
+msgid "%c"
+msgstr "%c"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:69
+msgid "Comment: this is the free-form comment field"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:74
+msgid "%p"
+msgstr "%p"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:77
+msgid "Composer: this is the creator of the track"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:82
+msgid "%r"
+msgstr "%r"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:85
+msgid ""
+"Copyright holder: this is usually the artist, but it can also be the record "
+"label"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:91
+msgid "%d"
+msgstr "%d"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:94
+msgid "Disc number"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:99
+msgid "%e"
+msgstr "%e"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:102
+msgid ""
+"Encoded by: this is usually the person who encoded the file, but the field "
+"is also used for the application that was used to encode the file"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:109
+msgid "%g"
+msgstr "%g"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:112
+msgid "Genre"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:117
+msgid "%i"
+msgstr "%i"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:120
+msgid ""
+"Ignored: this format specifier can only be used in <gui>Fill Tag</gui> to "
+"specify parts of the file name which should be ignored"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:127
+msgid "%l"
+msgstr "%l"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:130
+msgid "Number of tracks: the total number of tracks on the medium"
+msgstr "Number of tracks: the total number of tracks on the medium"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:135
+msgid "%o"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:138
+msgid "Original artist"
+msgstr "Artista original"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:143
+msgid "%n"
+msgstr "%n"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:146
+msgid "Track number"
+msgstr "Número de pista"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:151
+msgid "%t"
+msgstr "%t"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:154
+msgid "Track title"
+msgstr "Título de la pista"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:159
+msgid "%u"
+msgstr "%u"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:162
+msgid "URL"
+msgstr "URL"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:167
+msgid "%x"
+msgstr "%x"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:170
+msgid "Number of discs"
+msgstr "Número de discos"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:175
+msgid "%y"
+msgstr "%y"
+
+#. (itstool) path: td/p
+#: C/format-specifier.page:178
+msgid "Year of recording, sometimes the date of release is used instead"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/image-delete.page:19
+msgid "Delete an image"
+msgstr "Eliminar una imagen"
+
+#. (itstool) path: page/p
+#: C/image-delete.page:21
+msgid ""
+"To delete an image from a tag, select it and press the <gui style=\"button"
+"\">Remove selected images from the tag</gui> button."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image-delete.page:24
+msgid ""
+"To delete more than one image, select those images before deleting them."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image-delete.page:27
+msgid ""
+"It is also possible to delete all images from more than one file. To do "
+"this, select the files from which you want to delete the images, delete all "
+"images from the <gui style=\"tab\">Image</gui> tab, then press the <gui "
+"style=\"button\">Tag selected files with these images</gui> button."
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/image-export.page:19
+msgid "Save an image"
+msgstr "Guardar una imagen"
+
+#. (itstool) path: page/p
+#: C/image-export.page:21
+msgid ""
+"If the file is already tagged with an image, you can export the image from "
+"the tag by selecting it and pressing <gui style=\"button\">Save the selected "
+"images to files</gui> button. The default filename will be the image "
+"description."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image-export.page:26
+msgid ""
+"To export a number of images, select these images, then press the <gui style="
+"\"button\">Save the selected images to files</gui> button."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/image.page:19
+msgid "Add images, such as cover art to the tag"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/image.page:23
+msgid "Add an image to a file"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image.page:25
+msgid ""
+"Most audio file formats support an <sys>image</sys> tag field which can be "
+"used to add cover art and other related images to the audio file."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image.page:28
+msgid ""
+"To add an image to the file, select the file, open the <gui style=\"tab"
+"\">Images</gui> tab and press the <gui style=\"button\">Add images to the "
+"tag</gui> button. Select the image and confirm your selection."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image.page:33
+msgid ""
+"Once the image is uploaded, it will be automatically marked as a front cover "
+"and the description will be the filename. To change the <gui>type</gui> and "
+"<gui>description</gui>, press the <gui style=\"button\">Edit image "
+"properties</gui> button. Once you have made the changes, press <gui style="
+"\"button\">OK</gui> to apply the changes."
+msgstr ""
+
+#. (itstool) path: note/p
+#: C/image.page:40
+msgid "Your changes will not be saved automatically."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image.page:43
+msgid ""
+"You can tag multiple files with the same image by selecting them in the list "
+"of files, then selecting the image and pressing the <gui style=\"button"
+"\">Tag selected files with these images</gui> button. You will need to save "
+"these changes to write them to the files."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/image.page:48
+msgid ""
+"You can work with more than one image at a time by selecting those images "
+"before you edit, apply, save to file or delete them."
+msgstr ""
+
+#. (itstool) path: info/title
+#: C/index.page:17
+msgctxt "link"
+msgid "EasyTAG"
+msgstr "EasyTAG"
+
+#. (itstool) path: info/title
+#: C/index.page:18
+msgctxt "text"
+msgid "EasyTAG"
+msgstr "EasyTAG"
+
+#. (itstool) path: page/title
+#: C/index.page:22
+msgid "<_:media-1/> EasyTAG"
+msgstr "<_:media-1/> EasyTAG"
+
+#. (itstool) path: section/title
+#: C/index.page:28
+msgid "Features"
+msgstr "Características"
+
+#. (itstool) path: section/title
+#: C/index.page:32
+msgid "Tags"
+msgstr "Etiquetas"
+
+#. (itstool) path: section/title
+#: C/index.page:36
+msgid "The image tag field"
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/index.page:44
+msgid "Common problems and questions"
+msgstr "Problemas comunes y preguntas"
+
+#. (itstool) path: page/title
+#: C/introduction.page:21
+msgid "Introduction"
+msgstr "Introducción"
+
+#. (itstool) path: page/p
+#: C/introduction.page:23
+msgid ""
+"<app>EasyTAG</app> is a comprehensive tag editor for FLAC, Monkey's Audio, "
+"MP2, MP3, MP4/AAC, MusePack, Ogg Opus, Ogg Speex, Ogg Vorbis and WavPack "
+"audio files."
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/keyboard-shortcuts.page:20
+msgid "Keyboard shortcuts"
+msgstr "Atajos del teclado"
+
+#. (itstool) path: page/p
+#: C/keyboard-shortcuts.page:22
+msgid ""
+"<app>EasyTAG</app> has a number of keyboard shortcuts, most of which are "
+"listed in the menus. Here are some which are especially useful:"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:29
+msgid "Action"
+msgstr "Acción"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:32
+msgid "Shortcut"
+msgstr "Atajo"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:39
+msgid "Apply tag to selected files"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:42
+msgid "<keyseq><key>Ctrl</key><key>Return</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>Intro</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:47
+msgid "Search all files, including filenames and tags"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:50
+msgid "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+msgstr "<keyseq><key>Ctrl</key><key>F</key></keyseq>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:55
+msgid "Go to previous file while keeping focus on the same tag field"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:58
+msgid "<key>Page Up</key>"
+msgstr "<key>Re Pág</key>"
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:63
+msgid "Go to next file while keeping focus on the same tag field"
+msgstr ""
+
+#. (itstool) path: td/p
+#: C/keyboard-shortcuts.page:66
+msgid "<key>Page Down</key>"
+msgstr "<key>Av Pág</key>"
+
+#. (itstool) path: p/link
+#: C/legal.xml:4
+msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
+msgstr "Creative Commons de Atribución-Compartir Igual 3.0 sin soporte"
+
+#. (itstool) path: license/p
+#: C/legal.xml:3
+msgid "This work is licensed under a <_:link-1/>."
+msgstr "Este trabajo está licenciado bajo la <_:link-1/>."
+
+#. (itstool) path: info/desc
+#: C/playlist-generate.page:17
+msgid "Generate a playlist from the file list"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/playlist-generate.page:20
+msgid "Create a playlist"
+msgstr "Crear una lista de reproducción"
+
+#. (itstool) path: page/p
+#: C/playlist-generate.page:22
+msgid ""
+"You can create a M3U playlist for use with a music player based on the list "
+"of files shown in <app>EasyTAG</app>:"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:27
+msgid ""
+"<link xref=\"file-select\">Select the files</link> that you wish to be in "
+"the playlist in the file list."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:31
+msgid ""
+"Select <guiseq><gui style=\"menu\">Miscellaneous</gui> <gui style=\"menuitem"
+"\">Generate Playlist…</gui></guiseq>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:35
+msgid ""
+"Select <gui style=\"radiobutton\">Use mask</gui> and enter a mask, using "
+"<link xref=\"format-specifier\">format specifiers</link>, or select <gui "
+"style=\"radiobutton\">Use directory name</gui> to name the playlist after "
+"the directory which is selected in the <gui style=\"group\">Browser</gui>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:42
+msgid ""
+"Select <gui style=\"checkbox\">Include only the selected files</gui> to use "
+"the files which are selected in the file list when generating the playlist. "
+"Deselect it to include all the displayed files in the playlist."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:48
+msgid ""
+"Select <gui style=\"radiobutton\">Use relative path for files in playlist</"
+"gui> unless you only plan to use the playlist on the same computer and you "
+"do not plan to move the audio files, in which case you can select <gui style="
+"\"radiobutton\">Use full path for files in playlist</gui>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:55
+msgid ""
+"Select <gui style=\"checkbox\">Create playlist in the parent directory</gui> "
+"if you want to save the playlist in the parent of the directory selected in "
+"the <gui style=\"group\">Browser</gui>. Otherwise, the playlist will be "
+"saved in the directory selected in the <gui style=\"group\">Browser</gui>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:63
+msgid ""
+"If you are creating a playlist for use on a Windows computer, or on a "
+"<sys>NTFS</sys> or <sys>FAT</sys> file system, select <gui style=\"checkbox"
+"\">Use DOS directory separator</gui>."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:68
+msgid ""
+"Select <gui style=\"radiobutton\">Write only list of files</gui> to create a "
+"playlist which only contains a list of files. Select <gui style=\"radiobutton"
+"\">Write info using filename</gui> to also write extended information, "
+"including the duration of the audio file, to the playlist. Select <gui style="
+"\"radiobutton\">Write info using</gui> and enter a mask, using format "
+"specifiers, to write custom extended information to the playlist."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/playlist-generate.page:77
+msgid "To generate the playlist, select <gui style=\"button\">Save</gui>."
+msgstr ""
+
+#. (itstool) path: credit/name
+#: C/problems-id3.page:13 C/problems-ogg-split.page:13
+msgid "David King"
+msgstr "David King"
+
+#. (itstool) path: info/desc
+#: C/problems-id3.page:17
+msgid "Fix ID3 tags that show up blank or incorrect tags in other applications"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/problems-id3.page:21
+msgid "MP3 tags not showing correctly"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-id3.page:23
+msgid ""
+"<em>ID3</em> tags, which are used for MP3 files, can be of one of several "
+"different versions. <app>EasyTAG</app> supports ID3v2.4, ID3v2.3 and "
+"ID3v1.1. The default version in <app>EasyTAG</app> is ID3v2.4, which has the "
+"most features and is most efficient."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-id3.page:28
+msgid ""
+"Most applications support the most recent version of the ID3 standard: "
+"ID3v2.4."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-id3.page:31
+msgid ""
+"Some applications and devices may support only ID3v2.3 and ID3v1.1 tags, and "
+"a few may support only ID3v1.1 tags. If another application or a device has "
+"a problem reading tags from your files, you should try changing the ID3 tag "
+"version settings in the preferences:"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-id3.page:38 C/problems-ogg-split.page:45
+msgid ""
+"Select <guiseq style=\"menuitem\"><gui style=\"menu\">Edit</gui><gui style="
+"\"menuitem\">Preferences</gui></guiseq>"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-id3.page:42
+msgid "Select the <gui style=\"tab\">ID3 Tag Settings</gui> tab"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-id3.page:45
+msgid ""
+"In the <gui style=\"group\">ID3v2 tags</gui> section, choose the "
+"<gui>ID3v2.3</gui> setting in the <gui>Version</gui> drop-down lid to "
+"improve compatibility with other systems capable of reading ID3v2 tags"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-id3.page:50
+msgid ""
+"Make sure that <gui style=\"check\">Write ID3v1.x tag</gui> is checked in "
+"the <gui style=\"group\">ID3v1 tags</gui> section"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-id3.page:54 C/problems-ogg-split.page:56
+msgid "Click <gui style=\"button\">OK</gui> to save the settings"
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/problems-ogg-split.page:21
+msgid ""
+"Split a single tag field into multiple fields when you save Ogg and FLAC "
+"files"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/problems-ogg-split.page:25
+msgid "Split tag fields when saving"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-ogg-split.page:27
+msgid ""
+"In Ogg and FLAC files, it is possible to have more than one <link xref=\"tag"
+"\">tag field</link> of each type. For example, if two artists performed a "
+"song, there can be two artist fields in the tag, one for each artist. "
+"<app>EasyTAG</app> automatically reads the extra fields, combining them "
+"together and showing them as if they were a single field."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-ogg-split.page:33
+msgid ""
+"Many applications do not read the multi-value field correctly, so the "
+"default configuration is to save using a single field per entry. If the "
+"application that you are using supports multiple field of one type, you can "
+"configure EasyTAG to split fields when you save the file. Fields will "
+"automatically be split whenever \" - \" occurs in the field. For example, in "
+"the field \"David Bowie - Queen\", two fields would be saved: \"David Bowie"
+"\" and \"Queen\"."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/problems-ogg-split.page:41
+msgid "To split fields when you save the files:"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-ogg-split.page:49
+msgid "Select the <gui style=\"tab\">Tag Settings</gui> tab"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/problems-ogg-split.page:52
+msgid ""
+"In <gui style=\"group\">Tag Splitting</gui> section, check the fields that "
+"you want to be split into multiple fields when saving"
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/scanner.page:17
+msgid "Update tags automatically."
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/scanner.page:21
+msgid "The <gui>Scanner</gui>"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/scanner.page:23
+msgid ""
+"The scanner can be used to fill in fields based on the filename, rename a "
+"file and create a new directory based on the filled fields, and process the "
+"text in fields and the filename."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/scanner.page:28
+msgid "Fill fields from a filename and directory structure"
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:30
+msgid ""
+"<gui>Fill Tag</gui> can be used to fill in tag fields based on the filename "
+"and its parent directories."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:33
+msgid ""
+"Use <em xref=\"format-specifier\">format specifiers</em> and <em>separators</"
+"em> to split the filename and parent directories into different tag fields. "
+"The <em>format specifiers</em>, such as <input>%t</input> for track title, "
+"which are used to indicate the different tag fields, are listed in the "
+"<gui>Legend</gui>. <em>Separators</em> can be any part of the filename or "
+"the parent directories. Use <key>/</key> to add the <em>separator</em> for a "
+"parent directory."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:41
+msgid ""
+"For example, if you keep your audio files using the <file>artist/"
+"album/01 track title.flac</file> directory structure and filenames, use the "
+"<input>%a/%b/%t %n</input> <em>format string</em> to extract the track "
+"number and title from the filename, the album title from the parent "
+"directory and the artist from the grandparent directory."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:47
+msgid ""
+"Fill the tag fields for the selected files using the <gui style=\"button"
+"\">Scan Files</gui> button."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/scanner.page:53
+msgid "Rename files and create new directories"
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:55
+msgid ""
+"<gui xref=\"file-rename\">Rename File and Directory</gui> can be used to "
+"create a directory hierarchy and update filenames using the filled tag "
+"fields. If a new directory hierarchy is specified, it will be created inside "
+"the directory where the file is currently located."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:60
+msgid ""
+"For example, if you have a tagged file inside the <file>Music</file> "
+"directory, you can use the <input>%a/%b/%t %n</input> <em>format string</"
+"em>, it will create the <file>Music/artist/album/01 track title.flac</file> "
+"file structure and filename. You will see a preview of the naming scheme "
+"below your specified format string."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:66
+msgid ""
+"To prepare the files for moving and renaming, press the <gui style=\"button"
+"\">Scan Files</gui> button."
+msgstr ""
+
+#. (itstool) path: section/title
+#: C/scanner.page:72
+msgid "Bulk process tag fields and filename"
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:74
+msgid ""
+"<gui>Process Fields</gui> is a sophisticated find and replace feature which "
+"allows you to select which tag fields to process. It also allows for the "
+"filename to be processed as well."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:78
+msgid ""
+"You can <gui>Convert</gui> characters for a simple find and replace, change "
+"capitalization and add or remove spaces."
+msgstr ""
+
+#. (itstool) path: section/p
+#: C/scanner.page:81
+msgid ""
+"Use the <gui>Select fields</gui> buttons to specify which fields to change. "
+"You can also select or deselect all fields and invert your selection."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/starting.page:16
+msgid "Using <app>EasyTAG</app> for the first time"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/starting.page:19
+msgid "Start using <app>EasyTAG</app>"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/starting.page:21
+msgid ""
+"When you start <app>EasyTAG</app> for the first time, it will search your "
+"<file>Music</file> directory or your home directory for audio files. If you "
+"wish to skip the search, press the <gui style=\"button\">Stop</gui> button."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/starting.page:25
+msgid ""
+"<app>EasyTAG</app> may apply some automatic corrections to some of your "
+"music files. These files will be highlighted in bold. These are normally "
+"updates to the tag metadata containers and will not be applied until you "
+"save the changes."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/starting.page:30
+msgid ""
+"To save these changes, select all the files that have been affected and "
+"press <keyseq><key>Ctrl</key><key>S</key></keyseq>. It is not possible to "
+"undo the automatic changes but they will not be saved unless you select the "
+"file and save it. You can disable some of the automatic updates in the <gui "
+"style=\"tab\">ID3 Tag Settings</gui> tab in the <gui style=\"dialog"
+"\">Preferences</gui> dialog."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/tag-field.page:18
+msgid "Add text tags to a file"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/tag-field.page:22
+msgid "Tag a file"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/tag-field.page:24
+msgid ""
+"Audio files can support a number of different tag <em>fields</em> which "
+"depend on the file format."
+msgstr ""
+
+#. (itstool) path: steps/title
+#: C/tag-field.page:28
+msgid "Update a tag field in a file"
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/tag-field.page:30
+msgid "Select the file that you wish to tag."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/tag-field.page:33
+msgid "Update the field that you want to change in the <gui>Tag</gui> panel."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/tag-field.page:37
+msgid ""
+"Select <guiseq><gui style=\"menu\">File</gui><gui style=\"menuitem\">Save "
+"files</gui></guiseq> to save your changes to the selected file."
+msgstr ""
+
+#. (itstool) path: item/p
+#: C/tag-field.page:42
+msgid ""
+"When you are asked to <gui>Confirm Tag Writing</gui>, press <gui style="
+"\"button\">Save</gui> to save the changes."
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/tag-field.page:47
+msgid ""
+"You can tag multiple files with the same field by selecting them in the list "
+"of files and pressing the <gui>Tag selected files with this […]</gui> icon "
+"in the field that you want to tag. You will need to save these changes to "
+"write them to the files."
+msgstr ""
+
+#. (itstool) path: info/desc
+#: C/tag.page:17
+msgid "What is a tag and what are fields?"
+msgstr ""
+
+#. (itstool) path: page/title
+#: C/tag.page:21
+msgid "Audio file tags"
+msgstr ""
+
+#. (itstool) path: page/p
+#: C/tag.page:23
+msgid ""
+"An audio file can contain <em>metadata</em> — information about itself — "
+"inside a <em>tag</em>. Each tag can contain one or more <em>fields</em>, "
+"such as <gui>Title</gui> or <gui>Artist</gui>. You can edit some of these "
+"fields using <app>EasyTAG</app>. The editable fields depend on the format of "
+"the file that you want to tag."
+msgstr ""
diff --git a/help/el/el.stamp b/help/es/es.stamp
similarity index 100%
copy from help/el/el.stamp
copy to help/es/es.stamp
diff --git a/help/C/file-rename.page b/help/es/file-rename.page
similarity index 58%
copy from help/C/file-rename.page
copy to help/es/file-rename.page
index 923198a..de1188b 100644
--- a/help/C/file-rename.page
+++ b/help/es/file-rename.page
@@ -1,34 +1,35 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic" style="guide"
-      id="file-rename">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="guide" id="file-rename" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#main"/>
-    <revision pkgversion="2.1.9" date="2013-08-18" status="draft" />
+    <revision pkgversion="2.1.9" date="2013-08-18" status="draft"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email>kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc>Change the file names using tags</desc>
+    <desc>Cambiar los nombres de los archivos usando etiquetas</desc>
   </info>
 
-  <title>Rename files</title>
+  <title>Renombrar archivos</title>
 
   <p>You can rename your music files using the tags from within
   <app>EasyTAG</app>:</p>
 
   <steps>
     <item>
-      <p><link xref="file-select">Select the files</link> that you wish to
-      rename in the file view.</p>
+      <p><link xref="file-select">Seleccione los archivos</link> que quiere renombrar en la vista de archivos.</p>
     </item>
     <item>
-      <p>Select <guiseq><gui style="menu">Scanner</gui>
-      <gui style="menuitem">Rename Files and Directories…</gui></guiseq>.</p>
+      <p>Select <guiseq><gui style="menu">View</gui>
+      <gui style="menuitem">Show Scanner</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the <gui>Rename File and Directory</gui> scanner.</p>
     </item>
     <item>
       <p>Using the <gui xref="format-specifier">Legend</gui>, type in the
@@ -38,12 +39,11 @@
       into the renaming field.</p>
     </item>
     <item>
-      <p>To apply the changes to all files, select
-      <guiseq><gui style="menu">File</gui>
-      <gui style="menuitem">Scan Files…</gui></guiseq>.</p>
+      <p>To apply the changes to the selected files, click
+      <gui style="button">Scan Files</gui>.</p>
     </item>
     <item>
-      <p>Close the <gui style="dialog">Tag and Filename scan</gui> dialog.</p>
+      <p>Close the <gui style="dialog">Tag and Filename Scan</gui> dialog.</p>
     </item>
     <item>
       <p>To save the applied changes, select
diff --git a/help/C/file-select.page b/help/es/file-select.page
similarity index 71%
copy from help/C/file-select.page
copy to help/es/file-select.page
index 48fd357..c1b9c70 100644
--- a/help/C/file-select.page
+++ b/help/es/file-select.page
@@ -1,23 +1,21 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="guide"
-      id="file-select">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="file-select" xml:lang="es">
 
   <info>
     <link type="guide" style="2column" xref="index#main"/>
-    <revision pkgversion="2.1.9" date="2013-10-06" status="draft" />
+    <revision pkgversion="2.1.9" date="2013-10-06" status="draft"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <desc>Choose files in the file list</desc>
   </info>
 
-  <title>Select files</title>
+  <title>Seleccionar archivos</title>
 
   <p><app>EasyTAG</app> has several features which operate on the files that
   are currently selected in the file list. To select multiple files, you can
diff --git a/help/C/format-specifier.page b/help/es/format-specifier.page
similarity index 89%
copy from help/C/format-specifier.page
copy to help/es/format-specifier.page
index 16745ca..88828db 100644
--- a/help/C/format-specifier.page
+++ b/help/es/format-specifier.page
@@ -1,7 +1,5 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="format-specifier">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="format-specifier" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#main"/>
@@ -12,7 +10,7 @@
       <email its:translate="no">kittykat3756 at googlemail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <desc>What is a format-specifier and which ones can I use?</desc>
 
@@ -135,7 +133,7 @@
           <p>%o</p>
         </td>
         <td>
-          <p>Original artist</p>
+          <p>Artista original</p>
         </td>
       </tr>
       <tr>
@@ -143,7 +141,7 @@
           <p>%n</p>
         </td>
         <td>
-          <p>Track number</p>
+          <p>Número de pista</p>
         </td>
       </tr>
       <tr>
@@ -151,7 +149,7 @@
           <p>%t</p>
         </td>
         <td>
-          <p>Track title</p>
+          <p>Título de la pista</p>
         </td>
       </tr>
       <tr>
@@ -167,7 +165,7 @@
           <p>%x</p>
         </td>
         <td>
-          <p>Number of discs</p>
+          <p>Número de discos</p>
         </td>
       </tr>
       <tr>
diff --git a/help/C/image-delete.page b/help/es/image-delete.page
similarity index 73%
copy from help/C/image-delete.page
copy to help/es/image-delete.page
index 342bb3c..815c2f5 100644
--- a/help/C/image-delete.page
+++ b/help/es/image-delete.page
@@ -1,13 +1,11 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="task" style="task"
-      id="image-delete">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="task" style="task" id="image-delete" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#image"/>
     <revision pkgversion="2.1.9" date="2013-06-02" status="candidate"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
@@ -16,7 +14,7 @@
 
   </info>
 
-  <title>Delete an image</title>
+  <title>Eliminar una imagen</title>
 
   <p>To delete an image from a tag, select it and press the
   <gui style="button">Remove selected images from the tag</gui> button.</p>
diff --git a/help/C/image-export.page b/help/es/image-export.page
similarity index 70%
copy from help/C/image-export.page
copy to help/es/image-export.page
index 59a3342..5b48b7c 100644
--- a/help/C/image-export.page
+++ b/help/es/image-export.page
@@ -1,13 +1,11 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="task" style="task"
-      id="image-export">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="task" style="task" id="image-export" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#image"/>
     <revision pkgversion="2.1.9" date="2013-06-02" status="candidate"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
@@ -16,7 +14,7 @@
 
   </info>
 
-  <title>Save an image</title>
+  <title>Guardar una imagen</title>
 
   <p>If the file is already tagged with an image, you can export the image from
   the tag by selecting it and pressing <gui style="button">Save the selected
diff --git a/help/C/image.page b/help/es/image.page
similarity index 87%
copy from help/C/image.page
copy to help/es/image.page
index 22f5e1e..b372c0a 100644
--- a/help/C/image.page
+++ b/help/es/image.page
@@ -1,7 +1,5 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="image">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="image" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#image"/>
@@ -9,7 +7,7 @@
     <revision pkgversion="2.1.9" date="2013-05-20" status="review"/>
     <revision pkgversion="2.2.0" date="2014-04-10" status="review"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
diff --git a/help/el/index.page b/help/es/index.page
similarity index 63%
copy from help/el/index.page
copy to help/es/index.page
index 3599517..54531b1 100644
--- a/help/el/index.page
+++ b/help/es/index.page
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="task" id="index" xml:lang="el">
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" xmlns:e="http://projectmallard.org/experimental/" type="guide" style="task" id="index" xml:lang="es">
 
   <info>
     <revision pkgversion="2.1.9" date="2013-03-05" status="review"/>
@@ -14,26 +14,20 @@
     <title type="link">EasyTAG</title>
     <title type="text">EasyTAG</title>
 
-  
-    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
-      <mal:name> Δημήτρης Σπίγγος</mal:name>
-      <mal:email>dmtrs32 at gmail.com</mal:email>
-      <mal:years>2014</mal:years>
-    </mal:credit>
   </info>
 
   <title><media its:translate="no" type="image" mime="image/png" src="media/icon.png"/> EasyTAG</title>
 
   <section id="main" style="2column">
-    <title>Γνωρίσματα</title>
+    <title>Características</title>
   </section>
 
   <section id="tag" style="2column">
-    <title>Ετικέτες</title>
+    <title>Etiquetas</title>
   </section>
 
   <section id="image" style="2column">
-    <title>Το πεδίο ετικέτας εικόνας</title>
+    <title>The image tag field</title>
   </section>
 
 <!--  <section id="preferences" style="2column">
@@ -41,7 +35,7 @@
   </section>-->
 
   <section id="problems">
-    <title>Συνηθισμένα προβλήματα και ερωτήσεις</title>
+    <title>Problemas comunes y preguntas</title>
   </section>
 
 </page>
diff --git a/help/C/introduction.page b/help/es/introduction.page
similarity index 62%
copy from help/C/introduction.page
copy to help/es/introduction.page
index bf758bc..879922b 100644
--- a/help/C/introduction.page
+++ b/help/es/introduction.page
@@ -1,24 +1,22 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="guide"
-      id="introduction">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="introduction" xml:lang="es">
 
   <info>
     <link type="guide" xref="index" group="#first"/>
-    <revision pkgversion="2.1.9" date="2013-03-05" status="candidate" />
-    <revision pkgversion="2.2.0" date="2014-04-09" status="candidate" />
+    <revision pkgversion="2.1.9" date="2013-03-05" status="candidate"/>
+    <revision pkgversion="2.2.0" date="2014-04-09" status="candidate"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc></desc>
+    <desc/>
   </info>
 
-  <title>Introduction</title>
+  <title>Introducción</title>
 
   <p><app>EasyTAG</app> is a comprehensive tag editor for FLAC, Monkey's Audio,
   MP2, MP3, MP4/AAC, MusePack, Ogg Opus, Ogg Speex, Ogg Vorbis and WavPack
diff --git a/help/C/keyboard-shortcuts.page b/help/es/keyboard-shortcuts.page
similarity index 71%
copy from help/C/keyboard-shortcuts.page
copy to help/es/keyboard-shortcuts.page
index 39c4ac2..b80b24f 100644
--- a/help/C/keyboard-shortcuts.page
+++ b/help/es/keyboard-shortcuts.page
@@ -1,23 +1,21 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="guide"
-      id="keyboard-shortcuts">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="keyboard-shortcuts" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#main"/>
-    <revision pkgversion="2.1.9" date="2013-03-20" status="draft" />
+    <revision pkgversion="2.1.9" date="2013-03-20" status="draft"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email its:translate="no">kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
-    <desc></desc>
+    <desc/>
   </info>
 
-  <title>Keyboard shortcuts</title>
+  <title>Atajos del teclado</title>
 
   <p><app>EasyTAG</app> has a number of keyboard shortcuts, most of which are
   listed in the menus. Here are some which are especially useful:</p>
@@ -26,10 +24,10 @@
     <thead>
       <tr>
         <td>
-          <p>Action</p>
+          <p>Acción</p>
         </td>
         <td>
-          <p>Shortcut</p>
+          <p>Atajo</p>
         </td>
       </tr>
     </thead>
@@ -39,7 +37,7 @@
           <p>Apply tag to selected files</p>
         </td>
         <td>
-          <p><keyseq><key>Ctrl</key><key>Return</key></keyseq></p>
+          <p><keyseq><key>Ctrl</key><key>Intro</key></keyseq></p>
         </td>
       </tr>
       <tr>
@@ -55,7 +53,7 @@
           <p>Go to previous file while keeping focus on the same tag field</p>
         </td>
         <td>
-          <p><key>Page Up</key></p>
+          <p><key>Re Pág</key></p>
         </td>
       </tr>
       <tr>
@@ -63,7 +61,7 @@
           <p>Go to next file while keeping focus on the same tag field</p>
         </td>
         <td>
-          <p><key>Page Down</key></p>
+          <p><key>Av Pág</key></p>
         </td>
       </tr>
     </tbody>
diff --git a/help/es/legal.xml b/help/es/legal.xml
new file mode 100644
index 0000000..03a245f
--- /dev/null
+++ b/help/es/legal.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
+  <p>Este trabajo está licenciado bajo la <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons de Atribución-Compartir Igual 3.0 sin soporte</link>.</p>
+</license>
diff --git a/help/C/playlist-generate.page b/help/es/playlist-generate.page
similarity index 90%
copy from help/C/playlist-generate.page
copy to help/es/playlist-generate.page
index 83f43cc..ab9045b 100644
--- a/help/C/playlist-generate.page
+++ b/help/es/playlist-generate.page
@@ -1,23 +1,21 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="guide"
-      id="playlist-generate">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="guide" id="playlist-generate" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#main"/>
-    <revision pkgversion="2.1.9" date="2013-10-06" status="draft" />
+    <revision pkgversion="2.1.9" date="2013-10-06" status="draft"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email>kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <desc>Generate a playlist from the file list</desc>
   </info>
 
-  <title>Create a playlist</title>
+  <title>Crear una lista de reproducción</title>
 
   <p>You can create a M3U playlist for use with a music player based on the
   list of files shown in <app>EasyTAG</app>:</p>
diff --git a/help/C/problems-id3.page b/help/es/problems-id3.page
similarity index 87%
copy from help/C/problems-id3.page
copy to help/es/problems-id3.page
index 6f72802..11ce9cb 100644
--- a/help/C/problems-id3.page
+++ b/help/es/problems-id3.page
@@ -1,13 +1,11 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="problems-id3">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="problems-id3" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#problems"/>
     <revision pkgversion="2.2.0" date="2014-04-09" status="review"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>David King</name>
diff --git a/help/C/problems-ogg-split.page b/help/es/problems-ogg-split.page
similarity index 88%
copy from help/C/problems-ogg-split.page
copy to help/es/problems-ogg-split.page
index 8d4dd97..81f1979 100644
--- a/help/C/problems-ogg-split.page
+++ b/help/es/problems-ogg-split.page
@@ -1,13 +1,11 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="problems-ogg-split">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="problems-ogg-split" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#problems"/>
     <revision pkgversion="2.2.0" date="2014-04-11" status="candidate"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>David King</name>
diff --git a/help/C/scanner.page b/help/es/scanner.page
similarity index 88%
copy from help/C/scanner.page
copy to help/es/scanner.page
index e860d5f..4955c3e 100644
--- a/help/C/scanner.page
+++ b/help/es/scanner.page
@@ -1,7 +1,5 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="guide" style="task"
-      id="scanner">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="task" id="scanner" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#main" group="#first"/>
@@ -12,7 +10,7 @@
       <email its:translate="no">kittykat3756 at googlemail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <desc>Update tags automatically.</desc>
 
@@ -40,7 +38,7 @@
 
   <p>For example, if you keep your audio files using the
   <file>artist/album/01 track title.flac</file> directory structure and
-  filenames, use the <input>%a/%b/%t %n</input> <em>format string</em> to
+  filenames, use the <input>%a/%b/%n %t</input> <em>format string</em> to
   extract the track number and title from the filename, the album title from
   the parent directory and the artist from the grandparent directory.</p>
 
@@ -58,7 +56,7 @@
   the directory where the file is currently located.</p>
 
   <p>For example, if you have a tagged file inside the <file>Music</file>
-  directory, you can use the <input>%a/%b/%t %n</input> <em>format string</em>,
+  directory, you can use the <input>%a/%b/%n %t</input> <em>format string</em>,
   it will create the <file>Music/artist/album/01 track title.flac</file> file
   structure and filename. You will see a preview of the naming scheme below
   your specified format string.</p>
diff --git a/help/C/starting.page b/help/es/starting.page
similarity index 85%
copy from help/C/starting.page
copy to help/es/starting.page
index 6b25bdd..a2b2e39 100644
--- a/help/C/starting.page
+++ b/help/es/starting.page
@@ -1,17 +1,16 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic" style="guide"
-      id="starting">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="guide" id="starting" xml:lang="es">
 
   <info>
     <link type="guide" xref="index"/>
-    <revision pkgversion="2.1.9" date="2013-06-25" status="candidate" />
+    <revision pkgversion="2.1.9" date="2013-06-25" status="candidate"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
       <email>kittykat3756 at gmail.com</email>
     </credit>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <desc>Using <app>EasyTAG</app> for the first time</desc>
   </info>
diff --git a/help/C/tag-field.page b/help/es/tag-field.page
similarity index 84%
copy from help/C/tag-field.page
copy to help/es/tag-field.page
index 65bf4df..2b370c9 100644
--- a/help/C/tag-field.page
+++ b/help/es/tag-field.page
@@ -1,14 +1,12 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" style="task"
-      id="tag-field">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="tag-field" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#tag"/>
     <link type="guide" xref="tag" group="#first"/>
     <revision pkgversion="2.1.9" date="2013-05-20"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
diff --git a/help/C/tag.page b/help/es/tag.page
similarity index 74%
copy from help/C/tag.page
copy to help/es/tag.page
index a8cda31..e57279f 100644
--- a/help/C/tag.page
+++ b/help/es/tag.page
@@ -1,13 +1,11 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:its="http://www.w3.org/2005/11/its"
-      type="guide" style="task"
-      id="tag">
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="guide" style="task" id="tag" xml:lang="es">
 
   <info>
     <link type="guide" xref="index#tag" group="#first"/>
     <revision pkgversion="2.1.9" date="2013-03-13" status="stub"/>
 
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+    <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/>
 
     <credit type="author">
       <name>Ekaterina Gerasimova</name>
diff --git a/po/id.po b/po/id.po
index f8391aa..f1ae2d0 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: easytag easytag-2-2\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=easytag&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-04-25 03:12+0000\n"
-"PO-Revision-Date: 2014-05-03 11:13+0700\n"
+"POT-Creation-Date: 2014-09-05 03:13+0000\n"
+"PO-Revision-Date: 2014-09-05 23:11+0700\n"
 "Last-Translator: Andika Triwidada <andika at gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id at googlegroups.com>\n"
 "Language: id\n"
@@ -26,7 +26,7 @@ msgid ""
 "Vorbis, MusePack, Monkey's Audio and WavPack files."
 msgstr ""
 "Lihat dan sunting tag bagi berkas-berkas MP3, MP2, MP4/AAC, FLAC, Ogg Opus, "
-"Ogg Speex, Ogg Vorbis, MusePack, Monkey's Audio, dan WavPack."
+"Ogg Speex, Ogg Vorbis, MusePack, Monkey’s Audio, dan WavPack."
 
 #: ../data/easytag.appdata.xml.in.h:2
 msgid ""
@@ -94,7 +94,7 @@ msgstr "Andika Triwidada <andika at gmail.com>, 2014"
 msgid "View and edit tags in audio files"
 msgstr "Lihat dan sunting tag dalam berkas audio"
 
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.cc:46
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:113 ../src/mp4_header.cc:46
 #: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
 #: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
 #: ../src/mp4_tag.cc:283
@@ -430,8 +430,8 @@ msgstr "Jadikan lagi perubahan terakhir"
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4564
-#: ../src/easytag.c:4596
+#: ../src/bar.c:242 ../src/easytag.c:2428 ../src/easytag.c:4550
+#: ../src/easytag.c:4582
 msgid "Quit"
 msgstr "Keluar"
 
@@ -496,14 +496,12 @@ msgid "Go to default directory"
 msgstr "Ke direktori baku"
 
 #: ../src/bar.c:267
-#, fuzzy
 msgid "Set _Current Path as Default"
-msgstr "_Pengaturan Saat Ini sebagai Bawaan"
+msgstr "_Atur Path Saat Ini sebagai Bawaan"
 
 #: ../src/bar.c:267
-#, fuzzy
 msgid "Set current path as default"
-msgstr "_Pengaturan Saat Ini sebagai Bawaan"
+msgstr "Atur path saat ini sebagai bawaan"
 
 #: ../src/bar.c:268
 msgid "Rename Directory…"
@@ -530,14 +528,12 @@ msgid "Run a command on the directory"
 msgstr "Jalankan suatu perintah pada direktori"
 
 #: ../src/bar.c:276
-#, fuzzy
 msgid "_Collapse Tree"
-msgstr "ID-Tree:"
+msgstr "_Lipat Pohon"
 
 #: ../src/bar.c:277
-#, fuzzy
 msgid "Collapse directory tree"
-msgstr "Aktifkan Garis Bentuk Pohon"
+msgstr "Lipat pohon direktori"
 
 #: ../src/bar.c:278
 msgid "_Reload Tree"
@@ -564,9 +560,8 @@ msgid "Search filenames and tags"
 msgstr "Cari nama berkas dan tag"
 
 #: ../src/bar.c:288
-#, fuzzy
 msgid "CDD_B Search…"
-msgstr "Ketik untuk mencari…"
+msgstr "Pencarian CDD_B…"
 
 #: ../src/bar.c:289
 msgid "CDDB search"
@@ -614,9 +609,8 @@ msgid "_View"
 msgstr "_Tilik"
 
 #: ../src/bar.c:306
-#, fuzzy
 msgid "_Go"
-msgstr "B_uka"
+msgstr ""
 
 #: ../src/bar.c:308
 msgid "_Help"
@@ -657,14 +651,12 @@ msgid "S_canner"
 msgstr "Pe_mindai"
 
 #: ../src/bar.c:331
-#, fuzzy
 msgid "CDDB Search Files…"
-msgstr "Cari Berka_s…"
+msgstr "Cari Berkas CDDB…"
 
 #: ../src/bar.c:331
-#, fuzzy
 msgid "CDDB search files…"
-msgstr "Cari Berka_s…"
+msgstr "Cari berkas CDDB…"
 
 #. { AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
 #. { AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? Browser_Open_Run_Program_Tree_Window???) },
@@ -702,28 +694,24 @@ msgid "Tree Browser"
 msgstr "Peramban Pohon"
 
 #: ../src/bar.c:356
-#, fuzzy
 msgid "View by directory tree"
-msgstr "Model TreeView"
+msgstr "Tilik menurut pohon direktori"
 
 #: ../src/bar.c:358
 msgid "Artist and Album"
 msgstr "Artis dan album"
 
 #: ../src/bar.c:359
-#, fuzzy
 msgid "View by artist and album"
-msgstr "Edit artis, album dan judul trek disk "
+msgstr "Tilik menurut artis dan album"
 
 #: ../src/bar.c:364
-#, fuzzy
 msgid "_Fill Tags…"
-msgstr "_Tambah Tag…"
+msgstr "_Penuhi Tag…"
 
 #: ../src/bar.c:365
-#, fuzzy
 msgid "Fill tags"
-msgstr "Tag API (C/C++)"
+msgstr "Penuhi tag"
 
 #: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
@@ -738,9 +726,8 @@ msgid "_Process Fields…"
 msgstr "_Proses Ruas…"
 
 #: ../src/bar.c:370 ../src/scan_dialog.c:184
-#, fuzzy
 msgid "Process Fields"
-msgstr "Ruas tabel"
+msgstr "Proses ruas"
 
 #: ../src/bar.c:428
 #, c-format
@@ -755,7 +742,7 @@ msgstr "Siap memulai"
 msgid "New default path for files selected"
 msgstr "Dipilih path baku baru bagi berkas"
 
-#: ../src/browser.c:678 ../src/easytag.c:4560
+#: ../src/browser.c:678 ../src/easytag.c:4546
 msgid "Some files have been modified but not saved"
 msgstr "Beberapa berkas telah diubah tapi tak disimpan"
 
@@ -767,103 +754,101 @@ msgstr "Apakah Anda ingin menyimpan mereka sebelum mengubah direktori?"
 msgid "Confirm Directory Change"
 msgstr "Konfirmasikan Perubahan Direktori"
 
-#: ../src/browser.c:2146
+#: ../src/browser.c:2244
 msgid "<All albums>"
 msgstr "<Semua album>"
 
-#: ../src/browser.c:2607
+#: ../src/browser.c:2707
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Galat: Mencari %s, tak bisa temukan node %s dalam pohon."
 
-#: ../src/browser.c:3101 ../src/browser.c:3179
+#: ../src/browser.c:3201 ../src/browser.c:3279
 msgid "Tree"
 msgstr "Pohon"
 
-#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1903
+#: ../src/browser.c:3202 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
 msgstr "Nama berkas"
 
-#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1904
+#: ../src/browser.c:3202 ../src/cddb.c:804 ../src/misc.c:1904
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Judul"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
+#: ../src/browser.c:3203 ../src/browser.c:3210 ../src/cddb.c:483
 #: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Artis"
 
-#: ../src/browser.c:3103 ../src/misc.c:1906
+#: ../src/browser.c:3203 ../src/misc.c:1906
 msgid "Album Artist"
 msgstr "Artis Album"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
+#: ../src/browser.c:3204 ../src/browser.c:3212 ../src/cddb.c:486
 #: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1909
+#: ../src/browser.c:3204 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Tahun"
 
-#: ../src/browser.c:3104
+#: ../src/browser.c:3204
 msgid "Disc"
 msgstr "Diska"
 
-#: ../src/browser.c:3105 ../src/misc.c:1910
+#: ../src/browser.c:3205 ../src/misc.c:1910
 msgid "Track"
 msgstr "Trek"
 
-#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1911
+#: ../src/browser.c:3205 ../src/cddb.c:810 ../src/misc.c:1911
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Aliran"
 
-#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/prefs.c:647
+#: ../src/browser.c:3206 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../src/browser.c:3106 ../src/misc.c:1913 ../src/picture.c:1060
+#: ../src/browser.c:3206 ../src/misc.c:1913 ../src/picture.c:884
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Komposer"
 
-#: ../src/browser.c:3107 ../src/misc.c:1914
+#: ../src/browser.c:3207 ../src/misc.c:1914
 msgid "Original Artist"
 msgstr "Artis Asli"
 
-#: ../src/browser.c:3108 ../src/misc.c:1915
+#: ../src/browser.c:3208 ../src/misc.c:1915
 msgid "Copyright"
 msgstr "Hak Cipta"
 
-#: ../src/browser.c:3108 ../src/misc.c:1916
+#: ../src/browser.c:3208 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3109 ../src/misc.c:1917
+#: ../src/browser.c:3209 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Dienkode Oleh"
 
-#: ../src/browser.c:3110
-#, fuzzy
+#: ../src/browser.c:3210
 msgid "# Albums"
-msgstr "Album"
+msgstr "# Album"
 
-#: ../src/browser.c:3111 ../src/browser.c:3112
-#, fuzzy
+#: ../src/browser.c:3211 ../src/browser.c:3212
 msgid "# Files"
-msgstr "Berkas"
+msgstr "# Berkas"
 
-#: ../src/browser.c:3137
+#: ../src/browser.c:3237
 msgid "Enter a directory to browse."
 msgstr "Masukkan direktori yang akan diramban."
 
-#: ../src/browser.c:3146
+#: ../src/browser.c:3246
 msgid "Select a directory to browse."
 msgstr "Pilih direktori yang akan diramban."
 
@@ -871,100 +856,100 @@ msgstr "Pilih direktori yang akan diramban."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3153 ../src/easytag.c:3468
+#: ../src/browser.c:3253 ../src/easytag.c:3454
 msgid "No files"
 msgstr "Tak ada berkas"
 
-#: ../src/browser.c:3231
+#: ../src/browser.c:3331
 msgid "Artist & Album"
 msgstr "Artis & Album"
 
 #. Only directories changed
-#: ../src/browser.c:3595 ../src/easytag.c:2880
+#: ../src/browser.c:3696 ../src/easytag.c:2879
 msgid "Rename Directory"
 msgstr "Ubah Nama Direktori"
 
-#: ../src/browser.c:3617
+#: ../src/browser.c:3718
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Ubah nama direktori '%s' menjadi:"
 
-#: ../src/browser.c:3636 ../src/misc.c:1172
+#: ../src/browser.c:3737 ../src/misc.c:1172
 #, fuzzy
 msgid "Use mask:"
 msgstr "Mask Subnet:"
 
-#: ../src/browser.c:3639
-#, fuzzy
+#: ../src/browser.c:3740
 msgid "If activated, it will use masks to rename directory."
 msgstr "Bila diaktifkan, itu akan memakai mask untuk mengubah nama direktori."
 
-#: ../src/browser.c:3657
+#: ../src/browser.c:3758
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
 msgstr ""
+"Pilih atau ketikkan masker memakai kode (lihat Legenda dalam Jendela "
+"Pemindai) untuk mengubah nama direktori dari ruas tag."
 
 #. Preview label
-#: ../src/browser.c:3681
-#, fuzzy
+#: ../src/browser.c:3782
 msgid "Rename directory preview"
 msgstr "Pratinjau ubah nama direktori"
 
-#: ../src/browser.c:3773
+#: ../src/browser.c:3874
 msgid "You must type a directory name"
 msgstr "Anda mesti mengetikkan suatu nama direktori"
 
-#: ../src/browser.c:3774 ../src/browser.c:3795
+#: ../src/browser.c:3875 ../src/browser.c:3896
 msgid "Directory Name Error"
 msgstr "Galat Nama Direktori"
 
-#: ../src/browser.c:3792
+#: ../src/browser.c:3893
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Tak bisa mengonversi '%s' ke dalam pengodean nama berkas."
 
-#: ../src/browser.c:3794
+#: ../src/browser.c:3895
 msgid "Please use another name"
 msgstr "Silakan pakai nama lain"
 
-#: ../src/browser.c:3864
+#: ../src/browser.c:3965
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Nama direktori '%s' sudah ada"
 
-#: ../src/browser.c:3865 ../src/easytag.c:2963
+#: ../src/browser.c:3966 ../src/easytag.c:2962
 msgid "Rename File Error"
 msgstr "Galat Pengubahan Nama Berkas"
 
-#: ../src/browser.c:3903 ../src/browser.c:3932
+#: ../src/browser.c:4004 ../src/browser.c:4033
 msgid "Rename Directory Error"
 msgstr "Galat Pengubahan Nama Direktori"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4071
 msgid "Directory renamed"
 msgstr "Direktori diubah nama"
 
-#: ../src/browser.c:4006
+#: ../src/browser.c:4107
 msgid "Browse Directory With"
 msgstr "Ramban Direktori Dengan"
 
-#: ../src/browser.c:4022 ../src/browser.c:4148
+#: ../src/browser.c:4123 ../src/browser.c:4249
 msgid "Program to run:"
 msgstr "Program yang akan dijalankan:"
 
-#: ../src/browser.c:4034
+#: ../src/browser.c:4135
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Masukkan nama program yang akan dijalankan. Itu akan menerima direktori saat "
 "ini sebagai parameter."
 
-#: ../src/browser.c:4128
+#: ../src/browser.c:4229
 msgid "Open Files With"
 msgstr "Buka Berkas Dengan"
 
-#: ../src/browser.c:4160
+#: ../src/browser.c:4261
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
@@ -991,9 +976,8 @@ msgid "Duration"
 msgstr "Durasi"
 
 #: ../src/cddb.c:326
-#, fuzzy
 msgid "CDDB Search"
-msgstr "Dapat dicari"
+msgstr "Pencarian CDDB"
 
 #.
 #. * 1 - Page for automatic search (generate the CDDBId from files)
@@ -1003,9 +987,8 @@ msgid "Automatic Search"
 msgstr "Pencarian Otomatis"
 
 #: ../src/cddb.c:356
-#, fuzzy
 msgid "Request CDDB"
-msgstr "Permintaan lebar"
+msgstr "Permintaan CDDB"
 
 #: ../src/cddb.c:366
 msgid ""
@@ -1062,7 +1045,7 @@ msgstr "Semua Ruas"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:1038 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:862 ../src/prefs.c:807
 msgid "Other"
 msgstr "Lainnya"
 
@@ -1137,9 +1120,8 @@ msgid "included: funk, soul, rap, pop, industrial, metal, etc."
 msgstr "disertakan: funk, soul, rap, pop, industrial, metal, dsb."
 
 #: ../src/cddb.c:588
-#, fuzzy
 msgid "movies, shows"
-msgstr "Memutar film"
+msgstr "film, pertunjukan"
 
 #: ../src/cddb.c:589
 msgid "others that do not fit in the above categories"
@@ -1180,19 +1162,16 @@ msgstr ""
 "'Artis / Album'"
 
 #: ../src/cddb.c:655
-#, fuzzy
 msgid "Unselect all lines"
-msgstr "Keluarkan semua trek dari pilihan"
+msgstr "Tak pilih baris manapun"
 
 #: ../src/cddb.c:661
-#, fuzzy
 msgid "Invert lines selection"
-msgstr "Warna Kotak Pilihan"
+msgstr "Balikkan pilihan baris"
 
 #: ../src/cddb.c:670
-#, fuzzy
 msgid "Select all lines"
-msgstr "Pilih semua teks"
+msgstr "Pilih semua baris"
 
 #: ../src/cddb.c:788
 msgid ""
@@ -1209,23 +1188,20 @@ msgstr ""
 #. * Apply results to fields...
 #.
 #: ../src/cddb.c:795
-#, fuzzy
 msgid "Set Into:"
-msgstr "Menempelkan ke dalam %s"
+msgstr "Menjadi:"
 
 #: ../src/cddb.c:801
 msgid "All"
 msgstr "Semua"
 
 #: ../src/cddb.c:808
-#, fuzzy
 msgid "Track #"
 msgstr "Trek #"
 
 #: ../src/cddb.c:809
-#, fuzzy
 msgid "# Tracks"
-msgstr "Trek:"
+msgstr "# Trek"
 
 #. Check box to run the scanner
 #: ../src/cddb.c:847 ../src/misc.c:2992
@@ -1248,6 +1224,11 @@ msgid ""
 "used when selecting the corresponding audio file, or applying CDDB results, "
 "instead of using directly the position order."
 msgstr ""
+"Ketika mengaktifkan opsi ini, algoritma Levenshtein (DLM: Damerau-"
+"Levenshtein Metric) akan dipakai untuk mencocokkan judul CDDB terhadap "
+"setiap nama berkas dalam folder saat ini, dan untuk memilih kecocokan "
+"terbaik. Ini akan dipakai ketika memilih berkas audio yang bersesuaian, atau "
+"menerapkan hasil CDDB, sebagai ganti memakai secara langsung urutan posisi."
 
 #: ../src/cddb.c:871
 msgid "Load the selected lines or all lines (if no line selected)."
@@ -1267,9 +1248,9 @@ msgstr ""
 "Album: '%s', artis: '%s', panjang: '%s', tahun: '%s', aliran: '%s', ID: '%s'"
 
 #: ../src/cddb.c:1588
-#, fuzzy, c-format
+#, c-format
 msgid "Resolving host '%s'…"
-msgstr "Host tak dapat dihubungi"
+msgstr "Mengurai host ‘%s’…"
 
 #: ../src/cddb.c:1629
 #, c-format
@@ -1278,23 +1259,23 @@ msgstr "Tak dapat membuat soket baru (%s)"
 
 #: ../src/cddb.c:1643
 msgid "Cannot set options on the newly-created socket"
-msgstr ""
+msgstr "Tak bisa menata opsi pada soket yang baru saja dibuat"
 
 #. Open connection to the server.
 #: ../src/cddb.c:1647
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to host '%s', port '%d'…"
-msgstr "Galat saat koneksi ke host."
+msgstr "Menyambung ke host ‘%s’, port ‘%d’…"
 
 #: ../src/cddb.c:1660
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot connect to host '%s' (%s)"
-msgstr "Gagal menyambung ke host %s\n"
+msgstr "Tak dapat menyambung ke host ‘%s’ (%s)"
 
 #: ../src/cddb.c:1684
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot resolve host '%s' (%s)"
-msgstr "Resolve Nama Host Layanan"
+msgstr "Tak dapat mengurai host ‘%s’ (%s)"
 
 #: ../src/cddb.c:1697
 #, c-format
@@ -1312,9 +1293,9 @@ msgid "Receiving data (%s)…"
 msgstr "Sedang menerima data (%s)…"
 
 #: ../src/cddb.c:1801
-#, fuzzy, c-format
+#, c-format
 msgid "Error when reading CDDB response (%s)"
-msgstr "Galat saat membaca tubuh respon HTTP\n"
+msgstr "Galat saat membaca respon CDDB (%s)"
 
 #: ../src/cddb.c:1808
 #, c-format
@@ -1332,11 +1313,11 @@ msgstr "Tak dapat membuka berkas '%s' (%s)"
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
+#: ../src/cddb.c:2362 ../src/cddb.c:2693 ../src/cddb.c:3568
 msgid "Sending request…"
 msgstr "Sedang mengirim permintaan…"
 
-#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
+#: ../src/cddb.c:2366 ../src/cddb.c:2697 ../src/cddb.c:3267 ../src/cddb.c:3572
 #, c-format
 msgid "Cannot send the request (%s)"
 msgstr "Tak dapat mengirim permintaan (%s)"
@@ -1345,108 +1326,106 @@ msgstr "Tak dapat mengirim permintaan (%s)"
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
+#: ../src/cddb.c:2393 ../src/cddb.c:3281 ../src/cddb.c:3581
 msgid "Receiving data…"
 msgstr "Sedang menerima data…"
 
-#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
+#: ../src/cddb.c:2400 ../src/cddb.c:2726 ../src/cddb.c:3288 ../src/cddb.c:3588
 msgid "The server returned a bad response"
 msgstr "Server mengembalikan respon yang buruk"
 
-#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
-#: ../src/cddb.c:3568
+#: ../src/cddb.c:2414 ../src/cddb.c:2742 ../src/cddb.c:3303 ../src/cddb.c:3605
+#: ../src/cddb.c:3620
 #, c-format
 msgid "The server returned a bad response: %s"
 msgstr "Server mengembalikan respon yang buruk: %s"
 
-#: ../src/cddb.c:2512
+#: ../src/cddb.c:2561
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Maaf, pencarian berbasis web saat ini tak tersedia"
 
-#: ../src/cddb.c:2514 ../src/cddb.c:2863
+#: ../src/cddb.c:2563 ../src/cddb.c:2913
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
 msgstr[0] "Menemukan %d album yang cocok"
 
-#: ../src/cddb.c:2664
+#: ../src/cddb.c:2714
 #, fuzzy, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "album yang berisi data ini"
 
-#: ../src/cddb.c:2666
+#: ../src/cddb.c:2716
 #, fuzzy, c-format
 msgid "Receiving data of page %d…"
 msgstr "Jaringan sedang menerima data."
 
-#: ../src/cddb.c:2830
-#, fuzzy, c-format
+#: ../src/cddb.c:2880
+#, c-format
 msgid "More results to load…"
-msgstr "Cobalah memakai lebih banyak angka."
+msgstr "Lebih banyak hasil untuk dimuat..."
 
-#: ../src/cddb.c:2959
-#, fuzzy, c-format
+#: ../src/cddb.c:3009
+#, c-format
 msgid "No file selected"
 msgstr "Tak ada berkas yang dipilih"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2967
+#: ../src/cddb.c:3017
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
-msgstr ""
+msgstr "Lebih dari 99 berkas dipilih. Tak bisa mengirim permintaan"
 
-#: ../src/cddb.c:2973
+#: ../src/cddb.c:3023
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
 msgstr[0] "%d berkas dipilih"
 
-#: ../src/cddb.c:3056
+#: ../src/cddb.c:3107
 msgid "The path for 'Local CD Database' was not defined"
-msgstr ""
+msgstr "Path bagi ‘Basis Data CD Lokal’ tak didefinisikan"
 
 #. Translators: 'it' in this sentence refers to the local CD
 #. * database path.
-#: ../src/cddb.c:3059
+#: ../src/cddb.c:3110
 msgid "Enter it in the preferences window before using this search."
-msgstr ""
+msgstr "Masukkan ke dalam jendela preferensi sebelum memakai pencarian ini."
 
-#: ../src/cddb.c:3061
+#: ../src/cddb.c:3112
 #, fuzzy
 msgid "Local CD search"
 msgstr "Hanya cari direktori lokal saja"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3206
+#: ../src/cddb.c:3257
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
-msgstr ""
+msgstr "Mengirim permintaan (CddbId: %s, #trek: %d, Panjang cakram: %d)…"
 
-#: ../src/cddb.c:3363
+#: ../src/cddb.c:3414
 #, c-format
 msgid "DiscID '%s' gave one matching album"
 msgid_plural "DiscID '%s' gave %d matching albums"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "DiscID ‘%s’ memberikan %d album yang cocok"
 
-#: ../src/cddb.c:3460
-#, fuzzy, c-format
+#: ../src/cddb.c:3512
+#, c-format
 msgid "Can't load file: '%s' (%s)."
-msgstr "Muat Dari _Berkas"
+msgstr "Tak dapat memuat berkas '%s' (%s)."
 
 #. Load the track list of the album
-#: ../src/cddb.c:3759
-#, fuzzy
+#: ../src/cddb.c:3811
 msgid "Loading album track list…"
-msgstr "Posisi trek pada album."
+msgstr "Sedang memuat daftar trek album..."
 
-#: ../src/cddb.c:3958
+#: ../src/cddb.c:4010
 msgid "The number of CDDB results does not match the number of selected files"
-msgstr ""
+msgstr "Banyaknya hasil CDDB tak cocok dengan cacah berkas yang dipilih"
 
-#: ../src/cddb.c:3962
+#: ../src/cddb.c:4014
 #, fuzzy
 msgid "Write Tag from CDDB"
 msgstr "Hapus tag dari entri"
@@ -1635,7 +1614,7 @@ msgstr "Barat (Windows-1252)"
 #: ../src/charset.c:511
 #, c-format
 msgid "The filename '%s' couldn't be converted into UTF-8 (%s)."
-msgstr ""
+msgstr "Nama berkas ‘%s’ tak bisa dikonversi ke dalam UTF-8 (%s)."
 
 #: ../src/charset.c:512 ../src/charset.c:611 ../src/charset.c:674
 msgid "Invalid UTF-8"
@@ -1646,11 +1625,12 @@ msgstr "UTF-8 tak valid"
 msgid ""
 "The UTF-8 string '%s' couldn't be converted into filename encoding (%s)."
 msgstr ""
+"String UTF-8 ‘%s’ tak dapat dikonversi ke dalam enkoding nama berkas (%s)."
 
 #: ../src/charset.c:673
 #, c-format
 msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
-msgstr ""
+msgstr "String ‘%s’ tak dapat dikonversi ke dalam UTF-8 (%s)."
 
 #. Starting messages
 #: ../src/easytag.c:185
@@ -1671,32 +1651,32 @@ msgstr "Cetak versi program"
 #: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
-msgstr ""
+msgstr "Variabel EASYTAGLAG didefinisikan. Menata locale: ‘%s’"
 
 #: ../src/easytag.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "Setting locale: '%s'"
-msgstr "Lokal Saat Ini"
+msgstr "Menata locale: '%s'"
 
 #: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
-msgstr ""
+msgstr "Saat ini memakai locale ‘%s’ (dan pada akhirnya ‘%s’)"
 
 #: ../src/easytag.c:210
 #, fuzzy
 msgid "Unable to create setting directories"
 msgstr "Tak dapat membuat tampilan transien: "
 
-#: ../src/easytag.c:427 ../src/et_core.c:637 ../src/et_core.c:649
-#, fuzzy, c-format
+#: ../src/easytag.c:427 ../src/et_core.c:638 ../src/et_core.c:650
+#, c-format
 msgid "Error while querying information for file: '%s' (%s)"
-msgstr "Galat saat mengambil informasi bagi berkas '%s': %s"
+msgstr "Galat saat mengambil informasi bagi berkas ‘%s’: %s"
 
 #: ../src/easytag.c:490
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open path '%s'"
-msgstr "Tidak bisa membuka lokasi direktori maildir: %s: %s"
+msgstr "Tak dapat membuka path '%s'"
 
 #.
 #. * Browser
@@ -1705,7 +1685,7 @@ msgstr "Tidak bisa membuka lokasi direktori maildir: %s: %s"
 msgid "Browser"
 msgstr "Peramban"
 
-#: ../src/easytag.c:604 ../src/et_core.c:2857
+#: ../src/easytag.c:604 ../src/et_core.c:2869
 msgid "File"
 msgstr "Berkas"
 
@@ -1715,7 +1695,7 @@ msgstr "Berkas"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:636 ../src/easytag.c:4231 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4217 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
 #: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
@@ -1733,7 +1713,7 @@ msgid "Frequency:"
 msgstr "Frekuensi:"
 
 #. Mode
-#: ../src/easytag.c:665 ../src/easytag.c:4235 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4221 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Mode:"
 
@@ -1746,7 +1726,7 @@ msgid "Duration:"
 msgstr "Durasi:"
 
 #. Main Frame
-#: ../src/easytag.c:726 ../src/et_core.c:2787
+#: ../src/easytag.c:726 ../src/et_core.c:2799
 msgid "Tag"
 msgstr "Tag"
 
@@ -1764,7 +1744,7 @@ msgstr "Judul:"
 
 #: ../src/easytag.c:769
 msgid "Tag selected files with this title"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan judul ini"
 
 #. Artist
 #: ../src/easytag.c:774
@@ -1773,7 +1753,7 @@ msgstr "Artis:"
 
 #: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan artis ini"
 
 #. Album Artist
 #: ../src/easytag.c:793
@@ -1782,7 +1762,7 @@ msgstr "Artis album:"
 
 #: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan artis album ini"
 
 #. Album
 #: ../src/easytag.c:812
@@ -1791,7 +1771,7 @@ msgstr "Album:"
 
 #: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan nama album ini"
 
 #. Disc Number
 #: ../src/easytag.c:831
@@ -1800,7 +1780,7 @@ msgstr "CD:"
 
 #: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan nomor cakram ini"
 
 #. Year
 #: ../src/easytag.c:853
@@ -1809,18 +1789,19 @@ msgstr "Tahun:"
 
 #: ../src/easytag.c:873
 msgid "Tag selected files with this year"
-msgstr ""
+msgstr "Berkas yang dipilih tag dengan tahun ini"
 
 #: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
+"Banyaknya trek yang dipilih secara berurutan. Mulai dari 01 dalam setiap "
+"subdirektori."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
 #: ../src/easytag.c:896
-#, fuzzy
 msgid "Track #:"
-msgstr "Trek %u"
+msgstr "Trek #:"
 
 #: ../src/easytag.c:927
 msgid ""
@@ -1830,7 +1811,7 @@ msgstr ""
 
 #: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan nomor trek ini"
 
 #. Genre
 #: ../src/easytag.c:951
@@ -1839,7 +1820,7 @@ msgstr "Aliran:"
 
 #: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan genre ini"
 
 #. Comment
 #: ../src/easytag.c:984
@@ -1848,7 +1829,7 @@ msgstr "Komentar:"
 
 #: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan komentar ini"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
@@ -1858,7 +1839,7 @@ msgstr "Komposer:"
 
 #: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan komposer ini"
 
 #. Translators: Original Artist / Performer. Please try to keep this string
 #. * as short as possible, as it must fit into a narrow column.
@@ -1868,7 +1849,7 @@ msgstr "Artis asli:"
 
 #: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan artis asli ini"
 
 #. Copyright
 #: ../src/easytag.c:1059
@@ -1877,7 +1858,7 @@ msgstr "Hak Cipta:"
 
 #: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan hak cipta ini"
 
 #. URL
 #: ../src/easytag.c:1079
@@ -1886,7 +1867,7 @@ msgstr "URL:"
 
 #: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan URL ini"
 
 #. Encoded by
 #: ../src/easytag.c:1099
@@ -1896,592 +1877,570 @@ msgstr "Dienkode Oleh"
 
 #: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
-msgstr ""
+msgstr "Tag berkas yang dipilih dengan nama enkoder ini"
 
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1147 ../src/et_core.c:3229 ../src/et_core.c:3232
-#, fuzzy
+#: ../src/easytag.c:1146 ../src/et_core.c:3241 ../src/et_core.c:3244
 msgid "Images"
 msgstr "Citra"
 
-#: ../src/easytag.c:1171
+#: ../src/easytag.c:1170
 msgid "You can use drag and drop to add an image"
 msgstr ""
 
-#: ../src/easytag.c:1218
-#, fuzzy
+#: ../src/easytag.c:1217
 msgid "Add images to the tag"
-msgstr "Tambahkan gambar terpilih ke sebuah katalog"
+msgstr "Tambahkan citra ke tag"
 
-#: ../src/easytag.c:1236
-#, fuzzy
+#: ../src/easytag.c:1235
 msgid "Remove selected images from the tag"
-msgstr "Buang gambar terpilih dari katalog"
+msgstr "Buang citra yang dipilih dari tag"
 
-#: ../src/easytag.c:1250
-#, fuzzy
+#: ../src/easytag.c:1249
 msgid "Save the selected images to files"
-msgstr "Simpan trek yang dipilih ke disk sebagai file"
+msgstr "Simpan citra yang dipilih ke berkas"
 
-#: ../src/easytag.c:1261
-#, fuzzy
+#: ../src/easytag.c:1260
 msgid "Edit image properties"
-msgstr "Sunting properti proyek"
+msgstr "Sunting properti citra"
 
-#: ../src/easytag.c:1275
+#: ../src/easytag.c:1274
 msgid "Tag selected files with these images"
 msgstr ""
 
-#: ../src/easytag.c:1333
-#, fuzzy, c-format
+#: ../src/easytag.c:1332
+#, c-format
 msgid "Selected files tagged with title '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan judul ‘%s’."
 
-#: ../src/easytag.c:1335
+#: ../src/easytag.c:1334
 #, fuzzy
 msgid "Removed title from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1350
-#, fuzzy, c-format
+#: ../src/easytag.c:1349
+#, c-format
 msgid "Selected files tagged with artist '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan artis ‘%s’."
 
-#: ../src/easytag.c:1352
+#: ../src/easytag.c:1351
 #, fuzzy
 msgid "Removed artist from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1366
+#: ../src/easytag.c:1365
 #, c-format
 msgid "Selected files tagged with album artist '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1368
+#: ../src/easytag.c:1367
 msgid "Removed album artist from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1383
-#, fuzzy, c-format
+#: ../src/easytag.c:1382
+#, c-format
 msgid "Selected files tagged with album '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan album ‘%s’."
 
-#: ../src/easytag.c:1385
+#: ../src/easytag.c:1384
 msgid "Removed album name from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1422
+#: ../src/easytag.c:1421
 #, c-format
 msgid "Selected files tagged with disc number '%s/%s'."
 msgstr ""
 
-#: ../src/easytag.c:1427
+#: ../src/easytag.c:1426
 #, c-format
 msgid "Selected files tagged with disc number like 'xx'."
 msgstr ""
 
-#: ../src/easytag.c:1432
+#: ../src/easytag.c:1431
 msgid "Removed disc number from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1448
-#, fuzzy, c-format
+#: ../src/easytag.c:1447
+#, c-format
 msgid "Selected files tagged with year '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan tahun ‘%s’."
 
-#: ../src/easytag.c:1450
+#: ../src/easytag.c:1449
 #, fuzzy
 msgid "Removed year from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1476 ../src/easytag.c:1566
+#: ../src/easytag.c:1475 ../src/easytag.c:1565
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr ""
 
-#: ../src/easytag.c:1479
+#: ../src/easytag.c:1478
 #, c-format
 msgid "Selected files tagged with track like 'xx'."
 msgstr ""
 
-#: ../src/easytag.c:1483 ../src/easytag.c:1569
+#: ../src/easytag.c:1482 ../src/easytag.c:1568
 msgid "Removed track number from selected files."
 msgstr ""
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1539
-#, fuzzy, c-format
+#: ../src/easytag.c:1538
+#, c-format
 msgid "Selected tracks numbered sequentially."
-msgstr "Sunting informasi pada trek yang dipilih"
+msgstr "Trek yang dipilih dinomori secara berurutan."
 
-#: ../src/easytag.c:1585
-#, fuzzy, c-format
+#: ../src/easytag.c:1584
+#, c-format
 msgid "Selected files tagged with genre '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan aliran ‘%s’."
 
-#: ../src/easytag.c:1587
+#: ../src/easytag.c:1586
 #, fuzzy
 msgid "Removed genre from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1609
-#, fuzzy, c-format
+#: ../src/easytag.c:1608
+#, c-format
 msgid "Selected files tagged with comment '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan komentar ‘%s’."
 
-#: ../src/easytag.c:1611
+#: ../src/easytag.c:1610
 #, fuzzy
 msgid "Removed comment from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1625
-#, fuzzy, c-format
+#: ../src/easytag.c:1624
+#, c-format
 msgid "Selected files tagged with composer '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan komponis ‘%s’."
 
-#: ../src/easytag.c:1627
+#: ../src/easytag.c:1626
 #, fuzzy
 msgid "Removed composer from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1642
+#: ../src/easytag.c:1641
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1644
+#: ../src/easytag.c:1643
 msgid "Removed original artist from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1659
-#, fuzzy, c-format
+#: ../src/easytag.c:1658
+#, c-format
 msgid "Selected files tagged with copyright '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan hak cipta ‘%s’."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1660
 #, fuzzy
 msgid "Removed copyright from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1676
-#, fuzzy, c-format
+#: ../src/easytag.c:1675
+#, c-format
 msgid "Selected files tagged with URL '%s'."
-msgstr "Daftar berkas yang dipilih terkat dengan permintaan"
+msgstr "Berkas yang dipilih ditag dengan URL ‘%s’."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1677
 #, fuzzy
 msgid "Removed URL from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:1693
+#: ../src/easytag.c:1692
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr ""
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1694
 msgid "Removed encoder name from selected files."
 msgstr ""
 
-#: ../src/easytag.c:1727
-#, fuzzy
+#: ../src/easytag.c:1726
 msgid "Selected files tagged with images."
-msgstr "Menyimpan gambar yang dipilih dengan nama berbeda"
+msgstr "Berkas yang dipilih ditag dengan citra."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1728
 #, fuzzy
 msgid "Removed images from selected files."
 msgstr "Menghapus berkas yang dipilih dari proyek"
 
-#: ../src/easytag.c:2010
+#: ../src/easytag.c:2009
 msgid "Select Mode and Mask, and redo the same action"
 msgstr ""
 
-#: ../src/easytag.c:2062
+#: ../src/easytag.c:2061
 msgid "All tags have been scanned"
 msgstr "Semua tag telah dipindai"
 
-#: ../src/easytag.c:2118
+#: ../src/easytag.c:2117
 msgid "All tags have been removed"
 msgstr "Semua tag telah dihapus"
 
-#: ../src/easytag.c:2423
+#: ../src/easytag.c:2422
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/easytag.c:2428
-#, fuzzy
+#: ../src/easytag.c:2427
 msgid "Do you want to continue saving the file?"
-msgstr "Anda Anda ingin menghapus %d berkas yang dipilih?"
+msgstr "Apakah Anda ingin melanjutkan menyimpan berkas?"
 
-#: ../src/easytag.c:2486 ../src/easytag.c:2506
+#: ../src/easytag.c:2485 ../src/easytag.c:2505
 msgid "Saving files was stopped"
 msgstr "Penyimpanan berkas dihentikan"
 
-#: ../src/easytag.c:2508
+#: ../src/easytag.c:2507
 msgid "All files have been saved"
 msgstr "Semua berkas telah disimpan"
 
-#: ../src/easytag.c:2643
+#: ../src/easytag.c:2642
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Tak dapat menghapus berkas (%s)"
 
-#: ../src/easytag.c:2664
+#: ../src/easytag.c:2663
 msgid "Files have been partially deleted"
 msgstr "Berkas-berkas telah dihapus sebagian"
 
-#: ../src/easytag.c:2666
+#: ../src/easytag.c:2665
 msgid "All files have been deleted"
 msgstr "Semua berkas telah dihapus"
 
-#: ../src/easytag.c:2782
+#: ../src/easytag.c:2781
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Anda ingin menulis tag dari berkas '%s'?"
 
-#: ../src/easytag.c:2784
-#, fuzzy
+#: ../src/easytag.c:2783
 msgid "Confirm Tag Writing"
-msgstr "galat ketika menulisi `%s': %s\n"
+msgstr "Konfirmasikan Penulisan Tag"
 
-#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
+#: ../src/easytag.c:2788 ../src/easytag.c:2908 ../src/easytag.c:3158
 msgid "Repeat action for the remaining files"
 msgstr ""
 
 #. Directories and filename changed
-#: ../src/easytag.c:2873 ../src/scan_dialog.c:183
-#, fuzzy
+#: ../src/easytag.c:2872 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
-msgstr "Ubah nama berkas atau direktori"
+msgstr "Ubah Nama Berkas dan Direktori"
 
-#: ../src/easytag.c:2874
+#: ../src/easytag.c:2873
 msgid "File and directory rename confirmation required"
 msgstr ""
 
-#: ../src/easytag.c:2875
+#: ../src/easytag.c:2874
 #, fuzzy, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Anda ingin membuang perubahan dan memuat ulang berkas?"
 
-#: ../src/easytag.c:2881
-#, fuzzy
+#: ../src/easytag.c:2880
 msgid "Directory rename confirmation required"
-msgstr "Tak bisa mengubah nama direktori root"
+msgstr "Diperlukan konfirmasi pengubahan nama direktori"
 
-#: ../src/easytag.c:2882
-#, fuzzy, c-format
+#: ../src/easytag.c:2881
+#, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
-msgstr "Apakah Anda ingin menutup koneksi '%s'?"
+msgstr "Apakah Anda ingin mengubah nama direktori ‘%s’ menjadi ‘%s’?"
 
 #. Only filename changed
-#: ../src/easytag.c:2888
+#: ../src/easytag.c:2887
 msgid "Rename File"
 msgstr "Ubah Nama Berkas"
 
-#: ../src/easytag.c:2889
+#: ../src/easytag.c:2888
 #, fuzzy
 msgid "File rename confirmation required"
 msgstr "Berkas berikut diperlukan:"
 
-#: ../src/easytag.c:2890
+#: ../src/easytag.c:2889
 #, fuzzy, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Anda ingin memuat ulang berkas?"
 
-#: ../src/easytag.c:2956
-#, fuzzy, c-format
+#: ../src/easytag.c:2955
+#, c-format
 msgid "Cannot rename file '%s' to '%s'"
-msgstr ""
-"Gagal untuk mengubah nama berkas '%s' menjadi '%s': g_rename() gagal: %s"
+msgstr "Tak bisa mengubah nama berkas ‘%s’ menjadi ‘%s’"
 
-#: ../src/easytag.c:2970
-#, fuzzy, c-format
+#: ../src/easytag.c:2969
+#, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
-msgstr ""
-"Gagal untuk mengubah nama berkas '%s' menjadi '%s': g_rename() gagal: %s"
+msgstr "Tak bisa mengubah nama berkas ‘%s’ menjadi ‘%s’: %s"
 
-#: ../src/easytag.c:2974
+#: ../src/easytag.c:2973
 msgid "File(s) not renamed"
 msgstr "Berkas tak diubah nama"
 
-#: ../src/easytag.c:3086
+#: ../src/easytag.c:3085
 #, fuzzy, c-format
 msgid "Writing tag of '%s'"
 msgstr "Tag Git:"
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3092
 msgid "Tag(s) written"
 msgstr "Tag ditulis"
 
-#: ../src/easytag.c:3108
-#, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr "Tak dapat menulis tag dalam berkas '%s' (%s)"
-
-#: ../src/easytag.c:3121
+#: ../src/easytag.c:3105
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Tak dapat menulis tag dalam berkas '%s'"
 
-#: ../src/easytag.c:3124
+#: ../src/easytag.c:3109
 msgid "Tag Write Error"
 msgstr "Galat Tulis Tag"
 
-#: ../src/easytag.c:3169 ../src/easytag.c:3183
-#, fuzzy, c-format
+#: ../src/easytag.c:3155 ../src/easytag.c:3169
+#, c-format
 msgid "Do you really want to delete the file '%s'?"
-msgstr "Anda Anda ingin menghapus %d berkas yang dipilih?"
+msgstr "Apakah Anda benar-benar ingin menghapus berkas ‘%s’?"
 
-#: ../src/easytag.c:3175 ../src/easytag.c:3185
+#: ../src/easytag.c:3161 ../src/easytag.c:3171
 msgid "Delete File"
 msgstr "Hapus Berkas"
 
-#: ../src/easytag.c:3210
+#: ../src/easytag.c:3196
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Berkas '%s' dihapus"
 
-#: ../src/easytag.c:3345
-#, fuzzy, c-format
+#: ../src/easytag.c:3331
+#, c-format
 msgid "Cannot read directory '%s'"
-msgstr "gagal membaca direktori 'info'"
+msgstr "Tak bisa membaca direktori '%s'"
 
-#: ../src/easytag.c:3349
-#, fuzzy
+#: ../src/easytag.c:3335
 msgid "Directory Read Error"
-msgstr "Laju Galat Pembacaan"
+msgstr "Galat Baca Direktori"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3370
-#, fuzzy, c-format
+#: ../src/easytag.c:3356
+#, c-format
 msgid "Search in progress…"
-msgstr "Impor tengah berlangsung…"
+msgstr "Pencarian tengah berlangsung…"
 
-#: ../src/easytag.c:3393 ../src/et_core.c:2864
+#: ../src/easytag.c:3379 ../src/et_core.c:2876
 #, c-format
 msgid "File: '%s'"
 msgstr "Berkas: '%s'"
 
-#: ../src/easytag.c:3443
+#: ../src/easytag.c:3429
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/easytag.c:3450
+#: ../src/easytag.c:3436
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Menemukan %d berkas dalam direktori ini"
 
-#: ../src/easytag.c:3472
+#: ../src/easytag.c:3458
 msgid "No file found in this directory and subdirectories"
 msgstr ""
 
-#: ../src/easytag.c:3474
+#: ../src/easytag.c:3460
 msgid "No file found in this directory"
 msgstr "Tak ditemukan berkas pada direktori ini"
 
-#: ../src/easytag.c:3542
+#: ../src/easytag.c:3528
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Galat saat membuka direktori '%s': (%s)"
 
-#: ../src/easytag.c:3578
+#: ../src/easytag.c:3564
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Tak dapat membaca direktori (%s)"
 
-#: ../src/easytag.c:3598
+#: ../src/easytag.c:3584
 msgid "Searching for audio files…"
 msgstr "Sedang mencari berkas audio…"
 
-#: ../src/easytag.c:3599
+#: ../src/easytag.c:3585
 msgid "Searching"
 msgstr "Mencari"
 
-#: ../src/easytag.c:4265
-#, fuzzy
+#: ../src/easytag.c:4251
 msgid "Select a directory to browse"
-msgstr "Tak bisa meramban direktori profil"
+msgstr "Pilih direktori untuk diramban"
 
 #. Menu items
-#: ../src/easytag.c:4411
+#: ../src/easytag.c:4397
 msgid "Tag selected files with this field"
 msgstr ""
 
-#: ../src/easytag.c:4423 ../src/scan_dialog.c:2128
+#: ../src/easytag.c:4409 ../src/scan_dialog.c:2128
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Ubah '_' dan '%20' ke spasi"
 
-#: ../src/easytag.c:4430 ../src/scan_dialog.c:2130
+#: ../src/easytag.c:4416 ../src/scan_dialog.c:2130
 msgid "Convert ' ' to '_'"
 msgstr "Ubah ' ' menjadi '_'"
 
-#: ../src/easytag.c:4441
+#: ../src/easytag.c:4427
 msgid "All uppercase"
 msgstr "Semua huruf besar"
 
-#: ../src/easytag.c:4448
+#: ../src/easytag.c:4434
 msgid "All lowercase"
 msgstr "Semua huruf kecil"
 
-#: ../src/easytag.c:4455
+#: ../src/easytag.c:4441
 msgid "First letter uppercase"
 msgstr "Huruf pertama kapital"
 
-#: ../src/easytag.c:4462
+#: ../src/easytag.c:4448
 msgid "First letter uppercase of each word"
 msgstr ""
 
-#: ../src/easytag.c:4473 ../src/prefs.c:1023 ../src/scan_dialog.c:2228
+#: ../src/easytag.c:4459 ../src/prefs.c:1023 ../src/scan_dialog.c:2254
 msgid "Remove spaces"
 msgstr "Buang spasi"
 
-#: ../src/easytag.c:4480
+#: ../src/easytag.c:4466
 msgid "Insert space before uppercase letter"
 msgstr ""
 
-#: ../src/easytag.c:4487
+#: ../src/easytag.c:4473
 msgid "Remove duplicate spaces or underscores"
 msgstr ""
 
-#: ../src/easytag.c:4494
+#: ../src/easytag.c:4480
 msgid "Remove all text"
 msgstr "Buang semua teks"
 
-#: ../src/easytag.c:4513
-#, fuzzy
+#: ../src/easytag.c:4499
 msgid "EasyTAG: Normal exit."
-msgstr "Simpan saat keluar"
+msgstr "EasyTAG: Keluar normal."
 
-#: ../src/easytag.c:4565
+#: ../src/easytag.c:4551
 msgid "Do you want to save them before quitting?"
 msgstr ""
 
-#: ../src/easytag.c:4592
+#: ../src/easytag.c:4578
 msgid "Do you really want to quit?"
 msgstr "Anda benar-benar ingin berhenti?"
 
-#: ../src/et_core.c:550
+#: ../src/et_core.c:551
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr ""
 
-#: ../src/et_core.c:579
+#: ../src/et_core.c:580
 #, c-format
 msgid "Error reading tag from Opus file (%s)"
 msgstr ""
 
-#: ../src/et_core.c:722
+#: ../src/et_core.c:723
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr ""
 
-#: ../src/et_core.c:2747
+#: ../src/et_core.c:2759
 msgid "ID3 Tag"
 msgstr "Tag ID3"
 
-#: ../src/et_core.c:2753
+#: ../src/et_core.c:2765
 msgid "Ogg Vorbis Tag"
 msgstr "Tag Ogg Vorbis"
 
-#: ../src/et_core.c:2759
+#: ../src/et_core.c:2771
 msgid "FLAC Vorbis Tag"
 msgstr "Tag FLAC Vorbis"
 
-#: ../src/et_core.c:2764
+#: ../src/et_core.c:2776
 msgid "APE Tag"
 msgstr "Tag APE"
 
-#: ../src/et_core.c:2769
+#: ../src/et_core.c:2781
 msgid "MP4/M4A/AAC Tag"
-msgstr ""
+msgstr "Tag MP4/M4A/AAC"
 
-#: ../src/et_core.c:2775
+#: ../src/et_core.c:2787
 msgid "Wavpack Tag"
 msgstr "Tag Wavpack"
 
-#: ../src/et_core.c:2781
+#: ../src/et_core.c:2793
 msgid "Opus Tag"
 msgstr "Tag Opus"
 
-#: ../src/et_core.c:2801
+#: ../src/et_core.c:2813
 msgid "MP3 File"
 msgstr "Berkas MP3"
 
-#: ../src/et_core.c:2805
+#: ../src/et_core.c:2817
 msgid "MP2 File"
 msgstr "Berkas MP2"
 
-#: ../src/et_core.c:2811
+#: ../src/et_core.c:2823
 msgid "Ogg Vorbis File"
 msgstr "Berkas Ogg Vorbis"
 
-#: ../src/et_core.c:2817
+#: ../src/et_core.c:2829
 msgid "Speex File"
 msgstr "Berkas Speex"
 
-#: ../src/et_core.c:2823
+#: ../src/et_core.c:2835
 msgid "FLAC File"
 msgstr "Berkas FLAC"
 
-#: ../src/et_core.c:2828
+#: ../src/et_core.c:2840
 msgid "MusePack File"
 msgstr "Berkas MusePack"
 
-#: ../src/et_core.c:2832
+#: ../src/et_core.c:2844
 #, fuzzy
 msgid "Monkey's Audio File"
 msgstr "Peringkat dari berkas audio."
 
-#: ../src/et_core.c:2837
+#: ../src/et_core.c:2849
 msgid "MP4/AAC File"
 msgstr "Berkas MP4/AAC"
 
-#: ../src/et_core.c:2843
+#: ../src/et_core.c:2855
 msgid "Wavpack File"
 msgstr "Berkas WavPack"
 
-#: ../src/et_core.c:2849
+#: ../src/et_core.c:2861
 msgid "Opus File"
 msgstr "Berkas Opus"
 
-#: ../src/et_core.c:2908 ../src/et_core.c:2963
+#: ../src/et_core.c:2920 ../src/et_core.c:2975
 msgid "File not found"
 msgstr "Berkas tak ditemukan"
 
-#: ../src/et_core.c:2913
-#, fuzzy, c-format
+#: ../src/et_core.c:2925
+#, c-format
 msgid "Cannot query file information (%s)"
-msgstr "Tak bisa membaca informasi berkas"
+msgstr "Tak dapat meminta informasi berkas (%s)"
 
-#: ../src/et_core.c:2947
-#, fuzzy
+#: ../src/et_core.c:2959
 msgid "Read-only file"
-msgstr "Berkas Hanya-baca."
+msgstr "Berkas hanya-baca"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:3011
+#: ../src/et_core.c:3023
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
 msgstr[0] "%u berkas"
 
-#: ../src/et_core.c:3215
+#: ../src/et_core.c:3227
 #, c-format
 msgid "Images (%d)"
 msgstr "Citra (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3257 ../src/flac_header.c:205
+#: ../src/et_core.c:3269 ../src/flac_header.c:205
 #: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
 #: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
@@ -2490,7 +2449,7 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3262 ../src/flac_header.c:210
+#: ../src/et_core.c:3274 ../src/flac_header.c:210
 #: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
 #: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
@@ -2498,20 +2457,20 @@ msgstr "%d kb/s"
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3408 ../src/scan_dialog.c:688
+#: ../src/et_core.c:3420 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 
-#: ../src/et_core.c:3410
+#: ../src/et_core.c:3422
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr ""
 
-#: ../src/et_core.c:3411 ../src/scan_dialog.c:690
+#: ../src/et_core.c:3423 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Terjemahan nama berkas"
 
-#: ../src/et_core.c:4116
+#: ../src/et_core.c:4129
 #, fuzzy, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Galat ketika menulis ke berkas unduhan."
@@ -2526,11 +2485,11 @@ msgid "Channels:"
 msgstr "Kanal:"
 
 #: ../src/flac_tag.c:131 ../src/flac_tag.c:850 ../src/flac_tag.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "Error while opening file: '%s' as FLAC (%s)."
-msgstr "Kesalahan saat membuka berkas \"%s\" untuk menulis."
+msgstr "Galat saat membuka berkas: '%s' sebagai FLAC (%s)."
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:310
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:304
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2543,11 +2502,11 @@ msgid "Picture block isn't valid: '%s'"
 msgstr ""
 
 #: ../src/flac_tag.c:1094
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Failed to write comments to file '%s' (%s)."
-msgstr "Gagal menulis file kunci privat '%s': %s"
+msgstr "Gagal menulis file kunci privat ‘%s’: %s"
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1161
 #, fuzzy, c-format
 msgid "Written tag of '%s'"
 msgstr "Tag Git:"
@@ -2565,9 +2524,8 @@ msgid ""
 msgstr ""
 
 #: ../src/id3_tag.c:219
-#, fuzzy
 msgid "Corrupted file"
-msgstr "Berkas telah rusak"
+msgstr "Berkas terkorupsi"
 
 #: ../src/id3_tag.c:592
 #, fuzzy, c-format
@@ -2616,7 +2574,7 @@ msgstr ""
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Terjadi galat sewaktu memperbaharui berkas."
 
-#: ../src/id3_tag.c:702 ../src/id3v24_tag.c:1042
+#: ../src/id3_tag.c:702 ../src/id3v24_tag.c:1108
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr ""
@@ -2677,9 +2635,8 @@ msgid "No file to parse"
 msgstr "Gagal mengurai berkas: %s"
 
 #: ../src/id3_tag.c:745
-#, fuzzy
 msgid "Attempting to write to a read-only file"
-msgstr "Mencoba mengubah model data yang hanya-baca"
+msgstr "Mencoba menulis ke suatu berkas yang hanya-baca"
 
 #: ../src/id3_tag.c:747
 msgid "Error in compression/uncompression"
@@ -2690,39 +2647,38 @@ msgstr ""
 msgid "Unknown error message"
 msgstr "Galat saat menerima pesan: %s"
 
-#: ../src/id3_tag.c:1353
-#, fuzzy, c-format
+#: ../src/id3_tag.c:1357
+#, c-format
 msgid "Error while creating temporary file: '%s'"
-msgstr "Terjadi galat ketika membuat berkas baru"
+msgstr "Galat ketika membuat berkas sementara: ‘%s’"
 
-#: ../src/id3_tag.c:1360
-#, fuzzy
+#: ../src/id3_tag.c:1364
 msgid "Error while creating temporary file"
-msgstr "Terjadi galat ketika membuat berkas baru"
+msgstr "Galat ketika membuat berkas sementara"
 
-#: ../src/id3_tag.c:1380
-#, fuzzy, c-format
+#: ../src/id3_tag.c:1384
+#, c-format
 msgid "Error while writing to file: '%s' (%s)"
-msgstr "Galat ketika menulis ke berkas \"%s\"."
+msgstr "Galat ketika menulis ke berkas: '%s' (%s)"
 
 #. Translators: The first string is a filename, the
 #. * second string is the number of bytes that were
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1497
+#: ../src/id3v24_tag.c:1563
 #, c-format
 msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
 msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/id3v24_tag.c:1518
-#, fuzzy, c-format
+#: ../src/id3v24_tag.c:1584
+#, c-format
 msgid "Cannot save tag of file '%s'"
-msgstr "Tak dapat menyimpan ke berkas \"{0}\"."
+msgstr "Tak dapat menyimpan tag berkas ‘%s’"
 
-#: ../src/id3v24_tag.c:1529
+#: ../src/id3v24_tag.c:1595
 #, fuzzy, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Galat saat menyimpan informasi lagu"
@@ -2732,9 +2688,8 @@ msgid "Log"
 msgstr "Log"
 
 #: ../src/misc.c:720
-#, fuzzy
 msgid "You must type a program name"
-msgstr "Anda harus menyatakan suatu nama berkas"
+msgstr "Anda harus mengetikkan suatu nama program"
 
 #: ../src/misc.c:721
 #, fuzzy
@@ -2742,14 +2697,14 @@ msgid "Program Name Error"
 msgstr "Nama program salah: %s"
 
 #: ../src/misc.c:800
-#, fuzzy, c-format
+#, c-format
 msgid "Executed command: %s"
-msgstr "Perintah Top"
+msgstr "Perintah yang dieksekusi: %s"
 
 #: ../src/misc.c:807
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to launch program: %s"
-msgstr "Gagal meluncurkan pratilik:%s.\n"
+msgstr "Gagal meluncurkan program: %s"
 
 #: ../src/misc.c:824
 msgid "Select File"
@@ -2802,9 +2757,8 @@ msgstr ""
 
 #. Create playlist in parent directory
 #: ../src/misc.c:1219
-#, fuzzy
 msgid "Create playlist in the parent directory"
-msgstr "Buat berkas baru di direktori yang diberikan"
+msgstr "Buat daftar putar di direktori induk"
 
 #: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
@@ -2823,9 +2777,8 @@ msgid ""
 msgstr ""
 
 #: ../src/misc.c:1241
-#, fuzzy
 msgid "Playlist Content"
-msgstr "Ganjal Isi"
+msgstr "Isi Daftar Putar"
 
 #: ../src/misc.c:1247
 #, fuzzy
@@ -2843,21 +2796,20 @@ msgid "Write info using:"
 msgstr "Sedang mengganti info paket yang tersedia, dengan %s.\n"
 
 #: ../src/misc.c:1468
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot write playlist file '%s'"
-msgstr "Tak bisa menulis ke berkas temporer %s"
+msgstr "Tak bisa menulis berkas daftar putar ‘%s’"
 
 #: ../src/misc.c:1472
-#, fuzzy
 msgid "Playlist File Error"
-msgstr "Error menghapus berkas '%s': %s"
+msgstr "Galat Berkas Daftar Putar"
 
 #: ../src/misc.c:1480
 #, fuzzy, c-format
 msgid "Written playlist file '%s'"
 msgstr "Untuk menyimpan daftar putar ke berkas"
 
-#: ../src/misc.c:1544 ../src/scan_dialog.c:2713 ../src/scan_dialog.c:2775
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2747 ../src/scan_dialog.c:2809
 #, fuzzy
 msgid "Invalid scanner mask"
 msgstr "Mask pengubah bagi akselerator"
@@ -2867,9 +2819,8 @@ msgid "CD"
 msgstr "CD"
 
 #: ../src/misc.c:1930
-#, fuzzy
 msgid "Find Files"
-msgstr "Cari berkas"
+msgstr "Cari Berkas"
 
 #: ../src/misc.c:1962
 msgid ""
@@ -2901,9 +2852,8 @@ msgstr "Tag"
 
 #. Property of the search
 #: ../src/misc.c:1990 ../src/prefs.c:335
-#, fuzzy
 msgid "Case sensitive"
-msgstr "Huruf besar berbeda dengan huruf kecil"
+msgstr "Peka huruf besar kecil"
 
 #: ../src/misc.c:2217
 #, fuzzy
@@ -2928,14 +2878,12 @@ msgstr "Berkas:"
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
 #: ../src/misc.c:2770
-#, fuzzy
 msgid " Load "
-msgstr "Muat"
+msgstr " Muat "
 
 #: ../src/misc.c:2788
-#, fuzzy
 msgid "Content of Text File"
-msgstr "Berkas Teks Baru"
+msgstr "Isi Berkas Teks"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
 #: ../src/misc.c:2809 ../src/misc.c:2904
@@ -2944,15 +2892,13 @@ msgstr ""
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
 #: ../src/misc.c:2818 ../src/misc.c:2913
-#, fuzzy
 msgid "Delete the selected line"
-msgstr "Menghapus baris saat ini"
+msgstr "Hapus baris yang dipilih"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3408
-#, fuzzy
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3403
 msgid "Delete all blank lines"
-msgstr "Hapus Sem_ua Kejadian"
+msgstr "Hapus semua baris kosong"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
 #: ../src/misc.c:2839 ../src/misc.c:2934
@@ -2967,20 +2913,17 @@ msgid "Move down the selected line"
 msgstr "Memindah baris yang dipilih sebaris ke bawah"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3432
-#, fuzzy
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3427
 msgid "Reload"
 msgstr "Muat Ulang"
 
 #: ../src/misc.c:2882
-#, fuzzy
 msgid "List of Files"
-msgstr "Daftar file"
+msgstr "Daftar Berkas"
 
 #: ../src/misc.c:2977
-#, fuzzy
 msgid "Selected line:"
-msgstr "Pilih revisi dari baris yang dipilih"
+msgstr "Baris yang dipilih"
 
 #: ../src/misc.c:2995
 msgid ""
@@ -2993,29 +2936,29 @@ msgstr ""
 msgid "Cannot retrieve file info (%s)"
 msgstr "Tak bisa mengambil info berkas (%s)"
 
-#: ../src/misc.c:3144
+#: ../src/misc.c:3145
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Tak dapat membuka berkas '%s' (%s)"
 
-#: ../src/misc.c:3180
+#: ../src/misc.c:3174
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Galat saat membaca berkas (%s)"
 
-#: ../src/misc.c:3396
+#: ../src/misc.c:3391
 msgid "Insert a blank line"
 msgstr "Menyisipkan suatu baris kosong"
 
-#: ../src/misc.c:3402
+#: ../src/misc.c:3397
 msgid "Delete this line"
 msgstr "Menghapus baris ini"
 
-#: ../src/misc.c:3417
+#: ../src/misc.c:3412
 msgid "Move up this line"
 msgstr "Memindah baris ini ke atas"
 
-#: ../src/misc.c:3423
+#: ../src/misc.c:3418
 msgid "Move down this line"
 msgstr "Memindah baris ini ke bawah"
 
@@ -3116,204 +3059,204 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Galat: Ggagal membuka berkas: '%s' sebagai Vorbis (%s)."
 
-#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
+#: ../src/ogg_tag.c:706 ../src/ogg_tag.c:881
 #, c-format
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr ""
 
-#: ../src/ogg_tag.c:1035 ../src/picture.c:1258
+#: ../src/ogg_tag.c:1030 ../src/picture.c:1082
 #, c-format
 msgid "Error with 'loader_write': %s"
 msgstr "Galat dengan 'loader_write': %s"
 
-#: ../src/ogg_tag.c:1050 ../src/picture.c:1181
+#: ../src/ogg_tag.c:1045 ../src/picture.c:1005
 #, c-format
 msgid "Error with 'loader_close': %s"
 msgstr "Galat dengan 'loader_close': %s"
 
-#: ../src/picture.c:104
+#: ../src/picture.c:244 ../src/picture.c:269
 #, c-format
-msgid "Image file not saved: %s"
-msgstr "Berkas citra tak disimpan: %s"
+msgid "Image file not loaded: %s"
+msgstr "Berkas citra tak dimuat: %s"
 
-#: ../src/picture.c:154
+#: ../src/picture.c:261
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Tak dapat membuka berkas: '%s'"
 
-#: ../src/picture.c:158
+#: ../src/picture.c:265
 msgid "Image File Error"
 msgstr "Galat Berkas Citra"
 
-#: ../src/picture.c:162 ../src/picture.c:424
-#, c-format
-msgid "Image file not loaded: %s"
-msgstr "Berkas citra tak dimuat: %s"
-
-#: ../src/picture.c:446
+#: ../src/picture.c:276
 msgid "Image file loaded"
 msgstr "Berkas citra dimuat"
 
-#: ../src/picture.c:504
+#: ../src/picture.c:334
 msgid "Add Images"
 msgstr "Tambah Citra"
 
-#: ../src/picture.c:514 ../src/picture.c:875
+#: ../src/picture.c:344 ../src/picture.c:701
 msgid "All Files"
 msgstr "Semua Berkas"
 
-#: ../src/picture.c:520 ../src/picture.c:881
+#: ../src/picture.c:350 ../src/picture.c:707
 msgid "PNG and JPEG"
 msgstr "PNG dan JPEG"
 
-#: ../src/picture.c:651
+#: ../src/picture.c:477
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Properti Citra %d/%d"
 
-#: ../src/picture.c:677
+#: ../src/picture.c:503
 msgid "Image Type"
 msgstr "Tipe Citra"
 
 #. Description of the picture
-#: ../src/picture.c:735
+#: ../src/picture.c:561
 msgid "Image Description:"
 msgstr "Deskripsi Citra"
 
-#: ../src/picture.c:862
+#: ../src/picture.c:688
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Simpan Citra %d/%d"
 
-#: ../src/picture.c:1022
+#: ../src/picture.c:763
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Berkas citra tak disimpan: %s"
+
+#: ../src/picture.c:846
 msgid "JPEG image"
 msgstr "Citra JPEG"
 
-#: ../src/picture.c:1024
+#: ../src/picture.c:848
 msgid "PNG image"
 msgstr "Citra PNG"
 
-#: ../src/picture.c:1026
+#: ../src/picture.c:850
 msgid "GIF image"
 msgstr "Citra GIF"
 
-#: ../src/picture.c:1028
+#: ../src/picture.c:852
 msgid "Unknown image"
 msgstr "Citra tak dikenal"
 
-#: ../src/picture.c:1040
+#: ../src/picture.c:864
 msgid "32x32 pixel PNG file icon"
 msgstr ""
 
-#: ../src/picture.c:1042
+#: ../src/picture.c:866
 msgid "Other file icon"
 msgstr "Ikon berkas lain"
 
-#: ../src/picture.c:1044
+#: ../src/picture.c:868
 msgid "Cover (front)"
 msgstr "Sampul (depan)"
 
-#: ../src/picture.c:1046
+#: ../src/picture.c:870
 msgid "Cover (back)"
 msgstr "Sampul (belakang)"
 
-#: ../src/picture.c:1048
+#: ../src/picture.c:872
 msgid "Leaflet page"
 msgstr "Halaman leaflet"
 
-#: ../src/picture.c:1050
+#: ../src/picture.c:874
 msgid "Media (e.g. label side of CD)"
 msgstr ""
 
-#: ../src/picture.c:1052
+#: ../src/picture.c:876
 msgid "Lead artist/lead performer/soloist"
 msgstr ""
 
-#: ../src/picture.c:1054
+#: ../src/picture.c:878
 #, fuzzy
 msgid "Artist/performer"
 msgstr "Artis Album"
 
-#: ../src/picture.c:1056
+#: ../src/picture.c:880
 msgid "Conductor"
 msgstr "Dirigen"
 
-#: ../src/picture.c:1058
+#: ../src/picture.c:882
 msgid "Band/Orchestra"
 msgstr "Band/Orkestra"
 
-#: ../src/picture.c:1062
+#: ../src/picture.c:886
 #, fuzzy
 msgid "Lyricist/text writer"
 msgstr "Penulis Image Diska"
 
-#: ../src/picture.c:1064
+#: ../src/picture.c:888
 msgid "Recording location"
 msgstr "Lokasi perekaman"
 
-#: ../src/picture.c:1066
+#: ../src/picture.c:890
 msgid "During recording"
 msgstr "Saat perekaman"
 
-#: ../src/picture.c:1068
+#: ../src/picture.c:892
 #, fuzzy
 msgid "During performance"
 msgstr "Saat "
 
-#: ../src/picture.c:1070
+#: ../src/picture.c:894
 #, fuzzy
 msgid "Movie/video screen capture"
 msgstr "Rekam video pendek atas layar"
 
-#: ../src/picture.c:1072
+#: ../src/picture.c:896
 msgid "A bright colored fish"
 msgstr "Seekor ikan berwarna cerah"
 
-#: ../src/picture.c:1074
+#: ../src/picture.c:898
 msgid "Illustration"
 msgstr "Ilustrasi"
 
-#: ../src/picture.c:1076
+#: ../src/picture.c:900
 msgid "Band/Artist logotype"
 msgstr ""
 
-#: ../src/picture.c:1078
+#: ../src/picture.c:902
 #, fuzzy
 msgid "Publisher/studio logotype"
 msgstr "Citra 3D Studio"
 
-#: ../src/picture.c:1082
+#: ../src/picture.c:906
 msgid "Unknown image type"
 msgstr "Tipe citra tak dikenal"
 
-#: ../src/picture.c:1112 ../src/picture.c:1123
+#: ../src/picture.c:936 ../src/picture.c:947
 msgid "pixels"
 msgstr "piksel"
 
-#: ../src/picture.c:1113 ../src/picture.c:1124
+#: ../src/picture.c:937 ../src/picture.c:948
 msgid "Type"
 msgstr "Tipe"
 
-#: ../src/picture.c:1125
+#: ../src/picture.c:949
 msgid "Description"
 msgstr "Deskripsi"
 
-#: ../src/picture.c:1241
+#: ../src/picture.c:1065
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1248
+#: ../src/picture.c:1072
 msgid "Cannot display the image"
 msgstr "Tak data menampilkan citra"
 
-#: ../src/picture.c:1250
+#: ../src/picture.c:1074
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 
-#: ../src/picture.c:1252
+#: ../src/picture.c:1076
 msgid "Load Image File"
 msgstr "Muat Berkas Citra"
 
@@ -3374,7 +3317,6 @@ msgstr ""
 #. * Misc
 #.
 #: ../src/prefs.c:222
-#, fuzzy
 msgid "Misc"
 msgstr "Rupa-rupa"
 
@@ -3502,29 +3444,24 @@ msgid "Ascending composer"
 msgstr "nama singkat komposer"
 
 #: ../src/prefs.c:308
-#, fuzzy
 msgid "Descending composer"
-msgstr "nama singkat komposer"
+msgstr "Komposer menurun"
 
 #: ../src/prefs.c:310
-#, fuzzy
 msgid "Ascending original artist"
-msgstr "ID Artis MB"
+msgstr "Artis asli meningkat"
 
 #: ../src/prefs.c:312
-#, fuzzy
 msgid "Descending original artist"
-msgstr "ID Artis MB"
+msgstr "Artis asli menurun"
 
 #: ../src/prefs.c:314
-#, fuzzy
 msgid "Ascending copyright"
-msgstr "Kalimat hak cipta"
+msgstr "Hak cipta meningkat"
 
 #: ../src/prefs.c:316
-#, fuzzy
 msgid "Descending copyright"
-msgstr "Kalimat hak cipta"
+msgstr "Hak cipta menurun"
 
 #: ../src/prefs.c:318
 msgid "Ascending URL"
@@ -3545,14 +3482,12 @@ msgid "Descending encoded by"
 msgstr "Terakhir Disimpan Oleh"
 
 #: ../src/prefs.c:326
-#, fuzzy
 msgid "Ascending creation date"
-msgstr "Tanggal Pembuatan Digital"
+msgstr "Tanggal pembuatan meningkat"
 
 #: ../src/prefs.c:328
-#, fuzzy
 msgid "Descending creation date"
-msgstr "Tanggal Pembuatan Digital"
+msgstr "Tanggal pembuatan menurun"
 
 #: ../src/prefs.c:332
 msgid "Select the type of file sorting when loading a directory."
@@ -3629,9 +3564,8 @@ msgstr ""
 
 #. Extension case (lower/upper?)
 #: ../src/prefs.c:441
-#, fuzzy
 msgid "Convert filename extension to:"
-msgstr "Tidak bisa mengubah nama berkas '%s' ke UTF-8: %s\n"
+msgstr "Konversikan ekstensi nama berkas menjadi:"
 
 #: ../src/prefs.c:444
 msgid "Lower Case"
@@ -3689,9 +3623,8 @@ msgstr ""
 
 #. Character Set for Filename
 #: ../src/prefs.c:481
-#, fuzzy
 msgid "Character Set for Filename"
-msgstr "Pengkodean set karakter untuk subtitel."
+msgstr "Set Karakter untuk Nama Berkas"
 
 #. Rules for character set
 #: ../src/prefs.c:493
@@ -3808,9 +3741,8 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs.c:649
-#, fuzzy
 msgid "Original artist"
-msgstr "Artis Asli"
+msgstr "Artis asli"
 
 #.
 #. * ID3 Tag Settings
@@ -3886,9 +3818,8 @@ msgstr ""
 
 #. ID3v2 tags
 #: ../src/prefs.c:734
-#, fuzzy
 msgid "ID3v2 tags"
-msgstr "Tag API (C/C++)"
+msgstr "Tag ID3v2"
 
 #. Write ID3v2 tag
 #: ../src/prefs.c:747
@@ -3917,7 +3848,6 @@ msgstr ""
 #. Charset
 #. Id3V1 writing character set
 #: ../src/prefs.c:778 ../src/prefs.c:882
-#, fuzzy
 msgid "Charset:"
 msgstr "Set karakter:"
 
@@ -3938,9 +3868,8 @@ msgstr ""
 #. ID3v2 Additional iconv() options
 #. ID3V1 Additional iconv() options
 #: ../src/prefs.c:825 ../src/prefs.c:894
-#, fuzzy
 msgid "Additional settings for iconv():"
-msgstr "Pengaturan bagi depth cueing"
+msgstr "Pengaturan tambahan bagi iconv():"
 
 #: ../src/prefs.c:831 ../src/prefs.c:900
 msgid "No"
@@ -3958,15 +3887,13 @@ msgid "//TRANSLIT"
 msgstr ""
 
 #: ../src/prefs.c:850 ../src/prefs.c:919
-#, fuzzy
 msgid "//IGNORE"
-msgstr "Aba_ikan"
+msgstr "//ABAIKAN"
 
 #. ID3v1 tags
 #: ../src/prefs.c:859
-#, fuzzy
 msgid "ID3v1 tags"
-msgstr "Tag API (C/C++)"
+msgstr "Tag ID3v1"
 
 #. Write ID3v1 tag
 #: ../src/prefs.c:873
@@ -4019,7 +3946,6 @@ msgstr ""
 #. * Scanner
 #.
 #: ../src/prefs.c:980
-#, fuzzy
 msgid "Scanner"
 msgstr "Pemindai"
 
@@ -4033,9 +3959,8 @@ msgid "Convert underscore character '_' and string '%20' to space ' '"
 msgstr ""
 
 #: ../src/prefs.c:998 ../src/prefs.c:1022
-#, fuzzy
 msgid "Convert space ' ' to underscore '_'"
-msgstr "Tekan spasi untuk menjungkit."
+msgstr "Konversikan spasi ‘ ‘ ke garis bawah ‘_’"
 
 #: ../src/prefs.c:1010 ../src/prefs.c:1012
 msgid ""
@@ -4075,9 +4000,8 @@ msgstr ""
 
 #. Properties of the scanner window
 #: ../src/prefs.c:1057
-#, fuzzy
 msgid "Scanner Window"
-msgstr "Jendela Yang Tampak"
+msgstr "Jendela Pemindai"
 
 #: ../src/prefs.c:1063
 #, fuzzy
@@ -4136,9 +4060,8 @@ msgstr "CDDB"
 
 #. CDDB Server Settings (Automatic Search)
 #: ../src/prefs.c:1134
-#, fuzzy
 msgid "Server Settings for Automatic Search"
-msgstr "Cari kunci di server kunci"
+msgstr "Pengaturan Server untuk Pencarian Otomatis"
 
 #: ../src/prefs.c:1143 ../src/prefs.c:1182 ../src/prefs.c:1216
 msgid "Name:"
@@ -4150,21 +4073,18 @@ msgid "Port:"
 msgstr "Porta:"
 
 #: ../src/prefs.c:1172 ../src/prefs.c:1200 ../src/prefs.c:1234
-#, fuzzy
 msgid "CGI Path:"
-msgstr "Path Akselerator"
+msgstr "Path CGI:"
 
 #. CDDB Server Settings (Manual Search)
 #: ../src/prefs.c:1208
-#, fuzzy
 msgid "Server Settings for Manual Search"
-msgstr "Cari kunci di server kunci"
+msgstr "Pengaturan Server untuk Pencarian Manual"
 
 #. Local access for CDDB (Automatic Search)
 #: ../src/prefs.c:1242
-#, fuzzy
 msgid "Local CDDB"
-msgstr "Pada Komputer Ini Saja"
+msgstr "CDDB Lokal"
 
 #: ../src/prefs.c:1250
 msgid "Path:"
@@ -4201,9 +4121,8 @@ msgid "Name of the proxy server."
 msgstr "Server Proxy SIP"
 
 #: ../src/prefs.c:1317
-#, fuzzy
 msgid "Port of the proxy server."
-msgstr "Server Proxy SIP"
+msgstr "Port server proksi."
 
 #: ../src/prefs.c:1321
 msgid "User Name:"
@@ -4226,9 +4145,8 @@ msgstr "Silakan masukkan sandi server basis data bagi pengguna %1:"
 
 #. Track Name list (CDDB results)
 #: ../src/prefs.c:1343
-#, fuzzy
 msgid "Track Name List"
-msgstr "Nama daftar kontak:"
+msgstr "Daftar Nama Trek"
 
 #: ../src/prefs.c:1350
 msgid ""
@@ -4257,9 +4175,8 @@ msgid "Confirmation"
 msgstr "Konfirmasi"
 
 #: ../src/prefs.c:1379
-#, fuzzy
 msgid "Confirm exit from program"
-msgstr "Lepaskan _Dari Program Yang Berjalan"
+msgstr "Konfirmasikan keluar dari program"
 
 #: ../src/prefs.c:1382
 msgid ""
@@ -4268,24 +4185,20 @@ msgid ""
 msgstr ""
 
 #: ../src/prefs.c:1385
-#, fuzzy
 msgid "Confirm writing of file tag"
-msgstr "Ada error saat menulisi berkas sesi '%s': %s\n"
+msgstr "Konfirmasikan penulisan tag berkas"
 
 #: ../src/prefs.c:1389
-#, fuzzy
 msgid "Confirm renaming of file"
-msgstr "Error mengganti nama berkas \"%s\": %s"
+msgstr "Konfirmasikan penggantian nama berkas"
 
 #: ../src/prefs.c:1393
-#, fuzzy
 msgid "Confirm deleting of file"
-msgstr "Menghapus berkas .la: %r"
+msgstr "Konfirmasikan penghapusan berkas"
 
 #: ../src/prefs.c:1397
-#, fuzzy
 msgid "Confirm writing of playlist"
-msgstr "Tambah ke Daftar Putar"
+msgstr "Konfirmasikan penulisan daftar putar"
 
 #: ../src/prefs.c:1401
 msgid "Confirm changing directory when there are unsaved changes"
@@ -4308,9 +4221,8 @@ msgid "Configuration saved"
 msgstr "Konfigurasi disimpan"
 
 #: ../src/prefs.c:1622
-#, fuzzy
 msgid "Configuration unchanged"
-msgstr "Sandi tidak berubah"
+msgstr "Konfigurasi tidak berubah"
 
 #: ../src/prefs.c:1713
 msgid "The selected path for 'Default path to files' is invalid"
@@ -4334,9 +4246,8 @@ msgid "The audio file player '%s' cannot be found"
 msgstr ""
 
 #: ../src/prefs.c:1833
-#, fuzzy
 msgid "Audio Player Error"
-msgstr "Galat putar balik audio."
+msgstr "Galat Pemutar Audio"
 
 #: ../src/scan_dialog.c:182
 #, fuzzy
@@ -4379,9 +4290,9 @@ msgid "New filename successfully scanned: %s"
 msgstr "Proyek baru telah sukses dibuat."
 
 #: ../src/scan_dialog.c:1632
-#, fuzzy, c-format
+#, c-format
 msgid "Error while processing fields: %s"
-msgstr "Terjadi galat saat memroses \"{0}\": {1}"
+msgstr "Galat saat memroses ruas: %s"
 
 #. The window
 #: ../src/scan_dialog.c:1802
@@ -4391,15 +4302,13 @@ msgstr "Nama file yang hendak dibuka dan ditampilkan"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
 #: ../src/scan_dialog.c:1811
-#, fuzzy
 msgid "Scan Files"
-msgstr "Semua Berkas"
+msgstr "Pindai Berkas"
 
 #. Option Menu
 #: ../src/scan_dialog.c:1839
-#, fuzzy
 msgid "Scanner:"
-msgstr "Pelarik %s"
+msgstr "Pemindai:"
 
 #: ../src/scan_dialog.c:1860
 #, fuzzy
@@ -4407,9 +4316,8 @@ msgid "Select the type of scanner to use"
 msgstr "(Usang) Tipe proksi yang akan dipakai"
 
 #: ../src/scan_dialog.c:1869
-#, fuzzy
 msgid "Scanner Preferences"
-msgstr "Preferensi Ekiga"
+msgstr "Preferensi Pemindai"
 
 #: ../src/scan_dialog.c:1878
 #, fuzzy
@@ -4417,9 +4325,8 @@ msgid "Show / Hide Masks Editor"
 msgstr "Tampilkan atau sembunyikan pembidik silang"
 
 #: ../src/scan_dialog.c:1888
-#, fuzzy
 msgid "Show / Hide Legend"
-msgstr "Tampilkan/Sembunyikan toolbar %s"
+msgstr "Tampilkan / Sembunyikan Legenda"
 
 #: ../src/scan_dialog.c:1918
 msgid ""
@@ -4452,9 +4359,8 @@ msgid "Rename file preview"
 msgstr "Pratinjau Format Berkas"
 
 #: ../src/scan_dialog.c:2030
-#, fuzzy
 msgid "Select fields:"
-msgstr "Pilih Ruas"
+msgstr "Pilih ruas:"
 
 #: ../src/scan_dialog.c:2033
 msgid ""
@@ -4572,7 +4478,6 @@ msgid "Process encoder name field"
 msgstr "Nama ruas kotak kombo"
 
 #: ../src/scan_dialog.c:2116
-#, fuzzy
 msgid "Invert selection"
 msgstr "Balik pilihan"
 
@@ -4582,121 +4487,113 @@ msgid "Select/Unselect all"
 msgstr "Keluarkan semua trek dari pilihan"
 
 #: ../src/scan_dialog.c:2138
-#, fuzzy
 msgid "Convert:"
-msgstr "_Konversi"
+msgstr "Konversikan:"
 
 #: ../src/scan_dialog.c:2140
-#, fuzzy
 msgid "to: "
-msgstr "Ke '%s':"
+msgstr "Ke ‘%s’:"
 
 #: ../src/scan_dialog.c:2147
-#, fuzzy
 msgid "Do not convert"
-msgstr "Jangan Lacak"
+msgstr "Jangan konversikan"
 
-#: ../src/scan_dialog.c:2166
+#: ../src/scan_dialog.c:2177
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2169
+#: ../src/scan_dialog.c:2180
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2172
+#: ../src/scan_dialog.c:2183
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr ""
 
-#: ../src/scan_dialog.c:2179
-#, fuzzy
+#: ../src/scan_dialog.c:2190
 msgid "Capitalize all"
-msgstr "Semu_a Halaman"
+msgstr "Kapitalkan semua"
 
-#: ../src/scan_dialog.c:2181
-#, fuzzy
+#: ../src/scan_dialog.c:2192
 msgid "Lowercase all"
-msgstr "Semu_a Halaman"
+msgstr "Semua huruf kecil"
 
-#: ../src/scan_dialog.c:2183
-#, fuzzy
+#: ../src/scan_dialog.c:2194
 msgid "Capitalize first letter"
-msgstr "Kapitalkan _huruf pertama kalimat"
+msgstr "Kapitalkan huruf pertama"
 
-#: ../src/scan_dialog.c:2185
+#: ../src/scan_dialog.c:2196
 msgid "Capitalize the first letter of each word"
 msgstr ""
 
-#: ../src/scan_dialog.c:2186
-#, fuzzy
+#: ../src/scan_dialog.c:2197
 msgid "Detect Roman numerals"
-msgstr "Angka Counting·Rod"
+msgstr "Deteksi angka Romawi"
 
-#: ../src/scan_dialog.c:2188
-#, fuzzy
+#: ../src/scan_dialog.c:2199
 msgid "Do not change capitalization"
-msgstr "Tidak dapat mengubah nama"
+msgstr "Jangan ubah kapitalisasi"
 
-#: ../src/scan_dialog.c:2210
+#: ../src/scan_dialog.c:2236
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2213
+#: ../src/scan_dialog.c:2239
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2216
+#: ../src/scan_dialog.c:2242
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2219
+#: ../src/scan_dialog.c:2245
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2222
+#: ../src/scan_dialog.c:2248
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2230
+#: ../src/scan_dialog.c:2256
 msgid "Insert a space before uppercase letters"
 msgstr ""
 
-#: ../src/scan_dialog.c:2232
+#: ../src/scan_dialog.c:2258
 msgid "Remove duplicate spaces and underscores"
 msgstr ""
 
-#: ../src/scan_dialog.c:2234
+#: ../src/scan_dialog.c:2260
 msgid "Do not change word separators"
 msgstr ""
 
-#: ../src/scan_dialog.c:2248
+#: ../src/scan_dialog.c:2282
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2251
+#: ../src/scan_dialog.c:2285
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
 msgstr ""
 
-#: ../src/scan_dialog.c:2254
+#: ../src/scan_dialog.c:2288
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4705,173 +4602,169 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan_dialog.c:2261
-#, fuzzy
+#: ../src/scan_dialog.c:2295
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan_dialog.c:2267
+#: ../src/scan_dialog.c:2301
 #, c-format
 msgid "%a: artist"
 msgstr "%a: artis"
 
-#: ../src/scan_dialog.c:2270
+#: ../src/scan_dialog.c:2304
 #, fuzzy
 msgid "%z: album artist"
 msgstr "Artis Album"
 
-#: ../src/scan_dialog.c:2273
+#: ../src/scan_dialog.c:2307
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan_dialog.c:2276
+#: ../src/scan_dialog.c:2310
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentar"
 
-#: ../src/scan_dialog.c:2279
+#: ../src/scan_dialog.c:2313
 #, fuzzy, c-format
 msgid "%p: composer"
 msgstr "Komposer"
 
-#: ../src/scan_dialog.c:2282
+#: ../src/scan_dialog.c:2316
 msgid "%r: copyright"
 msgstr "%r: hak cipta"
 
-#: ../src/scan_dialog.c:2285
+#: ../src/scan_dialog.c:2319
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: nomor cakram"
 
-#: ../src/scan_dialog.c:2288
+#: ../src/scan_dialog.c:2322
 #, fuzzy, c-format
 msgid "%e: encoded by"
 msgstr "Dienkode Oleh"
 
-#: ../src/scan_dialog.c:2291
+#: ../src/scan_dialog.c:2325
 #, c-format
 msgid "%g: genre"
 msgstr "%g: aliran"
 
-#: ../src/scan_dialog.c:2294
+#: ../src/scan_dialog.c:2328
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: diabaikan"
 
-#: ../src/scan_dialog.c:2297
+#: ../src/scan_dialog.c:2331
 msgid "%l: number of tracks"
 msgstr "%l: cacah trek"
 
-#: ../src/scan_dialog.c:2300
+#: ../src/scan_dialog.c:2334
 #, fuzzy, c-format
 msgid "%o: orig. artist"
 msgstr "Artis Album"
 
-#: ../src/scan_dialog.c:2303
+#: ../src/scan_dialog.c:2337
 #, c-format
 msgid "%n: track"
 msgstr "%n: trek"
 
-#: ../src/scan_dialog.c:2306
+#: ../src/scan_dialog.c:2340
 msgid "%t: title"
 msgstr "%t: judul"
 
-#: ../src/scan_dialog.c:2309
+#: ../src/scan_dialog.c:2343
 #, c-format
 msgid "%u: URL"
 msgstr "%u: URL"
 
-#: ../src/scan_dialog.c:2312
+#: ../src/scan_dialog.c:2346
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: cacah cakram"
 
-#: ../src/scan_dialog.c:2315
+#: ../src/scan_dialog.c:2349
 msgid "%y: year"
 msgstr "%y: tahun"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan_dialog.c:2322
+#: ../src/scan_dialog.c:2356
 #, fuzzy
 msgid "Mask Editor"
 msgstr "Penulis/Penyunting"
 
-#: ../src/scan_dialog.c:2376
+#: ../src/scan_dialog.c:2410
 #, fuzzy
 msgid "Create New Mask"
 msgstr "Buat topik baru"
 
-#: ../src/scan_dialog.c:2386
+#: ../src/scan_dialog.c:2420
 #, fuzzy
 msgid "Move Up this Mask"
 msgstr "Pindah ke Area Kerja _Atas"
 
-#: ../src/scan_dialog.c:2396
+#: ../src/scan_dialog.c:2430
 #, fuzzy
 msgid "Move Down this Mask"
 msgstr "Catan URL ini"
 
-#: ../src/scan_dialog.c:2406
+#: ../src/scan_dialog.c:2440
 #, fuzzy
 msgid "Duplicate Mask"
 msgstr "Mask Subnet:"
 
-#: ../src/scan_dialog.c:2416
+#: ../src/scan_dialog.c:2450
 #, fuzzy
 msgid "Add Default Masks"
 msgstr "Jarak luar default"
 
-#: ../src/scan_dialog.c:2426
+#: ../src/scan_dialog.c:2460
 #, fuzzy
 msgid "Remove Mask"
 msgstr "Mask Subnet:"
 
-#: ../src/scan_dialog.c:2436
+#: ../src/scan_dialog.c:2470
 #, fuzzy
 msgid "Save Masks"
 msgstr "Simp_an Sebagai"
 
-#: ../src/scan_dialog.c:3016
+#: ../src/scan_dialog.c:3050
 #, fuzzy
 msgid "New_mask"
 msgstr "Mask Subnet:"
 
-#: ../src/scan_dialog.c:3055
-#, fuzzy
+#: ../src/scan_dialog.c:3089
 msgid "Copy: No row selected"
-msgstr "Tidak ada statistik yang dipilih."
+msgstr "Salin: Tak ada baris yang dipilih"
 
-#: ../src/scan_dialog.c:3148
+#: ../src/scan_dialog.c:3182
 #, fuzzy
 msgid "Remove: No row selected"
 msgstr "Tidak ada statistik yang dipilih."
 
-#: ../src/scan_dialog.c:3195
-#, fuzzy
+#: ../src/scan_dialog.c:3229
 msgid "Move Up: No row selected"
-msgstr "Memindahkan tajuk yang dipilih naik satu baris"
+msgstr "Pindah Naik: Tak ada baris yang dipilih"
 
-#: ../src/scan_dialog.c:3239
-#, fuzzy
+#: ../src/scan_dialog.c:3273
 msgid "Move Down: No row selected"
-msgstr "Memindahkan tajuk yang dipilih turun satu baris"
+msgstr "Pindah Turun: Tak ada baris yang dipilih"
 
 #: ../src/setting.c:924
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Cannot write configuration file: %s (%s)"
-msgstr "gagal menulis berkas konfigurasi"
+msgstr "Galat: Tak bisa menulis berkas konfigurasi: %s (%s)"
 
 #: ../src/setting.c:944 ../src/setting.c:961 ../src/setting.c:981
-#, fuzzy, c-format
+#, c-format
 msgid "Error while writing configuration file: %s"
-msgstr "Galat ketika menulis ke berkas \"%s\"."
+msgstr "Galat ketika menulis berkas konfigurasi: %s"
 
 #: ../src/setting.c:1100
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open configuration file '%s' (%s)"
-msgstr "Tak bisa membuka berkas konfig '%s': %s\n"
+msgstr "Tak bisa membuka berkas konfigurasi '%s' (%s)"
 
 #: ../src/setting.c:1102
 #, fuzzy
@@ -4879,9 +4772,9 @@ msgid "Loading default configuration"
 msgstr "gunakan berkas konfigurasi bukan bawaan"
 
 #: ../src/setting.c:1143
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot create or open file '%s' (%s)"
-msgstr "Buka suatu berkas atau suatu set berkas"
+msgstr "Tak bisa membuat atau membuka berkas ‘%s’ (%s)"
 
 #: ../src/setting.c:1203
 #, fuzzy, c-format
@@ -4889,9 +4782,9 @@ msgid "Error: Cannot write list to file: %s (%s)"
 msgstr "Kesalahan saat coba menulis berkas CSV"
 
 #: ../src/setting.c:1221
-#, fuzzy, c-format
+#, c-format
 msgid "Error while writing list file: %s"
-msgstr "Galat ketika menulis ke berkas \"%s\"."
+msgstr "Galat ketika menulis berkas daftar: %s"
 
 #. Fall back to defaults
 #: ../src/setting.c:1301
@@ -4922,3 +4815,6 @@ msgstr "gagal membaca berkas konfigurasi"
 #, fuzzy, c-format
 msgid "Error: Cannot create directory '%s' (%s)"
 msgstr "Tak bisa membuat direktori sementara."
+
+#~ msgid "Cannot write tag in file '%s' (%s)"
+#~ msgstr "Tak dapat menulis tag dalam berkas '%s' (%s)"
diff --git a/po/pl.po b/po/pl.po
index 901cef5..24b9ed2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: easytag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-07 19:02+0200\n"
-"PO-Revision-Date: 2014-04-07 19:03+0200\n"
+"POT-Creation-Date: 2014-09-07 00:59+0200\n"
+"PO-Revision-Date: 2014-09-07 01:00+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <gnomepl at aviary.pl>\n"
 "Language: pl\n"
@@ -109,9 +109,10 @@ msgstr ""
 msgid "View and edit tags in audio files"
 msgstr "Wyświetlanie i modyfikowanie etykiet w plikach dźwiękowych"
 
-#. g_print(_("Error while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
-#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:112 ../src/mp4_header.c:63
-#: ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/ape_tag.c:61 ../src/id3v24_tag.c:113 ../src/mp4_header.cc:46
+#: ../src/mp4_header.cc:59 ../src/mp4_tag.cc:69 ../src/mp4_tag.cc:85
+#: ../src/mp4_tag.cc:90 ../src/mp4_tag.cc:262 ../src/mp4_tag.cc:278
+#: ../src/mp4_tag.cc:283
 #, c-format
 msgid "Error while opening file: '%s' (%s)."
 msgstr "Błąd podczas otwierania pliku: \"%s\" (%s)."
@@ -380,7 +381,7 @@ msgstr "Ostatni plik"
 msgid "S_can Files"
 msgstr "S_kanuj pliki"
 
-#: ../src/bar.c:225 ../src/scan.c:2008
+#: ../src/bar.c:225 ../src/scan_dialog.c:1818
 msgid "Scan selected files"
 msgstr "Skanuj zaznaczone pliki"
 
@@ -444,8 +445,8 @@ msgstr "Ponów ostatnie zmiany"
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/bar.c:242 ../src/easytag.c:2429 ../src/easytag.c:4565
-#: ../src/easytag.c:4597
+#: ../src/bar.c:242 ../src/easytag.c:2428 ../src/easytag.c:4550
+#: ../src/easytag.c:4582
 msgid "Quit"
 msgstr "Zakończ"
 
@@ -579,7 +580,7 @@ msgstr "Wyszukaj pliki w CDD_B…"
 
 #: ../src/bar.c:289
 msgid "CDDB search"
-msgstr "Wyszukiwanie w CDDB"
+msgstr "Wyszukaj w CDDB"
 
 #: ../src/bar.c:291
 msgid "Load Filenames From a Text File…"
@@ -721,27 +722,27 @@ msgstr "Wyświetlanie według wykonawcy i albumu"
 
 #: ../src/bar.c:364
 msgid "_Fill Tags…"
-msgstr "_Wypełnij etykiety…"
+msgstr "_Wypełnianie etykiet…"
 
 #: ../src/bar.c:365
 msgid "Fill tags"
-msgstr "Wypełnij etykiety"
+msgstr "Wypełnianie etykiet"
 
 #: ../src/bar.c:367
 msgid "_Rename Files and Directories…"
-msgstr "Z_mień nazwy plików i katalogów…"
+msgstr "Z_miana nazw plików i katalogów…"
 
 #: ../src/bar.c:368
 msgid "Rename files and directories"
-msgstr "Zmień nazwy plików i katalogów"
+msgstr "Zmiana nazw plików i katalogów"
 
 #: ../src/bar.c:370
 msgid "_Process Fields…"
-msgstr "_Przetwarzaj pola…"
+msgstr "_Przetwarzanie pól…"
 
-#: ../src/bar.c:370 ../src/scan.c:182
+#: ../src/bar.c:370 ../src/scan_dialog.c:184
 msgid "Process Fields"
-msgstr "Przetwarzaj pola"
+msgstr "Przetwarzanie pól"
 
 #: ../src/bar.c:428
 #, c-format
@@ -756,7 +757,7 @@ msgstr "Gotowe do rozpoczęcia"
 msgid "New default path for files selected"
 msgstr "Wybrano nową domyślną ścieżkę do plików"
 
-#: ../src/browser.c:678 ../src/easytag.c:4561
+#: ../src/browser.c:678 ../src/easytag.c:4546
 msgid "Some files have been modified but not saved"
 msgstr "Niektóre pliki zostały zmodyfikowane, ale nie zostały zapisane"
 
@@ -768,101 +769,101 @@ msgstr "Zapisać je przed zmianą katalogu?"
 msgid "Confirm Directory Change"
 msgstr "Potwierdzenie zmiany katalogu"
 
-#: ../src/browser.c:2146
+#: ../src/browser.c:2244
 msgid "<All albums>"
 msgstr "<Wszystkie albumy>"
 
-#: ../src/browser.c:2607
+#: ../src/browser.c:2707
 #, c-format
 msgid "Error: Searching for %s, could not find node %s in tree."
 msgstr "Błąd: wyszukiwanie %s, nie można odnaleźć węzła %s w drzewie."
 
-#: ../src/browser.c:3101 ../src/browser.c:3179
+#: ../src/browser.c:3201 ../src/browser.c:3279
 msgid "Tree"
 msgstr "Drzewo"
 
-#: ../src/browser.c:3102 ../src/cddb.c:803 ../src/misc.c:1902
+#: ../src/browser.c:3202 ../src/cddb.c:803 ../src/misc.c:1903
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../src/browser.c:3102 ../src/cddb.c:804 ../src/misc.c:1903
+#: ../src/browser.c:3202 ../src/cddb.c:804 ../src/misc.c:1904
 #: ../src/prefs.c:643
 msgid "Title"
 msgstr "Tytuł"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Artist".
-#: ../src/browser.c:3103 ../src/browser.c:3110 ../src/cddb.c:483
-#: ../src/cddb.c:805 ../src/misc.c:1904 ../src/prefs.c:644
+#: ../src/browser.c:3203 ../src/browser.c:3210 ../src/cddb.c:483
+#: ../src/cddb.c:805 ../src/misc.c:1905 ../src/prefs.c:644
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../src/browser.c:3103 ../src/misc.c:1905
+#: ../src/browser.c:3203 ../src/misc.c:1906
 msgid "Album Artist"
 msgstr "Wykonawca albumu"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Album".
-#: ../src/browser.c:3104 ../src/browser.c:3112 ../src/cddb.c:486
-#: ../src/cddb.c:806 ../src/misc.c:1906 ../src/prefs.c:645
+#: ../src/browser.c:3204 ../src/browser.c:3212 ../src/cddb.c:486
+#: ../src/cddb.c:806 ../src/misc.c:1907 ../src/prefs.c:645
 msgid "Album"
 msgstr "Album"
 
-#: ../src/browser.c:3104 ../src/cddb.c:807 ../src/misc.c:1908
+#: ../src/browser.c:3204 ../src/cddb.c:807 ../src/misc.c:1909
 msgid "Year"
 msgstr "Rok"
 
-#: ../src/browser.c:3104
+#: ../src/browser.c:3204
 msgid "Disc"
 msgstr "Płyta"
 
-#: ../src/browser.c:3105 ../src/misc.c:1909
+#: ../src/browser.c:3205 ../src/misc.c:1910
 msgid "Track"
 msgstr "Ścieżka"
 
-#: ../src/browser.c:3105 ../src/cddb.c:810 ../src/misc.c:1910
+#: ../src/browser.c:3205 ../src/cddb.c:810 ../src/misc.c:1911
 #: ../src/prefs.c:646
 msgid "Genre"
 msgstr "Gatunek"
 
-#: ../src/browser.c:3106 ../src/misc.c:1911 ../src/prefs.c:647
+#: ../src/browser.c:3206 ../src/misc.c:1912 ../src/prefs.c:647
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../src/browser.c:3106 ../src/misc.c:1912 ../src/picture.c:1059
+#: ../src/browser.c:3206 ../src/misc.c:1913 ../src/picture.c:884
 #: ../src/prefs.c:648
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: ../src/browser.c:3107 ../src/misc.c:1913
+#: ../src/browser.c:3207 ../src/misc.c:1914
 msgid "Original Artist"
 msgstr "Pierwotny wykonawca"
 
-#: ../src/browser.c:3108 ../src/misc.c:1914
+#: ../src/browser.c:3208 ../src/misc.c:1915
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
-#: ../src/browser.c:3108 ../src/misc.c:1915
+#: ../src/browser.c:3208 ../src/misc.c:1916
 msgid "URL"
 msgstr "URL"
 
-#: ../src/browser.c:3109 ../src/misc.c:1916
+#: ../src/browser.c:3209 ../src/misc.c:1917
 msgid "Encoded By"
 msgstr "Koder"
 
-#: ../src/browser.c:3110
+#: ../src/browser.c:3210
 msgid "# Albums"
 msgstr "# Albumy"
 
-#: ../src/browser.c:3111 ../src/browser.c:3112
+#: ../src/browser.c:3211 ../src/browser.c:3212
 msgid "# Files"
 msgstr "# Pliki"
 
-#: ../src/browser.c:3137
+#: ../src/browser.c:3237
 msgid "Enter a directory to browse."
 msgstr "Proszę podać katalog do przeglądania."
 
-#: ../src/browser.c:3146
+#: ../src/browser.c:3246
 msgid "Select a directory to browse."
 msgstr "Proszę wybrać katalog do przeglądania."
 
@@ -870,33 +871,33 @@ msgstr "Proszę wybrać katalog do przeglądania."
 #. * The label for displaying number of files in path (without subdirs)
 #.
 #. Translators: No files, as in "0 files".
-#: ../src/browser.c:3153 ../src/easytag.c:3468
+#: ../src/browser.c:3253 ../src/easytag.c:3454
 msgid "No files"
 msgstr "Brak plików"
 
-#: ../src/browser.c:3231
+#: ../src/browser.c:3331
 msgid "Artist & Album"
 msgstr "Wykonawca i album"
 
 #. Only directories changed
-#: ../src/browser.c:3595 ../src/easytag.c:2880
+#: ../src/browser.c:3696 ../src/easytag.c:2879
 msgid "Rename Directory"
 msgstr "Zmień nazwę katalogu"
 
-#: ../src/browser.c:3617
+#: ../src/browser.c:3718
 #, c-format
 msgid "Rename the directory '%s' to:"
 msgstr "Zmiana nazwy katalogu \"%s\" na:"
 
-#: ../src/browser.c:3636 ../src/misc.c:1171
+#: ../src/browser.c:3737 ../src/misc.c:1172
 msgid "Use mask:"
 msgstr "Maska:"
 
-#: ../src/browser.c:3639
+#: ../src/browser.c:3740
 msgid "If activated, it will use masks to rename directory."
 msgstr "Jeśli jest włączone, to użyje maski do zmiany nazwy katalogu."
 
-#: ../src/browser.c:3657
+#: ../src/browser.c:3758
 msgid ""
 "Select or type in a mask using codes (see Legend in Scanner Window) to "
 "rename the directory from tag fields."
@@ -905,64 +906,64 @@ msgstr ""
 "\"), aby zmienić nazwę katalogu z pól etykiet."
 
 #. Preview label
-#: ../src/browser.c:3681
+#: ../src/browser.c:3782
 msgid "Rename directory preview"
 msgstr "Podgląd zmiany nazwy katalogu"
 
-#: ../src/browser.c:3773
+#: ../src/browser.c:3874
 msgid "You must type a directory name"
 msgstr "Należy wprowadzić nazwę katalogu"
 
-#: ../src/browser.c:3774 ../src/browser.c:3795
+#: ../src/browser.c:3875 ../src/browser.c:3896
 msgid "Directory Name Error"
 msgstr "Błąd nazwy katalogu"
 
-#: ../src/browser.c:3792
+#: ../src/browser.c:3893
 #, c-format
 msgid "Could not convert '%s' into filename encoding."
 msgstr "Nie można przekonwertować \"%s\" na kodowanie znaków nazwy pliku."
 
-#: ../src/browser.c:3794
+#: ../src/browser.c:3895
 msgid "Please use another name"
 msgstr "Proszę użyć innej nazwy"
 
-#: ../src/browser.c:3864
+#: ../src/browser.c:3965
 #, c-format
 msgid "The directory name '%s' already exists"
 msgstr "Nazwa katalogu \"%s\" już istnieje"
 
-#: ../src/browser.c:3865 ../src/easytag.c:2963
+#: ../src/browser.c:3966 ../src/easytag.c:2962
 msgid "Rename File Error"
 msgstr "Błąd zmiany nazwy pliku"
 
-#: ../src/browser.c:3903 ../src/browser.c:3932
+#: ../src/browser.c:4004 ../src/browser.c:4033
 msgid "Rename Directory Error"
 msgstr "Błąd zmiany nazwy katalogu"
 
-#: ../src/browser.c:3970
+#: ../src/browser.c:4071
 msgid "Directory renamed"
 msgstr "Zmieniono nazwę katalogu"
 
-#: ../src/browser.c:4006
+#: ../src/browser.c:4107
 msgid "Browse Directory With"
 msgstr "Przeglądaj katalog za pomocą"
 
-#: ../src/browser.c:4022 ../src/browser.c:4148
+#: ../src/browser.c:4123 ../src/browser.c:4249
 msgid "Program to run:"
 msgstr "Program do uruchomienia:"
 
-#: ../src/browser.c:4034
+#: ../src/browser.c:4135
 msgid ""
 "Enter the program to run. It will receive the current directory as parameter."
 msgstr ""
 "Proszę podać program do uruchomienia. Otrzyma on bieżący katalog jako "
 "parametr."
 
-#: ../src/browser.c:4128
+#: ../src/browser.c:4229
 msgid "Open Files With"
 msgstr "Otwórz pliki za pomocą"
 
-#: ../src/browser.c:4160
+#: ../src/browser.c:4261
 msgid ""
 "Enter the program to run. It will receive the current file as parameter."
 msgstr ""
@@ -1057,7 +1058,7 @@ msgstr "Wszystkie pola"
 
 #. Translators: This option is for the previous 'search in' option. For
 #. * instance, translate this as "Search in:" "Other".
-#: ../src/cddb.c:492 ../src/picture.c:1037 ../src/prefs.c:807
+#: ../src/cddb.c:492 ../src/picture.c:862 ../src/prefs.c:807
 msgid "Other"
 msgstr "Inne"
 
@@ -1151,7 +1152,7 @@ msgstr "Kategorie"
 msgid "Results:"
 msgstr "Wyniki:"
 
-#: ../src/cddb.c:606 ../src/misc.c:1950
+#: ../src/cddb.c:606 ../src/misc.c:1951
 msgid "Search:"
 msgstr "Wyszukiwanie:"
 
@@ -1216,7 +1217,7 @@ msgid "# Tracks"
 msgstr "# Ścieżek"
 
 #. Check box to run the scanner
-#: ../src/cddb.c:847 ../src/misc.c:2991
+#: ../src/cddb.c:847 ../src/misc.c:2992
 msgid "Run the current scanner for each file"
 msgstr "Wykonanie bieżącego skanera dla każdego pliku"
 
@@ -1326,11 +1327,11 @@ msgstr "Nie można otworzyć pliku \"%s\" (%s)"
 #. Send the request
 #. g_print("Request Cddb_Get_Album_Tracks_List : '%s'\n", cddb_in);
 #. Send the request
-#: ../src/cddb.c:2314 ../src/cddb.c:2643 ../src/cddb.c:3516
+#: ../src/cddb.c:2362 ../src/cddb.c:2693 ../src/cddb.c:3568
 msgid "Sending request…"
 msgstr "Wysyłanie żądania…"
 
-#: ../src/cddb.c:2318 ../src/cddb.c:2647 ../src/cddb.c:3216 ../src/cddb.c:3520
+#: ../src/cddb.c:2366 ../src/cddb.c:2697 ../src/cddb.c:3267 ../src/cddb.c:3572
 #, c-format
 msgid "Cannot send the request (%s)"
 msgstr "Nie można wysłać żądania (%s)"
@@ -1339,26 +1340,26 @@ msgstr "Nie można wysłać żądania (%s)"
 #. * Read the answer
 #.
 #. Read the answer
-#: ../src/cddb.c:2344 ../src/cddb.c:3230 ../src/cddb.c:3529
+#: ../src/cddb.c:2393 ../src/cddb.c:3281 ../src/cddb.c:3581
 msgid "Receiving data…"
 msgstr "Pobieranie danych…"
 
-#: ../src/cddb.c:2351 ../src/cddb.c:2676 ../src/cddb.c:3237 ../src/cddb.c:3536
+#: ../src/cddb.c:2400 ../src/cddb.c:2726 ../src/cddb.c:3288 ../src/cddb.c:3588
 msgid "The server returned a bad response"
 msgstr "Serwer zwrócił błędną odpowiedź"
 
-#: ../src/cddb.c:2365 ../src/cddb.c:2692 ../src/cddb.c:3252 ../src/cddb.c:3553
-#: ../src/cddb.c:3568
+#: ../src/cddb.c:2414 ../src/cddb.c:2742 ../src/cddb.c:3303 ../src/cddb.c:3605
+#: ../src/cddb.c:3620
 #, c-format
 msgid "The server returned a bad response: %s"
 msgstr "Serwer zwrócił błędną odpowiedź: %s"
 
-#: ../src/cddb.c:2512
+#: ../src/cddb.c:2561
 #, c-format
 msgid "Sorry, the web-based search is currently not available"
 msgstr "Wyszukiwanie w sieci obecnie nie jest dostępne"
 
-#: ../src/cddb.c:2514 ../src/cddb.c:2863
+#: ../src/cddb.c:2563 ../src/cddb.c:2913
 #, c-format
 msgid "Found one matching album"
 msgid_plural "Found %d matching albums"
@@ -1366,34 +1367,34 @@ msgstr[0] "Odnaleziono jeden pasujący album"
 msgstr[1] "Odnaleziono %d pasujące albumy"
 msgstr[2] "Odnaleziono %d pasujących albumów"
 
-#: ../src/cddb.c:2664
+#: ../src/cddb.c:2714
 #, c-format
 msgid "Receiving data of page %d (album %d/%d)…"
 msgstr "Pobieranie danych ze strony %d (album %d/%d)…"
 
-#: ../src/cddb.c:2666
+#: ../src/cddb.c:2716
 #, c-format
 msgid "Receiving data of page %d…"
 msgstr "Pobieranie danych ze strony %d…"
 
-#: ../src/cddb.c:2830
+#: ../src/cddb.c:2880
 #, c-format
 msgid "More results to load…"
 msgstr "Więcej wyników do wczytania…"
 
-#: ../src/cddb.c:2959
+#: ../src/cddb.c:3009
 #, c-format
 msgid "No file selected"
 msgstr "Nie zaznaczono pliku"
 
 #. The CD redbook standard defines the maximum number of tracks as 99, any
 #. queries with more than 99 tracks will never return a result.
-#: ../src/cddb.c:2967
+#: ../src/cddb.c:3017
 #, c-format
 msgid "More than 99 files selected. Cannot send request"
 msgstr "Zaznaczono więcej niż 99 plików. Nie można wysłać żądania"
 
-#: ../src/cddb.c:2973
+#: ../src/cddb.c:3023
 #, c-format
 msgid "One file selected"
 msgid_plural "%d files selected"
@@ -1401,27 +1402,27 @@ msgstr[0] "Zaznaczono jeden plik"
 msgstr[1] "Zaznaczono %d pliki"
 msgstr[2] "Zaznaczono %d plików"
 
-#: ../src/cddb.c:3056
+#: ../src/cddb.c:3107
 msgid "The path for 'Local CD Database' was not defined"
 msgstr "Nie podano ścieżki do \"Lokalnej bazy danych CD\""
 
 #. Translators: 'it' in this sentence refers to the local CD
 #. * database path.
-#: ../src/cddb.c:3059
+#: ../src/cddb.c:3110
 msgid "Enter it in the preferences window before using this search."
 msgstr "Proszę wprowadzić ją w oknie preferencji przed użyciem wyszukiwania."
 
-#: ../src/cddb.c:3061
+#: ../src/cddb.c:3112
 msgid "Local CD search"
 msgstr "Wyszukiwanie lokalnej bazy CD"
 
 #. g_print("Request Cddb_Search_Album_From_Selected_Files : '%s'\n", cddb_in);
-#: ../src/cddb.c:3206
+#: ../src/cddb.c:3257
 #, c-format
 msgid "Sending request (CddbId: %s, #tracks: %d, Disc length: %d)…"
 msgstr "Wysyłanie żądania (CddbId: %s, # ścieżki: %d, długość płyty: %d)…"
 
-#: ../src/cddb.c:3363
+#: ../src/cddb.c:3414
 #, c-format
 msgid "DiscID '%s' gave one matching album"
 msgid_plural "DiscID '%s' gave %d matching albums"
@@ -1429,21 +1430,21 @@ msgstr[0] "DiscID \"%s\" zwróciło jeden pasujący album"
 msgstr[1] "DiscID \"%s\" zwróciło %d pasujące albumy"
 msgstr[2] "DiscID \"%s\" zwróciło %d pasujących albumów"
 
-#: ../src/cddb.c:3460
+#: ../src/cddb.c:3512
 #, c-format
 msgid "Can't load file: '%s' (%s)."
 msgstr "Nie można wczytać pliku: \"%s\" (%s)."
 
 #. Load the track list of the album
-#: ../src/cddb.c:3759
+#: ../src/cddb.c:3811
 msgid "Loading album track list…"
 msgstr "Wczytywanie listy ścieżek albumu…"
 
-#: ../src/cddb.c:3958
+#: ../src/cddb.c:4010
 msgid "The number of CDDB results does not match the number of selected files"
 msgstr "Liczba wyników CDDB nie pasuje do liczby zaznaczonych plików"
 
-#: ../src/cddb.c:3962
+#: ../src/cddb.c:4014
 msgid "Write Tag from CDDB"
 msgstr "Zapisz etykiety z CDDB"
 
@@ -1650,46 +1651,46 @@ msgid "The string '%s' couldn't be converted into UTF-8 (%s)."
 msgstr "Ciąg \"%s\" nie może zostać przekonwertowany na UTF-8 (%s)."
 
 #. Starting messages
-#: ../src/easytag.c:184
+#: ../src/easytag.c:185
 #, c-format
 msgid "Starting EasyTAG version %s (PID: %d)…"
 msgstr "Uruchamianie EasyTAG %s (PID: %d)…"
 
-#: ../src/easytag.c:186
+#: ../src/easytag.c:187
 #, c-format
 msgid "Using libid3tag version %s"
 msgstr "Używanie biblioteki libid3tag w wersji %s"
 
-#: ../src/easytag.c:189
+#: ../src/easytag.c:190
 #, c-format
 msgid "Using id3lib version %d.%d.%d"
 msgstr "Używanie biblioteki id3lib w wersji %d.%d.%d"
 
-#: ../src/easytag.c:195
+#: ../src/easytag.c:196
 #, c-format
 msgid "Variable EASYTAGLANG defined. Setting locale: '%s'"
 msgstr "Podano zmienną EASYTAGLANG. Ustawianie lokalizacji: \"%s\""
 
-#: ../src/easytag.c:197
+#: ../src/easytag.c:198
 #, c-format
 msgid "Setting locale: '%s'"
 msgstr "Ustawianie lokalizacji: \"%s\""
 
-#: ../src/easytag.c:202
+#: ../src/easytag.c:203
 #, c-format
 msgid "Currently using locale '%s' (and eventually '%s')"
 msgstr "Używanie lokalizacji \"%s\" (i ostatecznie \"%s\")"
 
-#: ../src/easytag.c:209
+#: ../src/easytag.c:210
 msgid "Unable to create setting directories"
 msgstr "Nie można utworzyć katalogów ustawień"
 
-#: ../src/easytag.c:426 ../src/et_core.c:597 ../src/et_core.c:609
+#: ../src/easytag.c:427 ../src/et_core.c:638 ../src/et_core.c:650
 #, c-format
 msgid "Error while querying information for file: '%s' (%s)"
 msgstr "Błąd podczas odpytywania informacji o pliku: \"%s\" (%s)"
 
-#: ../src/easytag.c:489
+#: ../src/easytag.c:490
 #, c-format
 msgid "Cannot open path '%s'"
 msgstr "Nie można otworzyć ścieżki \"%s\""
@@ -1697,11 +1698,11 @@ msgstr "Nie można otworzyć ścieżki \"%s\""
 #.
 #. * Browser
 #.
-#: ../src/easytag.c:581 ../src/prefs.c:142
+#: ../src/easytag.c:582 ../src/prefs.c:142
 msgid "Browser"
 msgstr "Przeglądarka"
 
-#: ../src/easytag.c:603 ../src/et_core.c:2817
+#: ../src/easytag.c:604 ../src/et_core.c:2869
 msgid "File"
 msgstr "Plik"
 
@@ -1711,114 +1712,114 @@ msgstr "Plik"
 #. gtk_label_set_text(GTK_LABEL(VersionValueLabel),"");
 #. Version changed to encoder version
 #. Encoder version
-#: ../src/easytag.c:635 ../src/easytag.c:4231 ../src/flac_header.c:201
+#: ../src/easytag.c:636 ../src/easytag.c:4217 ../src/flac_header.c:201
 #: ../src/monkeyaudio_header.c:96 ../src/musepack_header.c:98
 #: ../src/ogg_header.c:389 ../src/opus_header.c:221 ../src/wavpack_header.c:72
 #, c-format
 msgid "Encoder:"
 msgstr "Koder:"
 
-#: ../src/easytag.c:643
+#: ../src/easytag.c:644
 msgid "Bitrate:"
 msgstr "Gęstość bitowa:"
 
 #. Translators: Please try to keep this string as short as possible as it
 #. * is shown in a narrow column.
-#: ../src/easytag.c:653
+#: ../src/easytag.c:654
 msgid "Frequency:"
 msgstr "Częstotliwość:"
 
 #. Mode
-#: ../src/easytag.c:664 ../src/easytag.c:4235 ../src/mpeg_header.c:216
+#: ../src/easytag.c:665 ../src/easytag.c:4221 ../src/mpeg_header.c:216
 msgid "Mode:"
 msgstr "Tryb:"
 
-#: ../src/easytag.c:671
+#: ../src/easytag.c:672
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: ../src/easytag.c:678
+#: ../src/easytag.c:679
 msgid "Duration:"
 msgstr "Czas trwania:"
 
 #. Main Frame
-#: ../src/easytag.c:725 ../src/et_core.c:2747
+#: ../src/easytag.c:726 ../src/et_core.c:2799
 msgid "Tag"
 msgstr "Etykieta"
 
 #.
 #. * 1 - Page for common tag fields
 #.
-#: ../src/easytag.c:747
+#: ../src/easytag.c:748
 msgid "Common"
 msgstr "Ogólne"
 
 #. Title
-#: ../src/easytag.c:754
+#: ../src/easytag.c:755
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/easytag.c:768
+#: ../src/easytag.c:769
 msgid "Tag selected files with this title"
 msgstr "Tytuł z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Artist
-#: ../src/easytag.c:773
+#: ../src/easytag.c:774
 msgid "Artist:"
 msgstr "Wykonawca:"
 
-#: ../src/easytag.c:787
+#: ../src/easytag.c:788
 msgid "Tag selected files with this artist"
 msgstr "Wykonawca z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Album Artist
-#: ../src/easytag.c:792
+#: ../src/easytag.c:793
 msgid "Album artist:"
 msgstr "Wykonawca albumu:"
 
-#: ../src/easytag.c:806
+#: ../src/easytag.c:807
 msgid "Tag selected files with this album artist"
 msgstr "Wykonawca albumu z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Album
-#: ../src/easytag.c:811
+#: ../src/easytag.c:812
 msgid "Album:"
 msgstr "Album:"
 
-#: ../src/easytag.c:825
+#: ../src/easytag.c:826
 msgid "Tag selected files with this album name"
 msgstr "Nazwa albumu z tego pola zostanie wstawiona do zaznaczonych plików"
 
 #. Disc Number
-#: ../src/easytag.c:830
+#: ../src/easytag.c:831
 msgid "CD:"
 msgstr "CD:"
 
-#: ../src/easytag.c:847
+#: ../src/easytag.c:848
 msgid "Tag selected files with this disc number"
 msgstr "Numer płyty z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Year
-#: ../src/easytag.c:852
+#: ../src/easytag.c:853
 msgid "Year:"
 msgstr "Rok:"
 
-#: ../src/easytag.c:872
+#: ../src/easytag.c:873
 msgid "Tag selected files with this year"
 msgstr "Rok z tego pola zostanie wstawiony do zaznaczonych plików"
 
-#: ../src/easytag.c:886
+#: ../src/easytag.c:887
 msgid "Number selected tracks sequentially. Starts at 01 in each subdirectory."
 msgstr ""
 "Nadaje plikom kolejne numery ścieżek. Zaczyna od 01 w każdym podkatalogu."
 
 #. To have enough space to display the icon
 #. To have enough space to display the icon
-#: ../src/easytag.c:895
+#: ../src/easytag.c:896
 msgid "Track #:"
 msgstr "Ścieżka #:"
 
-#: ../src/easytag.c:926
+#: ../src/easytag.c:927
 msgid ""
 "Set the number of files, in the same directory of the displayed file, to the "
 "selected tracks."
@@ -1826,73 +1827,73 @@ msgstr ""
 "Ustawia liczbę plików w tym samym katalogu, co wyświetlany plik jako liczbę "
 "ścieżek."
 
-#: ../src/easytag.c:946
+#: ../src/easytag.c:947
 msgid "Tag selected files with this number of tracks"
 msgstr "Numer ścieżki z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Genre
-#: ../src/easytag.c:950
+#: ../src/easytag.c:951
 msgid "Genre:"
 msgstr "Gatunek:"
 
-#: ../src/easytag.c:978
+#: ../src/easytag.c:979
 msgid "Tag selected files with this genre"
 msgstr "Gatunek z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Comment
-#: ../src/easytag.c:983
+#: ../src/easytag.c:984
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../src/easytag.c:1010
+#: ../src/easytag.c:1011
 msgid "Tag selected files with this comment"
 msgstr "Komentarz z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Attach_Popup_Menu_To_Tag_Entries(GTK_ENTRY(CommentView));
 #. Composer (name of the composers)
-#: ../src/easytag.c:1017
+#: ../src/easytag.c:1018
 msgid "Composer:"
 msgstr "Kompozytor:"
 
-#: ../src/easytag.c:1031
+#: ../src/easytag.c:1032
 msgid "Tag selected files with this composer"
 msgstr "Kompozytor z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Translators: Original Artist / Performer. Please try to keep this string
 #. * as short as possible, as it must fit into a narrow column.
-#: ../src/easytag.c:1038
+#: ../src/easytag.c:1039
 msgid "Orig. artist:"
 msgstr "Pierwotny wykonawca:"
 
-#: ../src/easytag.c:1052
+#: ../src/easytag.c:1053
 msgid "Tag selected files with this original artist"
 msgstr ""
 "Pierwotny wykonawca z tego pola zostanie wstawiony do zaznaczonych plików"
 
 #. Copyright
-#: ../src/easytag.c:1058
+#: ../src/easytag.c:1059
 msgid "Copyright:"
 msgstr "Prawa autorskie:"
 
-#: ../src/easytag.c:1072
+#: ../src/easytag.c:1073
 msgid "Tag selected files with this copyright"
 msgstr "Prawa autorskie z tego pola zostaną wstawione do zaznaczonych plików"
 
 #. URL
-#: ../src/easytag.c:1078
+#: ../src/easytag.c:1079
 msgid "URL:"
 msgstr "Adres URL:"
 
-#: ../src/easytag.c:1092
+#: ../src/easytag.c:1093
 msgid "Tag selected files with this URL"
 msgstr "Adres URL z tego pola zostaną wstawione do zaznaczonych plików"
 
 #. Encoded by
-#: ../src/easytag.c:1098
+#: ../src/easytag.c:1099
 msgid "Encoded by:"
 msgstr "Skompresowany przez:"
 
-#: ../src/easytag.c:1112
+#: ../src/easytag.c:1113
 msgid "Tag selected files with this encoder name"
 msgstr ""
 "Nazwisko osoby, przez którą plik został utworzony z tego pola zostanie "
@@ -1901,7 +1902,7 @@ msgstr ""
 #.
 #. * 2 - Page for extra tag fields
 #.
-#: ../src/easytag.c:1146 ../src/et_core.c:3189 ../src/et_core.c:3192
+#: ../src/easytag.c:1146 ../src/et_core.c:3241 ../src/et_core.c:3244
 msgid "Images"
 msgstr "Obrazy"
 
@@ -1988,7 +1989,7 @@ msgstr "Zaznaczonym plikom ustawiono rok na \"%s\"."
 msgid "Removed year from selected files."
 msgstr "Usunięto rok z zaznaczonych plików."
 
-#: ../src/easytag.c:1475 ../src/easytag.c:1566
+#: ../src/easytag.c:1475 ../src/easytag.c:1565
 #, c-format
 msgid "Selected files tagged with track like 'xx/%s'."
 msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx/%s\"."
@@ -1998,100 +1999,100 @@ msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx/%s\"."
 msgid "Selected files tagged with track like 'xx'."
 msgstr "Zaznaczonym plikom ustawiono numer ścieżki na \"xx\"."
 
-#: ../src/easytag.c:1482 ../src/easytag.c:1569
+#: ../src/easytag.c:1482 ../src/easytag.c:1568
 msgid "Removed track number from selected files."
 msgstr "Usunięto numer ścieżki z zaznaczonych plików."
 
 #. msg = g_strdup_printf(_("All %d tracks numbered sequentially."), ETCore->ETFileSelectionList_Length);
-#: ../src/easytag.c:1539
+#: ../src/easytag.c:1538
 #, c-format
 msgid "Selected tracks numbered sequentially."
 msgstr "Zaznaczone pliki ponumerowano według kolejności."
 
-#: ../src/easytag.c:1585
+#: ../src/easytag.c:1584
 #, c-format
 msgid "Selected files tagged with genre '%s'."
 msgstr "Zaznaczonym plikom ustawiono gatunek na \"%s\"."
 
-#: ../src/easytag.c:1587
+#: ../src/easytag.c:1586
 msgid "Removed genre from selected files."
 msgstr "Usunięto gatunek z zaznaczonych plików."
 
-#: ../src/easytag.c:1609
+#: ../src/easytag.c:1608
 #, c-format
 msgid "Selected files tagged with comment '%s'."
 msgstr "Zaznaczonym plikom ustawiono komentarz na \"%s\"."
 
-#: ../src/easytag.c:1611
+#: ../src/easytag.c:1610
 msgid "Removed comment from selected files."
 msgstr "Usunięto komentarz z zaznaczonych plików."
 
-#: ../src/easytag.c:1625
+#: ../src/easytag.c:1624
 #, c-format
 msgid "Selected files tagged with composer '%s'."
 msgstr "Zaznaczonym plikom ustawiono kompozytora na \"%s\"."
 
-#: ../src/easytag.c:1627
+#: ../src/easytag.c:1626
 msgid "Removed composer from selected files."
 msgstr "Usunięto kompozytora z zaznaczonych plików."
 
-#: ../src/easytag.c:1642
+#: ../src/easytag.c:1641
 #, c-format
 msgid "Selected files tagged with original artist '%s'."
 msgstr "Zaznaczonym plikom ustawiono pierwotnego wykonawcę na \"%s\"."
 
-#: ../src/easytag.c:1644
+#: ../src/easytag.c:1643
 msgid "Removed original artist from selected files."
 msgstr "Usunięto pierwotnego wykonawcę z zaznaczonych plików."
 
-#: ../src/easytag.c:1659
+#: ../src/easytag.c:1658
 #, c-format
 msgid "Selected files tagged with copyright '%s'."
 msgstr "Zaznaczonym plikom ustawiono prawa autorskie na \"%s\"."
 
-#: ../src/easytag.c:1661
+#: ../src/easytag.c:1660
 msgid "Removed copyright from selected files."
 msgstr "Usunięto prawa autorskie z zaznaczonych plików."
 
-#: ../src/easytag.c:1676
+#: ../src/easytag.c:1675
 #, c-format
 msgid "Selected files tagged with URL '%s'."
 msgstr "Zaznaczonym plikom ustawiono adres URL na \"%s\"."
 
-#: ../src/easytag.c:1678
+#: ../src/easytag.c:1677
 msgid "Removed URL from selected files."
 msgstr "Usunięto adres URL z zaznaczonych plików."
 
-#: ../src/easytag.c:1693
+#: ../src/easytag.c:1692
 #, c-format
 msgid "Selected files tagged with encoder name '%s'."
 msgstr "Zaznaczonym plikom ustawiono nazwisko kodera na \"%s\"."
 
-#: ../src/easytag.c:1695
+#: ../src/easytag.c:1694
 msgid "Removed encoder name from selected files."
 msgstr "Usunięto nazwisko kodera z zaznaczonych plików."
 
-#: ../src/easytag.c:1727
+#: ../src/easytag.c:1726
 msgid "Selected files tagged with images."
 msgstr "Ustawiono obrazy w zaznaczonych plikach."
 
-#: ../src/easytag.c:1729
+#: ../src/easytag.c:1728
 msgid "Removed images from selected files."
 msgstr "Usunięto obrazy z zaznaczonych plików."
 
-#: ../src/easytag.c:2010
+#: ../src/easytag.c:2009
 msgid "Select Mode and Mask, and redo the same action"
 msgstr "Proszę wybrać tryb i maskę, po czym ponowić to samo działanie"
 
-#: ../src/easytag.c:2062
+#: ../src/easytag.c:2061
 msgid "All tags have been scanned"
 msgstr "Wszystkie etykiety zostały zeskanowane"
 
-#: ../src/easytag.c:2118
+#: ../src/easytag.c:2117
 msgid "All tags have been removed"
 msgstr "Wszystkie etykiety zostały usunięte"
 
-#: ../src/easytag.c:2423
+#: ../src/easytag.c:2422
 #, c-format
 msgid "A file was changed by an external program"
 msgid_plural "%d files were changed by an external program."
@@ -2099,153 +2100,148 @@ msgstr[0] "Plik został zmieniony przez zewnętrzny program"
 msgstr[1] "%d pliki zostały zmienione przez zewnętrzny program."
 msgstr[2] "%d plików zostało zmienionych przez zewnętrzny program."
 
-#: ../src/easytag.c:2428
+#: ../src/easytag.c:2427
 msgid "Do you want to continue saving the file?"
 msgstr "Kontynuować zapisywanie pliku?"
 
-#: ../src/easytag.c:2486 ../src/easytag.c:2506
+#: ../src/easytag.c:2485 ../src/easytag.c:2505
 msgid "Saving files was stopped"
 msgstr "Zatrzymano zapisywanie plików"
 
-#: ../src/easytag.c:2508
+#: ../src/easytag.c:2507
 msgid "All files have been saved"
 msgstr "Wszystkie pliki zostały zapisane"
 
-#: ../src/easytag.c:2643
+#: ../src/easytag.c:2642
 #, c-format
 msgid "Cannot delete file (%s)"
 msgstr "Nie można usunąć pliku (%s)"
 
-#: ../src/easytag.c:2664
+#: ../src/easytag.c:2663
 msgid "Files have been partially deleted"
 msgstr "Pliki zostały częściowo usunięte"
 
-#: ../src/easytag.c:2666
+#: ../src/easytag.c:2665
 msgid "All files have been deleted"
 msgstr "Wszystkie pliki zostały usunięte"
 
-#: ../src/easytag.c:2782
+#: ../src/easytag.c:2781
 #, c-format
 msgid "Do you want to write the tag of file '%s'?"
 msgstr "Zapisać etykietę pliku \"%s\"?"
 
-#: ../src/easytag.c:2784
+#: ../src/easytag.c:2783
 msgid "Confirm Tag Writing"
 msgstr "Potwierdzenie zapisania etykiety"
 
-#: ../src/easytag.c:2789 ../src/easytag.c:2909 ../src/easytag.c:3172
+#: ../src/easytag.c:2788 ../src/easytag.c:2908 ../src/easytag.c:3158
 msgid "Repeat action for the remaining files"
 msgstr "Powtórzenie działania dla pozostałych plików"
 
 #. Directories and filename changed
-#: ../src/easytag.c:2873 ../src/scan.c:181
+#: ../src/easytag.c:2872 ../src/scan_dialog.c:183
 msgid "Rename File and Directory"
-msgstr "Zmień nazwę pliku i katalogu"
+msgstr "Zmiana nazw plików i katalogów"
 
-#: ../src/easytag.c:2874
+#: ../src/easytag.c:2873
 msgid "File and directory rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku i katalogu"
 
-#: ../src/easytag.c:2875
+#: ../src/easytag.c:2874
 #, c-format
 msgid "Do you want to rename the file and directory '%s' to '%s'?"
 msgstr "Zmienić nazwę pliku i katalogu z \"%s\" na \"%s\"?"
 
-#: ../src/easytag.c:2881
+#: ../src/easytag.c:2880
 msgid "Directory rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy katalogu"
 
-#: ../src/easytag.c:2882
+#: ../src/easytag.c:2881
 #, c-format
 msgid "Do you want to rename the directory '%s' to '%s'?"
 msgstr "Zmienić nazwę katalogu \"%s\" na \"%s\"?"
 
 #. Only filename changed
-#: ../src/easytag.c:2888
+#: ../src/easytag.c:2887
 msgid "Rename File"
-msgstr "Zmień nazwę pliku"
+msgstr "Zmiana nazwy pliku"
 
-#: ../src/easytag.c:2889
+#: ../src/easytag.c:2888
 msgid "File rename confirmation required"
 msgstr "Wymagane jest potwierdzenie zmiany nazwy pliku"
 
-#: ../src/easytag.c:2890
+#: ../src/easytag.c:2889
 #, c-format
 msgid "Do you want to rename the file '%s' to '%s'?"
 msgstr "Zmienić nazwę pliku \"%s\" na \"%s\"?"
 
-#: ../src/easytag.c:2956
+#: ../src/easytag.c:2955
 #, c-format
 msgid "Cannot rename file '%s' to '%s'"
 msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\""
 
-#: ../src/easytag.c:2970
+#: ../src/easytag.c:2969
 #, c-format
 msgid "Cannot rename file '%s' to '%s': %s"
 msgstr "Nie można zmienić nazwy pliku \"%s\" na \"%s\": %s"
 
-#: ../src/easytag.c:2974
+#: ../src/easytag.c:2973
 msgid "File(s) not renamed"
 msgstr "Pliki, którym nie zmieniono nazwy"
 
-#: ../src/easytag.c:3086
+#: ../src/easytag.c:3085
 #, c-format
 msgid "Writing tag of '%s'"
 msgstr "Zapisywanie etykiety \"%s\""
 
-#: ../src/easytag.c:3093
+#: ../src/easytag.c:3092
 msgid "Tag(s) written"
 msgstr "Zapisano etykiety"
 
-#: ../src/easytag.c:3108
-#, c-format
-msgid "Cannot write tag in file '%s' (%s)"
-msgstr "Nie można zapisać etykiety w pliku \"%s\" (%s)"
-
-#: ../src/easytag.c:3121
+#: ../src/easytag.c:3105
 #, c-format
 msgid "Cannot write tag in file '%s'"
 msgstr "Nie można zapisać etykiety w pliku \"%s\""
 
-#: ../src/easytag.c:3124
+#: ../src/easytag.c:3109
 msgid "Tag Write Error"
 msgstr "Błąd zapisu etykiety"
 
-#: ../src/easytag.c:3169 ../src/easytag.c:3183
+#: ../src/easytag.c:3155 ../src/easytag.c:3169
 #, c-format
 msgid "Do you really want to delete the file '%s'?"
 msgstr "Na pewno usunąć plik \"%s\"?"
 
-#: ../src/easytag.c:3175 ../src/easytag.c:3185
+#: ../src/easytag.c:3161 ../src/easytag.c:3171
 msgid "Delete File"
 msgstr "Usuń pliki"
 
-#: ../src/easytag.c:3210
+#: ../src/easytag.c:3196
 #, c-format
 msgid "File '%s' deleted"
 msgstr "Usunięto plik \"%s\""
 
-#: ../src/easytag.c:3345
+#: ../src/easytag.c:3331
 #, c-format
 msgid "Cannot read directory '%s'"
 msgstr "Nie można odczytać katalogu \"%s\""
 
-#: ../src/easytag.c:3349
+#: ../src/easytag.c:3335
 msgid "Directory Read Error"
 msgstr "Błąd odczytu katalogu"
 
 #. Read the directory recursively
-#: ../src/easytag.c:3370
+#: ../src/easytag.c:3356
 #, c-format
 msgid "Search in progress…"
 msgstr "Trwa wyszukiwanie…"
 
-#: ../src/easytag.c:3393 ../src/et_core.c:2824
+#: ../src/easytag.c:3379 ../src/et_core.c:2876
 #, c-format
 msgid "File: '%s'"
 msgstr "Plik: \"%s\""
 
-#: ../src/easytag.c:3443
+#: ../src/easytag.c:3429
 #, c-format
 msgid "Found one file in this directory and subdirectories"
 msgid_plural "Found %d files in this directory and subdirectories"
@@ -2253,7 +2249,7 @@ msgstr[0] "Odnaleziono jeden plik w tym katalogu i jego podkatalogach"
 msgstr[1] "Odnaleziono %d pliki w tym katalogu i jego podkatalogach"
 msgstr[2] "Odnaleziono %d plików w tym katalogu i jego podkatalogach"
 
-#: ../src/easytag.c:3450
+#: ../src/easytag.c:3436
 #, c-format
 msgid "Found one file in this directory"
 msgid_plural "Found %d files in this directory"
@@ -2261,191 +2257,191 @@ msgstr[0] "Odnaleziono jeden plik w tym katalogu"
 msgstr[1] "Odnaleziono %d pliki w tym katalogu"
 msgstr[2] "Odnaleziono %d plików w tym katalogu"
 
-#: ../src/easytag.c:3472
+#: ../src/easytag.c:3458
 msgid "No file found in this directory and subdirectories"
 msgstr "Nie odnaleziono żadnego pliku w tym katalogu i jego podkatalogach"
 
-#: ../src/easytag.c:3474
+#: ../src/easytag.c:3460
 msgid "No file found in this directory"
 msgstr "Nie odnaleziono żadnego pliku w tym katalogu"
 
-#: ../src/easytag.c:3542
+#: ../src/easytag.c:3528
 #, c-format
 msgid "Error opening directory '%s' (%s)"
 msgstr "Błąd podczas otwierania katalogu \"%s\" (%s)"
 
-#: ../src/easytag.c:3578
+#: ../src/easytag.c:3564
 #, c-format
 msgid "Cannot read directory (%s)"
 msgstr "Nie można odczytać katalogu (%s)"
 
-#: ../src/easytag.c:3598
+#: ../src/easytag.c:3584
 msgid "Searching for audio files…"
 msgstr "Wyszukiwanie plików dźwiękowych…"
 
-#: ../src/easytag.c:3599
+#: ../src/easytag.c:3585
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: ../src/easytag.c:4265
+#: ../src/easytag.c:4251
 msgid "Select a directory to browse"
 msgstr "Proszę wybrać katalog do przeglądania"
 
 #. Menu items
-#: ../src/easytag.c:4412
+#: ../src/easytag.c:4397
 msgid "Tag selected files with this field"
 msgstr "Wartość z tego pola zostanie wstawiona do zaznaczonych plików"
 
-#: ../src/easytag.c:4424 ../src/scan.c:2318
+#: ../src/easytag.c:4409 ../src/scan_dialog.c:2128
 msgid "Convert '_' and '%20' to spaces"
 msgstr "Zamiana \"_\" i \"%20\" na spacje"
 
-#: ../src/easytag.c:4431 ../src/scan.c:2320
+#: ../src/easytag.c:4416 ../src/scan_dialog.c:2130
 msgid "Convert ' ' to '_'"
 msgstr "Zamiana \" \" na \"_\""
 
-#: ../src/easytag.c:4442
+#: ../src/easytag.c:4427
 msgid "All uppercase"
 msgstr "Wszystko wielką literą"
 
-#: ../src/easytag.c:4449
+#: ../src/easytag.c:4434
 msgid "All lowercase"
 msgstr "Wszystko małą literą"
 
-#: ../src/easytag.c:4456
+#: ../src/easytag.c:4441
 msgid "First letter uppercase"
 msgstr "Wielka pierwsza litera"
 
-#: ../src/easytag.c:4463
+#: ../src/easytag.c:4448
 msgid "First letter uppercase of each word"
 msgstr "Wielka pierwsza litera każdego słowa"
 
-#: ../src/easytag.c:4474 ../src/prefs.c:1023 ../src/scan.c:2418
+#: ../src/easytag.c:4459 ../src/prefs.c:1023 ../src/scan_dialog.c:2254
 msgid "Remove spaces"
 msgstr "Usuwanie spacji"
 
-#: ../src/easytag.c:4481
+#: ../src/easytag.c:4466
 msgid "Insert space before uppercase letter"
 msgstr "Wstawianie spacji przed wielką literą"
 
-#: ../src/easytag.c:4488
+#: ../src/easytag.c:4473
 msgid "Remove duplicate spaces or underscores"
 msgstr "Usuwanie powtarzających się spacji lub znaków podkreślenia"
 
-#: ../src/easytag.c:4495
+#: ../src/easytag.c:4480
 msgid "Remove all text"
 msgstr "Usuwanie całego tekstu"
 
-#: ../src/easytag.c:4514
+#: ../src/easytag.c:4499
 msgid "EasyTAG: Normal exit."
 msgstr "EasyTAG: prawidłowe zakończenie działania."
 
-#: ../src/easytag.c:4566
+#: ../src/easytag.c:4551
 msgid "Do you want to save them before quitting?"
 msgstr "Zapisać je przed zakończeniem działania?"
 
-#: ../src/easytag.c:4593
+#: ../src/easytag.c:4578
 msgid "Do you really want to quit?"
 msgstr "Na pewno zakończyć działanie?"
 
-#: ../src/et_core.c:510
+#: ../src/et_core.c:551
 #, c-format
 msgid "Error reading tag from ogg file (%s)"
 msgstr "Błąd podczas odczytywania etykiety z pliku Ogg (%s)"
 
-#: ../src/et_core.c:539
+#: ../src/et_core.c:580
 #, c-format
 msgid "Error reading tag from Opus file (%s)"
 msgstr "Błąd podczas odczytywania etykiety z pliku Opus (%s)"
 
-#: ../src/et_core.c:682
+#: ../src/et_core.c:723
 #, c-format
 msgid "Automatic corrections applied for file '%s'."
 msgstr "Zastosowano automatyczne poprawki do pliku \"%s\"."
 
-#: ../src/et_core.c:2707
+#: ../src/et_core.c:2759
 msgid "ID3 Tag"
 msgstr "Etykieta ID3"
 
-#: ../src/et_core.c:2713
+#: ../src/et_core.c:2765
 msgid "Ogg Vorbis Tag"
 msgstr "Etykieta Ogg Vorbis"
 
-#: ../src/et_core.c:2719
+#: ../src/et_core.c:2771
 msgid "FLAC Vorbis Tag"
 msgstr "Etykieta FLAC Vorbis"
 
-#: ../src/et_core.c:2724
+#: ../src/et_core.c:2776
 msgid "APE Tag"
 msgstr "Etykieta APE"
 
-#: ../src/et_core.c:2729
+#: ../src/et_core.c:2781
 msgid "MP4/M4A/AAC Tag"
 msgstr "Etykieta MP4/M4A/AAC"
 
-#: ../src/et_core.c:2735
+#: ../src/et_core.c:2787
 msgid "Wavpack Tag"
 msgstr "Etykieta WavPack"
 
-#: ../src/et_core.c:2741
+#: ../src/et_core.c:2793
 msgid "Opus Tag"
 msgstr "Etykieta Opus"
 
-#: ../src/et_core.c:2761
+#: ../src/et_core.c:2813
 msgid "MP3 File"
 msgstr "Plik MP3"
 
-#: ../src/et_core.c:2765
+#: ../src/et_core.c:2817
 msgid "MP2 File"
 msgstr "Plik MP2"
 
-#: ../src/et_core.c:2771
+#: ../src/et_core.c:2823
 msgid "Ogg Vorbis File"
 msgstr "Plik Ogg Vorbis"
 
-#: ../src/et_core.c:2777
+#: ../src/et_core.c:2829
 msgid "Speex File"
 msgstr "Plik Speex"
 
-#: ../src/et_core.c:2783
+#: ../src/et_core.c:2835
 msgid "FLAC File"
 msgstr "Plik FLAC"
 
-#: ../src/et_core.c:2788
+#: ../src/et_core.c:2840
 msgid "MusePack File"
 msgstr "Plik MusePack"
 
-#: ../src/et_core.c:2792
+#: ../src/et_core.c:2844
 msgid "Monkey's Audio File"
 msgstr "Plik Monkey's Audio"
 
-#: ../src/et_core.c:2797
+#: ../src/et_core.c:2849
 msgid "MP4/AAC File"
 msgstr "Plik MP4/AAC"
 
-#: ../src/et_core.c:2803
+#: ../src/et_core.c:2855
 msgid "Wavpack File"
 msgstr "Plik WavPack"
 
-#: ../src/et_core.c:2809
+#: ../src/et_core.c:2861
 msgid "Opus File"
 msgstr "Plik Opus"
 
-#: ../src/et_core.c:2868 ../src/et_core.c:2923
+#: ../src/et_core.c:2920 ../src/et_core.c:2975
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: ../src/et_core.c:2873
+#: ../src/et_core.c:2925
 #, c-format
 msgid "Cannot query file information (%s)"
 msgstr "Nie można odpytać informacji o pliku (%s)"
 
-#: ../src/et_core.c:2907
+#: ../src/et_core.c:2959
 msgid "Read-only file"
 msgstr "Plik tylko do odczytu"
 
 #. And refresh the number of files in this directory
-#: ../src/et_core.c:2971
+#: ../src/et_core.c:3023
 #, c-format
 msgid "One file"
 msgid_plural "%u files"
@@ -2453,14 +2449,14 @@ msgstr[0] "Jeden plik"
 msgstr[1] "%u pliki"
 msgstr[2] "%u plików"
 
-#: ../src/et_core.c:3175
+#: ../src/et_core.c:3227
 #, c-format
 msgid "Images (%d)"
 msgstr "Obrazy (%d)"
 
 #. Bitrate
-#: ../src/et_core.c:3217 ../src/flac_header.c:205
-#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.c:134
+#: ../src/et_core.c:3269 ../src/flac_header.c:205
+#: ../src/monkeyaudio_header.c:86 ../src/mp4_header.cc:142
 #: ../src/mpeg_header.c:206 ../src/musepack_header.c:88
 #: ../src/ogg_header.c:401 ../src/opus_header.c:227 ../src/wavpack_header.c:78
 #, c-format
@@ -2468,29 +2464,29 @@ msgid "%d kb/s"
 msgstr "%d kb/s"
 
 #. Samplerate
-#: ../src/et_core.c:3222 ../src/flac_header.c:210
-#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.c:139
+#: ../src/et_core.c:3274 ../src/flac_header.c:210
+#: ../src/monkeyaudio_header.c:91 ../src/mp4_header.cc:147
 #: ../src/mpeg_header.c:211 ../src/musepack_header.c:93
 #: ../src/ogg_header.c:406 ../src/opus_header.c:232 ../src/wavpack_header.c:83
 #, c-format
 msgid "%d Hz"
 msgstr "%d Hz"
 
-#: ../src/et_core.c:3368 ../src/scan.c:686
+#: ../src/et_core.c:3420 ../src/scan_dialog.c:688
 #, c-format
 msgid "Could not convert filename '%s' into system filename encoding"
 msgstr ""
 "Nie można przekonwertować nazwy pliku \"%s\" na systemowe kodowanie znaków"
 
-#: ../src/et_core.c:3370
+#: ../src/et_core.c:3422
 msgid "Try setting the environment variable G_FILENAME_ENCODING."
 msgstr "Proszę spróbować ustawić zmienną środowiskową G_FILENAME_ENCODING."
 
-#: ../src/et_core.c:3371 ../src/scan.c:688
+#: ../src/et_core.c:3423 ../src/scan_dialog.c:690
 msgid "Filename translation"
 msgstr "Tłumaczenie nazw plików"
 
-#: ../src/et_core.c:4076
+#: ../src/et_core.c:4129
 #, c-format
 msgid "Error writing tag type %d to file %s (%s)"
 msgstr "Błąd podczas zapisywania etykiety typu %d do pliku %s (%s)"
@@ -2499,7 +2495,7 @@ msgstr "Błąd podczas zapisywania etykiety typu %d do pliku %s (%s)"
 #. Mode
 #. mpeg4ip library seems to always return -1
 #. Mode
-#: ../src/flac_header.c:215 ../src/mp4_header.c:145 ../src/ogg_header.c:411
+#: ../src/flac_header.c:215 ../src/mp4_header.cc:153 ../src/ogg_header.c:411
 #: ../src/opus_header.c:237 ../src/wavpack_header.c:88
 msgid "Channels:"
 msgstr "Kanały:"
@@ -2509,7 +2505,7 @@ msgstr "Kanały:"
 msgid "Error while opening file: '%s' as FLAC (%s)."
 msgstr "Błąd podczas otwierania pliku: \"%s\" jako FLAC (%s)."
 
-#: ../src/flac_tag.c:352 ../src/ogg_tag.c:310
+#: ../src/flac_tag.c:352 ../src/ogg_tag.c:304
 #, c-format
 msgid ""
 "The year value '%s' seems to be invalid in file '%s'. The information will "
@@ -2528,17 +2524,17 @@ msgstr "Nieprawidłowy blok obrazu: \"%s\""
 msgid "Error: Failed to write comments to file '%s' (%s)."
 msgstr "Błąd: zapisanie komentarzy do pliku \"%s\" się nie powiodło (%s)."
 
-#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1166
+#: ../src/flac_tag.c:1099 ../src/ogg_tag.c:1161
 #, c-format
 msgid "Written tag of '%s'"
 msgstr "Zapisano etykietę pliku \"%s\""
 
-#: ../src/id3_tag.c:158
+#: ../src/id3_tag.c:205
 #, c-format
 msgid "Error while reading file: '%s' (%s)"
 msgstr "Błąd podczas odczytywania pliku: \"%s\" (%s)"
 
-#: ../src/id3_tag.c:170
+#: ../src/id3_tag.c:217
 #, c-format
 msgid ""
 "As the following corrupted file '%s' will cause an error in id3lib, it will "
@@ -2547,31 +2543,31 @@ msgstr ""
 "Uszkodzony plik \"%s\" spowoduje błąd w bibliotece id3lib, więc nie zostanie "
 "on przetwarzany"
 
-#: ../src/id3_tag.c:172
+#: ../src/id3_tag.c:219
 msgid "Corrupted file"
 msgstr "Uszkodzony plik"
 
-#: ../src/id3_tag.c:555
+#: ../src/id3_tag.c:592
 #, c-format
 msgid "Removed tag of '%s'"
 msgstr "Usunięto etykietę z pliku \"%s\""
 
-#: ../src/id3_tag.c:559 ../src/id3_tag.c:659
+#: ../src/id3_tag.c:596 ../src/id3_tag.c:696
 #, c-format
 msgid "Error while removing ID3v1 tag of '%s' (%s)"
 msgstr "Błąd podczas usuwania etykiety ID3v1 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:561 ../src/id3_tag.c:631
+#: ../src/id3_tag.c:598 ../src/id3_tag.c:668
 #, c-format
 msgid "Error while removing ID3v2 tag of '%s' (%s)"
 msgstr "Błąd podczas usuwania etykiety ID3v2 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:580
+#: ../src/id3_tag.c:617
 #, c-format
 msgid "Error while updating ID3v2 tag of '%s' (%s)"
 msgstr "Błąd podczas uaktualniania etykiety ID3v2 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:608
+#: ../src/id3_tag.c:645
 msgid ""
 "You have tried to save this tag to Unicode but it was detected that your "
 "version of id3lib is buggy"
@@ -2579,7 +2575,7 @@ msgstr ""
 "Próbowano zapisać tę etykietę w unikodzie, ale wykryto wersję biblioteki "
 "id3lib z błędami"
 
-#: ../src/id3_tag.c:610
+#: ../src/id3_tag.c:647
 #, c-format
 msgid ""
 "If you reload this file, some characters in the tag may not be displayed "
@@ -2598,90 +2594,90 @@ msgstr ""
 "\n"
 "Plik: %s"
 
-#: ../src/id3_tag.c:617
+#: ../src/id3_tag.c:654
 msgid "Buggy id3lib"
 msgstr "Biblioteka id3lib z błędami"
 
-#: ../src/id3_tag.c:651
+#: ../src/id3_tag.c:688
 #, c-format
 msgid "Error while updating ID3v1 tag of '%s' (%s)"
 msgstr "Błąd podczas aktualizowania etykiety ID3v1 pliku \"%s\" (%s)"
 
-#: ../src/id3_tag.c:665 ../src/id3v24_tag.c:1048
+#: ../src/id3_tag.c:702 ../src/id3v24_tag.c:1108
 #, c-format
 msgid "Updated tag of '%s'"
 msgstr "Zaktualizowano etykietę pliku \"%s\""
 
-#: ../src/id3_tag.c:684
+#: ../src/id3_tag.c:721
 msgid "No error reported"
 msgstr "Nie zgłoszono błędów"
 
-#: ../src/id3_tag.c:686
+#: ../src/id3_tag.c:723
 msgid "No available memory"
 msgstr "Brak dostępnej pamięci"
 
-#: ../src/id3_tag.c:688
+#: ../src/id3_tag.c:725
 msgid "No data to parse"
 msgstr "Brak danych do przetwarzania"
 
-#: ../src/id3_tag.c:690
+#: ../src/id3_tag.c:727
 msgid "Improperly formatted data"
 msgstr "Niepoprawnie sformatowane dane"
 
-#: ../src/id3_tag.c:692
+#: ../src/id3_tag.c:729
 msgid "No buffer to write to"
 msgstr "Brak bufora do zapisu"
 
-#: ../src/id3_tag.c:694
+#: ../src/id3_tag.c:731
 msgid "Buffer is too small"
 msgstr "Bufor jest za mały"
 
-#: ../src/id3_tag.c:696
+#: ../src/id3_tag.c:733
 msgid "Invalid frame ID"
 msgstr "Nieprawidłowy identyfikator ramki"
 
-#: ../src/id3_tag.c:698
+#: ../src/id3_tag.c:735
 msgid "Requested field not found"
 msgstr "Nie odnaleziono żądanego pola"
 
-#: ../src/id3_tag.c:700
+#: ../src/id3_tag.c:737
 msgid "Unknown field type"
 msgstr "Nieznany typ pola"
 
-#: ../src/id3_tag.c:702
+#: ../src/id3_tag.c:739
 msgid "Tag is already attached to a file"
 msgstr "Plik już posiada dołączoną etykietę"
 
-#: ../src/id3_tag.c:704
+#: ../src/id3_tag.c:741
 msgid "Invalid tag version"
 msgstr "Nieprawidłowa wersja etykiety"
 
-#: ../src/id3_tag.c:706
+#: ../src/id3_tag.c:743
 msgid "No file to parse"
 msgstr "Brak pliku do przetwarzania"
 
-#: ../src/id3_tag.c:708
+#: ../src/id3_tag.c:745
 msgid "Attempting to write to a read-only file"
 msgstr "Próba zapisania do pliku tylko do odczytu"
 
-#: ../src/id3_tag.c:710
+#: ../src/id3_tag.c:747
 msgid "Error in compression/uncompression"
 msgstr "Błąd podczas kompresji/dekompresji"
 
-#: ../src/id3_tag.c:712
+#: ../src/id3_tag.c:749
 msgid "Unknown error message"
 msgstr "Nieznany komunikat błędu"
 
-#: ../src/id3_tag.c:1316
+#: ../src/id3_tag.c:1357
 #, c-format
 msgid "Error while creating temporary file: '%s'"
 msgstr "Błąd podczas tworzenia pliku tymczasowego: \"%s\""
 
-#: ../src/id3_tag.c:1323
+#: ../src/id3_tag.c:1364
 msgid "Error while creating temporary file"
 msgstr "Błąd podczas tworzenia pliku tymczasowego"
 
-#: ../src/id3_tag.c:1343
+#: ../src/id3_tag.c:1384
 #, c-format
 msgid "Error while writing to file: '%s' (%s)"
 msgstr "Błąd podczas zapisywania do pliku: \"%s\" (%s)"
@@ -2691,7 +2687,7 @@ msgstr "Błąd podczas zapisywania do pliku: \"%s\" (%s)"
 #. * missing (not read for some reason) while reading from
 #. * the file.
 #.
-#: ../src/id3v24_tag.c:1503
+#: ../src/id3v24_tag.c:1563
 #, c-format
 msgid "Cannot write tag of file ‘%s’ (a byte was missing)"
 msgid_plural "Cannot write tag of file ‘%s’ (%s bytes were missing)"
@@ -2699,12 +2695,12 @@ msgstr[0] "Nie można zapisać etykiety w pliku \"%s\" (brak jednego bajtu)"
 msgstr[1] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
 msgstr[2] "Nie można zapisać etykiety w pliku \"%s\" (brak %s bajtów)"
 
-#: ../src/id3v24_tag.c:1524
+#: ../src/id3v24_tag.c:1584
 #, c-format
 msgid "Cannot save tag of file '%s'"
 msgstr "Nie można zapisać etykiety pliku \"%s\""
 
-#: ../src/id3v24_tag.c:1535
+#: ../src/id3v24_tag.c:1595
 #, c-format
 msgid "Size error while saving tag of '%s'"
 msgstr "Błąd rozmiaru podczas etykiety pliku \"%s\""
@@ -2713,54 +2709,54 @@ msgstr "Błąd rozmiaru podczas etykiety pliku \"%s\""
 msgid "Log"
 msgstr "Dziennik"
 
-#: ../src/misc.c:719
+#: ../src/misc.c:720
 msgid "You must type a program name"
 msgstr "Należy wprowadzić nazwę programu"
 
-#: ../src/misc.c:720
+#: ../src/misc.c:721
 msgid "Program Name Error"
 msgstr "Błąd nazwy programu"
 
-#: ../src/misc.c:799
+#: ../src/misc.c:800
 #, c-format
 msgid "Executed command: %s"
 msgstr "Wykonano polecenie: %s"
 
-#: ../src/misc.c:806
+#: ../src/misc.c:807
 #, c-format
 msgid "Failed to launch program: %s"
 msgstr "Uruchomienie programu się nie powiodło: %s"
 
-#: ../src/misc.c:823
+#: ../src/misc.c:824
 msgid "Select File"
 msgstr "Wybierz plik"
 
-#: ../src/misc.c:829
+#: ../src/misc.c:830
 msgid "Select Directory"
 msgstr "Wybierz katalog"
 
-#: ../src/misc.c:1141
+#: ../src/misc.c:1142
 msgid "Generate Playlist"
 msgstr "Utworzenie listy odtwarzania"
 
-#: ../src/misc.c:1165
+#: ../src/misc.c:1166
 msgid "M3U Playlist Name"
 msgstr "Nazwa listy odtwarzania M3U"
 
-#: ../src/misc.c:1180
+#: ../src/misc.c:1181
 msgid "Use directory name"
 msgstr "Użycie nazwy katalogu"
 
 #. Playlist options
-#: ../src/misc.c:1197
+#: ../src/misc.c:1198
 msgid "Playlist Options"
 msgstr "Opcje listy odtwarzania"
 
-#: ../src/misc.c:1203
+#: ../src/misc.c:1204
 msgid "Include only the selected files"
 msgstr "Dołączenie tylko zaznaczonych plików"
 
-#: ../src/misc.c:1206
+#: ../src/misc.c:1207
 msgid ""
 "If activated, only the selected files will be written in the playlist file. "
 "Else, all the files will be written."
@@ -2768,31 +2764,31 @@ msgstr ""
 "Jeśli jest aktywowane, to tylko zaznaczone pliki będą zapisywanie do pliku "
 "listy odtwarzania. W przeciwnym przypadku, wszystkie pliki będą zapisywane."
 
-#: ../src/misc.c:1209
+#: ../src/misc.c:1210
 msgid "Use full path for files in playlist"
 msgstr "Użycie bezwzględnych ścieżek do plików"
 
-#: ../src/misc.c:1212
+#: ../src/misc.c:1213
 msgid "Use relative path for files in playlist"
 msgstr "Użycie względnych ścieżek do plików"
 
 #. Create playlist in parent directory
-#: ../src/misc.c:1218
+#: ../src/misc.c:1219
 msgid "Create playlist in the parent directory"
 msgstr "Utworzenie listy odtwarzania w katalogu nadrzędnym"
 
-#: ../src/misc.c:1221
+#: ../src/misc.c:1222
 msgid "If activated, the playlist will be created in the parent directory."
 msgstr ""
 "Jeśli jest aktywowane, to listy odtwarzania zostanie utworzona w katalogu "
 "nadrzędnym."
 
 #. DOS Separator
-#: ../src/misc.c:1225
+#: ../src/misc.c:1226
 msgid "Use DOS directory separator"
 msgstr "Użycie separatora katalogu systemu DOS"
 
-#: ../src/misc.c:1231
+#: ../src/misc.c:1232
 msgid ""
 "This option replaces the UNIX directory separator '/' into DOS separator "
 "'\\'."
@@ -2800,49 +2796,49 @@ msgstr ""
 "Ta opcja zastępuje separator katalogu systemu UNIX \"/\" znakiem separatora "
 "systemu DOS \"\\\"."
 
-#: ../src/misc.c:1240
+#: ../src/misc.c:1241
 msgid "Playlist Content"
 msgstr "Zawartość listy odtwarzania"
 
-#: ../src/misc.c:1246
+#: ../src/misc.c:1247
 msgid "Write only list of files"
 msgstr "Zapisywanie tylko listy plików"
 
-#: ../src/misc.c:1250
+#: ../src/misc.c:1251
 msgid "Write info using filename"
 msgstr "Zapisywanie informacji używając nazw plików"
 
-#: ../src/misc.c:1253
+#: ../src/misc.c:1254
 msgid "Write info using:"
 msgstr "Zapisywanie informacji używając:"
 
-#: ../src/misc.c:1467
+#: ../src/misc.c:1468
 #, c-format
 msgid "Cannot write playlist file '%s'"
 msgstr "Nie można zapisać pliku listy odtwarzania \"%s\""
 
-#: ../src/misc.c:1471
+#: ../src/misc.c:1472
 msgid "Playlist File Error"
 msgstr "Błąd pliku listy odtwarzania"
 
-#: ../src/misc.c:1479
+#: ../src/misc.c:1480
 #, c-format
 msgid "Written playlist file '%s'"
 msgstr "Zapisano listę odtwarzania \"%s\""
 
-#: ../src/misc.c:1543 ../src/scan.c:2903 ../src/scan.c:2965
+#: ../src/misc.c:1544 ../src/scan_dialog.c:2747 ../src/scan_dialog.c:2809
 msgid "Invalid scanner mask"
 msgstr "Nieprawidłowa maska skanera"
 
-#: ../src/misc.c:1907
+#: ../src/misc.c:1908
 msgid "CD"
 msgstr "CD"
 
-#: ../src/misc.c:1929
+#: ../src/misc.c:1930
 msgid "Find Files"
 msgstr "Znajdź pliki"
 
-#: ../src/misc.c:1961
+#: ../src/misc.c:1962
 msgid ""
 "Type the word to search into files. Or type nothing to display all files."
 msgstr ""
@@ -2850,13 +2846,13 @@ msgstr ""
 "wyświetlić wszystkie pliki."
 
 #. Where...
-#: ../src/misc.c:1967
+#: ../src/misc.c:1968
 msgid "In:"
 msgstr "W:"
 
 #. Translators: This option is for the previous 'in' option. For instance,
 #. * translate this as "Search" "In:" "the Filename".
-#: ../src/misc.c:1972
+#: ../src/misc.c:1973
 msgid "the Filename"
 msgstr "Nazwa pliku"
 
@@ -2865,20 +2861,20 @@ msgstr "Nazwa pliku"
 #. * Note: label changed to "the Tag" (to be the only one) to fix a Hungarian
 #. * grammatical problem (which uses one word to say "in the tag" like here)
 #.
-#: ../src/misc.c:1978
+#: ../src/misc.c:1979
 msgid "the Tag"
 msgstr "Etykieta"
 
 #. Property of the search
-#: ../src/misc.c:1989 ../src/prefs.c:335
+#: ../src/misc.c:1990 ../src/prefs.c:335
 msgid "Case sensitive"
 msgstr "Rozróżnianie małych i wielkich liter"
 
-#: ../src/misc.c:2216
+#: ../src/misc.c:2217
 msgid "Ready to search…"
 msgstr "Gotowe do wyszukiwania…"
 
-#: ../src/misc.c:2436
+#: ../src/misc.c:2437
 #, c-format
 msgid "Found one file"
 msgid_plural "Found %d files"
@@ -2886,63 +2882,63 @@ msgstr[0] "Odnaleziono jeden plik"
 msgstr[1] "Odnaleziono %d pliki"
 msgstr[2] "Odnaleziono %d plików"
 
-#: ../src/misc.c:2721
+#: ../src/misc.c:2722
 msgid "Load Filenames From a Text File"
 msgstr "Wczytaj nazwy plików z pliku tekstowego"
 
-#: ../src/misc.c:2750
+#: ../src/misc.c:2751
 msgid "File:"
 msgstr "Plik:"
 
 #. Button 'load'
 #. the signal attached to this button, to load the file, is placed after the LoadFileContentList definition
-#: ../src/misc.c:2769
+#: ../src/misc.c:2770
 msgid " Load "
 msgstr " Wczytaj "
 
-#: ../src/misc.c:2787
+#: ../src/misc.c:2788
 msgid "Content of Text File"
 msgstr "Zawartość pliku tekstowego"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2808 ../src/misc.c:2903
+#: ../src/misc.c:2809 ../src/misc.c:2904
 msgid "Insert a blank line before the selected line"
 msgstr "Wstaw pusty wiersz przed wybranym wierszem"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2817 ../src/misc.c:2912
+#: ../src/misc.c:2818 ../src/misc.c:2913
 msgid "Delete the selected line"
 msgstr "Usuń zaznaczony wiersz"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2826 ../src/misc.c:2921 ../src/misc.c:3407
+#: ../src/misc.c:2827 ../src/misc.c:2922 ../src/misc.c:3403
 msgid "Delete all blank lines"
 msgstr "Usuń wszystkie puste wiersze"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2838 ../src/misc.c:2933
+#: ../src/misc.c:2839 ../src/misc.c:2934
 msgid "Move up the selected line"
 msgstr "Przesuń do góry zaznaczony wiersz"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2847 ../src/misc.c:2942
+#: ../src/misc.c:2848 ../src/misc.c:2943
 msgid "Move down the selected line"
 msgstr "Przesuń w dół zaznaczony wiersz"
 
 #. gtk_button_set_relief(GTK_BUTTON(Button),GTK_RELIEF_NONE);
-#: ../src/misc.c:2859 ../src/misc.c:2954 ../src/misc.c:3431
+#: ../src/misc.c:2860 ../src/misc.c:2955 ../src/misc.c:3427
 msgid "Reload"
 msgstr "Wczytaj ponownie"
 
-#: ../src/misc.c:2881
+#: ../src/misc.c:2882
 msgid "List of Files"
 msgstr "Lista plików"
 
-#: ../src/misc.c:2976
+#: ../src/misc.c:2977
 msgid "Selected line:"
 msgstr "Wybrany wiersz:"
 
-#: ../src/misc.c:2994
+#: ../src/misc.c:2995
 msgid ""
 "When activating this option, after loading the filenames, the current "
 "selected scanner will be ran (the scanner window must be opened)."
@@ -2950,34 +2946,34 @@ msgstr ""
 "Jeśli jest aktywowane, to po wczytaniu nazw plików zostanie uruchomiony "
 "obecnie wybrany skaner (okno skanera musi być otwarte)."
 
-#: ../src/misc.c:3081
+#: ../src/misc.c:3082
 #, c-format
 msgid "Cannot retrieve file info (%s)"
 msgstr "Nie można pobrać informacji o pliku (%s)"
 
-#: ../src/misc.c:3143
+#: ../src/misc.c:3145
 #, c-format
 msgid "Can't open file '%s' (%s)"
 msgstr "Nie można otworzyć pliku \"%s\" (%s)"
 
-#: ../src/misc.c:3179
+#: ../src/misc.c:3174
 #, c-format
 msgid "Error reading file (%s)"
 msgstr "Błąd podczas odczytywania pliku (%s)"
 
-#: ../src/misc.c:3395
+#: ../src/misc.c:3391
 msgid "Insert a blank line"
 msgstr "Wstaw pusty wiersz"
 
-#: ../src/misc.c:3401
+#: ../src/misc.c:3397
 msgid "Delete this line"
 msgstr "Usuń ten wiersz"
 
-#: ../src/misc.c:3416
+#: ../src/misc.c:3412
 msgid "Move up this line"
 msgstr "Przesuń ten wiersz do góry"
 
-#: ../src/misc.c:3422
+#: ../src/misc.c:3418
 msgid "Move down this line"
 msgstr "Przesuń ten wiersz w dół"
 
@@ -2987,26 +2983,26 @@ msgstr "Przesuń ten wiersz w dół"
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/mp4_header.c:63 ../src/mp4_tag.c:65 ../src/mp4_tag.c:186
+#: ../src/mp4_header.cc:60 ../src/mp4_tag.cc:91 ../src/mp4_tag.cc:284
 msgid "MP4 format invalid"
 msgstr "Nieprawidłowy format MP4"
 
-#: ../src/mp4_header.c:72 ../src/mp4_tag.c:74
+#: ../src/mp4_header.cc:68
 #, c-format
 msgid "File contains no audio track: '%s'"
 msgstr "Plik nie zawiera ścieżki dźwiękowej: \"%s\""
 
-#: ../src/mp4_header.c:82
+#: ../src/mp4_header.cc:79
 #, c-format
 msgid "Error reading properties from file: '%s'"
 msgstr "Błąd podczas odczytywania właściwości z pliku: \"%s\""
 
-#: ../src/mp4_header.c:132 ../src/mpeg_header.c:204
+#: ../src/mp4_header.cc:140 ../src/mpeg_header.c:204
 #, c-format
 msgid "~%d kb/s"
 msgstr "~%d kb/s"
 
-#: ../src/mp4_tag.c:85 ../src/mp4_tag.c:194
+#: ../src/mp4_tag.cc:101 ../src/mp4_tag.cc:293
 #, c-format
 msgid "Error reading tags from file: '%s'"
 msgstr "Błąd podczas odczytywania etykiet z pliku: \"%s\""
@@ -3082,184 +3078,184 @@ msgstr ""
 msgid "Error: Failed to open file: '%s' as Vorbis (%s)."
 msgstr "Błąd: otwarcie pliku się nie powiodło: \"%s\" jako Vorbis (%s)."
 
-#: ../src/ogg_tag.c:712 ../src/ogg_tag.c:887
+#: ../src/ogg_tag.c:706 ../src/ogg_tag.c:881
 #, c-format
 msgid "Warning: The Ogg Vorbis file '%s' contains an ID3v2 tag."
 msgstr "Ostrzeżenie: plik Ogg Vorbis \"%s\" zawiera etykietę ID3v2."
 
-#: ../src/ogg_tag.c:1035 ../src/picture.c:1257
+#: ../src/ogg_tag.c:1030 ../src/picture.c:1082
 #, c-format
 msgid "Error with 'loader_write': %s"
 msgstr "Błąd \"loader_write\": %s"
 
-#: ../src/ogg_tag.c:1050 ../src/picture.c:1180
+#: ../src/ogg_tag.c:1045 ../src/picture.c:1005
 #, c-format
 msgid "Error with 'loader_close': %s"
 msgstr "Błąd \"loader_close\": %s"
 
-#: ../src/picture.c:104
+#: ../src/picture.c:244 ../src/picture.c:269
 #, c-format
-msgid "Image file not saved: %s"
-msgstr "Plik obrazu nie został zapisany: %s"
+msgid "Image file not loaded: %s"
+msgstr "Plik obrazu nie został wczytany: %s"
 
-#: ../src/picture.c:154
+#: ../src/picture.c:261
 #, c-format
 msgid "Cannot open file: '%s'"
 msgstr "Nie można otworzyć pliku: \"%s\""
 
-#: ../src/picture.c:158
+#: ../src/picture.c:265
 msgid "Image File Error"
 msgstr "Błąd pliku obrazu"
 
-#: ../src/picture.c:162 ../src/picture.c:424
-#, c-format
-msgid "Image file not loaded: %s"
-msgstr "Plik obrazu nie został wczytany: %s"
-
-#: ../src/picture.c:446
+#: ../src/picture.c:276
 msgid "Image file loaded"
 msgstr "Wczytano plik obrazu"
 
-#: ../src/picture.c:504
+#: ../src/picture.c:334
 msgid "Add Images"
 msgstr "Dodaj obrazy"
 
-#: ../src/picture.c:514 ../src/picture.c:874
+#: ../src/picture.c:344 ../src/picture.c:701
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../src/picture.c:520 ../src/picture.c:880
+#: ../src/picture.c:350 ../src/picture.c:707
 msgid "PNG and JPEG"
 msgstr "PNG i JPEG"
 
-#: ../src/picture.c:651
+#: ../src/picture.c:477
 #, c-format
 msgid "Image Properties %d/%d"
 msgstr "Właściwości obrazu %d/%d"
 
-#: ../src/picture.c:675
+#: ../src/picture.c:503
 msgid "Image Type"
 msgstr "Typ obrazu"
 
 #. Description of the picture
-#: ../src/picture.c:734
+#: ../src/picture.c:561
 msgid "Image Description:"
 msgstr "Opis obrazu:"
 
-#: ../src/picture.c:861
+#: ../src/picture.c:688
 #, c-format
 msgid "Save Image %d/%d"
 msgstr "Zapisz obraz %d/%d"
 
-#: ../src/picture.c:1021
+#: ../src/picture.c:763
+#, c-format
+msgid "Image file not saved: %s"
+msgstr "Plik obrazu nie został zapisany: %s"
+
+#: ../src/picture.c:846
 msgid "JPEG image"
 msgstr "Obraz JPEG"
 
-#: ../src/picture.c:1023
+#: ../src/picture.c:848
 msgid "PNG image"
 msgstr "Obraz PNG"
 
-#: ../src/picture.c:1025
+#: ../src/picture.c:850
 msgid "GIF image"
 msgstr "Obraz GIF"
 
-#: ../src/picture.c:1027
+#: ../src/picture.c:852
 msgid "Unknown image"
 msgstr "Nieznany obraz"
 
-#: ../src/picture.c:1039
+#: ../src/picture.c:864
 msgid "32x32 pixel PNG file icon"
 msgstr "Ikona 32x32 piksele w formacie PNG"
 
-#: ../src/picture.c:1041
+#: ../src/picture.c:866
 msgid "Other file icon"
 msgstr "Inny plik ikony"
 
-#: ../src/picture.c:1043
+#: ../src/picture.c:868
 msgid "Cover (front)"
 msgstr "Okładka (przód)"
 
-#: ../src/picture.c:1045
+#: ../src/picture.c:870
 msgid "Cover (back)"
 msgstr "Okładka (tył)"
 
-#: ../src/picture.c:1047
+#: ../src/picture.c:872
 msgid "Leaflet page"
 msgstr "Środek okładki"
 
-#: ../src/picture.c:1049
+#: ../src/picture.c:874
 msgid "Media (e.g. label side of CD)"
 msgstr "Nośnik (np. strona z nadrukiem na CD)"
 
-#: ../src/picture.c:1051
+#: ../src/picture.c:876
 msgid "Lead artist/lead performer/soloist"
 msgstr "Prowadzący wykonawca/solista"
 
-#: ../src/picture.c:1053
+#: ../src/picture.c:878
 msgid "Artist/performer"
 msgstr "Wykonawca"
 
-#: ../src/picture.c:1055
+#: ../src/picture.c:880
 msgid "Conductor"
 msgstr "Dyrygent"
 
-#: ../src/picture.c:1057
+#: ../src/picture.c:882
 msgid "Band/Orchestra"
 msgstr "Zespół/orkiestra"
 
-#: ../src/picture.c:1061
+#: ../src/picture.c:886
 msgid "Lyricist/text writer"
 msgstr "Tekściarz/autor tekstów"
 
-#: ../src/picture.c:1063
+#: ../src/picture.c:888
 msgid "Recording location"
 msgstr "Miejsce nagrywania"
 
-#: ../src/picture.c:1065
+#: ../src/picture.c:890
 msgid "During recording"
 msgstr "Podczas nagrywania"
 
-#: ../src/picture.c:1067
+#: ../src/picture.c:892
 msgid "During performance"
 msgstr "Podczas występu"
 
-#: ../src/picture.c:1069
+#: ../src/picture.c:894
 msgid "Movie/video screen capture"
 msgstr "Zrzut ekranu z filmu/wideo"
 
-#: ../src/picture.c:1071
+#: ../src/picture.c:896
 msgid "A bright colored fish"
 msgstr "Jaskrawo pokolorowana ryba"
 
-#: ../src/picture.c:1073
+#: ../src/picture.c:898
 msgid "Illustration"
 msgstr "Ilustracja"
 
-#: ../src/picture.c:1075
+#: ../src/picture.c:900
 msgid "Band/Artist logotype"
 msgstr "Logo zespołu/wykonawcy"
 
-#: ../src/picture.c:1077
+#: ../src/picture.c:902
 msgid "Publisher/studio logotype"
 msgstr "Logo wydawcy/studia"
 
-#: ../src/picture.c:1081
+#: ../src/picture.c:906
 msgid "Unknown image type"
 msgstr "Nieznany typ obrazu"
 
-#: ../src/picture.c:1111 ../src/picture.c:1122
+#: ../src/picture.c:936 ../src/picture.c:947
 msgid "pixels"
 msgstr "pikseli"
 
-#: ../src/picture.c:1112 ../src/picture.c:1123
+#: ../src/picture.c:937 ../src/picture.c:948
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/picture.c:1124
+#: ../src/picture.c:949
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/picture.c:1240
+#: ../src/picture.c:1065
 msgid ""
 "Cannot display the image because not enough data has been read to determine "
 "how to create the image buffer."
@@ -3267,18 +3263,18 @@ msgstr ""
 "Nie można wyświetlić obrazu, ponieważ za mała ilość danych została "
 "odczytana, aby ustalić, jak utworzyć bufor obrazu."
 
-#: ../src/picture.c:1247
+#: ../src/picture.c:1072
 msgid "Cannot display the image"
 msgstr "Nie można wyświetlić obrazu"
 
-#: ../src/picture.c:1249
+#: ../src/picture.c:1074
 msgid ""
 "Not enough data has been read to determine how to create the image buffer."
 msgstr ""
 "Za mała ilość danych została odczytana, aby ustalić, jak utworzyć bufor "
 "obrazu."
 
-#: ../src/picture.c:1251
+#: ../src/picture.c:1076
 msgid "Load Image File"
 msgstr "Wczytaj plik obrazu"
 
@@ -3300,8 +3296,8 @@ msgstr ""
 msgid ""
 "Load on startup the default directory or the directory passed as argument"
 msgstr ""
-"Wczytuje podczas uruchamiania katalog domyślny lub katalog podany jako "
-"parametr"
+"Wczytywanie podczas uruchamiania katalogu domyślnego lub katalogu podanego "
+"jako parametr"
 
 #: ../src/prefs.c:189
 msgid ""
@@ -3646,7 +3642,7 @@ msgid ""
 "Update modification time of the parent directory of the file (recommended "
 "when using Amarok)"
 msgstr ""
-"Aktualizuje czas modyfikacji katalogu nadrzędnego pliku (zalecane, kiedy "
+"Aktualizowanie czasu modyfikacji katalogu nadrzędnego pliku (zalecane, kiedy "
 "używany jest odtwarzacz Amarok)"
 
 #: ../src/prefs.c:473
@@ -3715,7 +3711,8 @@ msgid ""
 "Force using the system character encoding and silently discard some "
 "characters"
 msgstr ""
-"Wymuś używanie systemowego kodowania znaków i odrzuć nie pasujące znaki"
+"Wymuszenie używania systemowego kodowania znaków i odrzucanie niepasujących "
+"znaków"
 
 #: ../src/prefs.c:524 ../src/prefs.c:854 ../src/prefs.c:923
 msgid ""
@@ -4256,7 +4253,7 @@ msgid ""
 "Select corresponding audio file (according position or DLM if activated "
 "below)"
 msgstr ""
-"Proszę zaznaczyć odpowiedni plik dźwiękowy (odnośnie pozycji lub DLM, jeśli "
+"Wybieranie odpowiedniego pliku dźwiękowego (odnośnie pozycji lub DLM, jeśli "
 "włączono poniżej)"
 
 #: ../src/prefs.c:1354
@@ -4361,81 +4358,81 @@ msgstr "Nie można odnaleźć odtwarzacza dźwięku \"%s\""
 msgid "Audio Player Error"
 msgstr "Błąd odtwarzacza dźwięku"
 
-#: ../src/scan.c:180
+#: ../src/scan_dialog.c:182
 msgid "Fill Tag"
 msgstr "Wypełnianie etykiet"
 
-#: ../src/scan.c:354
+#: ../src/scan_dialog.c:356
 #, c-format
 msgid "Cannot calculate CRC value of file (%s)"
 msgstr "Nie można obliczyć wartości CRC pliku (%s)"
 
-#: ../src/scan.c:369
+#: ../src/scan_dialog.c:371
 msgid "Tag successfully scanned"
 msgstr "Pomyślnie zeskanowany etykiety"
 
-#: ../src/scan.c:371
+#: ../src/scan_dialog.c:373
 #, c-format
 msgid "Tag successfully scanned: %s"
 msgstr "Pomyślnie zeskanowany etykiety: %s"
 
-#: ../src/scan.c:412
+#: ../src/scan_dialog.c:414
 #, c-format
 msgid "Tag scanner: strange… the extension '%s' was not found in filename '%s'"
 msgstr ""
 "Skaner etykiet: rozszerzenie \"%s\" nie zostało odnalezione w pliku \"%s\""
 
-#: ../src/scan.c:494 ../src/scan.c:523
+#: ../src/scan_dialog.c:496 ../src/scan_dialog.c:525
 #, c-format
 msgid "Scan Error: can't find separator '%s' within '%s'"
 msgstr "Błąd skanowania: nie można odnaleźć separatora \"%s\" wewnątrz \"%s\""
 
-#: ../src/scan.c:710
+#: ../src/scan_dialog.c:712
 msgid "New filename successfully scanned"
 msgstr "Pomyślnie zeskanowano nową nazwę pliku"
 
-#: ../src/scan.c:713
+#: ../src/scan_dialog.c:715
 #, c-format
 msgid "New filename successfully scanned: %s"
 msgstr "Pomyślnie zeskanowano nową nazwę pliku: %s"
 
-#: ../src/scan.c:1822
+#: ../src/scan_dialog.c:1632
 #, c-format
 msgid "Error while processing fields: %s"
 msgstr "Błąd podczas przetwarzania pól: %s"
 
 #. The window
-#: ../src/scan.c:1992
+#: ../src/scan_dialog.c:1802
 msgid "Tag and Filename Scan"
 msgstr "Skanowanie etykiet i nazw plików"
 
 #. TODO: Set related action to match AM_SCAN_FILES.
-#: ../src/scan.c:2001
+#: ../src/scan_dialog.c:1811
 msgid "Scan Files"
 msgstr "Skanuj pliki"
 
 #. Option Menu
-#: ../src/scan.c:2029
+#: ../src/scan_dialog.c:1839
 msgid "Scanner:"
 msgstr "Skaner:"
 
-#: ../src/scan.c:2050
+#: ../src/scan_dialog.c:1860
 msgid "Select the type of scanner to use"
 msgstr "Proszę wybrać typ skanera, który ma zostać użyty"
 
-#: ../src/scan.c:2059
+#: ../src/scan_dialog.c:1869
 msgid "Scanner Preferences"
 msgstr "Preferencje skanera"
 
-#: ../src/scan.c:2068
+#: ../src/scan_dialog.c:1878
 msgid "Show / Hide Masks Editor"
 msgstr "Wyświetla/ukrywa edytor masek"
 
-#: ../src/scan.c:2078
+#: ../src/scan_dialog.c:1888
 msgid "Show / Hide Legend"
 msgstr "Wyświetla/ukrywa legendę"
 
-#: ../src/scan.c:2108
+#: ../src/scan_dialog.c:1918
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse filename and "
 "path. Used to fill in tag fields"
@@ -4445,15 +4442,15 @@ msgstr ""
 "etykiet"
 
 #. Preview label
-#: ../src/scan.c:2132
+#: ../src/scan_dialog.c:1942
 msgid "Fill tag preview"
 msgstr "Podgląd zmiany etykiet"
 
-#: ../src/scan.c:2162
+#: ../src/scan_dialog.c:1972
 msgid "Prefix mask with current path"
 msgstr "Dodaje do maski przedrostek bieżącej ścieżki"
 
-#: ../src/scan.c:2176
+#: ../src/scan_dialog.c:1986
 msgid ""
 "Select or type in a mask using codes (see Legend) to parse tag fields. Used "
 "to rename the file.\n"
@@ -4467,15 +4464,15 @@ msgstr ""
 "jako względna."
 
 #. Preview label
-#: ../src/scan.c:2201
+#: ../src/scan_dialog.c:2011
 msgid "Rename file preview"
 msgstr "Podgląd zmiany nazwy pliku"
 
-#: ../src/scan.c:2220
+#: ../src/scan_dialog.c:2030
 msgid "Select fields:"
 msgstr "Proszę wybrać pola:"
 
-#: ../src/scan.c:2223
+#: ../src/scan_dialog.c:2033
 msgid ""
 "The buttons on the right represent the fields which can be processed. Select "
 "those which interest you"
@@ -4484,134 +4481,134 @@ msgstr ""
 "przetworzone. Proszę wybrać te, które mają zostać zmienione"
 
 #. Advice for Translators: set the first letter of filename translated
-#: ../src/scan.c:2227
+#: ../src/scan_dialog.c:2037
 msgid "F"
 msgstr "N"
 
-#: ../src/scan.c:2229
+#: ../src/scan_dialog.c:2039
 msgid "Process filename field"
 msgstr "Przetwarzanie pola nazwy pliku"
 
 #. Advice for Translators: set the first letter of title translated
-#: ../src/scan.c:2231
+#: ../src/scan_dialog.c:2041
 msgid "T"
 msgstr "T"
 
-#: ../src/scan.c:2232
+#: ../src/scan_dialog.c:2042
 msgid "Process title field"
 msgstr "Przetwarzanie pola tytułu"
 
 #. Advice for Translators: set the first letter of artist translated
-#: ../src/scan.c:2234
+#: ../src/scan_dialog.c:2044
 msgid "Ar"
 msgstr "W"
 
-#: ../src/scan.c:2235
+#: ../src/scan_dialog.c:2045
 msgid "Process file artist field"
 msgstr "Przetwarzanie pola wykonawcy"
 
 #. Advice for Translators: set the first letter of album artist translated
-#: ../src/scan.c:2237
+#: ../src/scan_dialog.c:2047
 msgid "AA"
 msgstr "WA"
 
-#: ../src/scan.c:2238
+#: ../src/scan_dialog.c:2048
 msgid "Process album artist field"
 msgstr "Przetwarzanie pola wykonawcy albumu"
 
 #. Advice for Translators: set the first letter of album translated
-#: ../src/scan.c:2240
+#: ../src/scan_dialog.c:2050
 msgid "Al"
 msgstr "Al"
 
-#: ../src/scan.c:2241
+#: ../src/scan_dialog.c:2051
 msgid "Process album field"
 msgstr "Przetwarzanie pola albumu"
 
 #. Advice for Translators: set the first letter of genre translated
-#: ../src/scan.c:2243
+#: ../src/scan_dialog.c:2053
 msgid "G"
 msgstr "G"
 
-#: ../src/scan.c:2244
+#: ../src/scan_dialog.c:2054
 msgid "Process genre field"
 msgstr "Przetwarzanie pola gatunku"
 
 #. Advice for Translators: set the first letter of comment translated
-#: ../src/scan.c:2246
+#: ../src/scan_dialog.c:2056
 msgid "Cm"
 msgstr "Km"
 
-#: ../src/scan.c:2247
+#: ../src/scan_dialog.c:2057
 msgid "Process comment field"
 msgstr "Przetwarzanie pola komentarza"
 
 #. Advice for Translators: set the first letter of composer translated
-#: ../src/scan.c:2249
+#: ../src/scan_dialog.c:2059
 msgid "Cp"
 msgstr "Kp"
 
-#: ../src/scan.c:2250
+#: ../src/scan_dialog.c:2060
 msgid "Process composer field"
 msgstr "Przetwarzanie pola kompozytora"
 
 #. Advice for Translators: set the first letter of orig artist translated
-#: ../src/scan.c:2252
+#: ../src/scan_dialog.c:2062
 msgid "O"
 msgstr "P"
 
-#: ../src/scan.c:2253
+#: ../src/scan_dialog.c:2063
 msgid "Process original artist field"
 msgstr "Przetwarzanie pola pierwotnego wykonawcy"
 
 #. Advice for Translators: set the first letter of copyright translated
-#: ../src/scan.c:2255
+#: ../src/scan_dialog.c:2065
 msgid "Cr"
 msgstr "Cr"
 
-#: ../src/scan.c:2256
+#: ../src/scan_dialog.c:2066
 msgid "Process copyright field"
 msgstr "Przetwarzanie pola praw autorskich"
 
 #. Advice for Translators: set the first letter of URL translated
-#: ../src/scan.c:2258
+#: ../src/scan_dialog.c:2068
 msgid "U"
 msgstr "U"
 
-#: ../src/scan.c:2259
+#: ../src/scan_dialog.c:2069
 msgid "Process URL field"
 msgstr "Przetwarzanie pola adresu URL"
 
 #. Advice for Translators: set the first letter of encoder name translated
-#: ../src/scan.c:2261
+#: ../src/scan_dialog.c:2071
 msgid "E"
 msgstr "K"
 
-#: ../src/scan.c:2262
+#: ../src/scan_dialog.c:2072
 msgid "Process encoder name field"
 msgstr "Przetwarzanie pola nazwa kodera"
 
-#: ../src/scan.c:2306
+#: ../src/scan_dialog.c:2116
 msgid "Invert selection"
 msgstr "Odwróć zaznaczenie"
 
-#: ../src/scan.c:2313
+#: ../src/scan_dialog.c:2123
 msgid "Select/Unselect all"
 msgstr "Zaznacz/odznacz wszystko"
 
-#: ../src/scan.c:2328
+#: ../src/scan_dialog.c:2138
 msgid "Convert:"
 msgstr "Zamiana:"
 
-#: ../src/scan.c:2330
+#: ../src/scan_dialog.c:2140
 msgid "to: "
 msgstr "na: "
 
-#: ../src/scan.c:2337
+#: ../src/scan_dialog.c:2147
 msgid "Do not convert"
 msgstr "Bez zmieniania"
 
-#: ../src/scan.c:2356
+#: ../src/scan_dialog.c:2177
 msgid ""
 "The underscore character or the string '%20' are replaced by one space. "
 "Example, before: 'Text%20In%20An_Entry', after: 'Text In An Entry'."
@@ -4619,7 +4616,7 @@ msgstr ""
 "Znak podkreślenia oraz ciąg \"%20\" jest zamieniany na jedną spację. "
 "Przykład, przed: \"Tekst%20w%20jakimś_polu\", po: \"Tekst w jakimś polu\"."
 
-#: ../src/scan.c:2359
+#: ../src/scan_dialog.c:2180
 msgid ""
 "The space character is replaced by one underscore character. Example, "
 "before: 'Text In An Entry', after: 'Text_In_An_Entry'."
@@ -4627,36 +4624,36 @@ msgstr ""
 "Znak spacji jest zamieniany na jeden znak podkreślenia. Przykład, przed: "
 "\"Tekst w jakimś polu\", po: \"Tekst_w_jakimś_polu\"."
 
-#: ../src/scan.c:2362
+#: ../src/scan_dialog.c:2183
 msgid ""
 "Replace a string by another one. Note that the search is case sensitive."
 msgstr "Zamienia podany tekst na inny. Wyszukiwanie rozróżnia wielkość liter."
 
-#: ../src/scan.c:2369
+#: ../src/scan_dialog.c:2190
 msgid "Capitalize all"
 msgstr "Wszystkie wielkie litery"
 
-#: ../src/scan.c:2371
+#: ../src/scan_dialog.c:2192
 msgid "Lowercase all"
 msgstr "Wszystkie małe litery"
 
-#: ../src/scan.c:2373
+#: ../src/scan_dialog.c:2194
 msgid "Capitalize first letter"
 msgstr "Wielka pierwsza litera"
 
-#: ../src/scan.c:2375
+#: ../src/scan_dialog.c:2196
 msgid "Capitalize the first letter of each word"
 msgstr "Wielka pierwsza litera każdego słowa"
 
-#: ../src/scan.c:2376
+#: ../src/scan_dialog.c:2197
 msgid "Detect Roman numerals"
 msgstr "Wykrywanie liczb rzymskich"
 
-#: ../src/scan.c:2378
+#: ../src/scan_dialog.c:2199
 msgid "Do not change capitalization"
 msgstr "Bez zmiany wielkości liter"
 
-#: ../src/scan.c:2400
+#: ../src/scan_dialog.c:2236
 msgid ""
 "Convert all words in all fields to upper case. Example, before: 'Text IN AN "
 "entry', after: 'TEXT IN AN ENTRY'."
@@ -4664,7 +4661,7 @@ msgstr ""
 "Zamienia wszystkie słowa we wszystkich polach na wielkie litery. Przykład, "
 "przed: \"Tekst W JAKIMŚ polu\", po: \"TEKST W JAKIMŚ POLU\"."
 
-#: ../src/scan.c:2403
+#: ../src/scan_dialog.c:2239
 msgid ""
 "Convert all words in all fields to lower case. Example, before: 'TEXT IN an "
 "entry', after: 'text in an entry'."
@@ -4672,7 +4669,7 @@ msgstr ""
 "Zamienia wszystkie słowa we wszystkich polach na małe litery. Przykład, "
 "przed: \"TEKST W jakimś polu\", po: \"tekst w jakimś polu\"."
 
-#: ../src/scan.c:2406
+#: ../src/scan_dialog.c:2242
 msgid ""
 "Convert the initial of the first word in all fields to upper case. Example, "
 "before: 'text IN An ENTRY', after: 'Text in an entry'."
@@ -4681,7 +4678,7 @@ msgstr ""
 "literę. Przykład, przed: \"Tekst W Jakimś POLU\", po: \"Tekst w jakimś polu"
 "\"."
 
-#: ../src/scan.c:2409
+#: ../src/scan_dialog.c:2245
 msgid ""
 "Convert the initial of each word in all fields to upper case. Example, "
 "before: 'Text in an ENTRY', after: 'Text In An Entry'."
@@ -4690,7 +4687,7 @@ msgstr ""
 "literę. Przykład, przed: \"Tekst w jakimś POLU\", po: \"Tekst W Jakimś Polu"
 "\"."
 
-#: ../src/scan.c:2412
+#: ../src/scan_dialog.c:2248
 msgid ""
 "Force to convert to upper case the Roman numerals. Example, before: 'ix. "
 "text in an entry', after: 'IX. Text In An Entry'."
@@ -4698,19 +4695,19 @@ msgstr ""
 "Wymusza zamienianie liczb rzymskich na duże litery. Przykład, przed: \"ix. "
 "tekst w jakimś polu\", po: \"IX. Tekst W Jakimś Polu\"."
 
-#: ../src/scan.c:2420
+#: ../src/scan_dialog.c:2256
 msgid "Insert a space before uppercase letters"
 msgstr "Wstawianie spacji przed wielką literą"
 
-#: ../src/scan.c:2422
+#: ../src/scan_dialog.c:2258
 msgid "Remove duplicate spaces and underscores"
 msgstr "Usuwanie powtarzających się spacji i znaków podkreślenia"
 
-#: ../src/scan.c:2424
+#: ../src/scan_dialog.c:2260
 msgid "Do not change word separators"
 msgstr "Bez zmiany separatorów słów"
 
-#: ../src/scan.c:2438
+#: ../src/scan_dialog.c:2282
 msgid ""
 "All spaces between words are removed. Example, before: 'Text In An Entry', "
 "after: 'TextInAnEntry'."
@@ -4718,7 +4715,7 @@ msgstr ""
 "Wszystkie spacje pomiędzy słowami są usuwane. Przykład, przed: \"Tekst W "
 "Jakimś Polu\", po: \"TekstWJakimśPolu\"."
 
-#: ../src/scan.c:2441
+#: ../src/scan_dialog.c:2285
 msgid ""
 "A space is inserted before each upper case letter. Example, before: "
 "'TextInAnEntry', after: 'Text In An Entry'."
@@ -4726,7 +4723,7 @@ msgstr ""
 "Spacja jest wstawiana przed każdą wielką literą. Przykład, przed: "
 "\"TekstWJakimśPolu\", po: \"Tekst W Jakimś Polu\"."
 
-#: ../src/scan.c:2444
+#: ../src/scan_dialog.c:2288
 msgid ""
 "Duplicate spaces and underscores are removed. Example, before: "
 "'Text__In__An   Entry', after: 'Text_In_An Entry'."
@@ -4737,141 +4734,141 @@ msgstr ""
 #.
 #. * Frame to display codes legend
 #.
-#: ../src/scan.c:2451
+#: ../src/scan_dialog.c:2295
 msgid "Legend"
 msgstr "Legenda"
 
-#: ../src/scan.c:2457
+#: ../src/scan_dialog.c:2301
 #, c-format
 msgid "%a: artist"
 msgstr "%a: wykonawca"
 
-#: ../src/scan.c:2460
+#: ../src/scan_dialog.c:2304
 msgid "%z: album artist"
 msgstr "%z: wykonawca albumu"
 
-#: ../src/scan.c:2463
+#: ../src/scan_dialog.c:2307
 msgid "%b: album"
 msgstr "%b: album"
 
-#: ../src/scan.c:2466
+#: ../src/scan_dialog.c:2310
 #, c-format
 msgid "%c: comment"
 msgstr "%c: komentarz"
 
-#: ../src/scan.c:2469
+#: ../src/scan_dialog.c:2313
 #, c-format
 msgid "%p: composer"
 msgstr "%p: kompozytor"
 
-#: ../src/scan.c:2472
+#: ../src/scan_dialog.c:2316
 msgid "%r: copyright"
 msgstr "%r: prawa autorskie"
 
-#: ../src/scan.c:2475
+#: ../src/scan_dialog.c:2319
 #, c-format
 msgid "%d: disc number"
 msgstr "%d: numer płyty"
 
-#: ../src/scan.c:2478
+#: ../src/scan_dialog.c:2322
 #, c-format
 msgid "%e: encoded by"
 msgstr "%e: koder"
 
-#: ../src/scan.c:2481
+#: ../src/scan_dialog.c:2325
 #, c-format
 msgid "%g: genre"
 msgstr "%g: gatunek"
 
-#: ../src/scan.c:2484
+#: ../src/scan_dialog.c:2328
 #, c-format
 msgid "%i: ignored"
 msgstr "%i: ignorowane"
 
-#: ../src/scan.c:2487
+#: ../src/scan_dialog.c:2331
 msgid "%l: number of tracks"
 msgstr "%l: liczba ścieżek"
 
-#: ../src/scan.c:2490
+#: ../src/scan_dialog.c:2334
 #, c-format
 msgid "%o: orig. artist"
 msgstr "%o: pierwotny wykonawca"
 
-#: ../src/scan.c:2493
+#: ../src/scan_dialog.c:2337
 #, c-format
 msgid "%n: track"
 msgstr "%n: ścieżka"
 
-#: ../src/scan.c:2496
+#: ../src/scan_dialog.c:2340
 msgid "%t: title"
 msgstr "%t: tytuł"
 
-#: ../src/scan.c:2499
+#: ../src/scan_dialog.c:2343
 #, c-format
 msgid "%u: URL"
 msgstr "%u: adres URL"
 
-#: ../src/scan.c:2502
+#: ../src/scan_dialog.c:2346
 #, c-format
 msgid "%x: number of discs"
 msgstr "%x: liczba płyt"
 
-#: ../src/scan.c:2505
+#: ../src/scan_dialog.c:2349
 msgid "%y: year"
 msgstr "%y: rok"
 
 #.
 #. * Masks Editor
 #.
-#: ../src/scan.c:2512
+#: ../src/scan_dialog.c:2356
 msgid "Mask Editor"
 msgstr "Edytor masek"
 
-#: ../src/scan.c:2566
+#: ../src/scan_dialog.c:2410
 msgid "Create New Mask"
 msgstr "Utwórz nową maskę"
 
-#: ../src/scan.c:2576
+#: ../src/scan_dialog.c:2420
 msgid "Move Up this Mask"
 msgstr "Przesuń maskę do góry"
 
-#: ../src/scan.c:2586
+#: ../src/scan_dialog.c:2430
 msgid "Move Down this Mask"
 msgstr "Przesuń maskę w dół"
 
-#: ../src/scan.c:2596
+#: ../src/scan_dialog.c:2440
 msgid "Duplicate Mask"
 msgstr "Zduplikuj maskę"
 
-#: ../src/scan.c:2606
+#: ../src/scan_dialog.c:2450
 msgid "Add Default Masks"
 msgstr "Dodaj domyślną maskę"
 
-#: ../src/scan.c:2616
+#: ../src/scan_dialog.c:2460
 msgid "Remove Mask"
 msgstr "Usuń maskę"
 
-#: ../src/scan.c:2626
+#: ../src/scan_dialog.c:2470
 msgid "Save Masks"
 msgstr "Zapisz maski"
 
-#: ../src/scan.c:3206
+#: ../src/scan_dialog.c:3050
 msgid "New_mask"
 msgstr "Nowa_maska"
 
-#: ../src/scan.c:3245
+#: ../src/scan_dialog.c:3089
 msgid "Copy: No row selected"
 msgstr "Kopiowanie: nie wybrano rzędu"
 
-#: ../src/scan.c:3338
+#: ../src/scan_dialog.c:3182
 msgid "Remove: No row selected"
 msgstr "Usuwanie: nie wybrano rzędu"
 
-#: ../src/scan.c:3385
+#: ../src/scan_dialog.c:3229
 msgid "Move Up: No row selected"
 msgstr "Przesunięcie w górę: nie wybrano rzędu"
 
-#: ../src/scan.c:3429
+#: ../src/scan_dialog.c:3273
 msgid "Move Down: No row selected"
 msgstr "Przesunięcie w dół: nie wybrano rzędu"
 
diff --git a/src/browser.c b/src/browser.c
index 4954f54..822d4b1 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -2639,12 +2639,12 @@ void Browser_Tree_Rebuild (gchar *path_to_load)
             current_path = g_strdup(DEFAULT_PATH_TO_MP3);
     }
 
-    Browser_Tree_Initialize();
     /* Select again the memorized path without loading files */
     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserTree));
     if (selection)
     {
         g_signal_handlers_block_by_func(G_OBJECT(selection),G_CALLBACK(Browser_Tree_Node_Selected),NULL);
+        Browser_Tree_Initialize ();
         Browser_Tree_Select_Dir(current_path);
         g_signal_handlers_unblock_by_func(G_OBJECT(selection),G_CALLBACK(Browser_Tree_Node_Selected),NULL);
     }
diff --git a/src/cddb.c b/src/cddb.c
index e90daa7..3751250 100644
--- a/src/cddb.c
+++ b/src/cddb.c
@@ -2026,7 +2026,55 @@ Cddb_Free_Track_Album_List (GList *track_list)
     return TRUE;
 }
 
+/*
+ * Clear the album model, blocking the tree view selection changed handlers
+ * during the process, to prevent the handlers being called on removed rows.
+ */
+static void
+cddb_album_model_clear (void)
+{
+    GtkTreeSelection *selection;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (CddbAlbumListView));
+
+    g_signal_handlers_block_by_func (selection,
+                                     G_CALLBACK (Cddb_Get_Album_Tracks_List_CB),
+                                     NULL);
+    g_signal_handlers_block_by_func (selection,
+                                     G_CALLBACK (Cddb_Show_Album_Info),
+                                     NULL);
+
+    gtk_list_store_clear (CddbAlbumListModel);
+
+    g_signal_handlers_unblock_by_func (selection,
+                                       G_CALLBACK (Cddb_Show_Album_Info),
+                                       NULL);
+    g_signal_handlers_unblock_by_func (selection,
+                                       G_CALLBACK (Cddb_Get_Album_Tracks_List_CB),
+                                       NULL);
+}
+
+/*
+ * Clear the album model, blocking the tree view selection changed handlers
+ * during the process, to prevent the handlers being called on removed rows.
+ */
+static void
+cddb_track_model_clear (void)
+{
+    GtkTreeSelection *selection;
+
+    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (CddbTrackListView));
+
+    g_signal_handlers_block_by_func (selection,
+                                     G_CALLBACK (Cddb_Track_List_Row_Selected),
+                                     NULL);
 
+    gtk_list_store_clear (CddbTrackListModel);
+
+    g_signal_handlers_unblock_by_func (selection,
+                                       G_CALLBACK (Cddb_Track_List_Row_Selected),
+                                       NULL);
+}
 
 /*
  * Load the CddbAlbumList into the corresponding List
@@ -2054,8 +2102,8 @@ Cddb_Load_Album_List (gboolean only_red_lines)
                                    CDDB_ALBUM_LIST_DATA, &cddbalbumSelected, -1);
         }
 
-        // Remove lines
-        gtk_list_store_clear(CddbAlbumListModel);
+        /* Remove lines. */
+        cddb_album_model_clear ();
 
         // Reload list following parameter 'only_red_lines'
         for (l = g_list_first (CddbAlbumList); l != NULL; l = g_list_next (l))
@@ -2097,8 +2145,8 @@ Cddb_Load_Track_Album_List (GList *track_list)
     {
         GList *l;
 
-        // Must block the select signal of the target to avoid looping
-        gtk_list_store_clear(CddbTrackListModel);
+        /* Must block the select signal of the target to avoid looping. */
+        cddb_track_model_clear ();
 
         for (l = g_list_first (track_list); l != NULL; l = g_list_next (l))
         {
@@ -2326,9 +2374,10 @@ Cddb_Search_Album_List_From_String_Freedb (void)
     g_free(cddb_in);
 
 
-    // Delete previous album list
-    gtk_list_store_clear(CddbAlbumListModel);
-    gtk_list_store_clear(CddbTrackListModel);
+    /* Delete previous album list. */
+    cddb_album_model_clear ();
+    cddb_track_model_clear ();
+
     if (CddbAlbumList)
     {
         Cddb_Free_Album_List();
@@ -2586,9 +2635,10 @@ Cddb_Search_Album_List_From_String_Gnudb (void)
         *tmp = '+';
 
 
-    // Delete previous album list
-    gtk_list_store_clear(CddbAlbumListModel);
-    gtk_list_store_clear(CddbTrackListModel);
+    /* Delete previous album list. */
+    cddb_album_model_clear ();
+    cddb_track_model_clear ();
+
     if (CddbAlbumList)
     {
         Cddb_Free_Album_List();
@@ -3012,9 +3062,10 @@ Cddb_Search_Album_From_Selected_Files (void)
                                          (disc_length << 8) | num_tracks));
 
 
-    // Delete previous album list
-    gtk_list_store_clear(CddbAlbumListModel);
-    gtk_list_store_clear(CddbTrackListModel);
+    /* Delete previous album list. */
+    cddb_album_model_clear ();
+    cddb_track_model_clear ();
+
     if (CddbAlbumList)
     {
         Cddb_Free_Album_List();
@@ -3431,8 +3482,9 @@ Cddb_Get_Album_Tracks_List (GtkTreeSelection* selection)
 
     g_return_val_if_fail (CddbWindow != NULL, FALSE);
 
-    gtk_list_store_clear(CddbTrackListModel);
-    Cddb_Set_Apply_Button_Sensitivity();
+    cddb_track_model_clear ();
+    Cddb_Set_Apply_Button_Sensitivity ();
+
     if (gtk_tree_selection_get_selected(selection, NULL, &row))
     {
         gtk_tree_model_get(GTK_TREE_MODEL(CddbAlbumListModel), &row, CDDB_ALBUM_LIST_DATA, &cddbalbum, -1);
diff --git a/src/easytag.c b/src/easytag.c
index aa24a0b..1117931 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -3054,17 +3054,84 @@ et_rename_file (const char *old_filepath, const char *new_filepath,
     if (!g_file_move (file_old, file_new, G_FILE_COPY_NONE, NULL, NULL, NULL,
                       error))
     {
-        /* Error moving file. */
-        g_object_unref (file_old);
-        g_object_unref (file_new);
-        g_assert (error == NULL || *error != NULL);
-        return FALSE;
+        if (g_error_matches (*error, G_IO_ERROR, G_IO_ERROR_EXISTS))
+        {
+            /* Possibly a case change on a case-insensitive filesystem. */
+            /* TODO: casefold the paths of both files, and check to see whether
+             * they only differ by case? */
+            gchar *tmp_filename;
+            mode_t old_mode;
+            gint fd;
+            GFile *tmp_file;
+            GError *tmp_error = NULL;
+
+            tmp_filename = g_strconcat (old_filepath, ".XXXXXX", NULL);
+
+            old_mode = umask (077);
+            fd = mkstemp (tmp_filename);
+            umask (old_mode);
+
+            if (fd >= 0)
+            {
+                close (fd);
+            }
+
+            tmp_file = g_file_new_for_path (tmp_filename);
+            g_free (tmp_filename);
+
+            if (!g_file_move (file_old, tmp_file, G_FILE_COPY_OVERWRITE, NULL,
+                              NULL, NULL, &tmp_error))
+            {
+                g_file_delete (tmp_file, NULL, NULL);
+
+                g_object_unref (tmp_file);
+                g_clear_error (error);
+                g_propagate_error (error, tmp_error);
+                goto err;
+            }
+            else
+            {
+                /* Move to temporary file succeeded, now move to the real new
+                 * location. */
+                if (!g_file_move (tmp_file, file_new, G_FILE_COPY_NONE, NULL,
+                                  NULL, NULL, &tmp_error))
+                {
+                    g_file_move (tmp_file, file_old, G_FILE_COPY_NONE, NULL,
+                                 NULL, NULL, NULL);
+                    g_object_unref (tmp_file);
+                    g_clear_error (error);
+                    g_propagate_error (error, tmp_error);
+                    goto err;
+                }
+                else
+                {
+                    /* Move succeeded, so clear the original error about the
+                     * new file already existing. */
+                    g_object_unref (tmp_file);
+                    g_clear_error (error);
+                    goto out;
+                }
+            }
+        }
+        else
+        {
+            /* Error moving file. */
+            goto err;
+        }
     }
 
+out:
     g_object_unref (file_old);
     g_object_unref (file_new);
     g_assert (error == NULL || *error == NULL);
     return TRUE;
+
+err:
+    g_object_unref (file_new_parent);
+    g_object_unref (file_old);
+    g_object_unref (file_new);
+    g_assert (error == NULL || *error != NULL);
+    return FALSE;
 }
 
 /*
@@ -3075,9 +3142,9 @@ et_rename_file (const char *old_filepath, const char *new_filepath,
 static gboolean
 Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
 {
+    GError *error = NULL;
     gchar *cur_filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
     gchar *msg = NULL;
-    gchar *msg1;
     gchar *basename_utf8;
     GtkWidget *msgdialog;
 
@@ -3087,29 +3154,14 @@ Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
     g_free(msg);
     msg = NULL;
 
-    if (ET_Save_File_Tag_To_HD(ETFile))
+    if (ET_Save_File_Tag_To_HD (ETFile, &error))
     {
         Statusbar_Message(_("Tag(s) written"),TRUE);
         g_free (basename_utf8);
         return TRUE;
     }
 
-    switch ( ((ET_File_Description *)ETFile->ETFileDescription)->TagType)
-    {
-#ifdef ENABLE_OGG
-        case OGG_TAG:
-            /* Special for Ogg Vorbis because the error was already reported in
-             * ET_Save_File_Tag_To_HD. */
-            break;
-#endif
-        default:
-            msg = g_strdup (g_strerror (errno));
-            msg1 = g_strdup_printf (_("Cannot write tag in file '%s' (%s)"),
-                                    basename_utf8, msg);
-            Log_Print (LOG_ERROR, "%s", msg1);
-            g_free (msg1);
-    }
-
+    Log_Print (LOG_ERROR, "%s", error->message);
 
     if (!hide_msgbox)
     {
@@ -3119,13 +3171,15 @@ Write_File_Tag (ET_File *ETFile, gboolean hide_msgbox)
                              GTK_BUTTONS_CLOSE,
                              _("Cannot write tag in file '%s'"),
                              basename_utf8);
-        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(msgdialog),"%s",msg);
+        gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (msgdialog),
+                                                  "%s", error->message);
         gtk_window_set_title(GTK_WINDOW(msgdialog),_("Tag Write Error"));
 
         gtk_dialog_run(GTK_DIALOG(msgdialog));
         gtk_widget_destroy(msgdialog);
     }
-    g_free(msg);
+
+    g_clear_error (&error);
     g_free(basename_utf8);
 
     return FALSE;
diff --git a/src/et_core.c b/src/et_core.c
index c709a13..1885adc 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -4011,7 +4011,8 @@ ET_Save_File_Tag_Internal (ET_File *ETFile, File_Tag *FileTag)
 /*
  * Save data contained into File_Tag structure to the file on hard disk.
  */
-gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
+gboolean
+ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error)
 {
     ET_File_Description *ETFileDescription;
     gchar *cur_filename;
@@ -4019,9 +4020,9 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
     gboolean state;
     GFile *file;
     GFileInfo *fileinfo;
-    GError *error = NULL;
 
     g_return_val_if_fail (ETFile != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
     cur_filename      = ((File_Name *)(ETFile->FileNameCur)->data)->value;
     cur_filename_utf8 = ((File_Name *)(ETFile->FileNameCur)->data)->value_utf8;
@@ -4042,7 +4043,7 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
 #endif
 #ifdef ENABLE_OGG
         case OGG_TAG:
-            state = ogg_tag_write_file_tag (ETFile, &error);
+            state = ogg_tag_write_file_tag (ETFile, error);
             break;
 #endif
 #ifdef ENABLE_FLAC
@@ -4065,7 +4066,7 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
 #endif
 #ifdef ENABLE_OPUS
         case OPUS_TAG:
-            state = ogg_tag_write_file_tag (ETFile, &error);
+            state = ogg_tag_write_file_tag (ETFile, error);
             break;
 #endif
         case UNKNOWN_TAG:
@@ -4122,13 +4123,12 @@ gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile)
     }
     else
     {
-        if (error)
+        if (*error == NULL)
         {
-                Log_Print (LOG_ERROR,
-                           _("Error writing tag type %d to file %s (%s)"),
-                           ETFileDescription->TagType, cur_filename_utf8,
-                           error->message);
-                g_error_free (error);
+            g_set_error (error, G_IO_ERROR, G_IO_ERROR_UNKNOWN,
+                         _("Error writing tag type %d to file %s (%s)"),
+                         ETFileDescription->TagType, cur_filename_utf8,
+                         g_strerror (EIO));
         }
 
         return FALSE;
diff --git a/src/et_core.h b/src/et_core.h
index b81fbfd..ea00217 100644
--- a/src/et_core.h
+++ b/src/et_core.h
@@ -343,7 +343,7 @@ gboolean ET_Set_Displayed_File_List         (GList *ETFileList);
 
 void     ET_Display_File_Data_To_UI (ET_File *ETFile);
 void     ET_Save_File_Data_From_UI  (ET_File *ETFile);
-gboolean ET_Save_File_Tag_To_HD     (ET_File *ETFile);
+gboolean ET_Save_File_Tag_To_HD (ET_File *ETFile, GError **error);
 
 gboolean ET_Undo_File_Data          (ET_File *ETFile);
 gboolean ET_Redo_File_Data          (ET_File *ETFile);
diff --git a/src/id3_tag.c b/src/id3_tag.c
index 44536ca..5134228 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -1435,9 +1435,11 @@ gboolean Id3tag_Check_If_Id3lib_Is_Bugged (void)
     /* Same string found? if yes => not buggy. */
     if (result && strcmp (result, test_str) != 0)
     {
+        g_free (result);
         return TRUE;
     }
 
+    g_free (result);
     return FALSE;
 }
 

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list