Packman Build Service PMBS

Changes of Revision 5

ncmpc.changes Changed

ncmpc.spec Changed

ncmpc-0.20.tar.bz2/INSTALL -> ncmpc-0.21.tar.bz2/INSTALL Changed

ncmpc-0.20.tar.bz2/Makefile.am -> ncmpc-0.21.tar.bz2/Makefile.am Changed

ncmpc-0.20.tar.bz2/Makefile.in -> ncmpc-0.21.tar.bz2/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,6 +54,10 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = src/ncmpc$(EXEEXT)
+@HAVE_WINDOWS_FALSE@src_ncmpc_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
+@HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
+@HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1)
 @NCMPC_MINI_FALSE@am__append_1 = \
 @NCMPC_MINI_FALSE@	src/hscroll.c \
 @NCMPC_MINI_FALSE@	src/match.c \
@@ -51,15 +72,16 @@
 @ENABLE_SCREEN_TEXT_TRUE@am__append_8 = src/screen_text.c
 @ENABLE_LYRICS_SCREEN_TRUE@am__append_9 = src/screen_lyrics.c src/lyrics.c
 @ENABLE_OUTPUTS_SCREEN_TRUE@am__append_10 = src/screen_outputs.c
-@ENABLE_LIRC_TRUE@am__append_11 = src/lirc.c
+@ENABLE_CHAT_SCREEN_TRUE@am__append_11 = src/screen_chat.c
+@ENABLE_LIRC_TRUE@am__append_12 = src/lirc.c
 check_PROGRAMS = test/run_hscroll$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/doc/doxygen.conf.in \
-	AUTHORS COPYING INSTALL NEWS build/config.guess \
-	build/config.sub build/depcomp build/install-sh build/missing \
-	build/mkinstalldirs
+	$(top_srcdir)/src/win/ncmpc_win32_rc.rc.in AUTHORS COPYING \
+	INSTALL NEWS build/config.guess build/config.sub build/depcomp \
+	build/install-sh build/missing build/mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
 	$(top_srcdir)/m4/ax_append_flag.m4 \
@@ -74,7 +96,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = doc/doxygen.conf
+CONFIG_CLEAN_FILES = src/win/ncmpc_win32_rc.rc doc/doxygen.conf
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lyricsdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
@@ -92,11 +114,11 @@
 	src/i18n.h src/screen_help.h src/screen_queue.h \
 	src/screen_file.h src/screen_artist.h src/screen_browser.h \
 	src/screen_search.h src/screen_song.h src/screen_keydef.h \
-	src/screen_lyrics.h src/screen_outputs.h src/screen_text.h \
-	src/plugin.h src/lyrics.h src/lirc.h src/ncmpc_curses.h \
-	src/resolver.c src/main.c src/gidle.c src/mpdclient.c \
-	src/playlist.c src/filelist.c src/options.c src/command.c \
-	src/ncu.c src/player_command.c src/title_bar.c \
+	src/screen_lyrics.h src/screen_outputs.h src/screen_chat.h \
+	src/screen_text.h src/plugin.h src/lyrics.h src/lirc.h \
+	src/ncmpc_curses.h src/resolver.c src/main.c src/gidle.c \
+	src/mpdclient.c src/playlist.c src/filelist.c src/options.c \
+	src/command.c src/ncu.c src/player_command.c src/title_bar.c \
 	src/progress_bar.c src/status_bar.c src/screen.c \
 	src/screen_status.c src/screen_list.c src/screen_find.c \
 	src/screen_utils.c src/screen_client.c src/screen_queue.c \
@@ -106,7 +128,7 @@
 	src/conf.c src/screen_help.c src/screen_artist.c \
 	src/screen_search.c src/screen_song.c src/screen_keydef.c \
 	src/plugin.c src/screen_text.c src/screen_lyrics.c \
-	src/lyrics.c src/screen_outputs.c src/lirc.c
+	src/lyrics.c src/screen_outputs.c src/screen_chat.c src/lirc.c
 am__objects_1 =
 am__dirstamp = $(am__leading_dot)dirstamp
 @NCMPC_MINI_FALSE@am__objects_2 = src/hscroll.$(OBJEXT) \
@@ -126,7 +148,8 @@
 @ENABLE_LYRICS_SCREEN_TRUE@	src/lyrics.$(OBJEXT)
 @ENABLE_OUTPUTS_SCREEN_TRUE@am__objects_11 =  \
 @ENABLE_OUTPUTS_SCREEN_TRUE@	src/screen_outputs.$(OBJEXT)
-@ENABLE_LIRC_TRUE@am__objects_12 = src/lirc.$(OBJEXT)
+@ENABLE_CHAT_SCREEN_TRUE@am__objects_12 = src/screen_chat.$(OBJEXT)
+@ENABLE_LIRC_TRUE@am__objects_13 = src/lirc.$(OBJEXT)
 am_src_ncmpc_OBJECTS = $(am__objects_1) src/resolver.$(OBJEXT) \
 	src/main.$(OBJEXT) src/gidle.$(OBJEXT) src/mpdclient.$(OBJEXT) \
 	src/playlist.$(OBJEXT) src/filelist.$(OBJEXT) \
@@ -144,11 +167,11 @@
 	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
 	$(am__objects_6) $(am__objects_7) $(am__objects_8) \
 	$(am__objects_9) $(am__objects_10) $(am__objects_11) \
-	$(am__objects_12)
+	$(am__objects_12) $(am__objects_13)
 src_ncmpc_OBJECTS = $(am_src_ncmpc_OBJECTS)
 am__DEPENDENCIES_1 =
-src_ncmpc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+src_ncmpc_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(src_ncmpc_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_test_run_hscroll_OBJECTS =  \
 	test/test_run_hscroll-run_hscroll.$(OBJEXT) \
 	src/test_run_hscroll-hscroll.$(OBJEXT) \
@@ -176,6 +199,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 SCRIPTS = $(lyrics_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build/depcomp
@@ -195,10 +224,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(doc_DATA)
+DATA = $(doc_DATA) $(noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -211,9 +245,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$[^/]*$/.*$$,\1,'; \
@@ -242,6 +278,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -317,6 +355,11 @@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VERSION_EXTRA = @VERSION_EXTRA@
+VERSION_MAJOR = @VERSION_MAJOR@
+VERSION_MINOR = @VERSION_MINOR@
+VERSION_REVISION = @VERSION_REVISION@
+WINDRES = @WINDRES@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
 XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
@@ -430,6 +473,7 @@
 	src/screen_keydef.h \
 	src/screen_lyrics.h \
 	src/screen_outputs.h \
+	src/screen_chat.h \
 	src/screen_text.h \
 	src/plugin.h \
 	src/lyrics.h \
@@ -454,7 +498,10 @@
 	$(am__append_2) $(am__append_3) $(am__append_4) \
 	$(am__append_5) $(am__append_6) $(am__append_7) \
 	$(am__append_8) $(am__append_9) $(am__append_10) \
-	$(am__append_11)
+	$(am__append_11) $(am__append_12)
+@HAVE_WINDOWS_TRUE@noinst_DATA = src/win/ncmpc_win32_rc.rc
+@HAVE_WINDOWS_TRUE@src_ncmpc_DEPENDENCIES = src/win/ncmpc_win32_rc.$(OBJEXT)
+@HAVE_WINDOWS_TRUE@src_ncmpc_LDFLAGS = -Wl,src/win/ncmpc_win32_rc.$(OBJEXT)
 CLEANFILES = src/ncmpc-tiny
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
 test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
@@ -502,14 +549,15 @@
 #
 EXTRA_DIST = autogen.sh \
 	$(lyrics_plugins) \
-	$(man_MANS) $(doc_DATA) doc/doxygen.conf
+	$(man_MANS) $(doc_DATA) doc/doxygen.conf \
+	src/win/ncmpc_win32_rc.rc.in
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -545,10 +593,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -560,12 +606,17 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+src/win/ncmpc_win32_rc.rc: $(top_builddir)/config.status $(top_srcdir)/src/win/ncmpc_win32_rc.rc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 doc/doxygen.conf: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen.conf.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p; \
@@ -686,10 +737,12 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_outputs.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/screen_chat.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/lirc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/ncmpc$(EXEEXT): $(src_ncmpc_OBJECTS) $(src_ncmpc_DEPENDENCIES) src/$(am__dirstamp)
+src/ncmpc$(EXEEXT): $(src_ncmpc_OBJECTS) $(src_ncmpc_DEPENDENCIES) $(EXTRA_src_ncmpc_DEPENDENCIES) src/$(am__dirstamp)
 	@rm -f src/ncmpc$(EXEEXT)
-	$(LINK) $(src_ncmpc_OBJECTS) $(src_ncmpc_LDADD) $(LIBS)
+	$(src_ncmpc_LINK) $(src_ncmpc_OBJECTS) $(src_ncmpc_LDADD) $(LIBS)
 test/$(am__dirstamp):
 	@$(MKDIR_P) test
 	@: > test/$(am__dirstamp)
@@ -702,13 +755,16 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/test_run_hscroll-charset.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-test/run_hscroll$(EXEEXT): $(test_run_hscroll_OBJECTS) $(test_run_hscroll_DEPENDENCIES) test/$(am__dirstamp)
+test/run_hscroll$(EXEEXT): $(test_run_hscroll_OBJECTS) $(test_run_hscroll_DEPENDENCIES) $(EXTRA_test_run_hscroll_DEPENDENCIES) test/$(am__dirstamp)
 	@rm -f test/run_hscroll$(EXEEXT)
 	$(LINK) $(test_run_hscroll_OBJECTS) $(test_run_hscroll_LDADD) $(LIBS)
 install-lyricsSCRIPTS: $(lyrics_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(lyricsdir)" || $(MKDIR_P) "$(DESTDIR)$(lyricsdir)"
 	@list='$(lyrics_SCRIPTS)'; test -n "$(lyricsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(lyricsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(lyricsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -736,9 +792,7 @@
 	@list='$(lyrics_SCRIPTS)'; test -n "$(lyricsdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(lyricsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(lyricsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(lyricsdir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -765,6 +819,7 @@
 	-rm -f src/screen.$(OBJEXT)
 	-rm -f src/screen_artist.$(OBJEXT)
 	-rm -f src/screen_browser.$(OBJEXT)
+	-rm -f src/screen_chat.$(OBJEXT)
 	-rm -f src/screen_client.$(OBJEXT)
 	-rm -f src/screen_file.$(OBJEXT)
 	-rm -f src/screen_find.$(OBJEXT)
@@ -815,6 +870,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_artist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_browser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_chat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_file.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_find.Po@am__quote@
@@ -898,11 +954,18 @@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/test_run_hscroll-charset.obj `if test -f 'src/charset.c'; then $(CYGPATH_W) 'src/charset.c'; else $(CYGPATH_W) '$(srcdir)/src/charset.c'; fi`
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
+	@list1=''; \
+	list2='$(man_MANS)'; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -931,13 +994,14 @@
 	  sed -n '/\.1[a-z]*$$/p'; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-docDATA: $(doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -951,9 +1015,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1137,13 +1199,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1174,7 +1233,11 @@
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -1182,7 +1245,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -1200,7 +1263,7 @@
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -1214,6 +1277,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1223,7 +1288,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -1233,6 +1298,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -1261,8 +1327,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1299,10 +1373,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1403,11 +1482,11 @@
 	all all-am all-local am--refresh check check-am clean \
 	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
 	clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-binPROGRAMS install-data \
 	install-data-am install-docDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-lyricsSCRIPTS install-man \
@@ -1420,6 +1499,13 @@
 	uninstall-lyricsSCRIPTS uninstall-man uninstall-man1
 
 
+#
+# Windows resource file
+#
+
+src/win/ncmpc_win32_rc.$(OBJEXT): src/win/ncmpc_win32_rc.rc
+	$(WINDRES) -i $< -o $@
+
 # build the smallest possible ncmpc binary
 src/ncmpc-tiny: $(filter-out %.h,$(src_ncmpc_SOURCES))
 	$(COMPILE) --combine -fwhole-program $(src_ncmpc_LDFLAGS) $(src_ncmpc_LDADD) $(LIBS) $^ -o $@

ncmpc-0.20.tar.bz2/NEWS -> ncmpc-0.21.tar.bz2/NEWS Changed

ncmpc-0.20.tar.bz2/aclocal.m4 -> ncmpc-0.21.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,18 +14,21 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -34,7 +38,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,19 +54,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -144,14 +150,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -191,6 +197,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -255,7 +262,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -320,10 +327,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -545,12 +555,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -682,12 +695,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -710,13 +726,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -724,13 +741,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -806,12 +823,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -834,13 +853,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -849,13 +868,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -877,10 +896,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])

ncmpc-0.20.tar.bz2/autogen.sh -> ncmpc-0.21.tar.bz2/autogen.sh Changed

ncmpc-0.20.tar.bz2/build/config.guess -> ncmpc-0.21.tar.bz2/build/config.guess Changed

@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2012-02-10'
 
 # 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
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -145,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -792,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -807,6 +804,9 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -943,7 +953,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

ncmpc-0.20.tar.bz2/build/config.sub -> ncmpc-0.21.tar.bz2/build/config.sub Changed

@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -132,6 +130,10 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -223,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,17 +255,22 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +304,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +313,7 @@
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +328,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +341,10 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +367,13 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,8 +382,10 @@
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +419,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +427,11 @@
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +731,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -808,10 +827,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1120,13 +1147,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1336,7 +1358,7 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1521,6 +1543,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
@@ -1548,9 +1573,6 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout

ncmpc-0.20.tar.bz2/build/depcomp -> ncmpc-0.21.tar.bz2/build/depcomp Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +40,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +96,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +168,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -249,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: $.*$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -334,7 +367,7 @@
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -349,9 +382,9 @@
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -397,14 +430,59 @@
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *$.*$/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/$.*$/'"$tab"'\1 \\/p
+s/.$.*$ \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -422,7 +500,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,15 +520,14 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -503,9 +580,10 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*$$object *:$|\1|" "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -525,7 +603,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -594,8 +672,8 @@
   sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

ncmpc-0.20.tar.bz2/build/install-sh -> ncmpc-0.21.tar.bz2/build/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

ncmpc-0.20.tar.bz2/build/missing -> ncmpc-0.21.tar.bz2/build/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.

ncmpc-0.20.tar.bz2/config.h.in -> ncmpc-0.21.tar.bz2/config.h.in Changed

ncmpc-0.20.tar.bz2/configure -> ncmpc-0.21.tar.bz2/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ncmpc 0.20.
+# Generated by GNU Autoconf 2.69 for ncmpc 0.21.
 #
 # Report bugs to <max@duempel.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='ncmpc'
 PACKAGE_TARNAME='ncmpc'
-PACKAGE_VERSION='0.20'
-PACKAGE_STRING='ncmpc 0.20'
+PACKAGE_VERSION='0.21'
+PACKAGE_STRING='ncmpc 0.21'
 PACKAGE_BUGREPORT='max@duempel.org'
 PACKAGE_URL=''
 
@@ -612,10 +632,16 @@
 DOXYGEN
 ENABLE_TEST_FALSE
 ENABLE_TEST_TRUE
-ENABLE_OUTPUTS_SCREEN_FALSE
-ENABLE_OUTPUTS_SCREEN_TRUE
+VERSION_EXTRA
+VERSION_REVISION
+VERSION_MINOR
+VERSION_MAJOR
 ENABLE_SCREEN_TEXT_FALSE
 ENABLE_SCREEN_TEXT_TRUE
+ENABLE_CHAT_SCREEN_FALSE
+ENABLE_CHAT_SCREEN_TRUE
+ENABLE_OUTPUTS_SCREEN_FALSE
+ENABLE_OUTPUTS_SCREEN_TRUE
 ENABLE_PLUGIN_LIBRARY_FALSE
 ENABLE_PLUGIN_LIBRARY_TRUE
 lyrics_plugin_dir
@@ -666,6 +692,9 @@
 GLIB_LIBS
 GLIB_CFLAGS
 PKG_CONFIG
+HAVE_WINDOWS_FALSE
+HAVE_WINDOWS_TRUE
+WINDRES
 host_os
 host_vendor
 host_cpu
@@ -680,6 +709,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -775,6 +805,7 @@
 enable_lyrics_screen
 with_lyrics_plugin_dir
 enable_outputs_screen
+enable_chat_screen
 enable_werror
 enable_debug
 enable_test
@@ -1252,8 +1283,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1339,7 +1368,7 @@
   # 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 ncmpc 0.20 to adapt to many kinds of systems.
+\`configure' configures ncmpc 0.21 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1409,7 +1438,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ncmpc 0.20:";;
+     short | recursive ) echo "Configuration of ncmpc 0.21:";;
    esac
   cat <<\_ACEOF
 
@@ -1434,6 +1463,7 @@
   --enable-key-screen     Enable key editor screen [default=yes]
   --enable-lyrics-screen  Enable lyrics screen [default=no]
   --enable-outputs-screen Enable outputs screen [default=yes]
+  --enable-chat-screen    Enable chat screen [default=no]
   --enable-werror         Treat warnings as errors [default=no]
   --enable-debug          Enable debugging [default=no]
   --enable-test           build the test programs [default=no]
@@ -1536,10 +1566,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ncmpc configure 0.20
-generated by GNU Autoconf 2.68
+ncmpc configure 0.21
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1615,7 +1645,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1905,8 +1935,8 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ncmpc $as_me 0.20, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+It was created by ncmpc $as_me 0.21, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2254,6 +2284,12 @@
 
 
 
+VERSION_MAJOR=0
+VERSION_MINOR=21
+VERSION_REVISION=0
+VERSION_EXTRA=0
+
+
 ac_aux_dir=
 for ac_dir in build "$srcdir"/build; do
   if test -f "$ac_dir/install-sh"; then
@@ -2322,7 +2358,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2491,7 +2527,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2531,7 +2567,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2582,7 +2618,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -2635,7 +2671,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2721,7 +2757,7 @@
 
 # Define the identity of the package.
  PACKAGE='ncmpc'
- VERSION='0.20'
+ VERSION='0.21'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2751,11 +2787,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2817,6 +2853,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -2849,7 +2886,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2889,7 +2926,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2942,7 +2979,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2983,7 +3020,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -3041,7 +3078,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3085,7 +3122,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3531,8 +3568,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3630,6 +3666,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3689,7 +3726,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -3890,7 +3927,7 @@
   return 0;
 }
 _ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
@@ -4797,8 +4834,103 @@
 case "$host_os" in
 mingw32* | windows*)
 	LIBS="$LIBS -lws2_32"
-	;;
 
+	ac_config_files="$ac_config_files src/win/ncmpc_win32_rc.rc"
+
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_WINDRES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_WINDRES"; then
+  ac_ct_WINDRES=$WINDRES
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_WINDRES"; then
+  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_WINDRES="windres"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
+if test -n "$ac_ct_WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_WINDRES" = x; then
+    WINDRES=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    WINDRES=$ac_ct_WINDRES
+  fi
+else
+  WINDRES="$ac_cv_prog_WINDRES"
+fi
+
+	HAVE_WINDOWS=1
+	;;
 *)
 	ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
 if test "x$ac_cv_func_socket" = xyes; then :
@@ -4899,7 +5031,17 @@
 
 fi
 
+
+	HAVE_WINDOWS=0
 esac
+ if test $HAVE_WINDOWS -eq 1; then
+  HAVE_WINDOWS_TRUE=
+  HAVE_WINDOWS_FALSE='#'
+else
+  HAVE_WINDOWS_TRUE='#'
+  HAVE_WINDOWS_FALSE=
+fi
+
 
 
 # Check whether --enable-multibyte was given.
@@ -4943,7 +5085,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4986,7 +5128,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5047,12 +5189,12 @@
         pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.14\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.12" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.14" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -5065,12 +5207,12 @@
         pkg_cv_GLIB_LIBS="$GLIB_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.12\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.12") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.14\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.12" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.14" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -5089,18 +5231,18 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.12"`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.14"`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.12"`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.14"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                as_fn_error $? "glib 2.12 is required" "$LINENO" 5
+                as_fn_error $? "glib 2.14 is required" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	as_fn_error $? "glib 2.12 is required" "$LINENO" 5
+	as_fn_error $? "glib 2.14 is required" "$LINENO" 5
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -5181,6 +5323,16 @@
 	:
 fi
 
+if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpdclient >= 2.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpdclient >= 2.5") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_libmpdclient_2_5=yes
+else
+  have_libmpdclient_2_5=no
+fi
 
 
 # Check whether --enable-locale was given.
@@ -5346,7 +5498,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -5412,7 +5564,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -6134,7 +6286,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6447,7 +6599,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7061,14 +7213,6 @@
   ENABLE_PLUGIN_LIBRARY_FALSE=
 fi
 
- if test x$enable_lyrics_screen = xyes; then
-  ENABLE_SCREEN_TEXT_TRUE=
-  ENABLE_SCREEN_TEXT_FALSE='#'
-else
-  ENABLE_SCREEN_TEXT_TRUE='#'
-  ENABLE_SCREEN_TEXT_FALSE=
-fi
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include the outputs screen" >&5
 $as_echo_n "checking whether to include the outputs screen... " >&6; }
@@ -7098,6 +7242,50 @@
 $as_echo "$enable_outputs_screen" >&6; }
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include the chat screen" >&5
+$as_echo_n "checking whether to include the chat screen... " >&6; }
+# Check whether --enable-chat-screen was given.
+if test "${enable_chat_screen+set}" = set; then :
+  enableval=$enable_chat_screen;
+else
+  enable_chat_screen=no
+fi
+
+if test "x$enable_chat_screen" = "xauto"; then
+	enable_chat_screen=$have_libmpdclient_2_5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_chat_screen" >&5
+$as_echo "$enable_chat_screen" >&6; }
+if test "x$enable_chat_screen" = "xyes" ; then
+	if test "x$have_libmpdclient_2_5" = "xno"; then
+		as_fn_error $? "The chat screen requires at least libmpclient 2.5" "$LINENO" 5
+	fi
+
+$as_echo "#define ENABLE_CHAT_SCREEN 1" >>confdefs.h
+
+fi
+ if test x$enable_chat_screen = xyes; then
+  ENABLE_CHAT_SCREEN_TRUE=
+  ENABLE_CHAT_SCREEN_FALSE='#'
+else
+  ENABLE_CHAT_SCREEN_TRUE='#'
+  ENABLE_CHAT_SCREEN_FALSE=
+fi
+
+
+ if test x$enable_lyrics_screen = xyes -o x$enable_chat_screen = xyes; then
+  ENABLE_SCREEN_TEXT_TRUE=
+  ENABLE_SCREEN_TEXT_FALSE='#'
+else
+  ENABLE_SCREEN_TEXT_TRUE='#'
+  ENABLE_SCREEN_TEXT_FALSE=
+fi
+
+
+
+
+
+
 
 
 # Check whether --enable-werror was given.
@@ -7229,7 +7417,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7954,6 +8142,10 @@
   as_fn_error $? "conditional \"NCMPC_MINI\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_WINDOWS_TRUE}" && test -z "${HAVE_WINDOWS_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_WINDOWS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_LIRC_TRUE}" && test -z "${ENABLE_LIRC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_LIRC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -7986,14 +8178,18 @@
   as_fn_error $? "conditional \"ENABLE_PLUGIN_LIBRARY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ENABLE_SCREEN_TEXT_TRUE}" && test -z "${ENABLE_SCREEN_TEXT_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_SCREEN_TEXT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${ENABLE_OUTPUTS_SCREEN_TRUE}" && test -z "${ENABLE_OUTPUTS_SCREEN_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_OUTPUTS_SCREEN\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_CHAT_SCREEN_TRUE}" && test -z "${ENABLE_CHAT_SCREEN_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_CHAT_SCREEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ENABLE_SCREEN_TEXT_TRUE}" && test -z "${ENABLE_SCREEN_TEXT_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_SCREEN_TEXT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_TEST_TRUE}" && test -z "${ENABLE_TEST_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -8300,16 +8496,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -8369,28 +8565,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -8411,8 +8595,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ncmpc $as_me 0.20, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+This file was extended by ncmpc $as_me 0.21, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -8477,11 +8661,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ncmpc config.status 0.20
-configured by $0, generated by GNU Autoconf 2.68,
+ncmpc config.status 0.21
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -8572,7 +8756,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -8616,6 +8800,7 @@
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "src/win/ncmpc_win32_rc.rc") CONFIG_FILES="$CONFIG_FILES src/win/ncmpc_win32_rc.rc" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;

ncmpc-0.20.tar.bz2/configure.ac -> ncmpc-0.21.tar.bz2/configure.ac Changed

@@ -1,5 +1,11 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.20, max@duempel.org)
+AC_INIT(ncmpc, 0.21, max@duempel.org)
+
+VERSION_MAJOR=0
+VERSION_MINOR=21
+VERSION_REVISION=0
+VERSION_EXTRA=0
+
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(build)
 AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects])
@@ -51,8 +57,13 @@
 case "$host_os" in
 mingw32* | windows*)
 	LIBS="$LIBS -lws2_32"
-	;;
 
+	AC_CONFIG_FILES([
+		src/win/ncmpc_win32_rc.rc
+	])
+	AC_CHECK_TOOL(WINDRES, windres)
+	HAVE_WINDOWS=1
+	;;
 *)
 	AC_CHECK_FUNC([socket],
 		[],
@@ -65,7 +76,10 @@
 		[AC_CHECK_LIB([nsl],[gethostbyname],[LIBS="$LIBS -lnsl"],
 		[AC_MSG_ERROR(No UNIX gethostbyname API found)])
 		])
+
+	HAVE_WINDOWS=0
 esac
+AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
 
 dnl multi-byte character support
 
@@ -82,14 +96,17 @@
 	fi
 fi
 
-dnl Check for glib-2.12
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12],,
-	[AC_MSG_ERROR([glib 2.12 is required])])
+dnl Check for GLib
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
+	[AC_MSG_ERROR([glib 2.14 is required])])
 
 dnl Check for libmpdclient 2.2
 PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.2],,
 	[AC_MSG_ERROR([libmpdclient2 is required])])
 
+dnl Check for libmpdclient 2.5 (the chat screen requires this version)
+PKG_CHECK_EXISTS([libmpdclient >= 2.5],
+	[have_libmpdclient_2_5=yes], [have_libmpdclient_2_5=no])
 
 dnl i18n
 
@@ -310,7 +327,6 @@
 AC_SUBST(lyrics_plugin_dir)
 
 AM_CONDITIONAL(ENABLE_PLUGIN_LIBRARY, test x$enable_lyrics_screen = xyes)
-AM_CONDITIONAL(ENABLE_SCREEN_TEXT, test x$enable_lyrics_screen = xyes)
 
 dnl Optional screen - outputs
 AC_MSG_CHECKING([whether to include the outputs screen])
@@ -327,6 +343,34 @@
 AC_MSG_RESULT([$enable_outputs_screen])
 
 
+dnl Optional screen - client-to-client chat
+AC_MSG_CHECKING([whether to include the chat screen])
+AC_ARG_ENABLE([chat-screen],
+              AC_HELP_STRING([--enable-chat-screen],
+		[Enable chat screen @<:@default=no@:>@]),,
+	[enable_chat_screen=no])
+if test "x$enable_chat_screen" = "xauto"; then
+	enable_chat_screen=$have_libmpdclient_2_5
+fi
+AC_MSG_RESULT([$enable_chat_screen])
+if test "x$enable_chat_screen" = "xyes" ; then
+	if test "x$have_libmpdclient_2_5" = "xno"; then
+		AC_MSG_ERROR(The chat screen requires at least libmpclient 2.5)
+	fi
+	AC_DEFINE(ENABLE_CHAT_SCREEN, 1, [Enable chat screen])
+fi
+AM_CONDITIONAL(ENABLE_CHAT_SCREEN, test x$enable_chat_screen = xyes)
+
+AM_CONDITIONAL(ENABLE_SCREEN_TEXT,
+	test x$enable_lyrics_screen = xyes -o x$enable_chat_screen = xyes)
+
+dnl
+dnl Windows OS Resource File
+dnl
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_REVISION)
+AC_SUBST(VERSION_EXTRA)
 
 dnl
 dnl build options

ncmpc-0.20.tar.bz2/doc/config.sample -> ncmpc-0.21.tar.bz2/doc/config.sample Changed

ncmpc-0.20.tar.bz2/doc/doxygen.conf -> ncmpc-0.21.tar.bz2/doc/doxygen.conf Changed

@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.20
+PROJECT_NUMBER         = 0.21
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -127,7 +127,7 @@
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = /home/avuton/src/mpd-release-utils/src/ncmpc.git
+STRIP_FROM_PATH        = /home/max/git/ncmpc
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -611,7 +611,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = /home/avuton/src/mpd-release-utils/src/ncmpc.git/src/
+INPUT                  = /home/max/git/ncmpc/src/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

ncmpc-0.20.tar.bz2/doc/ncmpc.1 -> ncmpc-0.21.tar.bz2/doc/ncmpc.1 Changed

@@ -5,7 +5,7 @@
 .B ncmpc
 [options]
 .SH "DESCRIPTION"
-ncmpc is  a client for MPD, the Music Player Daemon. 
+ncmpc is a client for MPD, the Music Player Daemon.
 ncmpc connects to a MPD running on a machine on the local 
 network.
 
@@ -27,19 +27,19 @@
 .B \-?, \-\-help
 Display help.
 .TP 
-.B \-V,  \-\-version
+.B \-V, \-\-version
 Display version information and build-time configuration.
 .TP 
-.B \-c,  \-\-colors
+.B \-c, \-\-colors
 Enable colors.
 .TP 
-.B \-C,  \-\-no\-colors
+.B \-C, \-\-no\-colors
 Disable colors.
 .TP
-.B \-m,  \-\-mouse
+.B \-m, \-\-mouse
 Enable mouse.
 .TP
-.B \-M,  \-\-no\-mouse
+.B \-M, \-\-no\-mouse
 Disable mouse.
 .TP 
 .B \-h, \-\-host=HOSTNAME
@@ -85,7 +85,7 @@
 Enable mouse support (if enabled at compile time).
 .TP
 .B screen\-list = SCREEN1 SCREEN2...
-A list of screens to cycle through when using the previous/next screen commands. Valid choices, if enabled at compile time, are playlist, browse, artist, help, search, song, keydef, lyrics, and outputs.
+A list of screens to cycle through when using the previous/next screen commands. Valid choices, if enabled at compile time, are playlist, browse, artist, help, search, song, keydef, lyrics, outputs, and chat.
 .TP
 .B search\-mode = MODE
 Default search mode for the search screen. MODE must be one of title, artist, album, filename, and artist+title, or an interger index (0 for title, 1 for artist etc.).
@@ -139,6 +139,9 @@
 .B text\-editor\-ask = yes|no
 Ask before starting an editor.
 .TP
+.B chat\-prefix = PREFIX
+Prefix messages send with the chat screen with PREFIX. By default they are prefixed with the current user name enclosed by \fB<\fR and \fB>\fR and a space (i.e. "<name> ").
+.TP
 .B second-column = yes|no
 Display song length in a second column.
 .SS Display
@@ -194,7 +197,7 @@
 Set the background color. If the background color is assigned to the keyword \fBnone\fR, ncmpc will not change the background color. Standard colors are: black, red, green, yellow, blue, magenta, cyan and white. Terminal specific colors can also be given as integers.
 .TP 
 .B color title = COLOR[,ATTRIBUTE]...
-Set the text color and attributes for the title row.  Text colors are the same as for the background.  Valid attributes are: standout, underline, reverse, blink, dim, and bold.
+Set the text color and attributes for the title row. Text colors are the same as for the background. Valid attributes are: standout, underline, reverse, blink, dim, and bold.
 .TP 
 .B color title\-bold = COLOR[,ATTRIBUTE]...
 Set the text color for the title row (the bold part).
@@ -243,17 +246,24 @@
 ncmpc is running. To edit key bindings press 'K' and use the key editor in ncmpc.
 .SH "SONG FORMAT"
 Format of song display for status and the list window.
-The  metadata  delimiters  are: %name%, %artist%, %track%, %time%, %file%, %shortfile%.
+The metadata delimiters are: %artist%, %albumartist%, %composer%, %performer%, %title%, %album%, %shortalbum%, %track%, %genre%, %name%, %time%, %date%, %file%, %shortfile%.
 
-The [] operators are used to group output such that if no metadata delimiters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are output. '&' and '|' are logical operators for AND and OR. '#'  is used to escape characters. 
+The [] operators are used to group output such that if none of the metadata delimiters between '[' and ']' are matched, then none of the characters between '[' and ']' are output; literal text is always output. '&' and '|' are logical operators for AND and OR. '#' is used to escape characters.
 
-Some  useful examples for format are: 
+Some useful examples for format are:
 
    "%file%" 
 
 and 
 
-   "[[%artist% \- ]%title%]|[%file]" 
+   "[[%artist% \- ]%title%]|%file%"
+
+Another one is:
+
+   "[%artist%|(artist n/a)] - [%title%|(title n/a)]"
+
+.SH "CHAT PROTOCOL"
+If ncmpc has been compiled with "chat" support, it uses the client-to-client protocol available in MPD 0.17 or higher to communicate with other clients. In order to receive messages it subscribes to the channel with the name "chat", and displays any message sent there as-is. When the user enters a message, it is first with the prefix specified by the \fBchat-prefix\fR option (or the default prefix), and then sent to the "chat" channel for others to read.
 .SH "BUGS"
 Report bugs on http://www.musicpd.org/mantis/
 .SH "NOTE"

ncmpc-0.20.tar.bz2/lyrics/20-lyricwiki.rb -> ncmpc-0.21.tar.bz2/lyrics/20-lyricwiki.rb Changed

ncmpc-0.20.tar.bz2/po/POTFILES.in -> ncmpc-0.21.tar.bz2/po/POTFILES.in Changed

ncmpc-0.20.tar.bz2/po/cs.gmo -> ncmpc-0.21.tar.bz2/po/cs.gmo Changed

ncmpc-0.20.tar.bz2/po/cs.po -> ncmpc-0.21.tar.bz2/po/cs.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-03-02 13:59+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Připojuji se k %s... [Pro přerušení stiskněte %s]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Chyba: MPD verze %d.%d.%d je příliš stará (potřebuji %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Připojeno k %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "stiskněte %s pro otevření správce klávesových zkratek"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Seznam skladeb zamíchán"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Seznam skladeb smazán"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Chyba: Příliš malá obrazovka"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Opakování je zapnuto"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Opakování je vypnuto"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Náhodné přehrávání je zapnuto"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Náhodné přehrávání je vypnuto"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Jednoduchý mód je zapnutý"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Jednoduchý mód je vypnutý"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Režim konzumace zapnut"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Režim konzumace vypnut"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Přerušení %d sekund"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Databáze aktualizována"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhledávání: Zabalený"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Režim vyhledávání: Normální"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Automatické centrování zapnuto"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Automatické centrování vypnuto"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Všechny skladby"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Všichni interpreti"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alba interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všechny skladby interpreta: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Písničky bez alba zpěváka: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Přidávám album %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Přidávám %s..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Načítám seznam skladeb: %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Přidávám '%s' do seznamu skladeb"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Aktualizace databáze zahájena"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Najít"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Nemohu najít '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Heslo"
 
@@ -225,7 +246,8 @@
 msgstr "Nahradit %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Přerušeno"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Přidat"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Smazání této položky není možné"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Smazat seznam skladeb %s[%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Seznam skladeb smazán"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "interpret"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titulek"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "stopa"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "název"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "žánr"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "datum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "skladatel"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "umělec"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "poznámka"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "soubor"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Název"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Název souboru"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Interpret + Název"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Chybný tag vyhledávání %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Žádný argument vyhledávání %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Vyhledávání"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Režim vyhledávání: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Použít & Uložit klávesové zkratky  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Použít klávesové zkratky "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Nové klávesové zkratky"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Klávesové zkratky nezměněny"
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Chyba: Nemohu vytvořit adresář ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Chyba: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapsat %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Odstraněno"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Vložte novou klávesu pro %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Chyba: klávesa %s je již použita pro %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s přiřazeno k %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Použít klávesové zkratky "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Použít & Uložit klávesové zkratky  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Přidat novou klávesovou zkratku"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Poznámka: Zapomněl jste 'Uplatnit' změny?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Upravit klávesové zkratky"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Upravit klávesové zkratky pro %s"
@@ -449,142 +475,189 @@
 msgid "Movement"
 msgstr "Pohyb"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globální"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Obrazovka seznamu skladeb"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Posunout skladbu nahoru"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Posunout skladbu dolů"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Střed"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Obrazovka prohlížení"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Vytoupit do adresáře/Vybrat a přehrát skladbu"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Přidat skladbu do seznamu skladeb"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Smazat seznam skladeb"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Obrazovka vyhledávání"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Vybrat a přehrát"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Obrazovka textu písně"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Zobrazit text písně"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "Znovu načíst text písně"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Přerušit načítání"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Stáhnout text pro aktuálně přehrávanou skladbu"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Žádný uložený text písně"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Uložit text písně"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Smazat uložený text písně"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Obrazovka výstupů"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Povolit/zakázat výstup"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Další obrazovka"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Obrazovka keydef"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Upravit keydefs pro vybraný příkaz"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Odstranit vybraný keydef"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Přidat novou klávesovou zkratku"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Jít o úroveň výš"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Aplikovat a uložit změny"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Nápověda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Žádný text písně"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Text písně"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "načítám..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Text písně uložen"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Text písně smazán"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Žádný uložený text písně"
 
@@ -598,96 +671,100 @@
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' zakázán"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Délka"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Skladatel"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Název"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Skladba"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Poznámka"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Cesta"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Počet interpretů"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Počet alb"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Počet skladeb"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Doba běhu"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Poslední aktualizace db"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Čas přehrávání"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Čas hraní DB"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Prohlížeč skladeb"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Cesta"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD statistiky"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Vybraná skladba"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Právě přehrávaná skladba"
 
@@ -699,342 +776,361 @@
 msgid "[Paused]"
 msgstr "[Pozastaveno]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Hlasitost n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hlasitost %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Obrazovka klávesových zkratek"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Posunout kurzor nahoru"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Posunout kurzoru dolů"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Přesunout kurzor na horní okraj obrazovky"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Přesunout kurzor doprostřed obrazovky"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Přesunout kurzor na dolní okraj obrazovky"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Přesunout kurzor na vrchol seznamu"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Přesunout kurzor na dno seznamu"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Výběr rozsahu"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Posunout o jeden řádek nahoru"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Posunout o jeden řádek dolů"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Posunout o půlku obrazovky nahoru"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Posunout o půlku obrazovky dolů"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Zvolit právě hrající skladbu"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Obrazovka nápovědy"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Přehrát/Vstoupit do adresáře"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Oříznout"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Následující stopa"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Předchozí stopa"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Přetočit vpřed"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Přetočit zpět"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Zvýšit hlasitost"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Snížit hlasitost"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Vybrat/Zrušit výběr skladby v seznamu skladeb"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Vybrat všechny vypsané položky"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Smazat skladbu ze seznamu skladeb"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Zamíchat seznam skladeb"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Vyčistit seznam skladeb"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Přepnout režim opakování"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Přepnout náhodný režim"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Přepnout jednoduchý mód"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Přepnout režim konzumace"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Zapnout režim přerušení"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Spustit aktualizaci databáze skladeb"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Uložit seznam skladeb"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Přidat url/soubor do seznamu skladeb"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Přejít do kořenového adresáře"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazeného adresáře"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Najít skladbu v prohlížeči"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Přesunout položku výše"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Přesunout položku níže"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Aktualizovat obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Přepnout na režim vyhledávání"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Zapnout režim automatické centrování"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Další obrazovka"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Předchozí obrazovka"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Přepnout na nedávnou obrazovku"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Najít vpřed"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Najít další vpřed"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Najít zpět"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Najít předchozí"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Skočit na"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Obrazovka interpretů"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Změnit režim hledání"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Zobrazit vybranou a v současnosti přehrávanou píseň"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Přerušit akci"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Aktualizovat text písně"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Mezera"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Vstup"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Zpět"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Dolů"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Doleva"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Doprava"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Domů"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Konec"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Klávesa %s je přiřazena k %s a %s"
@@ -1058,22 +1154,22 @@
 msgstr "Terminál postrádá podporu barev"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Neplatná definice klávesové zkratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplné nastavení klávesových zkratek"
 
@@ -1081,53 +1177,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Chybný typ zobrazení času"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Chybí '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Chybné jméno barvy"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Neúplná definice barvy"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Neplatná definice barvy"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Neznámé jméno obrazovky"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Chybný vyhledávací mód"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Neznámý vyhledávací mód"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Neznámý parametr nastavení"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1135,11 +1231,11 @@
 "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
 "  Zbyněk Schwarz https://launchpad.net/~tsbook"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Výběr rozsahu vypnut"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Výběr rozsahu zapnut"

ncmpc-0.20.tar.bz2/po/da.gmo -> ncmpc-0.21.tar.bz2/po/da.gmo Changed

ncmpc-0.20.tar.bz2/po/da.po -> ncmpc-0.21.tar.bz2/po/da.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2009-09-24 10:26+0200\n"
 "Last-Translator: Niels Anker <nanker@webspeed.dk>\n"
 "Language-Team: da <da@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fejl: MPD version %d.%d.%d er for gammel (mindst %s er nødvendig)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Forbundet til %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "tryk på %s for at redigere"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Afspilninsglisten blandet"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Sletter afspilningslisten"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Fejl: Skærm for lille"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Gentagelse er slået til"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Gentagelse er slået fra"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Tilfældig orden slået til"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Tilfældig orden slået fra"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Single afspilning slået til"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Single afspilning slået fra"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "\"Consume mode\" er slået til"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "\"Consume mode\" er slået fra"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Søg (begynd forfra)"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Søg normalt (start/slut)"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Alle kunstnere"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra kunstneren: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Tilføjer mappen %s...\n"
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Henter %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Tilføjer '%s' til listen"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Database opdatering startet"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Søg"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Adgangskode"
 
@@ -225,7 +246,8 @@
 msgstr "Erstat '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Afbrudt"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Sletning af dette emne ikke muligt"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slet '%s' [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Afspilningslisten slettet"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Gennemse"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "kunstner"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titel"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "spor"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "navn"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "dato"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "komponist"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "udførende"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Kunstner + Titel"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Ugyldigt søge tag %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Inter argument for søge tag %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Søg"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Søg efter: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "==> Anvend og gem taste bindinger  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "==> Anvend taste bindinger "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Taste bindinger opdaterede"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Taste bindinger uændrede!"
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fejl: Kunne ikke oprette mappe ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fejl: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s anvendes allerede til %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tildelt %s til %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "==> Anvend taste bindinger "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "==> Anvend og gem taste bindinger  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Definér ny tast"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke at 'anvende' dine ændringer?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Modificer taste bindinger"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Modificer tast for '%s'"
@@ -449,144 +475,191 @@
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Afspilningsliste"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Afspil"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Flyt markøren op i afspilningslisten"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Flyt markøren ned i afspilningslisten"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Gennemse"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilføj til afspilningslisten og afspil"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Tilføj spor til afspilningsliste"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Database søgning"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Vælg og afspil"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Sangtekst skærm"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Gennemse sangtekster"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Gen)indlæs santekster"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Abryd hentning"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Download tekst for det nummer der afspilles"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Gem sagtekster"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 #, fuzzy
 msgid "Delete saved lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Output skærm"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Slå output til/fra"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Næste skærm"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Tastdefinitions skærm"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Redigér tastdefinitioner for udvalgte kommandoer"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Fjern valgte tastdefinitioner"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Definér ny tast"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Gå et niveau op"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Anvend og gem ændringer"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Hjælp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Ingen sangtekster"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Sangtekster"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "indlæser..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Sangtekster gemt"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Afspilningslisten slettet"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Gem sagtekster"
@@ -601,96 +674,100 @@
 msgid "Output '%s' disabled"
 msgstr "Output '%s' slået fra"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Output"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Længde"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Sti"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bithastighed"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Antal kunstnere"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Antal albums"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Antal sange"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Seneste db opdatering"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Spilletid"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "DB spilletid"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Sang viser"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Sti"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/sek"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD statistik"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Valgt nummer"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Nummer der afspilles"
 
@@ -702,342 +779,361 @@
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volumen: n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Taste konfigurations skærm"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Flyt markør op"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Flyt markør ned"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Flyt cursor til toppen af skærmen"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Flyt cursor til midten af skærmen"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Flyt cursor til bunden af skærmen"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Flyt cursor til toppen af listen"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Flyt cursor til bunden af listen"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Valg af interval"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Scroll en linie op"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Scroll en linie ned"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Scroll en halv skærm op"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Scroll en halv skærm ned"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Vælg den sang der spilles nu"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Hjælp"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Afspil/Gå til mappe"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Næste"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Søg fremad"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Søg tilbage"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Hæv volumen"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Sænk volumen"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Vælg alle emner på listen"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Slet sang fra afspilningsliste"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Bland rækkefølgen i afspilningslisten"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Slet afspilningslisten"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilfældigt valg"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Aktiver/deaktiver enkelt valg"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Aktiver/deaktiver consume valg"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Gem afspilningslisten"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Tilføj URL eller fil til afspilningslisten"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Gå til rod mappen"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Gå til forældre mappe"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Lokaliser sang i browseren"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Genopfrisk skærm"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Ændre søge tilstand"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Næste skærm"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Forrige skærm"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Skift til seneste skærm"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Søg"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Gentag søg"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Søg baglæns"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Gentag søg baglæns"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Spring til"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Kunstner skærm"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Ændre søge tilstand"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Vis valgte numre og det der afspilles"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Afbryd action"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Opdater sangtekster"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Tilbagetast"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Slet"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Op"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Højre"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Hjem"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Slut"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Skift+Tabulator"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tast %s tildelt %s og %s"
@@ -1061,22 +1157,22 @@
 msgstr "Terminalen understøtter ikke farver"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Fejl"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Forkert hotkey definition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Ufuldstændig hotkey konfiguration"
 
@@ -1084,64 +1180,64 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Ringe tidsvisningstype"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Dårligt farvenavn"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Ufuldstændig farve definition"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Ugyldigt tal."
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Forkert farve definition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Ukendt skærm navn"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Ugyldig søgetilstand"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Ukendt søgetilstand"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Ukendt konfigurations parameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Mikkel Kirkgaard Nielsen https://launchpad.net/~ncmpc\n"
 "  Niels Anker https://launchpad.net/~nanker"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Valg af interval slået fra"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Valg af interval slået til"

ncmpc-0.20.tar.bz2/po/de.gmo -> ncmpc-0.21.tar.bz2/po/de.gmo Changed

ncmpc-0.20.tar.bz2/po/de.po -> ncmpc-0.21.tar.bz2/po/de.po Changed

@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-06-21 08:19+0000\n"
 "Last-Translator: Christoph Mende <angelos@gentoo.org>\n"
 "Language-Team: de <de@li.org>\n"
@@ -27,21 +28,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbinde mit %s…   [%s drücken, um abzubrechen]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fehler: MPD-Version %d.%d.%d ist zu alt (%s wird benötigt)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Verbunden mit %s"
@@ -54,7 +55,7 @@
 msgid "press %s for the key editor"
 msgstr "drücken Sie %s für den Tasteneditor"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Playlist gemischt"
 
@@ -62,23 +63,23 @@
 msgid "Cleared playlist"
 msgstr "Playlist gelöscht"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Fehler: Anzeige zu klein"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Wiederhol-Modus ist aktiviert"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Wiederhol-Modus ist deaktiviert"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Zufalls-Modus ist aktiviert"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Zufalls-Modus ist deaktiviert"
 
@@ -87,11 +88,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Einzelabspiel-Modus ist aktiviert"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Einzelabspiel-Modus ist deaktiviert"
 
@@ -99,74 +100,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Verbrauchs-Modus Aktiviert"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Verbrauchs-Modus Deaktiviert"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Alle Stücke"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Alle Künstler"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alben des Künstlers: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle Lieder des Künstlers: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Titel von keinem Album des Künstlers: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Füge Album %s... hinzu"
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Hinzufügen %s..."
@@ -176,7 +177,8 @@
 msgid "Loading playlist %s..."
 msgstr "Lade Playlist %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Füge '%s' der Playlist hinzu"
@@ -194,6 +196,25 @@
 msgid "Database update started"
 msgstr "Datenbankaktualisierung gestartet"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Suche"
@@ -211,7 +232,7 @@
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Passwort"
 
@@ -226,7 +247,8 @@
 msgstr "Ersetze %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Abbruch"
 
@@ -241,7 +263,7 @@
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Playlist"
 
@@ -253,101 +275,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Dieses Objekt kann nicht gelöscht werden"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Lösche Playlist %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Playlist gelöscht"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "Künstler"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "Album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "Titel"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "Stück"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "Name"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "Genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "Datum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "Komponist"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "Aufführung"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "Anmerkung"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Künstler + Titel"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag nicht erkannt: %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Kein Argument für Tag %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Suche"
 
@@ -379,69 +401,73 @@
 msgid "Search mode: %s"
 msgstr "Suchmodus: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Tastenbelegung speichern und anwenden  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Tastenbelegung anwenden "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Du hast eine neue Tastenbelegung"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Tastenbelegung unverändert."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fehler: kann Verzeichnis ~/.ncmpc - %s nicht erstellen"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fehler: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s geschrieben"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Gib neue Taste für %s ein: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Fehler: Taste %s wird bereits benutzt für %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s wurde %s zugeordnet"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Tastenbelegung anwenden "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Tastenbelegung speichern und anwenden  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Füge neue Taste hinzu"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Tipp: Hast du vergessen, deine Änderungen 'Anzuwenden'?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Editiere Tastenbelegungen"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editiere Tasten für %s"
@@ -450,142 +476,189 @@
 msgid "Movement"
 msgstr "Bewegung"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Playlistenanzeige"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Stück nach oben bewegen"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Stück nach unten bewegen"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Anzeige durchstöbern"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Verzeichnis öffnen/Stück auswählen und abspielen"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Song zur Playlist hinzufügen"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Lösche Playlist"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Suchanzeige"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Auswählen und abspielen"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Liedtextanzeige"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Liedtext lesen"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "Text (neu) laden"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Laden unterbrechen"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Liedtexte für aktuell laufendes Stück herunterladen"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Keine gespeicherten Texte"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Liedtext speichern"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Lösche gespeicherte Texte"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Anzeige der Ausgabegeräte"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Ausgabegerät aktivieren/deaktivieren"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Nächste Anzeige"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Tastenbelegungsanzeige"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Tastenbelegung für ausgewählten Befehl bearbeiten"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Ausgewählte Tastenbelegung entfernen"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Füge neue Taste hinzu"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Eine Ebene nach oben"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Änderungen bestätigen und speichern"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Hilfe"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Kein Liedtext verfügbar"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Liedtexte"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "lade..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Liedtext gespeichert"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Texte gelöscht"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Keine gespeicherten Texte"
 
@@ -599,96 +672,100 @@
 msgid "Output '%s' disabled"
 msgstr "Ausgabegerät '%s' deaktiviert"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Ausgabegeräte"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Länge"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Name"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "CD"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Stück"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Pfad"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Anzahl der Künstler"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Anzahl der Alben"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Anzahl der Lieder"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Laufzeit"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Letzte db-Aktualisierung"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Spielzeit"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "DB Spielzeit"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Liedbetrachter"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Pfad"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD Statistik"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Lied anzeigen"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Gerade laufendes Lied"
 
@@ -700,342 +777,361 @@
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Lautstärke n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Lautstärke %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Cursor nach oben bewegen"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Markierung an den Anfang der Anzeige setzen"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Markierung in die Mitte der Anzeige setzen"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Markierung ans Ende der Anzeige setzen"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Markierung an den Anfang der Liste setzen"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Markierung ans Ende der Liste setzen"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Mehrfachauswahl"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Eine Zeile nach oben scrollen"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Eine Zeile nach unten scrollen"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Die halbe Anzeige nach oben scrollen"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Die halbe Anzeige nach unten scrollen"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Derzeit spielenden Song auswählen"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis öffnen"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Playlist auf das markierte Lied reduzieren"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Nächstes Stück"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Vorheriges Stück"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Zurückspulen"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Lautstärke verringern"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Wähle Stück in der Playlist an/ab"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Alle angezeigten Lieder zur Playlist hinzufügen"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Lösche Song aus der Playlist"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Mische Playlist"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Lösche Playlist"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Schalte Wiederholungswiedergabe ein/aus"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Schalte Zufallswiedergabe ein/aus"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Einzelabspiel-Modus umschalten"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Verbrauchs-Modus Umschalten"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Schalte Crossfade-Wiedergabe ein/aus"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Starte eine Aktualisierung der Musikdatenbank"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Speichere Playlist"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Füge eine URL/Datei der Playlist hinzu"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Basis-Verzeichnis öffnen"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Übergeordnetes Verzeichnis öffnen"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Lied in Datenbank orten"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Aktualisiere Anzeige"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Nächste Anzeige"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Wechsle zur zuletzt benutzten Anzeige"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Vorwärtssuche"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Vorwärtssuche fortsetzen"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Rückwärtssuche"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Rückwärtssuche fortsetzen"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Künstlerdatenbank"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Zeige das ausgewählte und das gerade laufende Lied an"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Kommando Unterbrechen"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Liedtext aktualisieren"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Pos1"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Ende"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Taste %s ist %s und %s zugeordnet"
@@ -1059,22 +1155,22 @@
 msgstr "Das Terminal unterstützt keine Farben"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Fehlerhafte Definition der Tastenbelegung"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Unvollständige Konfiguration für Tastenbelegung"
 
@@ -1082,53 +1178,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Ungültige Anzeigeart"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Es fehlt ein '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Ungültiger Farbname"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Unvollständige Farbkonfiguration"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Ungültige Zahl"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Fehlerhafte Farbdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Unbekannter Anzeigenname"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Ungültiger Suchmodus"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Unbekannter Suchmodus"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Unbekannter Konfigurationsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Übersetzer\n"
@@ -1141,11 +1237,11 @@
 "  Samuel Creshal https://launchpad.net/~samuel-creshal\n"
 "  cmdrhenner https://launchpad.net/~cmdrhenner"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Mehrfachauswahl deaktiviert"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Mehrfachauswahl aktiviert"

ncmpc-0.20.tar.bz2/po/eo.gmo -> ncmpc-0.21.tar.bz2/po/eo.gmo Changed

ncmpc-0.20.tar.bz2/po/eo.po -> ncmpc-0.21.tar.bz2/po/eo.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-05-16 15:13+0000\n"
 "Last-Translator: Aleksej <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Konektiĝado al %s...  [Premu %s por ĉesigi]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Problemo: la versio %d.%d.%d de MPD estas tro malnova (necesas %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Konektite al %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr ""
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr ""
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr ""
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr ""
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr ""
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr ""
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr ""
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Ĝisdatigis datumbazon"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr ""
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr ""
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Aldonas \"%s\" al la ludlisto"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr ""
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr ""
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Ne troviĝis \"%s\""
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr ""
 
@@ -225,7 +246,8 @@
 msgstr ""
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr ""
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Aldoni"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr ""
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr ""
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr ""
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr ""
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr ""
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr ""
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr ""
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr ""
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "dato"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr ""
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr ""
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "dosiero"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titolo"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr ""
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr ""
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr ""
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr ""
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr ""
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr ""
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr ""
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr ""
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
@@ -449,142 +475,186 @@
 msgid "Movement"
 msgstr ""
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr ""
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr ""
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr ""
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr ""
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr ""
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr ""
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr ""
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr ""
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr ""
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+msgid "Chat screen"
+msgstr ""
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+msgid "Add a keydef"
+msgstr ""
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr ""
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Helpo"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr ""
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr ""
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
@@ -598,96 +668,100 @@
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr ""
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr ""
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr ""
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr ""
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr ""
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr ""
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr ""
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr ""
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr ""
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr ""
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
@@ -699,342 +773,361 @@
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr ""
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr ""
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr ""
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr ""
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr ""
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -1058,22 +1151,22 @@
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1081,53 +1174,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1135,10 +1228,10 @@
 "  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
 "  Max Kellermann https://launchpad.net/~max-duempel"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/es.gmo -> ncmpc-0.21.tar.bz2/po/es.gmo Changed

ncmpc-0.20.tar.bz2/po/es.po -> ncmpc-0.21.tar.bz2/po/es.po Changed

@@ -11,17 +11,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
-"PO-Revision-Date: 2010-11-21 19:43+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"PO-Revision-Date: 2012-01-30 07:08+0000\n"
+"Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
 "Language-Team: es\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-05 20:00+0000\n"
-"X-Generator: Launchpad (build 12138)\n"
+"X-Launchpad-Export-Date: 2013-04-11 07:56+0000\n"
+"X-Generator: Launchpad (build 16550)\n"
 
 #: src/i18n.h:42
 msgid "y"
@@ -31,23 +32,23 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectándose a %s... [Presiona %s para interrumpir la ejecución]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 "Error: La versión %d.%d.%d del MPD es demasiado antigua (se necesita al "
 "menos la %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado a %s"
@@ -60,7 +61,7 @@
 msgid "press %s for the key editor"
 msgstr "pressiona %s para accer al editor de teclas"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Lista de canciones barajada"
 
@@ -68,23 +69,23 @@
 msgid "Cleared playlist"
 msgstr "Vaciada la lista de canciones"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Error: La ventana/pantalla es muy pequeña"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Modo aleatorio desactivado"
 
@@ -93,11 +94,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -105,74 +106,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Modo compacto desactivado"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Desvanecimiento de %d segundos"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: simple"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Todas las pistas"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Todos los artistas"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas las pistas del artista: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas del no álbum de artista: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Agregando álbum %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Agregando %s..."
@@ -182,7 +183,8 @@
 msgid "Loading playlist %s..."
 msgstr "Cargando la lista %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Añadiendo '%s' a la lista de canciones"
@@ -200,6 +202,25 @@
 msgid "Database update started"
 msgstr "Ha comenzado la actualización de la base de datos"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Buscar"
@@ -217,7 +238,7 @@
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Contraseña"
 
@@ -232,7 +253,8 @@
 msgstr "Sustituir %s [%s%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Ejecución interrumpida"
 
@@ -247,7 +269,7 @@
 msgid "Add"
 msgstr "Añadir"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Lista de canciones"
 
@@ -259,101 +281,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "No se puede borrar el elemento"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar la lista de reproducción %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Lista de reproducción borrada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "álbum"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "título"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "canción"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nombre"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "estilo"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "fecha"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "compositor"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "intérprete"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "comentario"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fichero"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etiqueta de búsqueda inválida: %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Sin argumentos para la etiqueta de búsqueda %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Búsqueda"
 
@@ -385,69 +407,73 @@
 msgid "Search mode: %s"
 msgstr "Modo de búsqueda: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Aplicar y guardar las teclas de acceso rápido  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Aplicar las teclas de acceso rápido "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Has definido nuevas teclas de acceso rápido"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Las teclas de acceso rápido no han sido modificadas."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Error: No se ha podido crear el directorio ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Error: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creado"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tecla de acceso rápido para %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Error: la tecla %s ya está asignada a %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s asignada a %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Aplicar las teclas de acceso rápido "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Aplicar y guardar las teclas de acceso rápido  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Introduce una nueva tecla"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Has olvidado 'Aplicar' tus cambios?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Cambia las teclas de acceso rápido"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia las teclas para %s"
@@ -456,142 +482,189 @@
 msgid "Movement"
 msgstr "Navegar"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Lista de canciones"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Mover la canción arriba"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Mover la canción abajo"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Navegador"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Acceder al directorio/Seleccionar y reproducir canción"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Añadir la canción de la lista"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Búsqueda"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Letras"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Ver letras"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Re)cargar letras"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Interrumpir la descarga"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Obtener las letras de la canción reproducida"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "No hay letras guardadas"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Guardar las letras"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Borrar letras guardadas"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Pantalla de salidas"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Activar/desactivar la salida"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Pantalla siguiente"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Pantalla de teclas de acceso"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Cambia las teclas de acceso rápido para el comando seleccionado"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "ELiminar la tecla de acceso rápido seleccionada"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Introduce una nueva tecla"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Subir un nivel"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Aplicar y guardar los cambios"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Ayuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "No hay letras disponibles"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Letras"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
-msgstr "cargando..."
+msgstr "cargando…"
+
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Letras borradas"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "No hay letras guardadas"
 
@@ -605,96 +678,100 @@
 msgid "Output '%s' disabled"
 msgstr "Se desactivó la salida '%s'"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Salidas"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Duración"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nombre"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Fecha"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Ruta"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Número de álbumes"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Número de canciones"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Tiempo de ejecución"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Actualización más reciente de la BD"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Tiempo de reproducción"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Duración de la BD"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Visor de la canción"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Ruta"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Estadísticas del MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Canción seleccionada"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Canción reproducida"
 
@@ -706,342 +783,361 @@
 msgid "[Paused]"
 msgstr "[Parado]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volumen n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volumen %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Salir"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Mover el cursor hasta el principio de la pantalla"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Mover el cursor hasta la mitad de la pantalla"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover el cursor hasta el final de la pantalla"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Mover el cursor hasta el principio de la lista"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover el cursor hasta el final de la lista"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Selección del rango"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir una linea"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Bajar una linea"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir media pantalla"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Bajar media pantalla"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Seleccionar la actual canción en reproducción"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Reducir lista de canciónes a canción marcado"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Borrar la canción de la lista"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Aleatorizar lista de canciones"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Alternar modo repetición"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Alternar modo aleatorio"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Alternar modo compacto"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Alternar modo completo"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Alternar modo crossfade"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Iniciar la actualización de la BD musical"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Guardar la lista de canciones"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Añadir una URL o fichero a la lista"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Entrar al directorio fundamental"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Entrar al directorio superior"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Encontrar la canción en el navegador"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Actualizar la ventana"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Alternar modo de búsqueda"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Volver a la anterior pantalla"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Buscar anterior"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Saltar a"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Ver la canción seleccionada y reproducida"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Interrumpir la acción"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Actualizar las letras"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Espacio"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tabulador"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tecla %s asignada a %s y %s"
@@ -1065,22 +1161,22 @@
 msgstr "La terminal no tiene la opcion de diferentes colores"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Error"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta de la tecla de acceso"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Configuración incompleta de la tecla de acceso"
 
@@ -1088,58 +1184,58 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Configuración incorrecta del tipo de duración mostrada"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Falta un '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Nombre de color incorrecto"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Definición de color incompleta"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Definición de color erronea"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Nombre de pantalla desconocido"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Modo de búsqueda inválido"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "No se reconoce el modo de búsqueda"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Parámetro de configuración desconocido"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
+"  Adolfo Jayme Barrientos https://launchpad.net/~fitoschido\n"
 "  Feder Sáiz https://launchpad.net/~federsaiz-deactivatedaccount\n"
-"  Fitoschido https://launchpad.net/~fitoschido\n"
 "  Johám-Luís Miguéns Vila https://launchpad.net/~ashtophet\n"
 "  Johám-Luís Miguéns Vila https://launchpad.net/~miluxovi\n"
 "  Luis Miguel D.P. https://launchpad.net/~lmdp\n"
@@ -1147,11 +1243,11 @@
 "  Monkey https://launchpad.net/~monkey-libre\n"
 "  Paco Molinero https://launchpad.net/~franciscomol"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Selección de rango desactivada"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Selección de rango activada"

ncmpc-0.20.tar.bz2/po/fi.gmo -> ncmpc-0.21.tar.bz2/po/fi.gmo Changed

ncmpc-0.20.tar.bz2/po/fi.po -> ncmpc-0.21.tar.bz2/po/fi.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-03-06 16:02+0000\n"
 "Last-Translator: Sami Sankala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "e"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Yhdistetään kohteeseen %s... [Paina %s keskeyttääksesi]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Virhe: MPD versio %d.%d.%d on liian vanha (tarvitaan %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Yhdistetty kohteeseen %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "Painalla %s pääset näppäineditoriin"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Sekoitettu soittolista"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Tyhjennetty soittolista"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Virhe: Ruutu on liian pieni"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Jatkuva toisto on päällä"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Jatkuva toisto on poissa päältä"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Satunnaistoisto on päällä"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Satunnaistoisto poissa päältä"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Kertatoisto on päällä"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Kertatoisto on poissa päältä"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Kertakäyttökuuntelu päällä"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Kertakäyttökuuntelu poissa päältä"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Ristiinhäivytys %d sekuntia"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Tietokanta päivitetty"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Hakutyyli: 'Wrapped'"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Hakutyyli: Normaali"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Kaikki kappaleet"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Kaikki esittäjät"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Kaikki albumit esittäjältä: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Kaikki kappaleet esittäjältä: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Levy: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Kappaleet tuntemattomista albumeista esittäjältä: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Lisätään albumia %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Lisätään %s..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Ladataan soittolistaa %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Soittolistaan lisätään '%s'"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Tietokannan päivitys käynnistyi"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Etsi"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Haku '%s' ei tuottanut tuloksia"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Salasana"
 
@@ -225,7 +246,8 @@
 msgstr "Korvaa %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Keskeytetty"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Lisää"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Soittolista"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Tämän kohteen poistaminen ei ole mahdollista"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Soittolista poistettu"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "esittäjä"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "levy"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "nimi"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "kappale"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nimi"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "tyylilaji"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "päiväys:"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "säveltäjä"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "esittäjä"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "kommentti"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "tiedosto"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Kappale"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Albumi"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Esittäjä + Kappale"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Haku"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Hakutyyli: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr ""
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr ""
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Uusia näppäinmäärittelyjä"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Näppäinmäärittelyjä ei muutettu"
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Virhe: Hakemistoa ~/ncmpc - %s ei pystytty luomaan"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Virhe: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Kirjoitettiin %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Virhe: näppäin %s on jo %s käytössä"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Asetettu %s %s:ksi"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr ""
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr ""
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Lisää uusi näppäin"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Huomio: Unohditko 'Toteuttaa' muutokset?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Muuta näppäinasetteluja"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Muokkaa %s näppäimiä"
@@ -449,142 +475,189 @@
 msgid "Movement"
 msgstr ""
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Soittolista näyttö"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Toista"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Siirrä kappaletta ylemmäksi"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Siirrä kappaletta alemmaksi"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Selailunäkymä"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Lisää kappale soittolistaan"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Poista soittolista"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Hakunäkymä"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Valitse ja toista"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Sanoitusnäkymä"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Näytä sanoitukset"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "Lataa sanoitukset"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Keskeytä sanoitusten noutaminen"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Lataa sanoitukset toistettavaan kappaleeseen"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Ei talletettuja sanoituksia"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Tallenna sanoitukset"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Poista tallennettut sanoitukset"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Ulostulo päälle/poissa"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Soittolista näyttö"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Näppäinmäärittely ruutu"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Muokkaa näppäinmäärittelyjä halutulle komennolle"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Poista valittu näppäinmäärittely"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Lisää uusi näppäin"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Siirry taso ylöspäin"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Toteuta ja tallenna muutokset"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Ohje"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Sanoituksia ei löytynyt"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Sanoitukset"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "latautuu..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Sanoitukset talletettu"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Sanoitukset poistettu"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Ei talletettuja sanoituksia"
 
@@ -598,96 +671,100 @@
 msgid "Output '%s' disabled"
 msgstr "Ulostulo '%s' poissa päältä"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Ulostulot"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Kesto"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Säveltäjä"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nimi"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Levy"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Kappale"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr ""
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr ""
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr ""
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr ""
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr ""
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr ""
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr ""
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
@@ -699,342 +776,361 @@
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr ""
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr ""
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr ""
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr ""
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr ""
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -1058,22 +1154,22 @@
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1081,63 +1177,63 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Katja Viljakainen https://launchpad.net/~katja-viljakainen\n"
 "  Sami Sankala https://launchpad.net/~valijumi"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/fr.gmo -> ncmpc-0.21.tar.bz2/po/fr.gmo Changed

ncmpc-0.20.tar.bz2/po/fr.po -> ncmpc-0.21.tar.bz2/po/fr.po Changed

@@ -8,8 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.14.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-09-23 11:15+0000\n"
 "Last-Translator: Thibault Févry <Unknown>\n"
 "Language-Team: <fr@li.org>\n"
@@ -28,21 +29,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Connexion à %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Erreur: la version %d.%d.%d de MPD est trop ancienne (%s requise)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Connecté à %s"
@@ -55,7 +56,7 @@
 msgid "press %s for the key editor"
 msgstr "appuyez sur %s pour l'éditeur de touches"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Liste de lecture aléatoire"
 
@@ -63,23 +64,23 @@
 msgid "Cleared playlist"
 msgstr "Liste de lecture vidée"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Erreur: Ecran trop petit"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Répétition activé"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Répétition désactivé"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Mode Aléatoire activé"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Mode Aléatoire désactivé"
 
@@ -88,11 +89,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Mode seul activé"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Mode seul désactivé"
 
@@ -100,74 +101,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Toutes les pistes"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Tous les artistes"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums de l'artiste : %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Toutes les pistes de l'artiste : %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Piste sans album de l'artiste : %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Ajout de l'album %s en cours..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Ajout de %s en cours..."
@@ -177,7 +178,8 @@
 msgid "Loading playlist %s..."
 msgstr "Chargement de la liste de lecture %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Ajout de '%s' à la liste de lecture"
@@ -195,6 +197,25 @@
 msgid "Database update started"
 msgstr "Début de la mise à jour de la base de données"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Trouver"
@@ -212,7 +233,7 @@
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -227,7 +248,8 @@
 msgstr "Remplacer %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Annulé"
 
@@ -242,7 +264,7 @@
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Liste de lecture"
 
@@ -254,101 +276,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Impossible d'effacer ce type d'objet"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Effacer la liste de lecture %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Liste de lecture effacée"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artiste"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titre"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "piste"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nom"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "date"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "compositeur"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "interprète"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "commentaire"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fichier"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artiste + Titre"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Mauvais champ recherché %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Pas d'argument pour le champ recherché %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Rechercher"
 
@@ -380,69 +402,73 @@
 msgid "Search mode: %s"
 msgstr "Mode de recherche : %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Appliquer et Enregistrer la correspondance des touches  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Appliquer la correspondance des touches "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Vous avez une nouvelle correspondance de touches"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "La correspondance des touches n'a pas été changée."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erreur : Impossible de créer le répertoire ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erreur: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s écrit"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Effacé"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entrez la nouvelle touche pour %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erreur: la touche %s est déja attribuée à %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assignée à %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Appliquer la correspondance des touches "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Appliquer et Enregistrer la correspondance des touches  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Ajouter une nouvelle touche"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Note: Auriez-vous oublié d''Appliquer' vos changements?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Editer les correspondances de touches"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editer les touches pour %s"
@@ -451,142 +477,189 @@
 msgid "Movement"
 msgstr "Déplacements"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globales"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Ecran de Liste de lecture"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Lire"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Déplacer la chanson vers le haut"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Déplacer la chanson vers le bas"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le répertoire/Sélectionner et lire la chanson"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Ajouter la chanson à la liste de lecture"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Sélectionner et Lire"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Ecran des paroles"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Voir les Paroles"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Re)charger les paroles"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Récupération interrompue"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Télécharger les paroles de la chanson en lecture"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Aucune parole sauvée"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Enregistrer les paroles"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Supprimer les paroles sauvées"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Ecran des sorties"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Activer/désactiver une sortie"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Ecran suivant"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Écran du paramétrage des raccourcis"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Éditer les raccourcis pour la commande sélectionnée"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Supprimer le raccourci sélectionné"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Ajouter une nouvelle touche"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Aller au dossier parent"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Appliquer et sauvegarder les changements"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Aide"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Pas de paroles"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Paroles"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "Chargement..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Paroles enregistrées"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Paroles supprimées"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Aucune parole sauvée"
 
@@ -600,96 +673,100 @@
 msgid "Output '%s' disabled"
 msgstr "Sortie %s désactivée"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Sorties"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Durée"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nom"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disque"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Piste"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Date"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Style"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Chemin"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Débit"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Nombre d'artistes"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Nombre d'albums"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Nombre de chansons"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Temps de service"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Mise à jour de la BD la plus récente"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Temps de lecture"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Temps de lecture de la BD"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Visualiseur de chanson"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Chemin"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Statistiques MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Chanson sélectionnée"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Chanson actuellement jouée"
 
@@ -701,342 +778,361 @@
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Déplacer le curseur vers le haut"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Déplacer le curseur vers le bas"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Déplacer le curseur vers le haut de l'écran"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Déplacer le curseur vers le milieu de l'écran"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Déplacer le curseur vers le bas de l'écran"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Déplacer le curseur vers le haut de la liste"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Déplacer le curseur vers le bas de la liste"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Sélection multi-ligne"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Défiler d'une ligne vers le haut"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Défiler d'une ligne vers le bas"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Défiler d'une moitié d'écran vers le haut"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Défiler d'une moitié d'écran vers le bas"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Sélectionner la chanson actuellement jouée"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le répertoire"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Couper"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Sélectionner/Désélectionner la chanson dans la liste de lecture"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Selectionner tous les éléments listés"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Enlever la chanson de la liste de lecture"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Liste de lecture aléatoire"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Vider la liste de lecture"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Activer/désactiver le mode répétition"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Activer/désactiver le mode aléatoire"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Basculer le mode seul"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Basculer le mode consommation"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Activer/désactiver le mode de fondu"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Mettre à jour la base de données musicale"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Enregistrer la liste de lecture"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Ajouter une url/un fichier à la liste de lecture"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Aller au répertoire racine"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Aller au répertoire supérieur"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Localiser la chanson dans le navigateur"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Déplacer l'élément vers le haut"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Déplacer l'élément vers le bas"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Rafraîchir l'écran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Activer le mode de recherche"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Ecran précédent"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Passer à l'écran le plus récent"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Chercher après"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Chercher après/suivant"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Chercher avant/précédent"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Aller à"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Ecran sur l'Artiste"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Voir la chanson sélectionnée et actuellement jouée"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Interrompre l'action"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Mettre à jour les paroles"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Début"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "La touche %s est assignée à %s et à %s"
@@ -1060,22 +1156,22 @@
 msgstr "Le terminal ne dispose pas de la gestion des couleurs"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Erreur"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Définition de raccourci malformée"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Configuration de raccourci incomplète"
 
@@ -1083,53 +1179,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Mauvais type d'affichage du temps"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Manque '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Mauvais nom de couleur"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Définition de couleur incomplète"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Nombre invalide"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Définition de couleur malformée"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Nom d'écran inconnu"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Mode de recherche invalide"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Mode de recherche inconnu"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Paramètre de configuration inconnu"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Traduction française : Yann Cézard <eesprit@free.fr>\n"
@@ -1142,11 +1238,11 @@
 "  Thibault Févry https://launchpad.net/~thibaultfevry\n"
 "  Yann Cézard https://launchpad.net/~eesprit"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Sélection multi-ligne désactivée"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Sélection multi-ligne activée"

ncmpc-0.20.tar.bz2/po/gl.gmo -> ncmpc-0.21.tar.bz2/po/gl.gmo Changed

ncmpc-0.20.tar.bz2/po/gl.po -> ncmpc-0.21.tar.bz2/po/gl.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-03-25 19:34+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectandose con %s... [Prema %s para interromper]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Erro: a versión %d.%d.%d do MPD é moi antiga (precisase a %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado a %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "prema %s para ir ao editor de atallos"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Lista de reprodución aleatoria"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Lista limpada"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Erro: A pantalla é moi pequena"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Activado o modo de repetición"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Modo aleatório activado"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Modo aleatório desactivado"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Modo completo desactivado"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento cruzado %d segundos"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Modo de busca: Limitada"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Modo de busca: Normal"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Modo de autocentrado: activado"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Modo de autocentrado: desactivado"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Todas as pistas"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as pistas do artista: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas de ningún álbum do artista: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Engadindo álbum %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Engadindo %s..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Cargando a lista de reprodución %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Engadindo «%s» á lista de reprodución"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Comezou a actualización da base de datos"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Buscar"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Non se puido atopar «%s»"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -225,7 +246,8 @@
 msgstr "Substituir %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Interrompido"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Engadir"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Non é possíbel borrar este elemento"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Borrar a lista de reprodución %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Lista de reprodución borrada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "álbum"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "título"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "pista"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nome"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "xénero"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "data"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "compositor"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "interprete"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "comentário"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "ficheiro"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etiqueta de busca errónea %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Sen argumento para a busca da etiqueta %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Buscar"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Modo da busca: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Aplicar e guardar os atallos de teclado  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Aplicar os atallos de teclado "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Ten novos atallos de teclado"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Non se cambiaron os atallos de teclado"
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erro: Non se puido crear o cartafol ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Escribiuse %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Borrada"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduza un novo atallo para %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erro: a tecla %s xá está sendo utilizada por %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Asignouse %s a %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Aplicar os atallos de teclado "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Aplicar e guardar os atallos de teclado  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Engadir un novo atallo"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Esquecuse de «Aplicar» os cambios?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Editar os atallos de teclado"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar atallos para %s"
@@ -449,142 +475,189 @@
 msgid "Movement"
 msgstr "Movemento"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Pantalla da lista de reprodución"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Mover a canción cara enrriba"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Mover a canción cara embaixo"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Pantalla do explorador"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Entre no cartafol/Seleccione e reproduza a canción"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Engadir a canción á lista de reprodución"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Borrar a lista de reprodución"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Pantalla de busca"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Seleccionar e reproducir"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Pantalla das letras de cancións"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Ver as letras de cancións"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Re)cargar as letras de cancións"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Interromper a descarga"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Obter as letras da canción reproducida"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Letras de cancións sen gardar"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Guardar as letras de cancións"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Eliminar as letras de cancións gardadas"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Pantalla de saída"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Activar/Desactivar a saída"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Seguinte pantalla"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Pantalla de atallos"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Editar atallos para a orde seleccionada"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Eliminar o atallo seleccionado"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Engadir un novo atallo"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Subir un nivel"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Aplicar e gardar os cambios"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Axuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Sen letras de cancións"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Letras de cancións"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "cargando..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Letras de cancións gardadas"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Letras de cancións eliminadas"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Letras de cancións sen gardar"
 
@@ -598,96 +671,100 @@
 msgid "Output '%s' disabled"
 msgstr "Desactivouse a saída «%s»"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Saídas"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Duración"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Xénero"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Ruta"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Número de álbumes"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Número de cancións"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Tempo de execución"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Actualización máis recente da BD"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Tempo de reprodución"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Duraciónacumulada da BD"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Visor da canción"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Ruta"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Estatísticas do MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Canción seleccionada"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Canción que se está reproducindo"
 
@@ -699,342 +776,361 @@
 msgid "[Paused]"
 msgstr "[En Pausa]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Pantalla de configuración dos atallos"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Saír"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Mover o cursor cara enriba"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Mover o cursor cara embaixo"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Mover o cursor até ao comezo da pantalla"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Mover o cursor até á metade da pantalla"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover o cursor até ao pe da pantalla"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Mover o cursor até ao comezo da lista"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover o cursor até ao pe da lista"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Páxina enriba"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Páxina embaixo"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Selección do rango"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir unha liña"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Baixar unha liña"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir media pantalla"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Baixar media pantalla"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Seleccionar a cannción actual canción en reprodución"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Pantalla de axuda"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar nun cartafol"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Deter"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Seguinte pista"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Seleccionar/deseleccionar a canción na lista de reprodución"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Seleccionar todos os elementos da lista"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Borrar a canción da lista de reproducción"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Lista de reproducción aleatoria"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Limpar a lista"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Activar/desactivar o modo repetición"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Activar/desactivar o modo aleatorio"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Alternar o modo compacto"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Alternar o modo completo"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Activar/desactivar o modo de esvaecimento cruzado"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Comezar unha actualización da BD"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Gardar a lista de reprodución"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Engadir url/ficheiro á lista de reprodución"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Ir ao cartafol raíz"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Ir ao cartafol pai"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Atopar a canción no explorador"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Movera o elemento cara arriba."
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Mover o elemento cara abaixo"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Actualizar a pantalla"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Alternar o modo de busca"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de autocentrado"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Seguinte pantalla"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Volvar á pantalla anterior"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Buscar cara adiante"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Buscar cara adiante, seguinte"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Buscar cara atrás"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Buscar cara atrás, anterior"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Ir a"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Pantalla de Artistas"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Cambiar o modo de buscas"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Ver a canción seleccionada e a que se está a reproducir"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Interromper a acción"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Actualizar as letras de cancións"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Sen definir"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Espazo"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PáxEmbaixo"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PáxEnriba"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Maiús + Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A tecla %s asignouse a %s e a %s"
@@ -1058,22 +1154,22 @@
 msgstr "A terminal non ten funcionalidades de cor"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta da tecla de acceso rápido."
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Configuraión incompleta da tecla de acceso rápido"
 
@@ -1081,53 +1177,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Configuración incorrecta da duración mostrada"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Falta o signo «=»"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Nome de cor incorrecto"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Definición incompleta da cor"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Número incorrecto"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Definición incorrecta da cor"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Nome de pantalla descoñecido"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "O modo de busca é incorrecto"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Modo de busca descoñecido"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Parámetro de configuración descoñecido"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "ashtophet\n"
@@ -1137,11 +1233,11 @@
 "  Johám-Luís Miguéns Vila https://launchpad.net/~miluxovi\n"
 "  Miguel Anxo Bouzada https://launchpad.net/~mbouzada"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "A selección de rango está desactivada"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "A selección de rango está sactivada"

ncmpc-0.20.tar.bz2/po/he.gmo -> ncmpc-0.21.tar.bz2/po/he.gmo Changed

ncmpc-0.20.tar.bz2/po/he.po -> ncmpc-0.21.tar.bz2/po/he.po Changed

@@ -1,8 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-09-07 20:35+0200\n"
 "Last-Translator: zeltak <Unknown>\n"
 "Language-Team: he <he@li.org>\n"
@@ -21,21 +22,21 @@
 msgid "n"
 msgstr "לא"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "מתחבר ל %s [לחץ על %s לביטול]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "שגיאה: גרסת התוכנה %d.%d.%d ישנה מדי (צריך %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "מתחבר ל %s"
@@ -48,7 +49,7 @@
 msgid "press %s for the key editor"
 msgstr "%s לעורך המקשים לחץ"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "רשימת שירים מעורבבת"
 
@@ -56,23 +57,23 @@
 msgid "Cleared playlist"
 msgstr "רשימת שירים מנוקה"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "שגיאה: המסך קטן מידי"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "מצב חזרה מופעל"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "מצב חזרה מופסק"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "מצב רנדומלי מופעל"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "מצב רנדומלי מופסק"
 
@@ -81,11 +82,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "מצב יחיד מופעל"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "מצב יחיד מופסק"
 
@@ -93,74 +94,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "מצב מתכלה מופעל"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "מצב יחיד מופסק"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "קרוספייד שניות %d"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "בסיס הנתונים עודכן"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "מצב סופי: כרוך"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "מצב סופי: נורמלי"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "מצב מרכז אוטומטי: מופעל"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "מצב מרכז אוטומטי: מופסק"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "כל השירים"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "כל האמנים"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "כל השירים של אומן: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "אלבום:%s-%s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "טוען...."
@@ -170,7 +171,8 @@
 msgid "Loading playlist %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "מוסיף %s לרשימת השירים"
@@ -188,6 +190,25 @@
 msgid "Database update started"
 msgstr "עדכון בסיס הנתנונים החל"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "חיפוש"
@@ -205,7 +226,7 @@
 msgid "Unable to find '%s'"
 msgstr "לא ניתן למצוא את '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "סיסמה"
 
@@ -220,7 +241,8 @@
 msgstr "החלף  %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "בוטל"
 
@@ -235,7 +257,7 @@
 msgid "Add"
 msgstr "הוסף"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "רשימת שירים"
 
@@ -247,101 +269,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "מחיקת פריט זה בלתי אפשרית"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "%s [%s/%s] ? מחיקת רשימת שירים "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "רשימת שירים נמחקה"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "דפדף"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "אומן"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "אלבום"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "שם"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "רצועה"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "שם"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "ג'אנר"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "תאריך"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "מלחין"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "מבצע"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "הערות"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "קובץ"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "שם"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "אומן"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "אלבום"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "שם קובץ"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "אומן+שם"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "חיפוש לא תקין של תגית %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "אין טעון לחיפוש תגית %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "חיפוש"
 
@@ -373,69 +395,73 @@
 msgid "Search mode: %s"
 msgstr "צורת חיפוש: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "=====> ישם ושמור תצורת מקשים  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "=====> ישם תצורת מקשים "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "יש תצורת מקשים חדשה"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "תצורת מקשים לא שונתה."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "שגיאה: לא ניתן ליצור את התיקיה ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "שגיאה:  %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "נכתב %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "נמחק"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "הכנס מקש חדש ל %s "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "שגיאה: המקש %s כבר קיים ל %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "הוקצה  %s ל %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "=====> ישם תצורת מקשים "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "=====> ישם ושמור תצורת מקשים  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "הוסף מקש חדש"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "הזהרה: האם שכחת 'לישם' את השינוים"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "ערוך את תצורת המקשים"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "ערוך את המקש ל %s"
@@ -444,142 +470,188 @@
 msgid "Movement"
 msgstr "תנועה"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "גלובלי"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "מסך רשימת שירים"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "נגן"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "הזז שיר למעלה"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "הזז שיר למטה"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "מרכז"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "דפדף במסך"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "הכנס תיקיה/בחר ונגן שיר"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "הוסף שיר לרשימת שירים"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "מחק רשימת שירים"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "חפש במסך"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "בחר ונגן"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "מסך מילות השיר"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "הצג מילים לשיר"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "הטען מחדש מילים לשיר"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "שליפת המידע הופסקה"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "הורד מילים לשיר המנגן כרגע"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "שמור מילים לשיר"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "מסך הפלט"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "אשר/אסור על פלט"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "מסך הבא"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "מסך שוני מקשים"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "ערוך שוני מקשים לפקודות שונות"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "הסר שוני מקשים"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "הוסף מקש חדש"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "עלה רמה אחת"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "ישם ושמור שינויים"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "עזרה"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "אין מילים לשיר"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "מילים"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "טוען...."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "מילים לשיר נשמרו"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
@@ -593,96 +665,100 @@
 msgid "Output '%s' disabled"
 msgstr "פלט  '%s' אינו אפשרי"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "פלטים"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "מלחון"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "שם"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "דיסק"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "רצועה"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "תאריך"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "ג'אנר"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "הערה"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "נתיב"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "ביטרייט"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "מספר אומנים"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "מספר אלבומים"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "מספר שירים"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "זמן פעילות"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "עדכון עדכני אחרון של בסיב נתונים"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "זמן נגינה"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "זמן נגינה בסיס נתונים"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "הצגת השיר"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "נתיב"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "סטטיסטיקה MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "בחר שיר"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "שיר עכשווי"
 
@@ -694,342 +770,361 @@
 msgid "[Paused]"
 msgstr "[הפסקה]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "ב n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "ווליום %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "מסך קינפוג מקשים"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "צא מהתוכנה"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "הזז סמן למעלה"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "הזז סמן למטה"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "הזז סמן לקצה העליון של המסך"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "הזז סמן לאמצע של המסך"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "הזז סמן לקצה התחתון של המסך"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "הזז סמן לקצה העליון של הרשימה"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "הזז סמן לקצה התחתון של הרשימה"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "דף למעלה"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "דף למטה"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "בחירת טווח"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "גלול שורה אחת למעלה"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "גלול שורה אחת"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "גלול חצי מסך למעלה"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "גלול חצי מסך למטה"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "בחר בשיר שכרגע מנגן"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "מסך עזרה"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "נגן/הכנס תיקיה"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "הפסק"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "עצור"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "חתוך"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "רצועה הבאה"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "רצועה קודמת"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "דלג קדימה"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "דלג אחורה"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "הגבר"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "הנמך"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "בחר/הסר שיר ברשימת שירים"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "בחר את הכל"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "מחק שיר מרשימת השירים"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "ערבב את רשימת שירים"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "מחק את רשימת שירים"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "הפעל מצב חזרה"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "הפעל מצב רנדומלי"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "הפעל מצב יחיד"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "הפעל מצב מתכלה"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "הפעל קרוספייד"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "התחל עדכון בסיס הנתונים המוזיקלי"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "שמור רשימת שירים"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "הוסף לינק/קובץ לרשימת שירים"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "לך לתיקיה שורש"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "לך לתיקיה עליונה"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "מצא שיר בדפדפן"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "הזז למעלה"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "הזז למטה"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "רענן מסך"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "הפעל מצב חיפוש"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "הפעל מירכוז אוטומטי"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "מסך הבא"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "מסך קודם"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "החלף למסך אחרון"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "מצא קדימה"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "מצא קדימה הבא"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "מצא אחורה"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "מצא אחורה הבא"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "קפוץ ל"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "מסך אומן"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "שנה תצורת מסך"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "הראה את השיר הנבחר והמנגן"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "הפסק פעולה"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "רענן מילים לשיר"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "רווח"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "הכנס"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "אחורה"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "מחק"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "למעלה"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "למטה"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "שמאלה"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "חמינה"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "בית"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "סוף"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "דף למטה"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "דף למעלה"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "טאב"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "מקש %s מוקצה ל %s ו %s"
@@ -1053,22 +1148,22 @@
 msgstr "המסוף ללא  יכולת תמיכה בצבעים"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "הגדרת המקשים החמים שגויה"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "פקודה לא ידועה"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "הגדרת המקשים החמים חסרה"
 
@@ -1076,62 +1171,62 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "תצוגת זמן שגויה"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "חסר '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "צבע שגוי"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "הגדרת צבעים חסרה"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "מספר לא תקין"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "הגדרת צבעים שגויה"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "שם מסך לא ידוע"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "חיפוש לא תקין"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "מצב חיפוש לא ידוע"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "פרמטר קונפיג לא ידוע"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  zeltak https://launchpad.net/~zeltak"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "טווח בחירה מאושר"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "טווח בחירה מבוטל"

ncmpc-0.20.tar.bz2/po/hu.gmo -> ncmpc-0.21.tar.bz2/po/hu.gmo Changed

ncmpc-0.20.tar.bz2/po/hu.po -> ncmpc-0.21.tar.bz2/po/hu.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2009-09-24 21:45+0000\n"
 "Last-Translator: Kiszel Kristóf <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kapcsolódás a következőhöz: %s... [Nyomj %s gombot a megszakításhoz]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Hiba: a(z) %d.%d.%d MPD verzió túl régi (%s kell)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Csatlakoztatva ide: %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "nyomj %s-t a szerkesztéshez"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Lejátszólista összekeverve"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Lejátszólista törölve"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Hiba: a képernyő túl kicsi"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Ismétlő mód be"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Ismétlő mód ki"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Véletlen mód be"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Véletlen mód ki"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Egyszeri lejátszás mód be"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Egyszeri lejátszás mód ki"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Fogyasztó mód be"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Fogyasztó mód ki"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Egymásba mosás %d másodperc"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Keresési mód: újrakezdő"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Keresési mód: normál"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Középre igazítás bekapcsolva"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Középre igazítás kikapcsolva"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Minden szám"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Minden előadó"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s előadó minden száma"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "%s könyvtár hozzáadása...\n"
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "'%s' hozzáadása a lejátszólistához"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Adatbázis frissítés elindult"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Keresés"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "'%s' nem található"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Jelszó"
 
@@ -225,7 +246,8 @@
 msgstr "Cserélni a következőt: %s [%s/%s]? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Megszakítva"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Lejátszólista"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Ez az elem nem törölhető"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Törlöd a %s lejátszólistát [%s/%s]? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Lejátszólista törölve"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Tallózás"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "előadó"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "cím"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "szám"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "név"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "műfaj"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "dátum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "zeneszerző"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "előadó"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "megjegyzés"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fájl"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Cím"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Előadó és Cím"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Hibás keresési elem %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Nincs argumentuma a(z) %s keresési elemnek"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Keresés"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Keresési mód: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Alkalmaz és Menti a billentyű beállításokat  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Billentyű beállítások használata "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Új billentyű beállításaid vannak"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "A billentyű beállítások változatlanok."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Hiba: nem sikerül létrehozni a ~/.ncmpc katalógust - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Hiba: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s elmentve"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Törölve"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Nyomd meg az új gombot a következőhöz: %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Hiba: %s gombot már a következő funkció használja: %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s hozzárendelve a következőhöz: %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Billentyű beállítások használata "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Alkalmaz és Menti a billentyű beállításokat  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Új gomb hozzáadása"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Észrevétel: nem felejtetted el érvényesíteni a változtatásaidat?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Billentyűk változtatása"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Gombok módosítása a következőhöz: %s"
@@ -449,142 +475,188 @@
 msgid "Movement"
 msgstr "Mozgás"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Általános"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Lejátszólista"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Szám mozgatása felfelé"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Szám mozgatása lefelé"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Közép"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Tallózás"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Könyvtár megadása/szám kiválasztása és lejátszása"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Szám hozzáadása a lejátszólistához"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Kereső képernyő"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Kiválasztás és lejátszás"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Dalszöveg képernyő"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Dalszövegek megtekintése"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "Dalszövegek (újra)töltése"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Újrapróbálkozás megszakítása"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Dalszöveg letöltése a jelenlegi zenéhez"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Dalszövegek mentése"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Kimenetek"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Kimenet engedélyezése/tiltása"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Kövezkező képernyő"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Billentyű beállító képernyő"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Billentyű szerkesztése a kiválasztott parancshoz"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Billentyű hozzárendelés megszűntetése"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Új gomb hozzáadása"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Egy szinttel feljebb"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Alkalmaz és menti a változásokat"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Súgó"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Nincs dalszöveg"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Dalszövegek"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "betöltés..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Dalszövegek elmentve"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
@@ -598,96 +670,100 @@
 msgid "Output '%s' disabled"
 msgstr "Kimenet tiltva: %s"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Kimenetek"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Hossz"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Név"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Lemez"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Szám"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Elérési út"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitráta"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Előadók száma"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Albumok száma"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Zenék száma"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Üzemidő"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Legutóbbi adatbázis frissítés"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Lejátszási idő"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Teljes adatbázis lejátszási ideje"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Szám néző"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Elérési út"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD statisztika"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Kiválasztott zene"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Jelenlegi zene"
 
@@ -699,342 +775,361 @@
 msgid "[Paused]"
 msgstr "[Szüneteltetve]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Hangerő ismeretlen"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hangerő %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Billentyű beállító képernyő"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Kurzormozgatás felfelé"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Kurzormozgatás lefelé"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Kurzor mozgatása a képernyő tetejére"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Kurzor mozgatása a képernyő közepére"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Kurzor mozgatása a képernyő aljára"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Kurzor mozgatása a lista tetejére"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Kurzor mozgatása a lista aljára"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Egy oldalt fel"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Egy oldalt le"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Tartomány kiválasztása"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Görgetés egy sorral fel"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Görgetés egy sorral le"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Görgetés fél képernyőnyivel fel"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Görgetés fél képernyőnyivel le"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Most lejátszott szám kiválasztása"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Segítség"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Lejátszás/Belépés könyvtárba"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Szüneteltetés"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Vágás"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Tekerés előre"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Tekerés hátra"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Hangerő növelése"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Hangerő csökkentése"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Szám kiválasztása a lejátszólistában"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Minden listázott elem kiválasztása"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Szám törlése a lejátszólistából"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Lejátszólista összekeverése"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Ismétlő mód ki- és bekapcsolása"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Véletlenszerű lejátszás ki- és bekapcsolása"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Egyszeri mód átkapcsolása"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Fogyasztó mód átkapcsolása"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Egymásba mosás ki- és bekapcsolása"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "A zenei adatbázis frissítésének indítása"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Lejátszólista mentése"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "URL vagy fájl hozzáadása a lejátszólistához"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Mozgás a gyökér könyvtárba"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Mozgás a szülő könyvtárba"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Szám megtekintése a tallozóban"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Elem mozgatása fel"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Elem mozgatása le"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Képernyő frissítése"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Kereső mód ki- és bekapcsolása"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Középre igazítás ki- és bekapcsolása"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Kövezkező képernyő"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Előző képernyő"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Váltás a legutóbbi képernyőre"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Keresés előre"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Következő keresése előre"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Keresés hátra"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Előző keresése hátra"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Ugrás oda"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Előadó képernyő"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Kereső mód váltása"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "A kiválasztott és épp lejátszott szám megtekintése"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "parancs megszakítása"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Dalszövegek frissítése"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Meghatározatlan"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Szóköz"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A(z) %s gomb a követlezőkhoz van rendelve: %s és %s"
@@ -1058,22 +1153,22 @@
 msgstr "A terminál nem támogatja a színeket"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Hiba"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Hibás gyorsbillentyű definíció"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Hiányos gyorsbillentyű definíció"
 
@@ -1081,64 +1176,64 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Hibás időkijelzési típus"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Hiányzó egyenlőség jel"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Hibás szín megnevezés"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Hiányos szín megadás"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Érvénytelen szám"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Hibás szín megadás"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Ismeretlen képernyő név"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Érvénytelen keresési mód"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Ismeretlen keresési mód"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Ismeretlen konfigurációs paraméter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Kiszel Kristóf https://launchpad.net/~ulysses\n"
 "  Laszlo Ashin https://launchpad.net/~kodest"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Tartomány kiválasztás letiltva"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Tartomány kiválasztás engedélyezve"

ncmpc-0.20.tar.bz2/po/it.gmo -> ncmpc-0.21.tar.bz2/po/it.gmo Changed

ncmpc-0.20.tar.bz2/po/it.po -> ncmpc-0.21.tar.bz2/po/it.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-10-31 19:53+0000\n"
 "Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -26,23 +27,23 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Collegandosi a %s... [Preme %s per annullare]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 "Errore: La versione di MPD %d.%d.%d è troppo vecchia (bisogna avere al meno "
 "la %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Connesso a %s"
@@ -55,7 +56,7 @@
 msgid "press %s for the key editor"
 msgstr "preme %s per accedere al editore di tasti"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Lista di canzoni mescolata"
 
@@ -63,23 +64,23 @@
 msgid "Cleared playlist"
 msgstr "Lista di canzoni vuotata"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Errore: La finestra è tropo piccola"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Modo ripetizione attivato"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Modo ripetizione disattivato"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Modo randomizzato attivo"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Modo randomizzato disattivato"
 
@@ -88,11 +89,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Modo singolo attivato"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Modo singolo disattivato"
 
@@ -100,74 +101,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Modo consumazione attivato"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Modo consumazione disattivato"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Database aggiornato"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Modo di ricerca: semplice"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Modo di ricerca: Normale"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Modo di auto-centrato: attivato"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Modo di auto-centrato: disattivato"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Tutte le piste"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Tutti gli artisti"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Tutte le piste del artista: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Aggiungendo album %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Aggiungendo %s..."
@@ -177,7 +178,8 @@
 msgid "Loading playlist %s..."
 msgstr "Caricando la lista %s"
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Aggiungendo '%s' alla lista di canzoni"
@@ -195,6 +197,25 @@
 msgid "Database update started"
 msgstr "Iniziato l'aggiornamento del database."
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Cerca"
@@ -212,7 +233,7 @@
 msgid "Unable to find '%s'"
 msgstr "Non si ha potuto trovare %s"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Password"
 
@@ -227,7 +248,8 @@
 msgstr "Sostituire %s [%s%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Annullato"
 
@@ -242,7 +264,7 @@
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Playlist"
 
@@ -254,101 +276,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Non è possibile rimuovere questo elemento."
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Rimuovere la playlist %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Playlist rimossa."
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Esplora"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titolo"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "track"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nome"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genero"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "data"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "compositore"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "interprete"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "commentare"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titolo"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nome del file"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artista + Titolo"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etichetta di ricerca invalida: %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Senza argomenti per la etichetta di ricerca %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Cerca"
 
@@ -380,69 +402,73 @@
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr ""
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr ""
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Errore: Non si ha potuto creare la cartella ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Errore: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creato"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Rimosso"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tasto di acceso veloce per %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Errore: il tasto %s già sta assegnato a %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assegnato a %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr ""
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr ""
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Introduce un nuovo tasto"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Hai dimenticato 'Applicare' i tuoi cambiamenti?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Cambia i tasti di acceso veloce"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia i tasti per %s"
@@ -451,142 +477,189 @@
 msgid "Movement"
 msgstr "Movimento"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Lista di canzoni"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Play"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Sposta la canzone su"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Sposta la canzone giù"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centrare"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr ""
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Accedere alla cartella/Selezionare e riprodurre la canzone"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Aggiungere la canzone alla lista"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Rimuove la playlist"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Ricerca"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Seleziona e riprodurre"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Lettere"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Vedere le lettere"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Ri)caricare le lettere"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Annullare la scarica."
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Ottenere le lettere della canzone riprodotta"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Non ci sono testi salvati"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Salvare le lettere"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Rimuovere le lettere"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Schermo di uscite"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Attivare/disattivare le uscite"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Lista di canzoni"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Schermo di tasti di acceso"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Cambia i tasti di acceso veloce per il commando selezionato"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Rimuovere il tasto di acceso veloce selezionato"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Introduce un nuovo tasto"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Salire un livello"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Applicare e salvare i cambiamenti"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Aiuto"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Non ci sono testi disponibili"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Testi"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "caricamento in corso..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Testi salvati"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Testi rimossi"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Non ci sono testi salvati"
 
@@ -600,96 +673,100 @@
 msgid "Output '%s' disabled"
 msgstr "La uscita '%s' è disattivata"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Uscite"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Durata"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Compositore"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Brano"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Genero"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Commento"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Path"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Numero di artisti"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Numero di albums"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Numero di brani"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Tempo in attività"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Aggiornamento più recente del database"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Tempo di riproduzione"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Durata del database"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Visore di canzoni"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Path"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Statistiche del MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Brano selezionato"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Brano riprodotto"
 
@@ -701,342 +778,361 @@
 msgid "[Paused]"
 msgstr "[Pausato]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Esci"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Muovi cursore in alto"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Muovi cursore in basso"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Muovi cursore in cima allo schermo"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Muovi cursore in mezzo allo schermo"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Muovi cursore in fondo allo schermo"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Muovi cursore in cima alla lista"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Muovi cursore in fondo alla lista"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Pagina sopra"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Pagina sotto"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Esegui/Entra nella cartella"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Prossima traccia"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Traccia precedente"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Alza volume"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Abbassa volume"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Seleziona tutti gli oggetti della lista"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Salva playlist"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr ""
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr ""
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr ""
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr ""
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -1060,22 +1156,22 @@
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1083,53 +1179,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1137,10 +1233,10 @@
 "  Max Kellermann https://launchpad.net/~max-duempel\n"
 "  simone.sandri https://launchpad.net/~lexluxsox"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/ko.gmo -> ncmpc-0.21.tar.bz2/po/ko.gmo Changed

ncmpc-0.20.tar.bz2/po/ko.po -> ncmpc-0.21.tar.bz2/po/ko.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2009-10-16 17:35+0000\n"
 "Last-Translator: Jay Whang <jaypedia@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "%s(으)로 연결중입니다. [취소하려면 %s키를 누르십시오]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "MPD 버전 %d%d%d (은)는 너무 낮습니다. (필요한 버전 %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "%s로 접속함"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "키 편집기 사용을 위하여 %s(을)를 누르십시오."
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "섞여진 연주목록"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "지워진 연주목록"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "오류: 화면이 너무 작습니다."
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "반복 모드 켜짐"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "반복 모드 꺼짐"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "무작위 모드 켜짐"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "무작위 모드 꺼짐"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "싱글 모드 켜짐"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "싱글 모드 꺼짐"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "소비 모드 켜짐"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "소비 모드 꺼짐"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "곡바뀜 %d 초"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "데이터베이스를 업데이트 하였습니다."
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "찾기 방식: 줄 이어짐"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "찾기 방식: 보통"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "자동 가운데 방식: 켜짐"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "자동 가운데 방식: 꺼짐"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "모든 트랙"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "모든 아티스트"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "아티스트의 모든 트랙: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "앨범: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "올리는 중..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "'%s'(을)를 연주목록에 더하기"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "데이터베이스 업데이트를 시작합니다."
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "찾기"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "'%s'(을)를 찾을 수 없습니다."
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "열쇠글"
 
@@ -225,7 +246,8 @@
 msgstr "변경하기 %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "중단됨"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "더하기"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "연주 목록"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "이 항목을 지우는 것은 가능하지 않습니다."
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "연주목록 %s [%s/%s] 삭제하기 ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "연주목록을 삭제하였습니다."
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "열람"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "아티스트"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "앨범"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "제목"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "트랙"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "이름"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "장르"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "날짜"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "작곡가"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "연주가"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "주석"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "파일"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "제목"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "아티스트"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "앨범"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "파일이름"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "아티스트 + 제목"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "잘못된 찾기 태그 %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "찾기 태그 %s위한 인자가 없습니다."
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "찾기"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "찾기 방식: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> 키 조합을 적용하고 저장  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> 키 조합을 적용 "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "새로운 키 조합을 지정하였습니다."
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "키 조합을 바꾸지 않았습니다."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "오류: ~/.ncmpc 폴더를 만들 수 없습니다. - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "오류: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "%s(을)를 썼습니다."
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "삭제됨"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "%s(을)를 위한 새 키를 입력하세요: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "오류: 키 %s(은)는 이미 %s(을)를 위하여 사용합니다."
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s(을)를 %s(으)로 지정하였습니다."
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> 키 조합을 적용 "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> 키 조합을 적용하고 저장  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "새로운 키 더하기"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "주의: 변경사항 '적용하기'를 잊었나요?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "키 조합 편집하기"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "%s(을)를 위한 키 편집"
@@ -449,144 +475,191 @@
 msgid "Movement"
 msgstr "이동"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "전체"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "연주목록 화면"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "연주"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "곡을 위로 올리기"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "곡을 아래로 내리기"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "가운데"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "열람하기 화면"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "디렉토리를 입력하고 곡을 선택하여 연주합니다."
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "연주목록에 곡을 더하기"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "연주목록 지우기"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "찾기 화면"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "선택하고 연주"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "가사 화면"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "가사 보기"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "가사 (다시)올리기"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "가사 가져오기 중지"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "현재 연주중인 노래의 가사를 다운로드"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "가사 저장하기"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "가사 저장하기"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 #, fuzzy
 msgid "Delete saved lyrics"
 msgstr "가사 저장하기"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "출력 화면"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "출력 사용하기/안하기"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "다음 화면"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "키설정 화면"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "선택한 명령을 위한 키설정 편집하기"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "선택한 키설정 삭제하기"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "새로운 키 더하기"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "한 단계 위로 가기"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "적용하고 변경사항을 저장하기"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "도움말"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "가사 없음"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "가사"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "올리는 중..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "가사를 저장하였습니다."
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "연주목록을 삭제하였습니다."
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "가사 저장하기"
@@ -601,96 +674,100 @@
 msgid "Output '%s' disabled"
 msgstr "출력 '%s'(을)를 사용 안합니다"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "출력"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "길이"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "작곡가"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "이름"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "디스크"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "트랙"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "날짜"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "장르"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "주석"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "경로"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "비트 전송률"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "아티스트 수"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "앨범 수"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "곡 수"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "업타임"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "가장 최근의 데이타베이스 업데이트"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "연주시간"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "데이타베이스 연주시간"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "곡 보기"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "경로"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD 통계"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "선택한 곡"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "현재 연주중인 곡"
 
@@ -702,342 +779,361 @@
 msgid "[Paused]"
 msgstr "[멈춰짐]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "음량 없음"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "음량 %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "키 설정 화면"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "커서를 위로 올리기"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "커서를 아래로 내리기"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "커서를 화면 맨 위로 옮기기"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "커서를 화면 가운데로 옮기기"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "커서를 화면 맨 아래로 옮기기"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "커서를 리스트 맨 위로 옮기기"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "커서를 리스트 맨 아래로 옮기기"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "위쪽 페이지"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "아래쪽 페이지"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "범위 선택"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "한 줄 위로 올리기"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "한 줄 아래로 내리기"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "화면 반 위로 올리기"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "화면 반 아래로 내리기"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "현재 재생중인 곡을 선택"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "도움말 화면"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "연주/디렉토리 입력"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "일시정지"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "멈춤"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "연주중인 곡만 선택"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "다음 트랙"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "앞으로 찾기"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "뒤로 찾기"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "음량 높이기"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "음량 낮추기"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "연주목록에서 곡 선택/해제"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "나열한 항목 모두 선택하기"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "연주목록에서 곡 삭제하기"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "연주목록 섞기"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "연주목록 비우기"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "반복연주 모드 토클"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "무작위연주 모드 토클"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "싱글 모드 토글"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "소비 모드 토글"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "곡바꿈 모드 토글"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "음악 데이타베이스 업데이트를 시작"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "연주목록 저장"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "연주목록에 url/파일 더하기"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "루트 디렉토리로 가기"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "상위 디렉토리로 가기"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "열람 화면에 곡을 위치하기"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "항목 위로 올리기"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "항목 아래로 내리기"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "화면 갱신하기"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "찾기 모드 토글"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "자동 가운데 모드 토글"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "다음 화면"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "이전 화면"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "가장 최근 화면으로 교환"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "앞으로 찾기"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "앞으로 다음 찾기"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "뒤로 찾기"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "뒤로 이전 찾기"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "직접 이동"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "아티스트 화면"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "찾기 모드 변경"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "선택하고 현재 연주중인 곡을 보기"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "백그라운드 실행을 중지"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "가사 업데이트"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "정의되지 않음"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "지우기"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "키 %s (이)가 %s (와)과 %s (으)로 지정되었습니다."
@@ -1061,22 +1157,22 @@
 msgstr "색상 기능이 없는 터미널입니다."
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "오류"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "잘못된 단축키 정의"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "알 수 없는 명령"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "단축키 설정이 불완전합니다."
 
@@ -1084,64 +1180,64 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "잘못된 시간 표시 형식"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "'=' 기호가 없습니다."
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "잘못된 색상 이름"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "불완전한 색상 지정"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "유효하지 않은 숫자"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "잘못된 색상 지정"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "알 수 없는 화면 이름"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "잘못된 검색 모드"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "알 수 없는 검색 모드"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "알 수 없는 설정 요소"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  atie https://launchpad.net/~atie-at-matrix\n"
 "  bluejay https://launchpad.net/~jaypedia"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "범위 선택 기능을 사용하지 않습니다."
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "범위 선택 기능을 사용합니다."

ncmpc-0.20.tar.bz2/po/nb.gmo -> ncmpc-0.21.tar.bz2/po/nb.gmo Changed

ncmpc-0.20.tar.bz2/po/nb.po -> ncmpc-0.21.tar.bz2/po/nb.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-07-03 16:34+0000\n"
 "Last-Translator: Mathias Bøhn Grytemark <Unknown>\n"
 "Language-Team: no <no@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon %s"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Koblet til %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "trykk %s for å rette"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Tilfeldigjort spillelisten"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Sletter spillelisten"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Feil: Skjermbildet er for lite"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr ""
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr ""
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Alle artister"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra artist: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laster..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Legger '%s' til spillelisten"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Oppdaterer databasen"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Søk"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Passord"
 
@@ -225,7 +246,8 @@
 msgstr "Erstatt '%s' [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Avbrutt"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Legg til"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Spilleliste"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Kan ikke slette dette elementet"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Slette '%s' [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Spillelisten slettet"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artist"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "tittel"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "spor"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "navn"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "sjanger"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "dato"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "komponist"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "utøver"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artist + tittel"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Søk"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Søk etter: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "==> Bruk og Lagre snarveier  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "==> Bruk snarveier "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Du har nye tastatursnarveier"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Tastatursnarveier uforandret!"
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Feil: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s brukes allerede for %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Satte %s = %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "==> Bruk snarveier "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "==> Bruk og Lagre snarveier  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Legg til ny tast"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke å legge til de nye endringene?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Endre tast"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Endre taster for '%s'"
@@ -449,142 +475,188 @@
 msgid "Movement"
 msgstr "Navigasjon"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Spilleliste"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Start/spill markert"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Flytt den markerte sangen opp i spillelisten"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Legg sang til spillelisten"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Database søk"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr ""
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr ""
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Neste skjerm"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Legg til ny tast"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr ""
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Hjelp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Ingen sangtekst"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Sangtekster"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "laster..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Sangteksten er lagret"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
@@ -598,96 +670,100 @@
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr ""
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Lengde"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Plate"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Sjanger"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr ""
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Antall artister"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Antall albumer"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Antall sanger"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Nyeste db oppdatering"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Spilletid"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "DB spilletid"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr ""
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD statestikk"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
@@ -699,342 +775,361 @@
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volum: n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volum: %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Flytt markør opp"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Flytt peker til toppen av skjermen"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Velg alle i listen"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Ta bort/slett"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Tilfeldiggjør spilleliste"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Tøm spillelisten"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Repeat På/Av"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Random På/Av"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Crossfade På/Av"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Lagre spillelisten"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Gå til rotmappe"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Gå ett nivå opp"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Oppdater skjermbilde"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Endre søkeinnstillinger"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Automatisk sentrering på/av"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Søk fremover"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Søk neste (fremover)"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Søk neste (bakover)"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Gå til"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Artistskjerm"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Oppdater sangtekster"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Ikke definert"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Tilbaketast"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "%s-tasten satt til %s og %s"
@@ -1058,22 +1153,22 @@
 msgstr "Terminalen mangler støtte for farger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Feil"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Malformert hurtigtastdefinisjon"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Uferdig hurtigtastkonfigurasjon"
 
@@ -1081,53 +1176,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Ugyldig tidsvisningstype"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Ugyldig fargenavn"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Uferdig fargedefinisjon"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Ugyldig tall"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Malformert fargedefinisjon"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Ukjent skjermnavn"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Ukjent konfiurasjonsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1137,10 +1232,10 @@
 "  Ole R. Thorsen https://launchpad.net/~ole-rth\n"
 "  Niels Anker https://launchpad.net/~nanker"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/ncmpc.pot -> ncmpc-0.21.tar.bz2/po/ncmpc.pot Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-05 11:04-0800\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,29 +18,29 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/i18n.h:42
+#: src/i18n.h:42
 msgid "y"
 msgstr ""
 
-#: ../src/i18n.h:43
+#: src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: ../src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: ../src/main.c:315
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: ../src/main.c:339
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 
-#: ../src/main.c:358
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr ""
@@ -48,36 +48,36 @@
 #. to translators: a key was bound twice in the key editor,
 #. and this is a hint for the user what to press to correct
 #. that
-#: ../src/main.c:529
+#: src/main.c:529
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: ../src/player_command.c:177 ../src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr ""
 
-#: ../src/player_command.c:187
+#: src/player_command.c:187
 msgid "Cleared playlist"
 msgstr ""
 
-#: ../src/screen.c:205 ../src/screen.c:272
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr ""
 
-#: ../src/screen.c:394
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr ""
 
-#: ../src/screen.c:395
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr ""
 
-#: ../src/screen.c:399
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr ""
 
-#: ../src/screen.c:400
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr ""
 
@@ -86,11 +86,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: ../src/screen.c:409
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr ""
 
-#: ../src/screen.c:410
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr ""
 
@@ -98,155 +98,174 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: ../src/screen.c:418
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr ""
 
-#: ../src/screen.c:419
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr ""
 
-#: ../src/screen.c:422
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: ../src/screen.c:434
+#: src/screen.c:435
 msgid "Database updated"
 msgstr ""
 
-#: ../src/screen.c:514
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: ../src/screen.c:515
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr ""
 
-#: ../src/screen.c:520
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr ""
 
-#: ../src/screen.c:521
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: ../src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr ""
 
-#: ../src/screen_artist.c:398
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: ../src/screen_artist.c:403
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: ../src/screen_artist.c:412
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: ../src/screen_artist.c:415
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: ../src/screen_artist.c:419
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: ../src/screen_artist.c:466
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: ../src/screen_artist.c:468
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: ../src/screen_browser.c:131
+#: src/screen_browser.c:131
 #, c-format
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: ../src/screen_browser.c:172 ../src/screen_browser.c:267
-#: ../src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr ""
 
-#: ../src/screen_client.c:93
+#: src/screen_client.c:93
 msgid "Database update running..."
 msgstr ""
 
-#: ../src/screen_client.c:105
+#: src/screen_client.c:105
 #, c-format
 msgid "Database update of %s started"
 msgstr ""
 
-#: ../src/screen_client.c:108
+#: src/screen_client.c:108
 msgid "Database update started"
 msgstr ""
 
-#: ../src/screen_find.c:28
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
+#: src/screen_find.c:28
 msgid "Find"
 msgstr ""
 
-#: ../src/screen_find.c:29
+#: src/screen_find.c:29
 msgid "Find backward"
 msgstr ""
 
-#: ../src/screen_find.c:30
+#: src/screen_find.c:30
 msgid "Jump"
 msgstr ""
 
-#: ../src/screen_find.c:80
+#: src/screen_find.c:80
 #, c-format
 msgid "Unable to find '%s'"
 msgstr ""
 
-#: ../src/screen_utils.c:115
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr ""
 
 #. query the user for a filename
-#: ../src/screen_queue.c:256
+#: src/screen_queue.c:256
 msgid "Save playlist as"
 msgstr ""
 
-#: ../src/screen_queue.c:292
+#: src/screen_queue.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr ""
 
 #. translators: a dialog was aborted by the user
-#: ../src/screen_queue.c:300 ../src/screen_file.c:236
-#: ../src/screen_keydef.c:269 ../src/screen_lyrics.c:367
+#: src/screen_queue.c:300 ../src/screen_file.c:236
+#: src/screen_keydef.c:269 ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr ""
 
 #. success
-#: ../src/screen_queue.c:324
+#: src/screen_queue.c:324
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
 #. get path
-#: ../src/screen_queue.c:401
+#: src/screen_queue.c:401
 msgid "Add"
 msgstr ""
 
-#: ../src/screen_queue.c:508 ../src/title_bar.c:79
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr ""
 
-#: ../src/screen_queue.c:510
+#: src/screen_queue.c:510
 #, c-format
 msgid "Playlist on %s"
 msgstr ""
@@ -254,887 +273,899 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: ../src/screen_file.c:222
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: ../src/screen_file.c:229
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: ../src/screen_file.c:249
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: ../src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr ""
 
-#: ../src/screen_search.c:46
+#: src/screen_search.c:46
 msgid "artist"
 msgstr ""
 
-#: ../src/screen_search.c:47
+#: src/screen_search.c:47
 msgid "album"
 msgstr ""
 
-#: ../src/screen_search.c:48
+#: src/screen_search.c:48
 msgid "title"
 msgstr ""
 
-#: ../src/screen_search.c:49
+#: src/screen_search.c:49
 msgid "track"
 msgstr ""
 
-#: ../src/screen_search.c:50
+#: src/screen_search.c:50
 msgid "name"
 msgstr ""
 
-#: ../src/screen_search.c:51
+#: src/screen_search.c:51
 msgid "genre"
 msgstr ""
 
-#: ../src/screen_search.c:52
+#: src/screen_search.c:52
 msgid "date"
 msgstr ""
 
-#: ../src/screen_search.c:53
+#: src/screen_search.c:53
 msgid "composer"
 msgstr ""
 
-#: ../src/screen_search.c:54
+#: src/screen_search.c:54
 msgid "performer"
 msgstr ""
 
-#: ../src/screen_search.c:55
+#: src/screen_search.c:55
 msgid "comment"
 msgstr ""
 
-#: ../src/screen_search.c:64
+#: src/screen_search.c:64
 msgid "file"
 msgstr ""
 
-#: ../src/screen_search.c:82 ../src/screen_song.c:45
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr ""
 
-#: ../src/screen_search.c:83 ../src/screen_song.c:44 ../src/title_bar.c:82
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr ""
 
-#: ../src/screen_search.c:84 ../src/screen_song.c:46
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr ""
 
-#: ../src/screen_search.c:85
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr ""
 
-#: ../src/screen_search.c:86
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr ""
 
-#: ../src/screen_search.c:232
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: ../src/screen_search.c:236
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: ../src/screen_search.c:343 ../src/screen_help.c:147 ../src/title_bar.c:85
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr ""
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: ../src/screen_search.c:384
+#: src/screen_search.c:385
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: ../src/screen_search.c:411
+#: src/screen_search.c:412
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: ../src/screen_search.c:414
+#: src/screen_search.c:415
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: ../src/screen_search.c:418
+#: src/screen_search.c:419
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: ../src/screen_search.c:442
+#: src/screen_search.c:443
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:131
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr ""
 
-#: ../src/screen_keydef.c:133
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: ../src/screen_keydef.c:143
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:161
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:245
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr ""
 
-#: ../src/screen_keydef.c:264
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: ../src/screen_keydef.c:274
+#: src/screen_keydef.c:274
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: ../src/screen_keydef.c:280
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:289
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: ../src/screen_keydef.c:315
+#: src/screen_keydef.c:315
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: ../src/screen_keydef.c:317
+#: src/screen_keydef.c:317
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: ../src/screen_keydef.c:345
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr ""
 
-#: ../src/screen_keydef.c:409
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: ../src/screen_keydef.c:416
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr ""
 
-#: ../src/screen_keydef.c:418
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
 
-#: ../src/screen_help.c:39
+#: src/screen_help.c:39
 msgid "Movement"
 msgstr ""
 
-#: ../src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr ""
 
-#: ../src/screen_help.c:116 ../src/command.c:106
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr ""
 
-#: ../src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr ""
 
-#: ../src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr ""
 
-#: ../src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr ""
 
-#: ../src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr ""
 
-#: ../src/screen_help.c:131 ../src/command.c:108
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr ""
 
-#: ../src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: ../src/screen_help.c:135 ../src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr ""
 
-#: ../src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr ""
 
-#: ../src/screen_help.c:145 ../src/command.c:219
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr ""
 
-#: ../src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr ""
 
-#: ../src/screen_help.c:157 ../src/command.c:229
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr ""
 
-#: ../src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr ""
 
-#: ../src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr ""
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: ../src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: ../src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr ""
 
-#: ../src/screen_help.c:165
+#: src/screen_help.c:168
 msgid "Add or edit lyrics"
 msgstr ""
 
-#: ../src/screen_help.c:166
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr ""
 
-#: ../src/screen_help.c:167
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: ../src/screen_help.c:172 ../src/command.c:244
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr ""
 
-#: ../src/screen_help.c:174
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr ""
 
-#: ../src/screen_help.c:179
+#: src/screen_help.c:182 ../src/command.c:250
+msgid "Chat screen"
+msgstr ""
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: ../src/screen_help.c:181
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: ../src/screen_help.c:182
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: ../src/screen_help.c:183
+#: src/screen_help.c:193
 msgid "Add a keydef"
 msgstr ""
 
-#: ../src/screen_help.c:184
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr ""
 
-#: ../src/screen_help.c:185
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr ""
 
-#: ../src/screen_help.c:231 ../src/title_bar.c:77
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr ""
 
 #. translators: no lyrics were found for the song
-#: ../src/screen_lyrics.c:200
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr ""
 
-#: ../src/screen_lyrics.c:218
+#: src/screen_lyrics.c:232
 #, c-format
 msgid "Lyrics timeout occurred after %d seconds"
 msgstr ""
 
-#: ../src/screen_lyrics.c:320 ../src/screen_lyrics.c:329
-#: ../src/screen_lyrics.c:339 ../src/title_bar.c:88
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344
+#: src/screen_lyrics.c:354 ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr ""
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: ../src/screen_lyrics.c:323
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr ""
 
-#: ../src/screen_lyrics.c:356
+#: src/screen_lyrics.c:371
 msgid "Editor not configured"
 msgstr ""
 
-#: ../src/screen_lyrics.c:362
+#: src/screen_lyrics.c:377
 #, c-format
 msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
 msgstr ""
 
-#: ../src/screen_lyrics.c:381 ../src/screen_lyrics.c:403
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
 msgid "Can't start editor"
 msgstr ""
 
-#: ../src/screen_lyrics.c:405
+#: src/screen_lyrics.c:422
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: ../src/screen_lyrics.c:408
+#: src/screen_lyrics.c:425
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: ../src/screen_lyrics.c:430
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr ""
 
-#: ../src/screen_lyrics.c:437
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr ""
 
-#: ../src/screen_lyrics.c:440
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
-#: ../src/screen_outputs.c:73
+#: src/screen_outputs.c:73
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: ../src/screen_outputs.c:84
+#: src/screen_outputs.c:84
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: ../src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr ""
 
-#: ../src/screen_song.c:47
+#: src/screen_song.c:48
 msgid "Length"
 msgstr ""
 
-#: ../src/screen_song.c:48
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr ""
 
-#: ../src/screen_song.c:49
+#: src/screen_song.c:51
 msgid "Name"
 msgstr ""
 
-#: ../src/screen_song.c:50
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr ""
 
-#: ../src/screen_song.c:51
+#: src/screen_song.c:53
 msgid "Track"
 msgstr ""
 
-#: ../src/screen_song.c:52
+#: src/screen_song.c:54
 msgid "Date"
 msgstr ""
 
-#: ../src/screen_song.c:53
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr ""
 
-#: ../src/screen_song.c:54
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr ""
 
-#: ../src/screen_song.c:55
+#: src/screen_song.c:57
 msgid "Path"
 msgstr ""
 
-#: ../src/screen_song.c:56
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr ""
 
-#: ../src/screen_song.c:72
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr ""
 
-#: ../src/screen_song.c:73
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr ""
 
-#: ../src/screen_song.c:74
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr ""
 
-#: ../src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr ""
 
-#: ../src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr ""
 
-#: ../src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr ""
 
-#: ../src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr ""
 
-#: ../src/screen_song.c:180
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr ""
 
-#: ../src/screen_song.c:319
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: ../src/screen_song.c:344
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr ""
 
-#: ../src/screen_song.c:399
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr ""
 
-#: ../src/screen_song.c:409
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
-#: ../src/status_bar.c:124
+#: src/status_bar.c:124
 msgid "Playing:"
 msgstr ""
 
-#: ../src/status_bar.c:127
+#: src/status_bar.c:127
 msgid "[Paused]"
 msgstr ""
 
-#: ../src/title_bar.c:98
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: ../src/title_bar.c:100
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: ../src/command.c:64
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr ""
 
-#: ../src/command.c:67
+#: src/command.c:68
 msgid "Quit"
 msgstr ""
 
-#: ../src/command.c:71
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr ""
 
-#: ../src/command.c:73
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr ""
 
-#: ../src/command.c:75
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: ../src/command.c:77
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: ../src/command.c:79
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: ../src/command.c:81
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: ../src/command.c:83
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: ../src/command.c:85
+#: src/command.c:86
 msgid "Page up"
 msgstr ""
 
-#: ../src/command.c:87
+#: src/command.c:88
 msgid "Page down"
 msgstr ""
 
-#: ../src/command.c:89
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: ../src/command.c:91
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: ../src/command.c:93
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: ../src/command.c:95
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: ../src/command.c:97
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: ../src/command.c:99
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: ../src/command.c:104
+#: src/command.c:105
 msgid "Help screen"
 msgstr ""
 
-#: ../src/command.c:113
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr ""
 
-#: ../src/command.c:115
+#: src/command.c:116
 msgid "Pause"
 msgstr ""
 
-#: ../src/command.c:117
+#: src/command.c:118
 msgid "Stop"
 msgstr ""
 
-#: ../src/command.c:119
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: ../src/command.c:121
+#: src/command.c:122
 msgid "Next track"
 msgstr ""
 
-#: ../src/command.c:123
+#: src/command.c:124
 msgid "Previous track"
 msgstr ""
 
-#: ../src/command.c:125
+#: src/command.c:126
 msgid "Seek forward"
 msgstr ""
 
-#: ../src/command.c:127
+#: src/command.c:128
 msgid "Seek backward"
 msgstr ""
 
-#: ../src/command.c:129
+#: src/command.c:130
 msgid "Increase volume"
 msgstr ""
 
-#: ../src/command.c:131
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr ""
 
-#: ../src/command.c:133
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: ../src/command.c:135
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr ""
 
-#: ../src/command.c:137
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr ""
 
-#: ../src/command.c:139
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr ""
 
-#: ../src/command.c:141
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr ""
 
-#: ../src/command.c:143
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: ../src/command.c:145
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr ""
 
-#: ../src/command.c:147
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: ../src/command.c:149
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: ../src/command.c:151
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: ../src/command.c:153
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr ""
 
-#: ../src/command.c:155
+#: src/command.c:156
 msgid "Save playlist"
 msgstr ""
 
-#: ../src/command.c:157
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: ../src/command.c:160
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr ""
 
-#: ../src/command.c:162
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr ""
 
-#: ../src/command.c:165
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: ../src/command.c:169
+#: src/command.c:170
 msgid "Move item up"
 msgstr ""
 
-#: ../src/command.c:171
+#: src/command.c:172
 msgid "Move item down"
 msgstr ""
 
-#: ../src/command.c:173
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: ../src/command.c:180
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: ../src/command.c:184
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: ../src/command.c:189
+#: src/command.c:190
 msgid "Next screen"
 msgstr ""
 
-#: ../src/command.c:191
+#: src/command.c:192
 msgid "Previous screen"
 msgstr ""
 
-#: ../src/command.c:193
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: ../src/command.c:198
+#: src/command.c:199
 msgid "Forward find"
 msgstr ""
 
-#: ../src/command.c:200
+#: src/command.c:201
 msgid "Forward find next"
 msgstr ""
 
-#: ../src/command.c:202
+#: src/command.c:203
 msgid "Backward find"
 msgstr ""
 
-#: ../src/command.c:204
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: ../src/command.c:209
+#: src/command.c:210
 msgid "Jump to"
 msgstr ""
 
-#: ../src/command.c:215
+#: src/command.c:216
 msgid "Artist screen"
 msgstr ""
 
-#: ../src/command.c:221
+#: src/command.c:222
 msgid "Change search mode"
 msgstr ""
 
-#: ../src/command.c:225
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: ../src/command.c:233
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr ""
 
-#: ../src/command.c:235
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr ""
 
-#: ../src/command.c:239
+#: src/command.c:240
 msgid "Edit the current item"
 msgstr ""
 
-#: ../src/command.c:292
+#: src/command.c:297
 msgid "Undefined"
 msgstr ""
 
-#: ../src/command.c:294
+#: src/command.c:299
 msgid "Space"
 msgstr ""
 
-#: ../src/command.c:296
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: ../src/command.c:298
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: ../src/command.c:300
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: ../src/command.c:302
+#: src/command.c:307
 msgid "Up"
 msgstr ""
 
-#: ../src/command.c:304
+#: src/command.c:309
 msgid "Down"
 msgstr ""
 
-#: ../src/command.c:306
+#: src/command.c:311
 msgid "Left"
 msgstr ""
 
-#: ../src/command.c:308
+#: src/command.c:313
 msgid "Right"
 msgstr ""
 
-#: ../src/command.c:310
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: ../src/command.c:312
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: ../src/command.c:314
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: ../src/command.c:316
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: ../src/command.c:318
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: ../src/command.c:320
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: ../src/command.c:322
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: ../src/command.c:324
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: ../src/command.c:328
+#: src/command.c:333
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: ../src/command.c:332
+#: src/command.c:337
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: ../src/command.c:334
+#: src/command.c:339
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: ../src/command.c:498 ../src/command.c:504
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: ../src/colors.c:158
+#: src/colors.c:158
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr ""
 
-#: ../src/colors.c:198
+#: src/colors.c:198
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr ""
 
-#: ../src/colors.c:231
+#: src/colors.c:231
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: ../src/colors.c:242
+#: src/colors.c:242
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: ../src/conf.c:97
+#: src/conf.c:98
 msgid "Error"
 msgstr ""
 
-#: ../src/conf.c:105 ../src/conf.c:114
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: ../src/conf.c:141
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: ../src/conf.c:154
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1142,60 +1173,60 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: ../src/conf.c:188
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: ../src/conf.c:203
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr ""
 
-#: ../src/conf.c:259
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr ""
 
-#: ../src/conf.c:268
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr ""
 
-#: ../src/conf.c:274
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr ""
 
-#: ../src/conf.c:282
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: ../src/conf.c:316
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr ""
 
-#: ../src/conf.c:345
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: ../src/conf.c:368
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: ../src/conf.c:557
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: ../src/options.c:231 ../src/options.c:234
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/list_window.c:588
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: ../src/list_window.c:593
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/nl.gmo -> ncmpc-0.21.tar.bz2/po/nl.gmo Changed

ncmpc-0.20.tar.bz2/po/nl.po -> ncmpc-0.21.tar.bz2/po/nl.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-02-24 11:17+0000\n"
 "Last-Translator: Tom Postma <tom-postma@hetnet.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbind met %s... [druk %s om af te breken]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr ""
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Verbonden met %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr ""
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr ""
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Fout: Scherm te klein"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Herhaling modus aan"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Herhaling modus uit"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Willekeurige modus is aan"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Willekeurige modus is uit"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr ""
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Database bijgewerkt"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Alle nummers"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Alle artiesten"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle nummers van artiest: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laden..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Toevoegen '%s' aan afspeellijst"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Database update begonnen"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Vind"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Niet mogelijk '%s' te vinden"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -225,7 +246,8 @@
 msgstr "Vervang %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Afgebroken"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Voeg toe"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Afspeellijst"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Blader"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artiest"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titel"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "nummer"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "naam"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "datum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "componist"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "uitvoerder"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "opmerking"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "bestand"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artiest + Titel"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Zoeken"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr ""
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr ""
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fout: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr ""
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr ""
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr ""
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
@@ -449,144 +475,188 @@
 msgid "Movement"
 msgstr "Beweging"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Algemeen"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr ""
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr ""
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr ""
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr ""
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr ""
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr ""
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Afspeellijst verwijderen"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr ""
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr ""
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr ""
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr ""
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr ""
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+msgid "Add or edit lyrics"
+msgstr ""
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr ""
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 #, fuzzy
 msgid "Delete saved lyrics"
 msgstr "Afspeellijst verwijderen"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr ""
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+msgid "Chat screen"
+msgstr ""
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+msgid "Add a keydef"
+msgstr ""
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr ""
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Documentatie"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Songteksten"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "laden..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Songteksten"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr ""
 
@@ -600,96 +670,100 @@
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Uitvoerapparaten"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Componist"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Naam"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Schijf"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Nummer"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Opmerking"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Locatie"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitsnelheid"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Aantal artiesten"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Aantal albums"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Aantal nummers"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Locatie"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
@@ -701,342 +775,361 @@
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/b"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr ""
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr ""
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr ""
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr ""
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr ""
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr ""
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr ""
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr ""
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr ""
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr ""
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr ""
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr ""
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr ""
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr ""
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr ""
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
@@ -1060,22 +1153,22 @@
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1083,63 +1176,63 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Hipska https://launchpad.net/~hipska\n"
 "  Tom Postma https://launchpad.net/~bluegen89"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/pl.gmo -> ncmpc-0.21.tar.bz2/po/pl.gmo Changed

ncmpc-0.20.tar.bz2/po/pl.po -> ncmpc-0.21.tar.bz2/po/pl.po Changed

@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.19\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-05 21:32+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-07-23 21:08+0200\n"
 "Last-Translator:  <krzysztof.krakowiak@gmail.com>\n"
 "Language-Team: Polish\n"
@@ -16,7 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: src/i18n.h:42
 msgid "y"
@@ -26,17 +28,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:305
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+msgid "unknown"
+msgstr ""
+
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Łączenie z %s... [Wciśnij %s by anulować]"
 
-#: src/main.c:329
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Błąd: MPD w wersji %d.%d.%d jest za stary (potrzebny jest %s)"
 
-#: src/main.c:348
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Połączony z %s"
@@ -44,12 +50,12 @@
 #. to translators: a key was bound twice in the key editor,
 #. and this is a hint for the user what to press to correct
 #. that
-#: src/main.c:523
+#: src/main.c:529
 #, c-format
 msgid "press %s for the key editor"
 msgstr "wciśnij %s by odpalić edytor klawiszy"
 
-#: src/player_command.c:177 src/screen_queue.c:750
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Przetasowano listę odtwarzania"
 
@@ -57,23 +63,23 @@
 msgid "Cleared playlist"
 msgstr "Wyczyszczono listę odtwarzania"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Błąd: Ekran za mały"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Tryb powtarzania jest włączony"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Tryb powtarzania jest wyłączony"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Tryb losowy jest włączony"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Tryb losowy jest wyłączony"
 
@@ -82,11 +88,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Tryb pojedynczej piosenki jest włączony"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Tryb pojedynczej piosenki jest wyłączony"
 
@@ -94,74 +100,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Tryb pożerania jest włączony"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Tryb pożerania jest wyłączony"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Przenikaj %d sekund"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Baza zaktualizowana"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Tryb wyszukiwania: Zawinięty"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Tryb wyszukiwania: Normalny"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Tryb automatycznego centrowania: Włączony"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Tryb automatycznego centrowania: Wyłączony"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Wszystkie ścieżki"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Wszyscy artyści"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy artysty: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Wszystkie piosenki artysty: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Albumy: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Ścieżki bez albumów lub artystów: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Dodawanie albumu %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Dodawanie %s..."
@@ -171,7 +177,8 @@
 msgid "Loading playlist %s..."
 msgstr "Ładowany listy odtwarzania %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Dodawanie '%s' do listy odtwarzania"
@@ -189,6 +196,25 @@
 msgid "Database update started"
 msgstr "Aktualizacja bazy rozpoczęta"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Znajdź"
@@ -206,7 +232,7 @@
 msgid "Unable to find '%s'"
 msgstr "Nie można znaleźć '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Hasło"
 
@@ -215,32 +241,33 @@
 msgid "Save playlist as"
 msgstr "Zapisz listę odtwarzania jako"
 
-#: src/screen_queue.c:290
+#: src/screen_queue.c:292
 #, c-format
 msgid "Replace %s [%s/%s] ? "
 msgstr "Zamień %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:298 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Anulowano"
 
 #. success
-#: src/screen_queue.c:322
+#: src/screen_queue.c:324
 #, c-format
 msgid "Saved %s"
 msgstr "Zapisano %s"
 
 #. get path
-#: src/screen_queue.c:399
+#: src/screen_queue.c:401
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/screen_queue.c:506 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: src/screen_queue.c:508
+#: src/screen_queue.c:510
 #, c-format
 msgid "Playlist on %s"
 msgstr "Lista odtwarzania na %s"
@@ -248,101 +275,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Usunięcie tego elementu nie jest możliwe"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Usuń listę odtwarzania %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Lista odtwarzania usunięta"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artysta"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "tutuł"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "ściezka"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nazwa"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "rodzaj"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "data"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "kompozytor"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "wykonawca"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "komentarz"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "plik"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artysta + Tytuł"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Nieprawidłowy wyszukiwany znacznik %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Brak argumentu przy wyszukiwaniu znacznika %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Znajdź"
 
@@ -374,69 +401,73 @@
 msgid "Search mode: %s"
 msgstr "Tryb szukania: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Zastosuj i Zapisz wiązania klawiszy "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Zastosuj wiązania klawiszy "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Masz nowe wiązania klawiszy"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Wiązania klawiszy niezmienione."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Błąd: Nie można stworzyć katalogu ~/.ncmpc -%s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Błąd: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapisano %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Usunięto"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Podaj nowy skrót dla %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Błąd: klawisz %s już jest używany do %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Przypisano klawisz %s do %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Zastosuj wiązania klawiszy "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Zastosuj i Zapisz wiązania klawiszy "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Dodaj nowy klawisz"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Informacja: Zapomniałeś 'Zastosować' swoje zmiany?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Edytuj wiązania klawiszy"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Edytuj klawisze dla %s"
@@ -445,142 +476,189 @@
 msgid "Movement"
 msgstr "Poruszanie"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globalne"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Ekran listy odtwarzania"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Przesuń piosenkę w gorę"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Przesuń piosenkę w dół"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Wycentruj"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Ekran przeglądania"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Podaj katalog/Wybierz i odtwarzaj piosenkę"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Dodaj piosenkę do listy odtwarzania"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Ekran wyszukiwania"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Wybierz i odtwarzaj"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Ekran z tekstem piosenki"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Zobacz teskt piosenki"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Prze)ładuj tekst"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Przerwij pobieranie"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Sćiagnij słowa dla obecnie odtwarzanej piosenki"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Brak zapisanego tesktu piosenki"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Zapisz tekst piosenku"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Usuń zapisany tekst piosenki"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Ekran z wyjściami dźwiękowymi"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Włącz/wyłącz wyjście"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Następny ekran"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Ekran definicji klawiszy"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Edytuj definicje klawiszy dla wybranego polecenia"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Usuń wybraną definicję klawiszy"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Dodaj nowy klawisz"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Idź poziom wyżej"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Zastosuj i zapisz zmiany"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Pomoc"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Brak tekstu piosenki"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Teskt piosenki"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "ładowanie..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Tekst piosenki zapisany"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Teskt piosenki usunięty"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Brak zapisanego tesktu piosenki"
 
@@ -594,96 +672,100 @@
 msgid "Output '%s' disabled"
 msgstr "Wyjście '%s' wyłączone"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Wyjścia"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Długość"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Dysk"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Ścieżka"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Rodzaj"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Ścieżka"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Przepływność bitowa"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Ilość artystów"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Ilość albumów"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Ilość piosenek"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Ostatnia aktualizacja bazy"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Czas odtwarzania"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "czas odtwarzania w bazie"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Przeglądarka piosenek"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Ścieżka"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "statystyki MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Wybrana piosenka"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Obecnie odtwarzana piosenka"
 
@@ -695,381 +777,400 @@
 msgid "[Paused]"
 msgstr "[Pauza]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Głośność: b/d"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Głóśność %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Ekran konfiguracji klawiszy"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Przesuń kursor w górę"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Przesuń kursor w dół"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Przesuń kursor na początek ekranu"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Przesuń kursor na środek ekranu"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Przesuń kursor na koniec ekranu"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Przesuń kursor na początek listy"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Przesuń kursor na koniec listy"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Przesuń o stronę do góry"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Przesuń o stronę w dół"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Wybór zakresu"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Przesuń o linijkę do góry"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Przesuń o linijkę w dół"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Przesuń o pół ekranu do góry"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Przesuń o pół ekranu w dół"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Zaznacz obecnie odtwarzaną piosenkę"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Ekran pomocy"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Odtwarzaj/Przejdź do katalogu"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Wstrzymanie"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Zatrzymanie"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Przycięcie"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Następna ścieżka"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Poprzednia ściężka"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Przewiń naprzód"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Przewiń wstecz"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Zgłośnij"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Przycisz"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Zaznacz/odznacz piosenkę na liście odtwarzania"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Zazczacz wszystkie wylistowane pozycje"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Usuń piosenkę z listy odtwarzania"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Tasuj listę odtwarzania"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Wyczyść listę odtwarzania"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Przełącz tryb powtarzania"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Przełącz tryb losowy"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Przełącz tryb pojedynczej piosenki"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Przełącz tryb pożerania"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Przełącz tryb przenikania"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Włącz aktualizacje bazy piosenek"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Zapisz listę odtwarzania"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Dodaj url/plik do playlisty"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Przejdź do katalogu głównego"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Przejdź do nadrzędnego katalogu"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Zlokalizuj piosenkę w przeglądarce"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Przesuń element w górę"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Przesuń element w dół"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Odświerz ekran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Przełącz tryb wyszukiwania"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Przełącz tryb automatycznego centrowania"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Następny ekran"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Poprzedni ekran"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Przełącz do najbardziej aktualnego ekranu"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Wyszukaj naprzód"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Znajdź następne"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Wyszukaj wstecz"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Znajdź poprzednie"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Skocz do"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Ekran artysty"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Zmień tryb wyszukiwania"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Zobacz zaznaczone i obecnie odtwarzaną piosenkę"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Przerwij zadanie"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Zaktualizuj tekst piosenki"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Spacja"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Góra"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Dół"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Lewo"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Prawo"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr ""
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr ""
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Klawisz %s przypisany do %s oraz %s"
 
-#: src/colors.c:156
+#: src/colors.c:158
 #, c-format
 msgid "Warning: Unknown color - %s\n"
 msgstr "Ostrzeżenie: Nieznany kolor - %s\n"
 
-#: src/colors.c:196
+#: src/colors.c:198
 #, c-format
 msgid "Warning: Unknown color field - %s\n"
 msgstr "Ostrzeżenie: Nieznany kolor pola - %s\n"
 
-#: src/colors.c:229
+#: src/colors.c:231
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminal nie obsługuje zmiany kolorów"
 
-#: src/colors.c:240
+#: src/colors.c:242
 msgid "Terminal lacks color capabilities"
 msgstr "Terminal nie obsługuje kolorów"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Błąd"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Nieprawidłowa definicja skrótu klaiwszowego"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Niekompletna konfiguracja skrótów klawiszowych"
 
@@ -1077,60 +1178,60 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Nieprawidłowy tryb wyświetlania czasu"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Brakujący '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Zła nazwa koloru"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Niekompletna definicja koloru"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Nieprawidłowy numer"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Nieprawidłowa definicja koloru"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Nieznana nazwa ekranu"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Nieprawidłowy tryb wyszukiwania"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Nieznany tryb wyszukiwania"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Nieznany parametr konfiguracyjny"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 
-#: src/list_window.c:566
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Wielozaznaczanie wyłączone"
 
-#: src/list_window.c:571
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Wielozaznaczanie włączone"

ncmpc-0.20.tar.bz2/po/pt_BR.gmo -> ncmpc-0.21.tar.bz2/po/pt_BR.gmo Changed

ncmpc-0.20.tar.bz2/po/pt_BR.po -> ncmpc-0.21.tar.bz2/po/pt_BR.po Changed

@@ -1,8 +1,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-12-19 01:05+0000\n"
 "Last-Translator: Jamerson Albuquerque Tiossi <jamersontiossi@yahoo.com.br>\n"
 "Language-Team: \n"
@@ -24,21 +25,21 @@
 msgid "n"
 msgstr "n (não)"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectando a %s... [Pressione %s para abortar]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Erro: Versão do MPD %d.%d.%d é muito antiga (necessária %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Conectado à %s"
@@ -51,7 +52,7 @@
 msgid "press %s for the key editor"
 msgstr "press %s para o editor de teclas"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Lista de Reprodução misturada"
 
@@ -59,23 +60,23 @@
 msgid "Cleared playlist"
 msgstr "Lista de Reprodução apagada"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Erro: Tela é muito pequena"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Modo de Repetição está ligado"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Modo de Repetição está desligado"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Modo Aleatório está ligado"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Modo Aleatório está desligado"
 
@@ -84,11 +85,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Modo de Faixa Única está ligado"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Modo de Faixa Única está desligado"
 
@@ -96,74 +97,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Modo de Deleção de Faixa Reproduzida está ligado"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Modo de Deleção de Faixa Reproduzida está desligado"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Inter-mixagem de %d segundos"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Banco de Dados atualizado"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Modo de Busca: Envolvido"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Modo de Busca: Normal"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Modo de Auto-Centralização: Ligado"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Modo de Auto-Centralização: Desligado"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Todas as faixas"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbuns do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as faixas do artista: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Faixas sem álbuns do artista: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Adicionando álbum %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Adicionando %s..."
@@ -173,7 +174,8 @@
 msgid "Loading playlist %s..."
 msgstr "Carregando Lista de Reprodução %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Adicionando '%s' á Lista de Reprodução"
@@ -191,6 +193,25 @@
 msgid "Database update started"
 msgstr "Atualização de Banco de Dados iniciada"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Procurar"
@@ -208,7 +229,7 @@
 msgid "Unable to find '%s'"
 msgstr "'%s' não pôde ser encontrado"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Senha"
 
@@ -223,7 +244,8 @@
 msgstr "Substituir %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Abortado"
 
@@ -238,7 +260,7 @@
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
@@ -250,101 +272,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Deletar este item não é possível"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Deletar Lista de Reprodução %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Lista de Reprodução deletada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artista"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "álbum"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "título"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "faixa"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "nome"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "estilo"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "data"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "compositor"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "intérprete"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "comentário"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "arquivo"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Nome de Arquivo"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag de pesquisa ruim %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Sem argumento para tag de pesquisa %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -376,69 +398,73 @@
 msgid "Search mode: %s"
 msgstr "Modo de Pesquisa: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Aplicar e salvar teclas de atalho  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Aplicar teclas de atalho "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Você tem novas teclas de atalho"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Teclas de atalho inalteradas."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erro: Não foi possível criar diretório ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Gravei %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Deletada"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entre nova tecla para %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Erro: tecla %s já está sendo usada para %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tecla %s definida para %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Aplicar teclas de atalho "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Aplicar e salvar teclas de atalho  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Adicionar nova tecla"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Você esqueceu de 'Aplicar' suas mudanças?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Editar teclas de atalho"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar teclas para %s"
@@ -447,142 +473,189 @@
 msgid "Movement"
 msgstr "Movimento"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Tela da Lista de Reprodução"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Reproduzir"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Mover trilha para cima"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Mover faixa para baixo"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centralizar"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Tela de Navegação"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Adentrar diretório/Selecionar e reproduzir trilha"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Adicionar trilha à Lista de Reprodução"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Deletar Lista de Reprodução"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Tela de pesquisa"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Selecionar e reproduzir"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Tela de Letra de Música"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Ver Letra de Música"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Re)Carregar letra de música"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Interromper busca"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Baixar letra de música da faixa em reprodução"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Sem letras salvas"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Salvar letra de música."
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Apagar letras salvas"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Tela de Saídas"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Habilitar/desabilitar saída"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Próxima tela"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Tela de definição de teclas"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Editar a definição de teclas para o comando selecionado"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Remover keydef selecionado"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Adicionar nova tecla"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Subir um nível"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Aplicar mudanças e salvar"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Ajuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Sem letra de música"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Letra de Música"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "carregando..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Letra de Música salva"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Letras apagadas"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Sem letras salvas"
 
@@ -596,96 +669,100 @@
 msgid "Output '%s' disabled"
 msgstr "Saída '%s' desabilitada"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Saídas"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Duração"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Faixa"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Caminho"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Taxa de Amostragem"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Número de álbuns"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Número de faixas"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Tempo rodando"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Atualização do BD mais recente"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Tempo de reprodução"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Tempo de reprodução do BD"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Visualizador de Trilha"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Caminho"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Estatísticas do MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Faixa selecionada"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Faixa atualmente em reprodução"
 
@@ -697,342 +774,361 @@
 msgid "[Paused]"
 msgstr "[Pausado]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Tela de configuração de teclas"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Sair"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Mover cursor para cima"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Mover cursor para baixo"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Mover cursor para o topo da tela"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Mover cursor para o meio da tela"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover cursor para o final da tela"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Mover cursor para o topo da lista"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover cursor para o final da lista"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Sobe uma página"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Desce uma página"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Seleção de Intervalo"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir uma linha"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Descer uma linha"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir meia tela"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Descer meia tela"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Selecionar faixa atualmente em reprodução"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Tela de Ajuda"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Reproduzir/Adentrar diretório"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Próxima faixa"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Correr para frente"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Correr para trás"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Abaixar volume"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Selecionar/De-selecionar trilha na Lista de Reprodução"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Selecionar todos os itens listados"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Deletar faixa da lista de reprodução"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Randomizar lista de reprodução"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Limpar lista de reprodução"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Liga/Desliga modo de repetição"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Liga/Desliga modo aleatório"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Liga/Desliga modo de única reprodução"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Liga/Desliga modo de deleção de faixa reproduzida"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Liga/Desliga inter-mixagem"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Iniciar a atualização do banco de dados de faixas"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Salvar lista de reprodução"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Adicionar URL/arquivo à lista de reprodução"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Ir para raiz"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Ir para diretório pai"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Localizar musica no navegador"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Mover item para cima"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Mover item para baixo"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Redesenhar tela"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Liga/Desliga modo de procura"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Liga/Desliga modo de centralização automática"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Próxima tela"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Tela anterior"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Troca para a tela mais recente"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Pesquisa para frente"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Pesquisa para a frente - próximo"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Pesquisa para trás"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Pesquisa para trás - anterior"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Pular para"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Tela de artista"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Mudar modo de pesquisa"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Ver a trilha selecionada e a em atual reprodução"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Interromper ação"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Atualizar letra de música"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Não-definido"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Espaço"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Cima"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Baixo"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tecla %s definida para %s e %s"
@@ -1056,22 +1152,22 @@
 msgstr "Terminal não tem capacidade para trabalhar com cores"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Definição de tecla de atalho malformada"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Configuração de teclas de atalho incompleta"
 
@@ -1079,53 +1175,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Tipo de visualização de tempo ruim"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Falta '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Nome de cor ruim"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Definição de cor incompleta"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Definição de cor malformada"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Nome de tela desconhecido"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Modo de pesquisa inválido"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Modo de pesquisa desconhecido"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Parâmetro de configuração desconhecido"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Traduzido por Carlos Eduardo C. B. Shinagawa <cadu.coelho at gmail.com>\n"
@@ -1137,10 +1233,10 @@
 "  Max Kellermann https://launchpad.net/~max-duempel\n"
 "  Osni Leandro https://launchpad.net/~osni"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Seleção de intervalo desabilitada"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Seleção de intervalo habilitada"

ncmpc-0.20.tar.bz2/po/ru.gmo -> ncmpc-0.21.tar.bz2/po/ru.gmo Changed

ncmpc-0.20.tar.bz2/po/ru.po -> ncmpc-0.21.tar.bz2/po/ru.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-01-05 21:31+0100\n"
 "Last-Translator: Max Arnold <lwarxx@gmail.com>\n"
 "Language-Team: ru <ru@li.org>\n"
@@ -24,21 +25,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Подключение к %s...  [Нажмите %s для отмены]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Ошибка: MPD версии %d.%d.%d устарел (необходим %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Подключено к %s"
@@ -51,7 +52,7 @@
 msgid "press %s for the key editor"
 msgstr "%s - редактор клавиш"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Плейлист перемешан"
 
@@ -59,23 +60,23 @@
 msgid "Cleared playlist"
 msgstr "Плейлист очищен"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Ошибка: экран слишком мал"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Повтор включен"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Повтор выключен"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Случайный режим включен"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Случайный режим выключен"
 
@@ -84,11 +85,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Одиночный режим включен"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Одиночный режим выключен"
 
@@ -96,74 +97,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Режим удаления после проигрывания включен"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Режим удаления после проигрывания выключен"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавный переход %d секунд"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "База обновлена"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Режим поиска: циклический"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Режим поиска: нормальный"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Режим автоцентрирования: вкл."
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Режим автоцентрирования: выкл."
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Все композиции"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Все исполнители"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбомы исполнителя: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Все композиции исполнителя: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Композиции исполнителя: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Добавляется альбом %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Добавляется %s..."
@@ -173,7 +174,8 @@
 msgid "Loading playlist %s..."
 msgstr "Загружается плейлист %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "В плейлист добавляется '%s'"
@@ -191,6 +193,25 @@
 msgid "Database update started"
 msgstr "Начато обновление базы"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Поиск"
@@ -208,7 +229,7 @@
 msgid "Unable to find '%s'"
 msgstr "Не удалось найти '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Пароль"
 
@@ -223,7 +244,8 @@
 msgstr "Заменить %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Прервано"
 
@@ -238,7 +260,7 @@
 msgid "Add"
 msgstr "Добавить"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Плейлист"
 
@@ -250,101 +272,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Удаление этого элемента невозможно"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Удалить плейлист %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Плейлист удалён"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Навигация"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artist"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "title"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "track"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "name"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "date"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "composer"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "performer"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "comment"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Композиция"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Альбом"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Исполнитель + Композиция"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Неверный тег поиска %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Не задан критерий поиска по тегу %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Поиск"
 
@@ -376,69 +398,73 @@
 msgid "Search mode: %s"
 msgstr "Поле для поиска: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Применить и сохранить клавиатурные комбинации  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Применить клавиатурные комбинации "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Новые клавиатурные комбинации задействованы"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Клавиатурные комбинации не изменились."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Ошибка: не удалось создать директорию ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Ошибка: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Записано %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Удалено"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Нажмите новую клавишу для %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Ошибка: клавиша %s уже используется для %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Назначено %s для %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Применить клавиатурные комбинации "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Применить и сохранить клавиатурные комбинации  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Добавить новую клавишу"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Внимание: вы не забыли применить сделанные изменения?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Изменение клавиатурных комбинаций"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Изменение клавиатурных комбинаций для %s"
@@ -447,142 +473,189 @@
 msgid "Movement"
 msgstr "Перемещение"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Глобальные"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Экран плейлиста"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Воспроизведение"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Переместить композицию вверх"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Переместить композицию вниз"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Центрировать"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Экран навигации"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Перейти в директорию/Выбрать и проиграть композицию"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Добавить композицию в плейлист"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Удалить плейлист"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Экран поиска"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Выбрать и проиграть"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Экран текста песни"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Показать текст"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Пере)загрузить текст"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Прервать загрузку"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Загрузить текст проигрываемой композиции"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Сохранённый текст отсутствует"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Сохранить текст"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Удалить сохранённый текст"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Экран аудиовыходов"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Вкл/выкл аудиовыход"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Следующий экран"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Экран клавиатурных комбинаций"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Изменить комбинации для выбранной команды"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Удалить выбранную комбинацию"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Добавить новую клавишу"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Перейти на уровень выше"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Применить и сохранить изменения"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Помощь"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Текст отсутствует"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Текст"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "загружается..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Текст сохранён"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Текст удалён"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Сохранённый текст отсутствует"
 
@@ -596,97 +669,101 @@
 msgid "Output '%s' disabled"
 msgstr "Аудиовыход '%s' выключен"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Аудиовыходы"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Длительность"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Название"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Диск"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Дата"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Путь"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Количество исполнителей"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Количество альбомов"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Количество композиций"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Время работы"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Последнее обновление базы"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Время воспроизведения"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Время воспроизведения базы"
 
 # Several translations for Song Viewer:
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Информация о композиции"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Путь"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/с"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Статистика MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Выбранная композиция"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Проигрываемая композиция"
 
@@ -698,342 +775,361 @@
 msgid "[Paused]"
 msgstr "[Пауза]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Громкость н/д"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Громкость %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Экран клавиатурных комбинаций"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Выход"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Курсор вверх"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Курсор вниз"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Переместить курсор в верх экрана"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Переместить курсор в середину экрана"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Переместить курсор в низ экрана"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Переместить курсор в начало списка"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Переместить курсор в конец списка"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "На страницу вверх"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "На страницу вниз"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Выбор диапазона"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Прокрутка на одну строку вверх"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Прокрутка на одну строку вниз"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Прокрутка на половину экрана вверх"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Прокрутка на половину экрана вниз"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Выбрать текущую композицию"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Экран помощи"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Воспроизвести/Перейти в директорию"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Останов"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Удалить из плейлиста все композиции кроме текущей"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Следующая композиция"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Предыдущая композиция"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Перемотка вперёд"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Перемотка назад"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Увеличить громкость"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Уменьшить громкость"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Добавить/убрать композицию из плейлиста"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Добавить все композиции в плейлист"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Удалить композицию из плейлиста"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Перемешать плейлист"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Очистить плейлист"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Вкл/выкл режим повтора"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Вкл/выкл случайный режим"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Вкл/выкл одиночный режим"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Вкл/выкл режим удаления после проигрывания"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Вкл/выкл режим плавного перехода"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Обновить музыкальную базу"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Сохранить плейлист"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Добавить url/файл в плейлист"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Перейти к корневой директории"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Перейти к родительской директории"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Перейти к файлу композиции"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Переместить вверх"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Переместить вниз"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Обновить экран"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Переключить режим поиска"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Вкл/выкл режим автоцентрирования"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Следующий экран"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Предыдущий экран"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Последний посещённый экран"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Поиск вперёд"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Продолжить поиск вперёд"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Поиск назад"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Продолжить поиск назад"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Перейти к"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Экран исполнителей"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Изменить поле для поиска"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Просмотр выбранной и проигрываемой композиций"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Прервать операцию"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Обновить текст"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Не задано"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Пробел"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Вверх"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Вниз"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Влево"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Вправо"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "В начало"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "В конец"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Клавиша %s назначена для %s и %s"
@@ -1057,22 +1153,22 @@
 msgstr "Терминал не поддерживает цвета"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Неправильное значение клавиатурной комбинации"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Неопределённое значение клавиатурной комбинации"
 
@@ -1080,61 +1176,61 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Неверный тип отображения времени"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Пропущен символ '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Неверное название цвета"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Неопределённое значение цвета"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Неверное число"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Неправильное значение цвета"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Неизвестное название экрана"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Неверный режим поиска"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Неизвестный режим поиска"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Неизвестный параметр конфигурации"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr "Перевод: Max Arnold <lwarxx@gmail.com>"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Выбор диапазона выключен"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Выбор диапазона включен"

ncmpc-0.20.tar.bz2/po/sk.gmo -> ncmpc-0.21.tar.bz2/po/sk.gmo Changed

ncmpc-0.20.tar.bz2/po/sk.po -> ncmpc-0.21.tar.bz2/po/sk.po Changed

@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.11.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-04-07 01:36+0000\n"
 "Last-Translator: Roman Horník <Unknown>\n"
 "Language-Team: sk <sk@li.org>\n"
@@ -25,21 +26,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Pripájam sa k %s... [Stlačte %s pre zrušenie]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Chyba: MPD verzie %d.%d.%d je príliš staré (%s je potrebná)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Pripojený k %s"
@@ -52,7 +53,7 @@
 msgid "press %s for the key editor"
 msgstr "stlačte %s pre editor klávesov"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Zamiešaný playlist"
 
@@ -60,23 +61,23 @@
 msgid "Cleared playlist"
 msgstr "Vyčistený playlist"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Chyba: Okno je príliš malé"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Režim opakovania zapnutý"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Režim opakovania vypnutý"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Náhodný režim zapnutý"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Náhodný režim vypnutý"
 
@@ -85,11 +86,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Jednotlivý režim zapnutý"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Jednotlivý režim vypnutý"
 
@@ -97,74 +98,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Spotrebný režim zapnutý"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Spotrebný režim vypnutý"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Prelínanie %d sekúnd"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhľadávania: Zabalený"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Režim vyhľadávanie: Normálny"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Automatické centrovanie: Zapnuté"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Automatické centrovanie: Vypnuté"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Všetky stopy"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Všetci interpreti"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všetky stopy od interpreta: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Pridávam adresár %s...\n"
@@ -174,7 +175,8 @@
 msgid "Loading playlist %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Pridávam '%s' do playlistu"
@@ -192,6 +194,25 @@
 msgid "Database update started"
 msgstr "Bola spustená aktualizácia databáze"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Vyhľadať"
@@ -209,7 +230,7 @@
 msgid "Unable to find '%s'"
 msgstr "Nepodarilo sa nájsť '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Heslo"
 
@@ -224,7 +245,8 @@
 msgstr "Nahradiť %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Zrušené"
 
@@ -239,7 +261,7 @@
 msgid "Add"
 msgstr "Pridať"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Playlist"
 
@@ -251,101 +273,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Zmazanie tejto položky nie je možné"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Vymazať playlist %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Playlist vymazaný"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Listovať"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "interpret"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "názov"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "stopa"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "názov"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "žáner"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "dátum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "skladateľ"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "umelec"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "komentár"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "súbor"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Názov"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Interpret + Názov"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Zlá značka vyhľadávania %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Chýba argument pre značku vyhľadávania %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Hľadanie"
 
@@ -377,69 +399,73 @@
 msgid "Search mode: %s"
 msgstr "Režim vyhľadávania: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Použiť & Uložiť nastavenie klávesov  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Použiť nastavenie klávesov "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Nastavili ste nové priradenie klávesov"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Priradenie klávesov sa nezmenilo."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Chyba: Nepodarilo sa vytvoriť adresár ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Chyba: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapísané %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Vymazané"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Zadajte nový kláves pre %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Chyba: kláves %s je už použitý pre %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s priradené k %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Použiť nastavenie klávesov "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Použiť & Uložiť nastavenie klávesov  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Pridať nový kláves"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Poznámka: Zabudli ste 'Použiť' vaše zmeny?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Upraviť priradenie klávesov"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Upraviť klávesy pre %s"
@@ -448,144 +474,191 @@
 msgid "Movement"
 msgstr "Pohyb"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globálne"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Okno playlistu"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Prehrávať"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Presunúť skladbu nahor"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Presunúť skladbu nadol"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Do stredu"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Okno listovania"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Vstúpiť do adresára/Vybrať a prehrať skladbu"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Pridať skladbu do playlistu"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Vymazať playlist"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Okno vyhľadávania"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Vybrať a prehrať"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Okno textu piesne"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Zobraziť text piesne"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Znovu)načítať text"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Zachytené prerušenie"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Stiahnuť text pre momentálne prehrávanú pieseň"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Uložiť text piesne"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 #, fuzzy
 msgid "Delete saved lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Obrazovka výstupov"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Povoliť/vypnúť výstup"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Ďalšia obrazovka"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Obrazovka s nastavením kláves"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Upraviť kláves pre vybraný príkaz"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Odstrániť vybrané nastavenie kláves"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Pridať nový kláves"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Prejsť o úroveň vyššie"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Použiť a uložiť zmeny"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Pomoc"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Bez textu"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Text piesne"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "načítam..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Text piesne uložený"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Playlist vymazaný"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Uložiť text piesne"
@@ -600,96 +673,100 @@
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' vypnutý"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Dĺžka"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Skladateľ"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Názov"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Stopa"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Cesta"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bitový tok"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Počet interpretov"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Počet albumov"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Počet piesní"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Uptime"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Najčerstvejší update databáze"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Čas hrania"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Čas hrania databáze"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Prehliadač piesní"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Cesta"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Štatistiky MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Vybraná pieseň"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Momentálne prehrávaná pieseň"
 
@@ -701,342 +778,361 @@
 msgid "[Paused]"
 msgstr "[Pozastavené]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Hlasitosť n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hlasitosť %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Okno nastavenia klávesov"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Presunúť kurzor nahor"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Presunúť kurzor nadol"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Presunúť na vrch obrazovky"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Presunúť kurzor do stredu obrazovky"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Presunúť kurzor na spodok obrazovky"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Presunúť kurzor na začiatok zoznamu"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Presunúť kurzor na koniec zoznamu"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Výber rozsahu"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Posun o jeden riadok nahor"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Posun o jeden riadok nadol"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Posun o polovicu obrazovky nahor"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Posun o polovicu obrazovky nadol"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Zvoľiť práve prehrávanú skladbu"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Okno s pomocou"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Prehrať/Vstúpiť do adresára"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Orezať"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Ďalšia stopa"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Predchádzajúca stopa"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Posunúť vpred"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Posunúť vzad"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Pridať hlasitosť"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Stíšiť"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Vybrať/odvybrať skladbu v playliste"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Vybrať všetky položky v zozname"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Vymazať skladbu z playlistu"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Zamiešať playlist"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Vyčistiť playlist"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Prepnúť režim opakovania"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Prepnúť náhodný režim"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Prepnúť jednotlivý režim"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Prepnúť spotrebný režim"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Prepnúť režím prelínania skladieb"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Spustiť aktualizáciu hudobnej databáze"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Uložiť playlist"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Pridať url/súbor do playlistu"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Prejsť do koreňového adresára"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Nájsť skladbu v prehliadači"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Presunúť položku nahor"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Presunúť položku nadol"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Obnoviť obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Prepnúť režim vyhľadávania"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Prepnúť automatický režim centrovania"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Ďalšia obrazovka"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Predchádzajúca obrazovka"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Prepnúť na predchádzajúcu obrazovku"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Hľadať vpred"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Pokračovať v hľadaní vpred"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Hľadať vzad"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Pokračovať v hľadaní vzad"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Skok na"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Okno interpreta"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Zmeniť režim vyhľadávania"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Zobraziť vybranú a momentálne prehrávanú pieseň"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Akcia prerušenia"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Obnoviť text"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Neurčené"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Medzera"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Hore"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Dole"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Vľavo"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Kláves %s priradený k %s a %s"
@@ -1060,22 +1156,22 @@
 msgstr "Terminál nemá schopnosti zobrazovania farieb"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Chybne zadaná definícia klávesovej skratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplná konfigurácie klavesových skratiek"
 
@@ -1083,53 +1179,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Nesprávny typ zobrazovania času"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Chýba '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Nesprávny názov farby"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Neúplná definícia farby"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Zle zadaná definícia farby"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Neznámy názov obrazovky"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Neplatný režim vyhľadávania"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Neznámy režim vyhľadávania"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Neznámy parameter konfigurácie"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Jozef Riha <jose1711@gmail.com>\n"
@@ -1138,11 +1234,11 @@
 "  Jose Riha https://launchpad.net/~jose1711\n"
 "  Roman Horník https://launchpad.net/~roman.hornik"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Výber rozsahu vypnutý"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Výber rozsahu zapnutý"

ncmpc-0.20.tar.bz2/po/sv.gmo -> ncmpc-0.21.tar.bz2/po/sv.gmo Changed

ncmpc-0.20.tar.bz2/po/sv.po -> ncmpc-0.21.tar.bz2/po/sv.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc 0.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2010-04-14 05:21+0000\n"
 "Last-Translator: Rickard Närström <rickard.narstrom@gmail.com>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Ansluter till %s... [Tryck %s för att avbryta]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Fel: MPD version %d.%d.%d är för gammal (%s krävs)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Ansluten till %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "tryck på %s för att korrigera"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Spellistan slumpsorterades"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "Spellistan rensad"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Fel: Terminalen är för liten"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Upprepningsläge på"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Upprepningsläge av"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Slumpningsläge på"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Slumpningsläge av"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr ""
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Förtäringsläge på"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Förtäringsläge av"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Mjuk övergång %d sekunder"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Sökläge: Börja om"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Sökläge: Till början/slut"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering påslaget"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering avslaget"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Alla spår"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Alla artister"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alla spår av artist: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laddar..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Lägger till '%s' till spellista"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "Databasuppdatering påbörjad"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Sök"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "Kan inte hitta '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Lösenord"
 
@@ -225,7 +246,8 @@
 msgstr "Ersätt %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Avbrutet"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Spellista"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Du kan inte ta bort det här föremålet"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Ta bort spellista %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Spellista borttagen"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Filer"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artist"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "titel"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "spår"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "namn"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "datum"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "kompositör"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "uppträdare"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Artist + titel"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Felaktig söktyp %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Argumentet för söktyp %s saknas"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Sök"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "Sök efter: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Verkställ och spara  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Verkställ "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Tangentdefinitioner uppdaterade"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Tangentdefinitioner oförändrade."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fel: Kunde inte skapa mappen ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fel: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Sparade %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tangent för %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Fel: Tangenten %s används redan för %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s tilldelad %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Verkställ "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Verkställ och spara  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Lägg till ny tangent"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Glömde du att 'Verkställa' dina ändringar?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Ändra tangentdefinitioner"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Ändra tangenter för kommandot %s"
@@ -449,144 +475,191 @@
 msgid "Movement"
 msgstr "Navigation"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Globala"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Spellista"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Starta/Spela markerad"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Flytta spår uppåt"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Flytta spår nedåt"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Filer"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Välj katalog/Markera och spela upp"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Lägg till i spellista"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Ta bort spellista"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Databassökning"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Lägg till spellistan och spela"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Texter"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Visa texter"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "Ladda (om) texter"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Avbryt hämtning"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Ladda ner texter till låten som spelas just nu"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Spara texter"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Spara texter"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 #, fuzzy
 msgid "Delete saved lyrics"
 msgstr "Spara texter"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Utgångar"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Slå på/av utgång"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Nästa skärm"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Lägg till ny tangent"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "Gå upp en nivå"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Verkställ och spara förändringar"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Hjälp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Ingen text"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Texter"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "laddar..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Text sparad"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Spellista borttagen"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Spara texter"
@@ -601,96 +674,100 @@
 msgid "Output '%s' disabled"
 msgstr "Utgång '%s' avslagen"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Utgångar"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Längd"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Namn"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Skiva"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Spår"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Sökväg"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Bithastighet"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Antal artister"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Antal album"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Antal låtar"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Upptid"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Senaste databasuppdateringen"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Speltid"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Spår"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Sökväg"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD-statistik"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Markerad låt"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr ""
 
@@ -702,342 +779,361 @@
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Volym: n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volym: %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Markör uppåt"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Markör nedåt"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Flytta markören längst upp"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Flytta markören till mitten"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Flytta markören längst ner"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Flytta markören längst upp i listan"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Flytta markören längst ner i listan"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Markören en skärm uppåt"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Markören en skärm nedåt"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr ""
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Gå upp en rad"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Gå ner en rad"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Gå upp en halv skärm"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Gå ner en halv skärm"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Hjälp"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Spela upp/Välj"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Nästa spår"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Föregående spår"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Sök framåt"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Sök bakåt"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Höj volymen"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Sänk volymen"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Markera/avmarkera spår till spellistan"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Markera alla listade föremål"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Ta bort låt från spellista"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Slumpsportera spellista"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Rensa spellista"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Repeat på/av"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Slumpning på/av"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Mjuk övergång på/av"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Updatera musikdatabasen"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Spara spellista"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Lägg till url eller fil till spellistan"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Gå till rotkatalogen"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Gå upp en nivå"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Hitta spår i Filer"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Uppdatera fönster"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Ändra sökinställningar"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering på/av"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Nästa skärm"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Tidigare skärm"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Sök"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Nästa träff"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Föregående träff"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Upprepa sökning bakåt"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Hoppa till"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Artister"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Ändra måltyp för databassökning"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Uppdatera texter"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Ej definierad"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Bakstegstangent"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Uppåtpil"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Nedåtpil"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Vänsterpil"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Högerpil"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+tabb"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tangent %s tilldelad %s och %s"
@@ -1061,22 +1157,22 @@
 msgstr "Terminalen saknar stöd för färger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Fel"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Dålig tangentdefinition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Inkomplett tangentdefinition"
 
@@ -1084,53 +1180,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Felaktigt tidsformat"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Saknar '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Felaktigt färgnamn"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Inkomplett färgdefinition"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Ogiltigt nummer"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Felaktig färgdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Skärmnamn okänt"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Okänd konfigurationsinställning"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1139,10 +1235,10 @@
 "  Rickard Närström https://launchpad.net/~riccetn\n"
 "  nanker https://launchpad.net/~nanker"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.20.tar.bz2/po/uk.gmo -> ncmpc-0.21.tar.bz2/po/uk.gmo Changed

ncmpc-0.20.tar.bz2/po/uk.po -> ncmpc-0.21.tar.bz2/po/uk.po Changed

@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-08-11 10:30+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -27,21 +28,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr "невідомо"
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Встановлення з'єднання з %s...  [Натисніть %s щоб припинити]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "Помилка: MPD версії %d.%d.%d застаріла (необхідна %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "Встановлене з'єднання з %s"
@@ -54,7 +55,7 @@
 msgid "press %s for the key editor"
 msgstr "натисніть %s щоб редагувати клавіші"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "Перемішаний перелік програвання"
 
@@ -62,23 +63,23 @@
 msgid "Cleared playlist"
 msgstr "Очищений перелік програвання"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "Помилка: екран занадто маленький"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "Режим повторення увімкнений"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "Режим повторення вимкнений"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "Режим випадкового програвання увімкнений"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "Режим випадкового програвання вимкнений"
 
@@ -87,11 +88,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "Режим повторення однієї доріжки увімкнений"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "Режим повторення однієї доріжки вимкнений"
 
@@ -99,74 +100,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "Режим вичерпання увімкнений"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "Режим вичерпання вимкнений"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавний перехід: %dс"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "База даних оновлена"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "Режим пошуку: завернутий (розділений???)"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "Режим пошуку: звичайний"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "Режим автоматичного центрування: увімкнено"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "Режим автоматичного центрування: вимкнено"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "Всі доріжки"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "Всі виконавці"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбоми виконавця: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Всі доріжки виконавця: %s"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Доріжки без альбому виконавця: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "Додається альбом %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "Додається %s..."
@@ -176,7 +177,8 @@
 msgid "Loading playlist %s..."
 msgstr "Завантажується перелік програвання %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "Додається '%s' до переліку програвання"
@@ -194,6 +196,25 @@
 msgid "Database update started"
 msgstr "Початок оновлення бази даних"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "Знайти"
@@ -211,7 +232,7 @@
 msgid "Unable to find '%s'"
 msgstr "Не вдається знайти '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "Пароль"
 
@@ -226,7 +247,8 @@
 msgstr "Замінити %s [%s/%s] ? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "Перервано"
 
@@ -241,7 +263,7 @@
 msgid "Add"
 msgstr "Додати"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "Перелік програвання"
 
@@ -253,101 +275,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "Видалити цей елемент неможливо"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "Видалити перелік програвання %s [%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "Перелік програвання видалений"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "Огляд"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "artist"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "album"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "title"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "track"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "name"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "genre"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "date"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "composer"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "performer"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "comment"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "Назва"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "Альбом"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "Назва файлу"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "Виконавець + Назва"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Неправильна мітка %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Немає аргументу для пошуку за міткою %s"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "Пошук"
 
@@ -379,69 +401,73 @@
 msgid "Search mode: %s"
 msgstr "Режим пошуку: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "===> Застосування та збереження прив'язки клавіші  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "===> Застосування прив'язки клавіші "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "Ви маєте нову прив'язку клавіші"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "Прив'язки клавіш не змінені."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Помилка: неможливо створити теку ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Помилка: %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "Записаний %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "Видалена"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Введіть нову клавішу для %s: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Помилка: клавіша %s вже використовується для %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Призначення %s до %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "===> Застосування прив'язки клавіші "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "===> Застосування та збереження прив'язки клавіші  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "Додати нову клавішу"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Примітка: ви забули \"Застосувати\" зроблені зміни?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "Редагувати прив'язки клавіш"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Редагувати клавішу для %s"
@@ -450,142 +476,189 @@
 msgid "Movement"
 msgstr "Переміщення"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "Загальні"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "Екран переліку програвання"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "Програти"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "Перемістити пісню вгору"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "Перемістити пісню вниз"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "По центру"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "Екран перегляду"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "Ввести теку чи вибрати та програти пісню"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "Долучити пісню до переліку програвання"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Видалити перелік програвання"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "Екран пошуку"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "Вибрати та програти"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "Екран текстів пісень"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "Переглянути текст пісні"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(Пере)завантажити текст пісні"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "Припинити отримання"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "Завантажити текст для пісні, що зараз програється"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "Немає збереженого тексту пісні"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "Зберегти текст пісні"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "Видалити збережений текст пісні"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "Екран виходів"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "Увімкнути/вимкнути вихід"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "Наступний екран"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "Екран призначення клавіш"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "Редагувати призначену клавішу для вибраної команди"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "Вилучити вибране призначення клавіші"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "Додати нову клавішу"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "На рівень вище"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "Застосувати та зберегти зміни"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "Допомога"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "Немає тексту пісні"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "Тексти пісень"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "завантаження..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "Текст пісні збережений"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "Текст пісні видалений"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "Немає збереженого тексту пісні"
 
@@ -599,96 +672,100 @@
 msgid "Output '%s' disabled"
 msgstr "Вихід '%s' вимкнений"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "Виходи"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "Назва"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "Диск"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "Доріжка"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "Дата"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "Примітка"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "Шлях"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "Бітрейт"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "Кількість виконавців"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "Кількість альбомів"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "Кількість пісень"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "Час роботи"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "Останнє оновлення бази даних"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "Час програвання"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "Час програвання всієї БД"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "Переглядач пісень"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "Шлях"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбіт/с"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "Статистика MPD"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "Вибрана пісня"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "Пісня, що зараз програється"
 
@@ -700,342 +777,361 @@
 msgid "[Paused]"
 msgstr "[Призупинено]"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "Гучність недоступна"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "Гучність %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "Екран конфігурації клавіш"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "Перемістити курсор доверху"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "Перемістити курсор донизу"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "Перемістити курсор на початок екрану"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "Перемістити курсор до середини екрану"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "Перемістити курсор в кінець екрану"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "Перемістити курсор на початок переліку"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "Перемістити курсор в кінець переліку"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "Сторінка догори"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "Сторінка донизу"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "Вибір обсягу"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Прогорнути один рядок догори"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "Прогорнути один рядок донизу"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Прогорнути півекрану догори"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "Прогорнути півекрану донизу"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "Вибрати пісню, що зараз програється"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "Екран допомоги"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "Програти чи увійти до каталогу"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "Призупинити"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "Обрізати"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "Наступна доріжка"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "Попередня доріжка"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "Шукати попереду"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "Шукати позаду"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "Збільшити гучність"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "Зменшити гучність"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "Вибрати чи зняти виділення пісні в переліку програвання"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "Вибрати всі перелічені елементи"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "Видалити пісню з переліку програвання"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "Перемішати перелік програвання"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "Очистити перелік програвання"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Перемкнути режим повторення"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "Перемкнути випадковий режим"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "Перемкнути режим повторення однієї пісні"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "Перемкнути режим вичерпання"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "Перемкнути режим плавного переходу"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "Розпочати оновлення бази даних музики"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "Зберегти перелік програвання"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "Додати url-посилання чи файл до переліку програвання"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "Перейти до кореневої теки"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "Перейти до батьківської теки"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "Визначити розміщення пісні в оглядачі"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "Перемістити елемент догори"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "Перемістити елемент донизу"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "Оновити екран"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "Перемкнути режим пошуку"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "Перемкнути режим автоматичного центрування"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "Наступний екран"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "Попередній екран"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "Поміняти останні екрани"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "Знайти попереду"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "Знайти попереду наступне"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "Знайти позаду"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "Знайти позаду попереднє"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "Перейти до"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "Екран виконавців"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "Змінити режим пошуку"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "Переглянути вибрану та пісню, що зараз програється"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "Припинити дію"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "Оновити текст пісні"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "Не визначений"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Клавіша %s призначена до %s та %s"
@@ -1059,22 +1155,22 @@
 msgstr "Терміналу бракує підтримки можливостей кольорів"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "Помилка"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "Неправильне визначення гарячої клавіші"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "Невідома команда"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "Незавершена конфігурація гарячих клавіш"
 
@@ -1082,60 +1178,60 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "Неправильний тип показу часу"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "Відсутній \"=\""
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "Неправильна назва кольору"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "Незавершене визначення кольору"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "Неправильне число"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "Неправильне визначення кольору"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "Невідома назва екрану"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "Помилковий режим пошуку"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "Невідомий режим пошуку"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "Невідомий конфігураційний параметр"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr "Oleksandr Kovalenko <alx.kovalenko@gmail.com>"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "Вибір обсягу вимкнений"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "Вибір обсягу увімкнений"

ncmpc-0.20.tar.bz2/po/zh_CN.gmo -> ncmpc-0.21.tar.bz2/po/zh_CN.gmo Changed

ncmpc-0.20.tar.bz2/po/zh_CN.po -> ncmpc-0.21.tar.bz2/po/zh_CN.po Changed

@@ -6,8 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ncmpc\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-23 21:08+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=glib&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-11 10:23+0200\n"
 "PO-Revision-Date: 2011-05-12 15:00+0000\n"
 "Last-Translator: snowdream <yanghui1986527@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -26,21 +27,21 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:243 src/main.c:265 src/main.c:283
+#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:313
+#: src/main.c:315
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "连接到 %s... [按 %s 键取消]"
 
-#: src/main.c:337
+#: src/main.c:339
 #, c-format
 msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
 msgstr "错误: MPD版本%d.%d.%d过低(需要 %s)"
 
-#: src/main.c:356
+#: src/main.c:358
 #, c-format
 msgid "Connected to %s"
 msgstr "连接到 %s"
@@ -53,7 +54,7 @@
 msgid "press %s for the key editor"
 msgstr "按 %s 编辑快捷键"
 
-#: src/player_command.c:177 src/screen_queue.c:752
+#: src/player_command.c:177 ../src/screen_queue.c:755
 msgid "Shuffled playlist"
 msgstr "乱序播放列表"
 
@@ -61,23 +62,23 @@
 msgid "Cleared playlist"
 msgstr "清空播放列表"
 
-#: src/screen.c:205 src/screen.c:269
+#: src/screen.c:206 ../src/screen.c:273
 msgid "Error: Screen too small"
 msgstr "错误: 屏幕太小"
 
-#: src/screen.c:389
+#: src/screen.c:395
 msgid "Repeat mode is on"
 msgstr "重复播放 开"
 
-#: src/screen.c:390
+#: src/screen.c:396
 msgid "Repeat mode is off"
 msgstr "重复播放 关"
 
-#: src/screen.c:394
+#: src/screen.c:400
 msgid "Random mode is on"
 msgstr "随机播放 开"
 
-#: src/screen.c:395
+#: src/screen.c:401
 msgid "Random mode is off"
 msgstr "随机播放 关"
 
@@ -86,11 +87,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:404
+#: src/screen.c:410
 msgid "Single mode is on"
 msgstr "单曲播放 开"
 
-#: src/screen.c:405
+#: src/screen.c:411
 msgid "Single mode is off"
 msgstr "单曲播放 关"
 
@@ -98,74 +99,74 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:413
+#: src/screen.c:419
 msgid "Consume mode is on"
 msgstr "消除模式 开"
 
-#: src/screen.c:414
+#: src/screen.c:420
 msgid "Consume mode is off"
 msgstr "消除模式 关"
 
-#: src/screen.c:417
+#: src/screen.c:423
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "淡入淡出 %d 秒"
 
-#: src/screen.c:429
+#: src/screen.c:435
 msgid "Database updated"
 msgstr "数据库已更新"
 
-#: src/screen.c:505
+#: src/screen.c:515
 msgid "Find mode: Wrapped"
 msgstr "查找模式: 循环"
 
-#: src/screen.c:506
+#: src/screen.c:516
 msgid "Find mode: Normal"
 msgstr "查找模式: 普通"
 
-#: src/screen.c:511
+#: src/screen.c:521
 msgid "Auto center mode: On"
 msgstr "自动居中模式: 开"
 
-#: src/screen.c:512
+#: src/screen.c:522
 msgid "Auto center mode: Off"
 msgstr "自动居中模式: 关"
 
-#: src/screen_artist.c:75 src/screen_artist.c:369
+#: src/screen_artist.c:75 ../src/screen_artist.c:366
 msgid "All tracks"
 msgstr "全部音轨"
 
-#: src/screen_artist.c:401
+#: src/screen_artist.c:398
 #, c-format
 msgid "All artists"
 msgstr "全部艺术家"
 
-#: src/screen_artist.c:406
+#: src/screen_artist.c:403
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s 的专辑:"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:412
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s 的所有曲目"
 
-#: src/screen_artist.c:418
+#: src/screen_artist.c:415
 #, c-format
 msgid "Album: %s - %s"
 msgstr "专辑: %s - %s"
 
-#: src/screen_artist.c:422
+#: src/screen_artist.c:419
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "艺术家的无专辑曲目: %s"
 
-#: src/screen_artist.c:465
+#: src/screen_artist.c:466
 #, c-format
 msgid "Adding album %s..."
 msgstr "添加专辑 %s..."
 
-#: src/screen_artist.c:467
+#: src/screen_artist.c:468
 #, c-format
 msgid "Adding %s..."
 msgstr "添加 %s..."
@@ -175,7 +176,8 @@
 msgid "Loading playlist %s..."
 msgstr "加载播放列表 %s..."
 
-#: src/screen_browser.c:172 src/screen_browser.c:267 src/screen_browser.c:292
+#: src/screen_browser.c:172 ../src/screen_browser.c:267
+#: src/screen_browser.c:292
 #, c-format
 msgid "Adding '%s' to playlist"
 msgstr "添加 '%s' 到播放列表"
@@ -193,6 +195,25 @@
 msgid "Database update started"
 msgstr "更新数据库中"
 
+#: src/screen_chat.c:59
+#, c-format
+msgid ""
+"connected to MPD %u.%u.%u (you need at least \n"
+"version 0.17.0 to use the chat feature)"
+msgstr ""
+
+#: src/screen_chat.c:179
+msgid "Your message"
+msgstr ""
+
+#: src/screen_chat.c:188
+msgid "Message could not be sent"
+msgstr ""
+
+#: src/screen_chat.c:201 ../src/title_bar.c:94
+msgid "Chat"
+msgstr ""
+
 #: src/screen_find.c:28
 msgid "Find"
 msgstr "查找"
@@ -210,7 +231,7 @@
 msgid "Unable to find '%s'"
 msgstr "找不到 '%s'"
 
-#: src/screen_utils.c:99
+#: src/screen_utils.c:115
 msgid "Password"
 msgstr "密码"
 
@@ -225,7 +246,8 @@
 msgstr "替换 %s [%s/%s]? "
 
 #. translators: a dialog was aborted by the user
-#: src/screen_queue.c:300 src/screen_file.c:238 src/screen_keydef.c:165
+#: src/screen_queue.c:300 ../src/screen_file.c:236 src/screen_keydef.c:269
+#: ../src/screen_lyrics.c:382
 msgid "Aborted"
 msgstr "已放弃"
 
@@ -240,7 +262,7 @@
 msgid "Add"
 msgstr "增加"
 
-#: src/screen_queue.c:508 src/title_bar.c:77
+#: src/screen_queue.c:508 ../src/title_bar.c:79
 msgid "Playlist"
 msgstr "列表"
 
@@ -252,101 +274,101 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: src/screen_file.c:225
+#: src/screen_file.c:222
 msgid "Deleting this item is not possible"
 msgstr "此项目不能被删除"
 
-#: src/screen_file.c:232
+#: src/screen_file.c:229
 #, c-format
 msgid "Delete playlist %s [%s/%s] ? "
 msgstr "确定要删除列表 %s[%s/%s] ? "
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:251
+#: src/screen_file.c:249
 msgid "Playlist deleted"
 msgstr "播放列表已删除"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:305 src/title_bar.c:78
+#: src/screen_file.c:303 ../src/title_bar.c:80
 msgid "Browse"
 msgstr "目录"
 
-#: src/screen_search.c:45
+#: src/screen_search.c:46
 msgid "artist"
 msgstr "艺术家"
 
-#: src/screen_search.c:46
+#: src/screen_search.c:47
 msgid "album"
 msgstr "专辑"
 
-#: src/screen_search.c:47
+#: src/screen_search.c:48
 msgid "title"
 msgstr "标题"
 
-#: src/screen_search.c:48
+#: src/screen_search.c:49
 msgid "track"
 msgstr "曲目"
 
-#: src/screen_search.c:49
+#: src/screen_search.c:50
 msgid "name"
 msgstr "名称"
 
-#: src/screen_search.c:50
+#: src/screen_search.c:51
 msgid "genre"
 msgstr "流派"
 
-#: src/screen_search.c:51
+#: src/screen_search.c:52
 msgid "date"
 msgstr "日期"
 
-#: src/screen_search.c:52
+#: src/screen_search.c:53
 msgid "composer"
 msgstr "作曲"
 
-#: src/screen_search.c:53
+#: src/screen_search.c:54
 msgid "performer"
 msgstr "歌手"
 
-#: src/screen_search.c:54
+#: src/screen_search.c:55
 msgid "comment"
 msgstr "注释"
 
-#: src/screen_search.c:63
+#: src/screen_search.c:64
 msgid "file"
 msgstr "文件"
 
-#: src/screen_search.c:83 src/screen_song.c:44
+#: src/screen_search.c:82 ../src/screen_song.c:46
 msgid "Title"
 msgstr "标题"
 
-#: src/screen_search.c:84 src/screen_song.c:43 src/title_bar.c:80
+#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/screen_search.c:85 src/screen_song.c:45
+#: src/screen_search.c:84 ../src/screen_song.c:47
 msgid "Album"
 msgstr "专辑"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:85
 msgid "Filename"
 msgstr "文件名"
 
-#: src/screen_search.c:87
+#: src/screen_search.c:86
 msgid "Artist + Title"
 msgstr "艺术家 + 标题"
 
-#: src/screen_search.c:233
+#: src/screen_search.c:232
 #, c-format
 msgid "Bad search tag %s"
 msgstr "不正确的搜索条目 %s"
 
-#: src/screen_search.c:237
+#: src/screen_search.c:236
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "搜索条目 %s 没有参数"
 
-#: src/screen_search.c:344 src/screen_help.c:147 src/title_bar.c:83
+#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
 msgid "Search"
 msgstr "查找"
 
@@ -378,69 +400,73 @@
 msgid "Search mode: %s"
 msgstr "搜索模式: %s"
 
-#: src/screen_keydef.c:42
-msgid "===> Apply & Save key bindings  "
-msgstr "应用 & 保存快捷键设置  "
-
-#: src/screen_keydef.c:43
-msgid "===> Apply key bindings "
-msgstr "应用快捷键设置 "
-
-#: src/screen_keydef.c:71
+#: src/screen_keydef.c:131
 msgid "You have new key bindings"
 msgstr "你有新绑定的快捷键"
 
-#: src/screen_keydef.c:73
+#: src/screen_keydef.c:133
 msgid "Keybindings unchanged."
 msgstr "取消快捷键变更."
 
-#: src/screen_keydef.c:83
+#: src/screen_keydef.c:143
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "错误: 无法创建文件夹 ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:92 src/screen_keydef.c:99
+#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
 #, c-format
 msgid "Error: %s - %s"
 msgstr "错误 %s - %s"
 
-#: src/screen_keydef.c:101
+#: src/screen_keydef.c:161
 #, c-format
 msgid "Wrote %s"
 msgstr "写入 %s"
 
-#: src/screen_keydef.c:139
+#: src/screen_keydef.c:245
 msgid "Deleted"
 msgstr "已删除"
 
-#: src/screen_keydef.c:160
+#: src/screen_keydef.c:264
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "为 %s 输入新的按键: "
 
-#: src/screen_keydef.c:171
+#: src/screen_keydef.c:274
+msgid "Ctrl-Space can't be used"
+msgstr ""
+
+#: src/screen_keydef.c:280
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "键 %s 已经绑定到 %s"
 
-#: src/screen_keydef.c:181
+#: src/screen_keydef.c:289
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "分配 %s 到 %s"
 
-#: src/screen_keydef.c:212
+#: src/screen_keydef.c:315
+msgid "===> Apply key bindings "
+msgstr "应用快捷键设置 "
+
+#: src/screen_keydef.c:317
+msgid "===> Apply & Save key bindings  "
+msgstr "应用 & 保存快捷键设置  "
+
+#: src/screen_keydef.c:345
 msgid "Add new key"
 msgstr "添加新的键"
 
-#: src/screen_keydef.c:277
+#: src/screen_keydef.c:409
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "提示: 你忘记了保存你的设置?"
 
-#: src/screen_keydef.c:284
+#: src/screen_keydef.c:416
 msgid "Edit key bindings"
 msgstr "编辑快捷键设置"
 
-#: src/screen_keydef.c:286
+#: src/screen_keydef.c:418
 #, c-format
 msgid "Edit keys for %s"
 msgstr "为 %s 编辑快捷键"
@@ -449,142 +475,189 @@
 msgid "Movement"
 msgstr "移动"
 
-#: src/screen_help.c:81
+#: src/screen_help.c:84
 msgid "Global"
 msgstr "全局设定"
 
-#: src/screen_help.c:116 src/command.c:111
+#: src/screen_help.c:119 ../src/command.c:107
 msgid "Playlist screen"
 msgstr "列表页面"
 
-#: src/screen_help.c:118
+#: src/screen_help.c:121
 msgid "Play"
 msgstr "播放"
 
-#: src/screen_help.c:121
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr "上移"
 
-#: src/screen_help.c:122
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr "下移"
 
-#: src/screen_help.c:125
+#: src/screen_help.c:128
 msgid "Center"
 msgstr "当前播放项居中显示"
 
-#: src/screen_help.c:131 src/command.c:113
+#: src/screen_help.c:134 ../src/command.c:109
 msgid "Browse screen"
 msgstr "目录页面"
 
-#: src/screen_help.c:133
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr "进入选中目录/播放选中歌曲"
 
-#: src/screen_help.c:135 src/screen_help.c:150
+#: src/screen_help.c:138 ../src/screen_help.c:153
 msgid "Append song to playlist"
 msgstr "添加到播放列表"
 
-#: src/screen_help.c:137
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "删除播放列表"
 
-#: src/screen_help.c:145 src/command.c:224
+#: src/screen_help.c:148 ../src/command.c:220
 msgid "Search screen"
 msgstr "查找页面"
 
-#: src/screen_help.c:148
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr "选中并播放"
 
-#: src/screen_help.c:157 src/command.c:234
+#: src/screen_help.c:160 ../src/command.c:230
 msgid "Lyrics screen"
 msgstr "歌词页面"
 
-#: src/screen_help.c:159
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr "查看歌词"
 
-#: src/screen_help.c:160
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr "(重新)加载歌词"
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: src/screen_help.c:163
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr "中断歌词下载"
 
-#: src/screen_help.c:164
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr "为当前曲目下载歌词"
 
-#: src/screen_help.c:165
+#: src/screen_help.c:168
+#, fuzzy
+msgid "Add or edit lyrics"
+msgstr "没有歌词"
+
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr "保存歌词"
 
-#: src/screen_help.c:166
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr "删除已保存歌词"
 
-#: src/screen_help.c:171 src/command.c:245
+#: src/screen_help.c:175 ../src/command.c:245
 msgid "Outputs screen"
 msgstr "输出页面"
 
-#: src/screen_help.c:173
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr "启用/禁用音频输出"
 
-#: src/screen_help.c:178
+#: src/screen_help.c:182 ../src/command.c:250
+#, fuzzy
+msgid "Chat screen"
+msgstr "下一页面"
+
+#: src/screen_help.c:184
+msgid "Write a message"
+msgstr ""
+
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr "键定义页面"
 
-#: src/screen_help.c:180
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr "为选择的命令定义快捷键"
 
-#: src/screen_help.c:181
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr "去除选择的快捷键设定"
 
-#: src/screen_help.c:182
+#: src/screen_help.c:193
+#, fuzzy
+msgid "Add a keydef"
+msgstr "添加新的键"
+
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr "上一级"
 
-#: src/screen_help.c:183
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr "保存设置"
 
-#: src/screen_help.c:229 src/title_bar.c:75
+#: src/screen_help.c:241 ../src/title_bar.c:77
 msgid "Help"
 msgstr "帮助"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:182
+#: src/screen_lyrics.c:214
 msgid "No lyrics"
 msgstr "无歌词"
 
-#: src/screen_lyrics.c:265 src/screen_lyrics.c:273 src/screen_lyrics.c:277
-#: src/title_bar.c:86
+#: src/screen_lyrics.c:232
+#, c-format
+msgid "Lyrics timeout occurred after %d seconds"
+msgstr ""
+
+#: src/screen_lyrics.c:335 ../src/screen_lyrics.c:344 src/screen_lyrics.c:354
+#: ../src/title_bar.c:88
 msgid "Lyrics"
 msgstr "歌词"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:268
+#: src/screen_lyrics.c:338
 msgid "loading..."
 msgstr "正在载入..."
 
+#: src/screen_lyrics.c:371
+msgid "Editor not configured"
+msgstr ""
+
+#: src/screen_lyrics.c:377
+#, c-format
+msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+msgstr ""
+
+#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+msgid "Can't start editor"
+msgstr ""
+
+#: src/screen_lyrics.c:422
+#, c-format
+msgid "Editor exited unexpectedly (%d)"
+msgstr ""
+
+#: src/screen_lyrics.c:425
+#, c-format
+msgid "Editor exited unexpectedly (signal %d)"
+msgstr ""
+
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:303
+#: src/screen_lyrics.c:447
 msgid "Lyrics saved"
 msgstr "歌词已保存"
 
-#: src/screen_lyrics.c:310
+#: src/screen_lyrics.c:454
 msgid "Lyrics deleted"
 msgstr "歌词已被删除"
 
-#: src/screen_lyrics.c:313
+#: src/screen_lyrics.c:457
 msgid "No saved lyrics"
 msgstr "没有歌词"
 
@@ -598,96 +671,100 @@
 msgid "Output '%s' disabled"
 msgstr "禁用 '%s' 输出"
 
-#: src/screen_outputs.c:176 src/title_bar.c:89
+#: src/screen_outputs.c:175 ../src/title_bar.c:91
 msgid "Outputs"
 msgstr "输出"
 
-#: src/screen_song.c:46
+#: src/screen_song.c:48
 msgid "Length"
 msgstr "时长"
 
-#: src/screen_song.c:47
+#: src/screen_song.c:49
+msgid "Position"
+msgstr ""
+
+#: src/screen_song.c:50
 msgid "Composer"
 msgstr "作曲"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:51
 msgid "Name"
 msgstr "名字"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:52
 msgid "Disc"
 msgstr "碟片"
 
-#: src/screen_song.c:50
+#: src/screen_song.c:53
 msgid "Track"
 msgstr "音轨"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:54
 msgid "Date"
 msgstr "日期"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:55
 msgid "Genre"
 msgstr "流派"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:56
 msgid "Comment"
 msgstr "注释"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:57
+msgid "Path"
+msgstr "路径"
+
+#: src/screen_song.c:58
 msgid "Bitrate"
 msgstr "比特率"
 
-#: src/screen_song.c:70
+#: src/screen_song.c:74
 msgid "Number of artists"
 msgstr "艺术家总数"
 
-#: src/screen_song.c:71
+#: src/screen_song.c:75
 msgid "Number of albums"
 msgstr "专辑总数"
 
-#: src/screen_song.c:72
+#: src/screen_song.c:76
 msgid "Number of songs"
 msgstr "歌曲总数"
 
-#: src/screen_song.c:73
+#: src/screen_song.c:77
 msgid "Uptime"
 msgstr "启动时间"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:78
 msgid "Most recent db update"
 msgstr "最新DB更新"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:79
 msgid "Playtime"
 msgstr "播放时间"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:80
 msgid "DB playtime"
 msgstr "DB 播放时间"
 
-#: src/screen_song.c:178
+#: src/screen_song.c:182
 msgid "Song viewer"
 msgstr "歌曲查看器"
 
-#: src/screen_song.c:311
-msgid "Path"
-msgstr "路径"
-
-#: src/screen_song.c:316
+#: src/screen_song.c:326
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/screen_song.c:341
+#: src/screen_song.c:351
 msgid "MPD statistics"
 msgstr "MPD统计"
 
-#: src/screen_song.c:396
+#: src/screen_song.c:406
 msgid "Selected song"
 msgstr "选中曲目"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:416
 msgid "Currently playing song"
 msgstr "当前播放曲目"
 
@@ -699,342 +776,361 @@
 msgid "[Paused]"
 msgstr "暂停"
 
-#: src/title_bar.c:96
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume n/a"
 msgstr "音量 n/a"
 
-#: src/title_bar.c:98
+#: src/title_bar.c:103
 #, c-format
 msgid "Volume %d%%"
 msgstr "音量 %d%%"
 
-#: src/command.c:69
+#: src/command.c:65
 msgid "Key configuration screen"
 msgstr "快捷键设置页面"
 
-#: src/command.c:72
+#: src/command.c:68
 msgid "Quit"
 msgstr "退出"
 
-#: src/command.c:76
+#: src/command.c:72
 msgid "Move cursor up"
 msgstr "向上移动光标"
 
-#: src/command.c:78
+#: src/command.c:74
 msgid "Move cursor down"
 msgstr "向下移动光标"
 
-#: src/command.c:80
+#: src/command.c:76
 msgid "Move cursor to the top of screen"
 msgstr "光标移到顶部"
 
-#: src/command.c:82
+#: src/command.c:78
 msgid "Move cursor to the middle of screen"
 msgstr "光标移到中部"
 
-#: src/command.c:84
+#: src/command.c:80
 msgid "Move cursor to the bottom of screen"
 msgstr "光标移到底部"
 
-#: src/command.c:86
+#: src/command.c:82
 msgid "Move cursor to the top of the list"
 msgstr "光标移到列表顶部"
 
-#: src/command.c:88
+#: src/command.c:84
 msgid "Move cursor to the bottom of the list"
 msgstr "光标移到列表底部"
 
-#: src/command.c:90
+#: src/command.c:86
 msgid "Page up"
 msgstr "上一页"
 
-#: src/command.c:92
+#: src/command.c:88
 msgid "Page down"
 msgstr "下一页"
 
-#: src/command.c:94
+#: src/command.c:90
 msgid "Range selection"
 msgstr "区段选择"
 
-#: src/command.c:96
+#: src/command.c:92
 msgid "Scroll up one line"
 msgstr "向上滚动一行"
 
-#: src/command.c:98
+#: src/command.c:94
 msgid "Scroll down one line"
 msgstr "向下滚动一行"
 
-#: src/command.c:100
+#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "向上滚动半屏"
 
-#: src/command.c:102
+#: src/command.c:98
 msgid "Scroll down half a screen"
 msgstr "向下滚动半屏"
 
-#: src/command.c:104
+#: src/command.c:100
 msgid "Select currently playing song"
 msgstr "选择当前播放曲目"
 
-#: src/command.c:109
+#: src/command.c:105
 msgid "Help screen"
 msgstr "帮助页面"
 
-#: src/command.c:118
+#: src/command.c:114
 msgid "Play/Enter directory"
 msgstr "播放/进入 目录"
 
-#: src/command.c:120
+#: src/command.c:116
 msgid "Pause"
 msgstr "暂停"
 
-#: src/command.c:122
+#: src/command.c:118
 msgid "Stop"
 msgstr "停止"
 
-#: src/command.c:124
+#: src/command.c:120
 msgid "Crop"
 msgstr "剪切"
 
-#: src/command.c:126
+#: src/command.c:122
 msgid "Next track"
 msgstr "下一曲"
 
-#: src/command.c:128
+#: src/command.c:124
 msgid "Previous track"
 msgstr "上一曲"
 
-#: src/command.c:130
+#: src/command.c:126
 msgid "Seek forward"
 msgstr "快进"
 
-#: src/command.c:132
+#: src/command.c:128
 msgid "Seek backward"
 msgstr "快退"
 
-#: src/command.c:134
+#: src/command.c:130
 msgid "Increase volume"
 msgstr "增加音量"
 
-#: src/command.c:136
+#: src/command.c:132
 msgid "Decrease volume"
 msgstr "降低音量"
 
-#: src/command.c:138
+#: src/command.c:134
 msgid "Select/deselect song in playlist"
 msgstr "添加/删除选中文件到播放列表"
 
-#: src/command.c:140
+#: src/command.c:136
 msgid "Select all listed items"
 msgstr "选中所有列出的项"
 
-#: src/command.c:142
+#: src/command.c:138
 msgid "Delete song from playlist"
 msgstr "从播放列表中删除歌曲"
 
-#: src/command.c:144
+#: src/command.c:140
 msgid "Shuffle playlist"
 msgstr "随机列表"
 
-#: src/command.c:146
+#: src/command.c:142
 msgid "Clear playlist"
 msgstr "清除播放列表"
 
-#: src/command.c:148
+#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "切换重复模式"
 
-#: src/command.c:150
+#: src/command.c:146
 msgid "Toggle random mode"
 msgstr "切换随机模式"
 
-#: src/command.c:152
+#: src/command.c:148
 msgid "Toggle single mode"
 msgstr "切换单曲模式"
 
-#: src/command.c:154
+#: src/command.c:150
 msgid "Toggle consume mode"
 msgstr "切换消除模式"
 
-#: src/command.c:156
+#: src/command.c:152
 msgid "Toggle crossfade mode"
 msgstr "切换淡入淡出模式"
 
-#: src/command.c:158
+#: src/command.c:154
 msgid "Start a music database update"
 msgstr "更新此数据库"
 
-#: src/command.c:160
+#: src/command.c:156
 msgid "Save playlist"
 msgstr "保存播放列表"
 
-#: src/command.c:162
+#: src/command.c:158
 msgid "Add url/file to playlist"
 msgstr "添加链接/路径到播放列表"
 
-#: src/command.c:165
+#: src/command.c:161
 msgid "Go to root directory"
 msgstr "进入根目录"
 
-#: src/command.c:167
+#: src/command.c:163
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
-#: src/command.c:170
+#: src/command.c:166
 msgid "Locate song in browser"
 msgstr "定位到音乐所在目录"
 
-#: src/command.c:174
+#: src/command.c:170
 msgid "Move item up"
 msgstr "上移"
 
-#: src/command.c:176
+#: src/command.c:172
 msgid "Move item down"
 msgstr "下移"
 
-#: src/command.c:178
+#: src/command.c:174
 msgid "Refresh screen"
 msgstr "刷新页面"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:185
+#: src/command.c:181
 msgid "Toggle find mode"
 msgstr "切换查找模式"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:189
+#: src/command.c:185
 msgid "Toggle auto center mode"
 msgstr "切换自动居中模式"
 
-#: src/command.c:194
+#: src/command.c:190
 msgid "Next screen"
 msgstr "下一页面"
 
-#: src/command.c:196
+#: src/command.c:192
 msgid "Previous screen"
 msgstr "上一页面"
 
-#: src/command.c:198
+#: src/command.c:194
 msgid "Swap to most recent screen"
 msgstr "切换到最近一个页面"
 
-#: src/command.c:203
+#: src/command.c:199
 msgid "Forward find"
 msgstr "前向查找"
 
-#: src/command.c:205
+#: src/command.c:201
 msgid "Forward find next"
 msgstr "查找下一个"
 
-#: src/command.c:207
+#: src/command.c:203
 msgid "Backward find"
 msgstr "后向查找"
 
-#: src/command.c:209
+#: src/command.c:205
 msgid "Backward find previous"
 msgstr "查找前一个"
 
 #. translators: this queries the user for a string
 #. * and jumps directly (while the user is typing)
 #. * to the entry which begins with this string
-#: src/command.c:214
+#: src/command.c:210
 msgid "Jump to"
 msgstr "跳转到"
 
-#: src/command.c:220
+#: src/command.c:216
 msgid "Artist screen"
 msgstr "艺术家页面"
 
-#: src/command.c:226
+#: src/command.c:222
 msgid "Change search mode"
 msgstr "更改搜索模式"
 
-#: src/command.c:230
+#: src/command.c:226
 msgid "View the selected and the currently playing song"
 msgstr "参看选择当前播放的曲目"
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: src/command.c:238
+#: src/command.c:234
 msgid "Interrupt action"
 msgstr "中断后台操作"
 
-#: src/command.c:240
+#: src/command.c:236
 msgid "Update Lyrics"
 msgstr "更新歌词"
 
-#: src/command.c:269
+#: src/command.c:240
+msgid "Edit the current item"
+msgstr ""
+
+#: src/command.c:297
 msgid "Undefined"
 msgstr "未定义的"
 
-#: src/command.c:271
+#: src/command.c:299
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:273
+#: src/command.c:301
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:275
+#: src/command.c:303
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:277
+#: src/command.c:305
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:279
+#: src/command.c:307
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:281
+#: src/command.c:309
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:283
+#: src/command.c:311
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:285
+#: src/command.c:313
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:287
+#: src/command.c:315
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:289
+#: src/command.c:317
 msgid "End"
 msgstr "End"
 
-#: src/command.c:291
+#: src/command.c:319
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:293
+#: src/command.c:321
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:295
+#: src/command.c:323
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:297
+#: src/command.c:325
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:299
+#: src/command.c:327
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:301
+#: src/command.c:329
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:503 src/command.c:509
+#: src/command.c:333
+#, c-format
+msgid "F%d"
+msgstr ""
+
+#: src/command.c:337
+#, c-format
+msgid "Ctrl-%c"
+msgstr ""
+
+#: src/command.c:339
+#, c-format
+msgid "Alt-%c"
+msgstr ""
+
+#: src/command.c:503 ../src/command.c:509
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "按键 %s 分配给 %s 和 %s"
@@ -1058,22 +1154,22 @@
 msgstr "终端不支持彩色"
 
 #. To translators: prefix for error messages
-#: src/conf.c:94
+#: src/conf.c:98
 msgid "Error"
 msgstr "错误"
 
-#: src/conf.c:102 src/conf.c:111
+#: src/conf.c:106 ../src/conf.c:115
 msgid "Malformed hotkey definition"
 msgstr "不正确的快捷键定义"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:138
+#: src/conf.c:142
 msgid "Unknown command"
 msgstr "未知命令"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:151
+#: src/conf.c:155
 msgid "Incomplete hotkey configuration"
 msgstr "不完整的快捷键配置"
 
@@ -1081,53 +1177,53 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: src/conf.c:185
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr "错误的时间显示格式"
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:200
+#: src/conf.c:204
 msgid "Missing '='"
 msgstr "缺少 '='"
 
-#: src/conf.c:256
+#: src/conf.c:260
 msgid "Bad color name"
 msgstr "错误的颜色名"
 
-#: src/conf.c:265
+#: src/conf.c:269
 msgid "Incomplete color definition"
 msgstr "不完整的颜色定义"
 
-#: src/conf.c:271
+#: src/conf.c:275
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: src/conf.c:279
+#: src/conf.c:283
 msgid "Malformed color definition"
 msgstr "不正确的颜色定义"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:313
+#: src/conf.c:317
 msgid "Unknown screen name"
 msgstr "未知的页面名"
 
-#: src/conf.c:342
+#: src/conf.c:346
 msgid "Invalid search mode"
 msgstr "无效的搜索模式"
 
-#: src/conf.c:365
+#: src/conf.c:369
 msgid "Unknown search mode"
 msgstr "未知的搜索模式"
 
-#: src/conf.c:534
+#: src/conf.c:564
 msgid "Unknown configuration parameter"
 msgstr "未知的配置参数"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:221 src/options.c:224
+#: src/options.c:234 ../src/options.c:237
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1136,11 +1232,11 @@
 "deactivatedaccount\n"
 "  snowdream https://launchpad.net/~yanghui"
 
-#: src/list_window.c:582
+#: src/list_window.c:588
 msgid "Range selection disabled"
 msgstr "禁用区段选取"
 
-#: src/list_window.c:587
+#: src/list_window.c:593
 msgid "Range selection enabled"
 msgstr "开启区段选取"

ncmpc-0.20.tar.bz2/src/command.c -> ncmpc-0.21.tar.bz2/src/command.c Changed

ncmpc-0.20.tar.bz2/src/command.h -> ncmpc-0.21.tar.bz2/src/command.h Changed

ncmpc-0.20.tar.bz2/src/conf.c -> ncmpc-0.21.tar.bz2/src/conf.c Changed

@@ -80,6 +80,7 @@
 #define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
 #define CONF_TEXT_EDITOR "text-editor"
 #define CONF_TEXT_EDITOR_ASK "text-editor-ask"
+#define CONF_CHAT_PREFIX "chat-prefix"
 #define CONF_SECOND_COLUMN "second-column"
 
 static bool
@@ -544,6 +545,12 @@
 #else
 		{}
 #endif
+	else if (!strcasecmp(name, CONF_CHAT_PREFIX))
+#ifdef ENABLE_CHAT_SCREEN
+		options.chat_prefix = get_format(value);
+#else
+		{}
+#endif
 	else if (!strcasecmp(CONF_SECOND_COLUMN, name))
 #ifdef NCMPC_MINI
 		{}
@@ -604,19 +611,75 @@
 char *
 build_user_conf_filename(void)
 {
+#ifdef WIN32
+	return g_build_filename(g_get_user_config_dir(), PACKAGE, "ncmpc.conf", NULL);
+#else
 	return g_build_filename(g_get_home_dir(), "." PACKAGE, "config", NULL);
+#endif
 }
 
 char *
 build_system_conf_filename(void)
 {
+#ifdef WIN32
+	const gchar* const *system_data_dirs;
+	gchar *pathname = NULL;
+
+	for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
+	{
+		g_message (*system_data_dirs);
+		pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
+		if (g_file_test(pathname, G_FILE_TEST_EXISTS))
+		{
+			break;
+		}
+		else
+		{
+			g_free (pathname);
+			pathname = NULL;
+		}
+	}
+	return pathname;
+#else
 	return g_build_filename(SYSCONFDIR, PACKAGE, "config", NULL);
+#endif
 }
 
 char *
 build_user_key_binding_filename(void)
 {
+#ifdef WIN32
+	return g_build_filename(g_get_user_config_dir(), PACKAGE, "keys.conf", NULL);
+#else
 	return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
+#endif
+}
+
+static char *
+g_build_system_key_binding_filename(void)
+{
+#ifdef WIN32
+	const gchar* const *system_data_dirs;
+	gchar *pathname = NULL;
+
+	for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
+	{
+		g_message (*system_data_dirs);
+		pathname = g_build_filename(*system_data_dirs, PACKAGE, "keys.conf", NULL);
+		if (g_file_test(pathname, G_FILE_TEST_EXISTS))
+		{
+			break;
+		}
+		else
+		{
+			g_free (pathname);
+			pathname = NULL;
+		}
+	}
+	return pathname;
+#else
+	return g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
+#endif
 }
 
 void
@@ -668,7 +731,7 @@
 
 	/* check for  global key bindings SYSCONFDIR/ncmpc/keys */
 	if (filename == NULL) {
-		filename = g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
+		filename = g_build_system_key_binding_filename();
 		if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
 			g_free(filename);
 			filename = NULL;

ncmpc-0.20.tar.bz2/src/list_window.h -> ncmpc-0.21.tar.bz2/src/list_window.h Changed

ncmpc-0.20.tar.bz2/src/mpdclient.c -> ncmpc-0.21.tar.bz2/src/mpdclient.c Changed

@@ -115,8 +115,10 @@
 		c->idle = false;
 	}
 
-	if (c->connection)
+	if (c->connection) {
 		mpd_connection_free(c->connection);
+		++c->connection_id;
+	}
 	c->connection = NULL;
 
 	if (c->status)
@@ -161,6 +163,8 @@
 		return false;
 	}
 
+	++c->connection_id;
+
 	return true;
 }
 
@@ -650,6 +654,76 @@
 	return true;
 }
 
+#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
+/* The client-to-client protocol (MPD 0.17.0) */
+
+bool
+mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+
+	if (connection == NULL)
+		return false;
+
+	if (!mpd_send_subscribe(connection, channel))
+		return mpdclient_handle_error(c);
+
+	return mpdclient_finish_command(c);
+}
+
+bool
+mpdclient_cmd_unsubscribe(struct mpdclient *c, const char *channel)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	if (!mpd_send_unsubscribe(connection, channel))
+		return mpdclient_handle_error(c);
+
+	return mpdclient_finish_command(c);
+}
+
+bool
+mpdclient_cmd_send_message(struct mpdclient *c, const char *channel,
+			   const char *text)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	if (!mpd_send_send_message(connection, channel, text))
+		return mpdclient_handle_error(c);
+
+	return mpdclient_finish_command(c);
+}
+
+bool
+mpdclient_send_read_messages(struct mpdclient *c)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	return mpd_send_read_messages(connection)?
+		true : mpdclient_handle_error(c);
+}
+
+struct mpd_message *
+mpdclient_recv_message(struct mpdclient *c)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	struct mpd_message *message = mpd_recv_message(connection);
+	if (message == NULL &&
+	    mpd_connection_get_error(connection) != MPD_ERROR_SUCCESS)
+		mpdclient_handle_error(c);
+
+	return message;
+}
+#endif
 
 /****************************************************************************/
 /*** Playlist management functions ******************************************/

ncmpc-0.20.tar.bz2/src/mpdclient.h -> ncmpc-0.21.tar.bz2/src/mpdclient.h Changed

@@ -2,7 +2,6 @@
 #define MPDCLIENT_H
 
 #include "playlist.h"
-#include "mpdclient.h"
 
 #include <mpd/client.h>
 
@@ -15,6 +14,12 @@
 	struct mpd_connection *connection;
 
 	/**
+	 * This attribute is incremented whenever the connection changes
+	 * (i.e. on disconnection and (re-)connection).
+	 */
+	unsigned connection_id;
+
+	/**
 	 * If this object is non-NULL, it tracks idle events.  It is
 	 * automatically called by mpdclient_get_connection() and
 	 * mpdclient_put_connection().  It is not created by the
@@ -159,6 +164,24 @@
 bool
 mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
+#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
+bool
+mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel);
+
+bool
+mpdclient_cmd_unsubscribe(struct mpdclient *c, const char *channel);
+
+bool
+mpdclient_cmd_send_message(struct mpdclient *c, const char *channel,
+			   const char *text);
+
+bool
+mpdclient_send_read_messages(struct mpdclient *c);
+
+struct mpd_message *
+mpdclient_recv_message(struct mpdclient *c);
+#endif
+
 /*** playlist functions  **************************************************/
 
 /* update the complete playlist */

ncmpc-0.20.tar.bz2/src/options.c -> ncmpc-0.21.tar.bz2/src/options.c Changed

ncmpc-0.20.tar.bz2/src/options.h -> ncmpc-0.21.tar.bz2/src/options.h Changed

ncmpc-0.20.tar.bz2/src/screen.c -> ncmpc-0.21.tar.bz2/src/screen.c Changed

ncmpc-0.21.tar.bz2/src/screen_chat.c Added

@@ -0,0 +1,214 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2012 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "screen_chat.h"
+
+#include "screen_interface.h"
+#include "screen_utils.h"
+#include "screen_status.h"
+#include "screen_text.h"
+#include "mpdclient.h"
+#include "i18n.h"
+#include "charset.h"
+#include "options.h"
+
+#include <glib.h>
+#include <mpd/idle.h>
+
+static struct screen_text text; /* rename? */
+static const char chat_channel[] = "chat";
+
+static bool
+check_chat_support(struct mpdclient *c)
+{
+	static unsigned last_connection_id = 0;
+	static bool was_supported = false;
+
+	/* if we're using the same connection as the last time
+	   check_chat_support was called, we can use the cached information
+	   about whether chat is supported */
+	if (c->connection_id == last_connection_id)
+		return was_supported;
+
+	last_connection_id = c->connection_id;
+
+	if (c->connection == NULL)
+		return (was_supported = false);
+
+	if (mpd_connection_cmp_server_version(c->connection, 0, 17, 0) == -1) {
+		const unsigned *version = mpd_connection_get_server_version(c->connection);
+		char *str;
+
+		str = g_strdup_printf(
+			_("connected to MPD %u.%u.%u (you need at least \n"
+			  "version 0.17.0 to use the chat feature)"),
+			version[0], version[1], version[2]);
+		screen_text_append(&text, str);
+		g_free(str);
+
+		return (was_supported = false);
+	}
+
+	/* mpdclient_get_connection? */
+	if (!mpdclient_cmd_subscribe(c, chat_channel))
+		return (was_supported = false);
+	/* mpdclient_put_connection? */
+
+	return (was_supported = true);
+}
+
+static void
+screen_chat_init(WINDOW *w, int cols, int rows)
+{
+	screen_text_init(&text, w, cols, rows);
+}
+
+static void
+screen_chat_exit(void)
+{
+	screen_text_deinit(&text);
+}
+
+static void
+screen_chat_open(struct mpdclient *c)
+{
+	(void) check_chat_support(c);
+}
+
+static void
+screen_chat_resize(int cols, int rows)
+{
+	screen_text_resize(&text, cols, rows);
+}
+
+static void
+screen_chat_paint(void)
+{
+	screen_text_paint(&text);
+}
+
+static void
+process_message(struct mpd_message *message)
+{
+	char *message_text;
+
+	assert(message != NULL);
+	/* You'll have to move this out of screen_chat, if you want to use
+	   client-to-client messages anywhere else */
+	assert(g_strcmp0(mpd_message_get_channel(message), chat_channel) == 0);
+
+	message_text = utf8_to_locale(mpd_message_get_text(message));
+	screen_text_append(&text, message_text);
+	g_free(message_text);
+
+	screen_chat_paint();
+}
+
+static void
+screen_chat_update(struct mpdclient *c)
+{
+	if (check_chat_support(c) && (c->events & MPD_IDLE_MESSAGE)) {
+		if (!mpdclient_send_read_messages(c))
+			return;
+
+		struct mpd_message *message;
+		while ((message = mpdclient_recv_message(c)) != NULL) {
+			process_message(message);
+			mpd_message_free(message);
+		}
+
+		mpdclient_finish_command(c);
+
+		c->events &= ~MPD_IDLE_MESSAGE;
+	}
+}
+
+static char *
+screen_chat_get_prefix(void)
+{
+	static char *prefix = NULL;
+
+	if (prefix)
+		return prefix;
+
+	if (options.chat_prefix) {
+		/* Options are encoded in the "locale" charset */
+		prefix = locale_to_utf8(options.chat_prefix);
+		return prefix;
+	}
+
+	prefix = g_strconcat("<", g_get_user_name(), "> ", NULL);
+	return prefix;
+}
+
+static void
+screen_chat_send_message(struct mpdclient *c, char *msg)
+{
+	char *utf8 = locale_to_utf8(msg);
+	char *prefix = screen_chat_get_prefix();
+	char *full_msg = g_strconcat(prefix, utf8, NULL);
+	g_free(utf8);
+
+	(void) mpdclient_cmd_send_message(c, chat_channel, full_msg);
+	g_free(full_msg);
+}
+
+static bool
+screen_chat_cmd(struct mpdclient *c, command_t cmd)
+{
+	if (screen_text_cmd(&text, c, cmd))
+		return true;
+
+	if (cmd == CMD_PLAY) {
+		char *message = screen_readln(_("Your message"), NULL, NULL, NULL);
+
+		/* the user entered an empty line */
+		if (message == NULL)
+			return true;
+
+		if (check_chat_support(c))
+			screen_chat_send_message(c, message);
+		else
+			screen_status_message(_("Message could not be sent"));
+
+		g_free(message);
+
+		return true;
+	}
+
+	return false;
+}
+
+static const char *
+screen_chat_title(G_GNUC_UNUSED char *s, G_GNUC_UNUSED size_t size)
+{
+	return _("Chat");
+}
+
+const struct screen_functions screen_chat = {
+	.init = screen_chat_init,
+	.exit = screen_chat_exit,
+	.open = screen_chat_open,
+	/* close */
+	.resize = screen_chat_resize,
+	.paint = screen_chat_paint,
+	.update = screen_chat_update,
+	.cmd = screen_chat_cmd,
+	.get_title = screen_chat_title,
+};

ncmpc-0.21.tar.bz2/src/screen_chat.h Added

@@ -0,0 +1,32 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2012 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef NCMPC_SCREEN_CHAT_H
+#define NCMPC_SCREEN_CHAT_H
+
+#include "config.h"
+
+#ifdef ENABLE_CHAT_SCREEN
+
+struct screen_functions;
+extern const struct screen_functions screen_chat;
+
+#endif
+
+#endif

ncmpc-0.20.tar.bz2/src/screen_help.c -> ncmpc-0.21.tar.bz2/src/screen_help.c Changed

ncmpc-0.20.tar.bz2/src/screen_list.c -> ncmpc-0.21.tar.bz2/src/screen_list.c Changed

ncmpc-0.20.tar.bz2/src/screen_lyrics.c -> ncmpc-0.21.tar.bz2/src/screen_lyrics.c Changed

@@ -45,6 +45,8 @@
 
 static struct mpd_song *next_song;
 static bool follow = false;
+/** Set if the cursor position shall be kept during the next lyrics update. */
+static bool reloading = false;
 
 static struct {
 	struct mpd_song *song;
@@ -172,7 +174,19 @@
 static void
 screen_lyrics_set(const GString *str)
 {
-	screen_text_set(&text, str);
+	if (reloading) {
+		unsigned saved_start = text.lw->start;
+
+		screen_text_set(&text, str->str);
+
+		/* restore the cursor and ensure that it's still valid */
+		text.lw->start = saved_start;
+		list_window_fetch_cursor(text.lw);
+	} else {
+		screen_text_set(&text, str->str);
+	}
+
+	reloading = false;
 
 	/* paint new data */
 
@@ -255,6 +269,7 @@
 {
 	if (current.loader == NULL && current.artist != NULL &&
 	    current.title != NULL) {
+		reloading = true;
 		current.loader = lyrics_load(current.artist, current.title,
 					     screen_lyrics_callback, NULL);
 		screen_text_repaint(&text);
@@ -379,6 +394,8 @@
 	pid_t pid = fork();
 	if (pid == -1) {
 		screen_status_printf(("%s (%s)"), _("Can't start editor"), g_strerror(errno));
+		ncu_init();
+		return;
 	} else if (pid == 0) {
 		char path[1024];
 		path_lyr_file(path, sizeof(path), current.artist, current.title);

ncmpc-0.20.tar.bz2/src/screen_queue.c -> ncmpc-0.21.tar.bz2/src/screen_queue.c Changed

ncmpc-0.20.tar.bz2/src/screen_search.c -> ncmpc-0.21.tar.bz2/src/screen_search.c Changed

ncmpc-0.20.tar.bz2/src/screen_song.c -> ncmpc-0.21.tar.bz2/src/screen_song.c Changed

ncmpc-0.20.tar.bz2/src/screen_text.c -> ncmpc-0.21.tar.bz2/src/screen_text.c Changed

@@ -37,44 +37,41 @@
 }
 
 void
-screen_text_set(struct screen_text *text, const GString *str)
+screen_text_append(struct screen_text *text, const char *str)
 {
-	const char *p, *eol, *next;
+	const char *eol, *next;
 
 	assert(str != NULL);
 
-	screen_text_clear(text);
-
-	p = str->str;
-	while ((eol = strchr(p, '\n')) != NULL) {
+	while ((eol = strchr(str, '\n')) != NULL) {
 		char *line;
 
 		next = eol + 1;
 
 		/* strip whitespace at end */
 
-		while (eol > p && (unsigned char)eol[-1] <= 0x20)
+		while (eol > str && (unsigned char)eol[-1] <= 0x20)
 			--eol;
 
 		/* create copy and append it to text->lines */
 
-		line = g_malloc(eol - p + 1);
-		memcpy(line, p, eol - p);
-		line[eol - p] = 0;
+		line = g_malloc(eol - str + 1);
+		memcpy(line, str, eol - str);
+		line[eol - str] = 0;
 
 		g_ptr_array_add(text->lines, line);
 
 		/* reset control characters */
 
-		for (eol = line + (eol - p); line < eol; ++line)
+		for (eol = line + (eol - str); line < eol; ++line)
 			if ((unsigned char)*line < 0x20)
 				*line = ' ';
 
-		p = next;
+		str = next;
 	}
 
-	if (*p != 0)
-		g_ptr_array_add(text->lines, g_strdup(p));
+	if (*str != 0)
+		g_ptr_array_add(text->lines, g_strdup(str));
 
 	list_window_set_length(text->lw, text->lines->len);
 }

ncmpc-0.20.tar.bz2/src/screen_text.h -> ncmpc-0.21.tar.bz2/src/screen_text.h Changed

ncmpc-0.20.tar.bz2/src/strfsong.c -> ncmpc-0.21.tar.bz2/src/strfsong.c Changed

@@ -118,8 +118,12 @@
 	gchar *temp;
 	gsize n, length = 0;
 	gboolean found = FALSE;
+	/* "missed" helps handling the case of mere literal text like
+	   found==TRUE instead of found==FALSE. */
+	gboolean missed = FALSE;
+
+	s[0] = '\0';
 
-	memset(s, 0, max);
 	if (song == NULL)
 		return 0;
 
@@ -127,9 +131,10 @@
 		/* OR */
 		if (p[0] == '|') {
 			++p;
-			if(!found) {
-				memset(s, 0, max);
+			if(missed && !found) {
+				s[0] = '\0';
 				length = 0;
+				missed = FALSE;
 			} else {
 				p = skip(p);
 			}
@@ -139,10 +144,11 @@
 		/* AND */
 		if (p[0] == '&') {
 			++p;
-			if(!found) {
+			if(missed && !found) {
 				p = skip(p);
 			} else {
 				found = FALSE;
+				missed = FALSE;
 			}
 			continue;
 		}
@@ -154,6 +160,8 @@
 				g_strlcat(s, temp, max);
 				length = strlen(s);
 				found = TRUE;
+			} else {
+				missed = TRUE;
 			}
 			g_free(temp);
 			continue;
@@ -162,8 +170,8 @@
 		/* EXPRESSION END */
 		if (p[0] == ']') {
 			if(last) *last = p+1;
-			if(!found && length) {
-				memset(s, 0, max);
+			if(missed && !found && length) {
+				s[0] = '\0';
 				length = 0;
 			}
 			return length;
@@ -172,6 +180,7 @@
 		/* pass-through non-escaped portions of the format string */
 		if (p[0] != '#' && p[0] != '%' && length<max) {
 			s[length++] = *p;
+			s[length] = '\0';
 			p++;
 			continue;
 		}
@@ -179,6 +188,7 @@
 		/* let the escape character escape itself */
 		if (p[0] == '#' && p[1] != '\0' && length<max) {
 			s[length++] = *(p+1);
+			s[length] = '\0';
 			p+=2;
 			continue;
 		}
@@ -196,11 +206,24 @@
 			n--;
 		else if (strncmp("%file%", p, n) == 0)
 			temp = utf8_to_locale(mpd_song_get_uri(song));
-		else if (strncmp("%artist%", p, n) == 0)
+		else if (strncmp("%artist%", p, n) == 0) {
 			temp = song_tag_locale(song, MPD_TAG_ARTIST);
-		else if (strncmp("%title%", p, n) == 0)
+			if (temp == NULL) {
+				temp = song_tag_locale(song, MPD_TAG_PERFORMER);
+				if (temp == NULL)
+					temp = song_tag_locale(song, MPD_TAG_COMPOSER);
+			}
+		} else if (strncmp("%albumartist", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_ALBUM_ARTIST);
+		else if (strncmp("%composer%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_COMPOSER);
+		else if (strncmp("%performer%", p, n) == 0)
+			temp = song_tag_locale(song, MPD_TAG_PERFORMER);
+		else if (strncmp("%title%", p, n) == 0) {
 			temp = song_tag_locale(song, MPD_TAG_TITLE);
-		else if (strncmp("%album%", p, n) == 0)
+			if (temp == NULL)
+				temp = song_tag_locale(song, MPD_TAG_NAME);
+		} else if (strncmp("%album%", p, n) == 0)
 			temp = song_tag_locale(song, MPD_TAG_ALBUM);
 		else if (strncmp("%shortalbum%", p, n) == 0) {
 			temp = song_tag_locale(song, MPD_TAG_ALBUM);
@@ -243,12 +266,14 @@
 		if( temp == NULL) {
 			gsize templen=n;
 			/* just pass-through any unknown specifiers (including esc) */
-			/* drop a null char in so printf stops at the end of this specifier,
-			   but put the real character back in (pseudo-const) */
 			if( length+templen > max )
 				templen = max-length;
-			g_strlcat(s, p,max);
+			gchar *ident = g_strndup(p, templen);
+			g_strlcat(s, ident, max);
 			length+=templen;
+			g_free(ident);
+
+			missed = TRUE;
 		} else {
 			gsize templen = strlen(temp);

ncmpc-0.20.tar.bz2/src/title_bar.c -> ncmpc-0.21.tar.bz2/src/title_bar.c Changed

ncmpc-0.21.tar.bz2/src/win Added

ncmpc-0.21.tar.bz2/src/win/ncmpc_win32_rc.rc.in Added