Packman Build Service PMBS

Changes of Revision 7

ncmpc.changes Changed

ncmpc.spec Changed

ncmpc-0.24.tar.xz/INSTALL -> ncmpc-0.27.tar.xz/INSTALL Changed

ncmpc-0.24.tar.xz/Makefile.am -> ncmpc-0.27.tar.xz/Makefile.am Changed

@@ -5,103 +5,75 @@
 AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 
 AM_CPPFLAGS = \
+	$(CURSES_CFLAGS) \
 	$(LIBMPDCLIENT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBLIRCCLIENT_CFLAGS) \
 	-DLOCALE_DIR=\""$(datadir)/locale"\"\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
-ncmpc_headers = \
-	src/gidle.h \
-	src/mpdclient.h \
-	src/playlist.h \
-	src/filelist.h \
-	src/options.h \
-	src/conf.h \
-	src/command.h \
-	src/ncu.h \
-	src/ncfix.h \
-	src/player_command.h \
-	src/window.h \
-	src/title_bar.h \
-	src/progress_bar.h \
-	src/status_bar.h \
-	src/screen.h \
-	src/screen_status.h \
-	src/screen_interface.h \
-	src/screen_list.h \
-	src/screen_find.h \
-	src/screen_utils.h \
-	src/screen_client.h \
-	src/list_window.h \
-	src/song_paint.h \
-	src/colors.h \
-	src/paint.h \
-	src/hscroll.h \
-	src/charset.h \
-	src/match.h \
-	src/wreadln.h \
-	src/strfsong.h \
-	src/utils.h \
-	src/ncmpc.h \
-	src/defaults.h \
-	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_chat.h \
-	src/screen_text.h \
-	src/plugin.h \
-	src/lyrics.h \
-	src/lirc.h \
-	src/ncmpc_curses.h
-
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
-	$(CURSES_LIB) \
+	$(CURSES_LIBS) \
 	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
 
 src_ncmpc_SOURCES = \
 	src/Compiler.h \
-	$(ncmpc_headers) \
+	src/ncmpc.h \
+	src/defaults.h \
+	src/ncmpc_curses.h \
+	src/i18n.h \
 	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 \
-	src/screen_browser.c \
-	src/screen_file.c \
-	src/list_window.c \
-	src/song_paint.c \
-	src/colors.c \
-	src/charset.c \
-	src/wreadln.c \
-	src/strfsong.c \
-	src/utils.c
+	src/gidle.c src/gidle.h \
+	src/mpdclient.c src/mpdclient.h \
+	src/callbacks.c src/callbacks.h \
+	src/playlist.c src/playlist.h \
+	src/filelist.c src/filelist.h \
+	src/options.c src/options.h \
+	src/command.c src/command.h \
+	src/keyboard.c src/keyboard.h \
+	src/ncfix.h \
+	src/ncu.c src/ncu.h \
+	src/player_command.c src/player_command.h \
+	src/title_bar.c src/title_bar.h \
+	src/progress_bar.c src/progress_bar.h \
+	src/status_bar.c src/status_bar.h \
+	src/screen.c src/screen.h \
+	src/screen_interface.h \
+	src/screen_init.c \
+	src/screen_paint.c \
+	src/screen_utils.c src/screen_utils.h \
+	src/screen_status.c src/screen_status.h \
+	src/screen_list.c src/screen_list.h \
+	src/screen_find.c src/screen_find.h \
+	src/screen_client.c src/screen_client.h \
+	src/screen_queue.c src/screen_queue.h \
+	src/screen_browser.c src/screen_browser.h \
+	src/screen_file.c src/screen_file.h \
+	src/list_window.c src/list_window.h \
+	src/save_playlist.c src/save_playlist.h \
+	src/paint.h \
+	src/song_paint.c src/song_paint.h \
+	src/colors.c src/colors.h \
+	src/charset.c src/charset.h \
+	src/window.h \
+	src/wreadln.c src/wreadln.h \
+	src/strfsong.c src/strfsong.h \
+	src/time_format.c src/time_format.h \
+	src/utils.c src/utils.h
+
+if ENABLE_ASYNC_CONNECT
+src_ncmpc_SOURCES += \
+	src/net/types.h \
+	src/net/socket.c src/net/socket.h \
+	src/net/resolver.c src/net/resolver.h \
+	src/net/async_connect.c src/net/async_connect.h \
+	src/net/async_rconnect.c src/net/async_rconnect.h \
+	src/aconnect.c src/aconnect.h
+endif
 
 #
 # Windows resource file
@@ -115,58 +87,64 @@
 
 src_ncmpc_DEPENDENCIES = src/win/ncmpc_win32_rc.$(OBJEXT)
 src_ncmpc_LDFLAGS = -Wl,src/win/ncmpc_win32_rc.$(OBJEXT)
+else
+src_ncmpc_SOURCES += src/signals.c src/signals.h
 endif
 
 if NCMPC_MINI
 else
 src_ncmpc_SOURCES += \
-	src/hscroll.c \
-	src/match.c \
-	src/conf.c
+	src/db_completion.c src/db_completion.h \
+	src/xterm_title.c src/xterm_title.h \
+	src/hscroll.c src/hscroll.h \
+	src/match.c src/match.h \
+	src/conf.c src/conf.h
 endif
 
 if ENABLE_HELP_SCREEN
-src_ncmpc_SOURCES += src/screen_help.c
+src_ncmpc_SOURCES += src/screen_help.c src/screen_help.h
 endif
 
 if ENABLE_ARTIST_SCREEN
-src_ncmpc_SOURCES += src/screen_artist.c
+src_ncmpc_SOURCES += src/screen_artist.c src/screen_artist.h
 endif
 
 if ENABLE_SEARCH_SCREEN
-src_ncmpc_SOURCES += src/screen_search.c
+src_ncmpc_SOURCES += src/screen_search.c src/screen_search.h
 endif
 
 if ENABLE_SONG_SCREEN
-src_ncmpc_SOURCES += src/screen_song.c
+src_ncmpc_SOURCES += src/screen_song.c src/screen_song.h
 endif
 
 if ENABLE_KEYDEF_SCREEN
-src_ncmpc_SOURCES += src/screen_keydef.c
+src_ncmpc_SOURCES += src/screen_keydef.c src/screen_keydef.h
 endif
 
 if ENABLE_PLUGIN_LIBRARY
-src_ncmpc_SOURCES += src/plugin.c
+src_ncmpc_SOURCES += src/plugin.c src/plugin.h
 endif
 
 if ENABLE_SCREEN_TEXT
-src_ncmpc_SOURCES += src/screen_text.c
+src_ncmpc_SOURCES += src/screen_text.c src/screen_text.h
 endif
 
 if ENABLE_LYRICS_SCREEN
-src_ncmpc_SOURCES += src/screen_lyrics.c src/lyrics.c
+src_ncmpc_SOURCES += \
+	src/screen_lyrics.c src/screen_lyrics.h \
+	src/lyrics.c src/lyrics.h
 endif
 
 if ENABLE_OUTPUTS_SCREEN
-src_ncmpc_SOURCES += src/screen_outputs.c
+src_ncmpc_SOURCES += src/screen_outputs.c src/screen_outputs.h
 endif
 
 if ENABLE_CHAT_SCREEN
-src_ncmpc_SOURCES += src/screen_chat.c
+src_ncmpc_SOURCES += src/screen_chat.c src/screen_chat.h
 endif
 
 if ENABLE_LIRC
-src_ncmpc_SOURCES += src/lirc.c
+src_ncmpc_SOURCES += src/lirc.c src/lirc.h
 endif
 
 
@@ -186,7 +164,7 @@
 
 test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
 test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
-test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
+test_run_hscroll_LDADD = $(CURSES_LIBS) $(GLIB_LIBS)
 
 #
 # sparse

ncmpc-0.24.tar.xz/Makefile.in -> ncmpc-0.27.tar.xz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -81,51 +91,58 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = src/ncmpc$(EXEEXT)
+@ENABLE_ASYNC_CONNECT_TRUE@am__append_1 = \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/types.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/socket.c src/net/socket.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/resolver.c src/net/resolver.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_connect.c src/net/async_connect.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_rconnect.c src/net/async_rconnect.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/aconnect.c src/aconnect.h
+
 @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 \
-@NCMPC_MINI_FALSE@	src/conf.c
-
-@ENABLE_HELP_SCREEN_TRUE@am__append_2 = src/screen_help.c
-@ENABLE_ARTIST_SCREEN_TRUE@am__append_3 = src/screen_artist.c
-@ENABLE_SEARCH_SCREEN_TRUE@am__append_4 = src/screen_search.c
-@ENABLE_SONG_SCREEN_TRUE@am__append_5 = src/screen_song.c
-@ENABLE_KEYDEF_SCREEN_TRUE@am__append_6 = src/screen_keydef.c
-@ENABLE_PLUGIN_LIBRARY_TRUE@am__append_7 = src/plugin.c
-@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_CHAT_SCREEN_TRUE@am__append_11 = src/screen_chat.c
-@ENABLE_LIRC_TRUE@am__append_12 = src/lirc.c
+@HAVE_WINDOWS_FALSE@am__append_2 = src/signals.c src/signals.h
+@NCMPC_MINI_FALSE@am__append_3 = \
+@NCMPC_MINI_FALSE@	src/db_completion.c src/db_completion.h \
+@NCMPC_MINI_FALSE@	src/xterm_title.c src/xterm_title.h \
+@NCMPC_MINI_FALSE@	src/hscroll.c src/hscroll.h \
+@NCMPC_MINI_FALSE@	src/match.c src/match.h \
+@NCMPC_MINI_FALSE@	src/conf.c src/conf.h
+
+@ENABLE_HELP_SCREEN_TRUE@am__append_4 = src/screen_help.c src/screen_help.h
+@ENABLE_ARTIST_SCREEN_TRUE@am__append_5 = src/screen_artist.c src/screen_artist.h
+@ENABLE_SEARCH_SCREEN_TRUE@am__append_6 = src/screen_search.c src/screen_search.h
+@ENABLE_SONG_SCREEN_TRUE@am__append_7 = src/screen_song.c src/screen_song.h
+@ENABLE_KEYDEF_SCREEN_TRUE@am__append_8 = src/screen_keydef.c src/screen_keydef.h
+@ENABLE_PLUGIN_LIBRARY_TRUE@am__append_9 = src/plugin.c src/plugin.h
+@ENABLE_SCREEN_TEXT_TRUE@am__append_10 = src/screen_text.c src/screen_text.h
+@ENABLE_LYRICS_SCREEN_TRUE@am__append_11 = \
+@ENABLE_LYRICS_SCREEN_TRUE@	src/screen_lyrics.c src/screen_lyrics.h \
+@ENABLE_LYRICS_SCREEN_TRUE@	src/lyrics.c src/lyrics.h
+
+@ENABLE_OUTPUTS_SCREEN_TRUE@am__append_12 = src/screen_outputs.c src/screen_outputs.h
+@ENABLE_CHAT_SCREEN_TRUE@am__append_13 = src/screen_chat.c src/screen_chat.h
+@ENABLE_LIRC_TRUE@am__append_14 = src/lirc.c src/lirc.h
 check_PROGRAMS = test/run_hscroll$(EXEEXT)
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in \
-	$(top_srcdir)/src/win/ncmpc_win32_rc.rc.in \
-	$(top_srcdir)/doc/doxygen.conf.in $(top_srcdir)/build/depcomp \
-	AUTHORS COPYING INSTALL NEWS README build/compile \
-	build/config.guess build/config.sub build/depcomp \
-	build/install-sh build/missing $(top_srcdir)/build/compile \
-	$(top_srcdir)/build/config.guess \
-	$(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \
-	$(top_srcdir)/build/missing
 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 \
 	$(top_srcdir)/m4/ax_append_link_flags.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
+	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 \
-	$(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/glib-gettext.m4 \
+	$(top_srcdir)/m4/mpd_with_flags.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -135,73 +152,93 @@
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lyricsdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
 PROGRAMS = $(bin_PROGRAMS)
-am__src_ncmpc_SOURCES_DIST = src/Compiler.h src/gidle.h \
-	src/mpdclient.h src/playlist.h src/filelist.h src/options.h \
-	src/conf.h src/command.h src/ncu.h src/ncfix.h \
-	src/player_command.h src/window.h src/title_bar.h \
-	src/progress_bar.h src/status_bar.h src/screen.h \
-	src/screen_status.h src/screen_interface.h src/screen_list.h \
-	src/screen_find.h src/screen_utils.h src/screen_client.h \
-	src/list_window.h src/song_paint.h src/colors.h src/paint.h \
-	src/hscroll.h src/charset.h src/match.h src/wreadln.h \
-	src/strfsong.h src/utils.h src/ncmpc.h src/defaults.h \
-	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_chat.h \
-	src/screen_text.h src/plugin.h src/lyrics.h src/lirc.h \
-	src/ncmpc_curses.h 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 \
-	src/screen_browser.c src/screen_file.c src/list_window.c \
-	src/song_paint.c src/colors.c src/charset.c src/wreadln.c \
-	src/strfsong.c src/utils.c src/hscroll.c src/match.c \
-	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/screen_chat.c src/lirc.c
-am__objects_1 =
+am__src_ncmpc_SOURCES_DIST = src/Compiler.h src/ncmpc.h src/defaults.h \
+	src/ncmpc_curses.h src/i18n.h src/main.c src/gidle.c \
+	src/gidle.h src/mpdclient.c src/mpdclient.h src/callbacks.c \
+	src/callbacks.h src/playlist.c src/playlist.h src/filelist.c \
+	src/filelist.h src/options.c src/options.h src/command.c \
+	src/command.h src/keyboard.c src/keyboard.h src/ncfix.h \
+	src/ncu.c src/ncu.h src/player_command.c src/player_command.h \
+	src/title_bar.c src/title_bar.h src/progress_bar.c \
+	src/progress_bar.h src/status_bar.c src/status_bar.h \
+	src/screen.c src/screen.h src/screen_interface.h \
+	src/screen_init.c src/screen_paint.c src/screen_utils.c \
+	src/screen_utils.h src/screen_status.c src/screen_status.h \
+	src/screen_list.c src/screen_list.h src/screen_find.c \
+	src/screen_find.h src/screen_client.c src/screen_client.h \
+	src/screen_queue.c src/screen_queue.h src/screen_browser.c \
+	src/screen_browser.h src/screen_file.c src/screen_file.h \
+	src/list_window.c src/list_window.h src/save_playlist.c \
+	src/save_playlist.h src/paint.h src/song_paint.c \
+	src/song_paint.h src/colors.c src/colors.h src/charset.c \
+	src/charset.h src/window.h src/wreadln.c src/wreadln.h \
+	src/strfsong.c src/strfsong.h src/time_format.c \
+	src/time_format.h src/utils.c src/utils.h src/net/types.h \
+	src/net/socket.c src/net/socket.h src/net/resolver.c \
+	src/net/resolver.h src/net/async_connect.c \
+	src/net/async_connect.h src/net/async_rconnect.c \
+	src/net/async_rconnect.h src/aconnect.c src/aconnect.h \
+	src/signals.c src/signals.h src/db_completion.c \
+	src/db_completion.h src/xterm_title.c src/xterm_title.h \
+	src/hscroll.c src/hscroll.h src/match.c src/match.h src/conf.c \
+	src/conf.h src/screen_help.c src/screen_help.h \
+	src/screen_artist.c src/screen_artist.h src/screen_search.c \
+	src/screen_search.h src/screen_song.c src/screen_song.h \
+	src/screen_keydef.c src/screen_keydef.h src/plugin.c \
+	src/plugin.h src/screen_text.c src/screen_text.h \
+	src/screen_lyrics.c src/screen_lyrics.h src/lyrics.c \
+	src/lyrics.h src/screen_outputs.c src/screen_outputs.h \
+	src/screen_chat.c src/screen_chat.h src/lirc.c src/lirc.h
 am__dirstamp = $(am__leading_dot)dirstamp
-@NCMPC_MINI_FALSE@am__objects_2 = src/hscroll.$(OBJEXT) \
-@NCMPC_MINI_FALSE@	src/match.$(OBJEXT) src/conf.$(OBJEXT)
-@ENABLE_HELP_SCREEN_TRUE@am__objects_3 = src/screen_help.$(OBJEXT)
-@ENABLE_ARTIST_SCREEN_TRUE@am__objects_4 =  \
+@ENABLE_ASYNC_CONNECT_TRUE@am__objects_1 = src/net/socket.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/resolver.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_connect.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_rconnect.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/aconnect.$(OBJEXT)
+@HAVE_WINDOWS_FALSE@am__objects_2 = src/signals.$(OBJEXT)
+@NCMPC_MINI_FALSE@am__objects_3 = src/db_completion.$(OBJEXT) \
+@NCMPC_MINI_FALSE@	src/xterm_title.$(OBJEXT) \
+@NCMPC_MINI_FALSE@	src/hscroll.$(OBJEXT) src/match.$(OBJEXT) \
+@NCMPC_MINI_FALSE@	src/conf.$(OBJEXT)
+@ENABLE_HELP_SCREEN_TRUE@am__objects_4 = src/screen_help.$(OBJEXT)
+@ENABLE_ARTIST_SCREEN_TRUE@am__objects_5 =  \
 @ENABLE_ARTIST_SCREEN_TRUE@	src/screen_artist.$(OBJEXT)
-@ENABLE_SEARCH_SCREEN_TRUE@am__objects_5 =  \
+@ENABLE_SEARCH_SCREEN_TRUE@am__objects_6 =  \
 @ENABLE_SEARCH_SCREEN_TRUE@	src/screen_search.$(OBJEXT)
-@ENABLE_SONG_SCREEN_TRUE@am__objects_6 = src/screen_song.$(OBJEXT)
-@ENABLE_KEYDEF_SCREEN_TRUE@am__objects_7 =  \
+@ENABLE_SONG_SCREEN_TRUE@am__objects_7 = src/screen_song.$(OBJEXT)
+@ENABLE_KEYDEF_SCREEN_TRUE@am__objects_8 =  \
 @ENABLE_KEYDEF_SCREEN_TRUE@	src/screen_keydef.$(OBJEXT)
-@ENABLE_PLUGIN_LIBRARY_TRUE@am__objects_8 = src/plugin.$(OBJEXT)
-@ENABLE_SCREEN_TEXT_TRUE@am__objects_9 = src/screen_text.$(OBJEXT)
-@ENABLE_LYRICS_SCREEN_TRUE@am__objects_10 =  \
+@ENABLE_PLUGIN_LIBRARY_TRUE@am__objects_9 = src/plugin.$(OBJEXT)
+@ENABLE_SCREEN_TEXT_TRUE@am__objects_10 = src/screen_text.$(OBJEXT)
+@ENABLE_LYRICS_SCREEN_TRUE@am__objects_11 =  \
 @ENABLE_LYRICS_SCREEN_TRUE@	src/screen_lyrics.$(OBJEXT) \
 @ENABLE_LYRICS_SCREEN_TRUE@	src/lyrics.$(OBJEXT)
-@ENABLE_OUTPUTS_SCREEN_TRUE@am__objects_11 =  \
+@ENABLE_OUTPUTS_SCREEN_TRUE@am__objects_12 =  \
 @ENABLE_OUTPUTS_SCREEN_TRUE@	src/screen_outputs.$(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/main.$(OBJEXT) \
-	src/gidle.$(OBJEXT) src/mpdclient.$(OBJEXT) \
+@ENABLE_CHAT_SCREEN_TRUE@am__objects_13 = src/screen_chat.$(OBJEXT)
+@ENABLE_LIRC_TRUE@am__objects_14 = src/lirc.$(OBJEXT)
+am_src_ncmpc_OBJECTS = src/main.$(OBJEXT) src/gidle.$(OBJEXT) \
+	src/mpdclient.$(OBJEXT) src/callbacks.$(OBJEXT) \
 	src/playlist.$(OBJEXT) src/filelist.$(OBJEXT) \
-	src/options.$(OBJEXT) src/command.$(OBJEXT) src/ncu.$(OBJEXT) \
+	src/options.$(OBJEXT) src/command.$(OBJEXT) \
+	src/keyboard.$(OBJEXT) src/ncu.$(OBJEXT) \
 	src/player_command.$(OBJEXT) src/title_bar.$(OBJEXT) \
 	src/progress_bar.$(OBJEXT) src/status_bar.$(OBJEXT) \
-	src/screen.$(OBJEXT) src/screen_status.$(OBJEXT) \
-	src/screen_list.$(OBJEXT) src/screen_find.$(OBJEXT) \
-	src/screen_utils.$(OBJEXT) src/screen_client.$(OBJEXT) \
+	src/screen.$(OBJEXT) src/screen_init.$(OBJEXT) \
+	src/screen_paint.$(OBJEXT) src/screen_utils.$(OBJEXT) \
+	src/screen_status.$(OBJEXT) src/screen_list.$(OBJEXT) \
+	src/screen_find.$(OBJEXT) src/screen_client.$(OBJEXT) \
 	src/screen_queue.$(OBJEXT) src/screen_browser.$(OBJEXT) \
 	src/screen_file.$(OBJEXT) src/list_window.$(OBJEXT) \
-	src/song_paint.$(OBJEXT) src/colors.$(OBJEXT) \
-	src/charset.$(OBJEXT) src/wreadln.$(OBJEXT) \
-	src/strfsong.$(OBJEXT) src/utils.$(OBJEXT) $(am__objects_2) \
-	$(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_13)
+	src/save_playlist.$(OBJEXT) src/song_paint.$(OBJEXT) \
+	src/colors.$(OBJEXT) src/charset.$(OBJEXT) \
+	src/wreadln.$(OBJEXT) src/strfsong.$(OBJEXT) \
+	src/time_format.$(OBJEXT) src/utils.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(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_13) \
+	$(am__objects_14)
 src_ncmpc_OBJECTS = $(am_src_ncmpc_OBJECTS)
 am__DEPENDENCIES_1 =
 src_ncmpc_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(src_ncmpc_LDFLAGS) \
@@ -211,7 +248,8 @@
 	src/test_run_hscroll-hscroll.$(OBJEXT) \
 	src/test_run_hscroll-charset.$(OBJEXT)
 test_run_hscroll_OBJECTS = $(am_test_run_hscroll_OBJECTS)
-test_run_hscroll_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_run_hscroll_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -322,6 +360,14 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/build/compile $(top_srcdir)/build/config.guess \
+	$(top_srcdir)/build/config.sub $(top_srcdir)/build/depcomp \
+	$(top_srcdir)/build/install-sh $(top_srcdir)/build/missing \
+	$(top_srcdir)/doc/doxygen.conf.in \
+	$(top_srcdir)/src/win/ncmpc_win32_rc.rc.in AUTHORS COPYING \
+	INSTALL NEWS README build/compile build/config.guess \
+	build/config.sub build/depcomp build/install-sh build/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -379,7 +425,8 @@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-CURSES_LIB = @CURSES_LIB@
+CURSES_CFLAGS = @CURSES_CFLAGS@
+CURSES_LIBS = @CURSES_LIBS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
 DEFS = @DEFS@
@@ -493,6 +540,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -507,90 +555,53 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 AM_CPPFLAGS = \
+	$(CURSES_CFLAGS) \
 	$(LIBMPDCLIENT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBLIRCCLIENT_CFLAGS) \
 	-DLOCALE_DIR=\""$(datadir)/locale"\"\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
-ncmpc_headers = \
-	src/gidle.h \
-	src/mpdclient.h \
-	src/playlist.h \
-	src/filelist.h \
-	src/options.h \
-	src/conf.h \
-	src/command.h \
-	src/ncu.h \
-	src/ncfix.h \
-	src/player_command.h \
-	src/window.h \
-	src/title_bar.h \
-	src/progress_bar.h \
-	src/status_bar.h \
-	src/screen.h \
-	src/screen_status.h \
-	src/screen_interface.h \
-	src/screen_list.h \
-	src/screen_find.h \
-	src/screen_utils.h \
-	src/screen_client.h \
-	src/list_window.h \
-	src/song_paint.h \
-	src/colors.h \
-	src/paint.h \
-	src/hscroll.h \
-	src/charset.h \
-	src/match.h \
-	src/wreadln.h \
-	src/strfsong.h \
-	src/utils.h \
-	src/ncmpc.h \
-	src/defaults.h \
-	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_chat.h \
-	src/screen_text.h \
-	src/plugin.h \
-	src/lyrics.h \
-	src/lirc.h \
-	src/ncmpc_curses.h
-
 src_ncmpc_LDADD = \
-	$(CURSES_LIB) \
+	$(CURSES_LIBS) \
 	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
 
-src_ncmpc_SOURCES = src/Compiler.h $(ncmpc_headers) 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 src/screen_browser.c src/screen_file.c \
-	src/list_window.c src/song_paint.c src/colors.c src/charset.c \
-	src/wreadln.c src/strfsong.c src/utils.c $(am__append_1) \
+src_ncmpc_SOURCES = src/Compiler.h src/ncmpc.h src/defaults.h \
+	src/ncmpc_curses.h src/i18n.h src/main.c src/gidle.c \
+	src/gidle.h src/mpdclient.c src/mpdclient.h src/callbacks.c \
+	src/callbacks.h src/playlist.c src/playlist.h src/filelist.c \
+	src/filelist.h src/options.c src/options.h src/command.c \
+	src/command.h src/keyboard.c src/keyboard.h src/ncfix.h \
+	src/ncu.c src/ncu.h src/player_command.c src/player_command.h \
+	src/title_bar.c src/title_bar.h src/progress_bar.c \
+	src/progress_bar.h src/status_bar.c src/status_bar.h \
+	src/screen.c src/screen.h src/screen_interface.h \
+	src/screen_init.c src/screen_paint.c src/screen_utils.c \
+	src/screen_utils.h src/screen_status.c src/screen_status.h \
+	src/screen_list.c src/screen_list.h src/screen_find.c \
+	src/screen_find.h src/screen_client.c src/screen_client.h \
+	src/screen_queue.c src/screen_queue.h src/screen_browser.c \
+	src/screen_browser.h src/screen_file.c src/screen_file.h \
+	src/list_window.c src/list_window.h src/save_playlist.c \
+	src/save_playlist.h src/paint.h src/song_paint.c \
+	src/song_paint.h src/colors.c src/colors.h src/charset.c \
+	src/charset.h src/window.h src/wreadln.c src/wreadln.h \
+	src/strfsong.c src/strfsong.h src/time_format.c \
+	src/time_format.h src/utils.c src/utils.h $(am__append_1) \
 	$(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_12)
+	$(am__append_11) $(am__append_12) $(am__append_13) \
+	$(am__append_14)
 @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)
-test_run_hscroll_LDADD = @CURSES_LIB@ $(GLIB_LIBS)
+test_run_hscroll_LDADD = $(CURSES_LIBS) $(GLIB_LIBS)
 
 #
 # sparse
@@ -657,7 +668,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -750,6 +760,8 @@
 src/gidle.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/mpdclient.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/callbacks.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/playlist.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/filelist.$(OBJEXT): src/$(am__dirstamp) \
@@ -758,6 +770,8 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/command.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/keyboard.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/ncu.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/player_command.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
@@ -769,14 +783,18 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/screen.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/screen_init.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/screen_paint.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/screen_utils.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_status.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_list.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_find.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
-src/screen_utils.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_client.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/screen_queue.$(OBJEXT): src/$(am__dirstamp) \
@@ -787,6 +805,8 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/list_window.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/save_playlist.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/song_paint.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/colors.$(OBJEXT): src/$(am__dirstamp) \
@@ -797,7 +817,31 @@
 	src/$(DEPDIR)/$(am__dirstamp)
 src/strfsong.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/time_format.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/utils.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/net/$(am__dirstamp):
+	@$(MKDIR_P) src/net
+	@: > src/net/$(am__dirstamp)
+src/net/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) src/net/$(DEPDIR)
+	@: > src/net/$(DEPDIR)/$(am__dirstamp)
+src/net/socket.$(OBJEXT): src/net/$(am__dirstamp) \
+	src/net/$(DEPDIR)/$(am__dirstamp)
+src/net/resolver.$(OBJEXT): src/net/$(am__dirstamp) \
+	src/net/$(DEPDIR)/$(am__dirstamp)
+src/net/async_connect.$(OBJEXT): src/net/$(am__dirstamp) \
+	src/net/$(DEPDIR)/$(am__dirstamp)
+src/net/async_rconnect.$(OBJEXT): src/net/$(am__dirstamp) \
+	src/net/$(DEPDIR)/$(am__dirstamp)
+src/aconnect.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/signals.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/db_completion.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/xterm_title.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/hscroll.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/match.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
@@ -884,18 +928,23 @@
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f src/*.$(OBJEXT)
+	-rm -f src/net/*.$(OBJEXT)
 	-rm -f test/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/aconnect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/callbacks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/charset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/colors.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/conf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/db_completion.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/filelist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/gidle.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/hscroll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/keyboard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lirc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/list_window.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/lyrics.Po@am__quote@
@@ -908,6 +957,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/playlist.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/plugin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/progress_bar.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/save_playlist.Po@am__quote@
 @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@
@@ -916,24 +966,33 @@
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_help.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_init.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_keydef.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_lyrics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_outputs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_paint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_queue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_search.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_song.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_status.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_text.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/signals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/song_paint.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/status_bar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/strfsong.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_run_hscroll-charset.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_run_hscroll-hscroll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time_format.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/title_bar.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/wreadln.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/xterm_title.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/net/$(DEPDIR)/async_connect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/net/$(DEPDIR)/async_rconnect.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/net/$(DEPDIR)/resolver.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/net/$(DEPDIR)/socket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po@am__quote@
 
 .c.o:
@@ -1244,15 +1303,15 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
-	@echo WARNING: "Support for shar distribution archives is" \
-	               "deprecated." >&2
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	@echo WARNING: "Support for distribution archives compressed with" \
-		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
@@ -1288,17 +1347,17 @@
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	    --srcdir=.. --prefix="$$dc_install_base" \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1391,6 +1450,8 @@
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f src/$(DEPDIR)/$(am__dirstamp)
 	-rm -f src/$(am__dirstamp)
+	-rm -f src/net/$(DEPDIR)/$(am__dirstamp)
+	-rm -f src/net/$(am__dirstamp)
 	-rm -f test/$(DEPDIR)/$(am__dirstamp)
 	-rm -f test/$(am__dirstamp)
 
@@ -1405,7 +1466,7 @@
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR) test/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/net/$(DEPDIR) test/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -1453,7 +1514,7 @@
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR) test/$(DEPDIR)
+	-rm -rf src/$(DEPDIR) src/net/$(DEPDIR) test/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1496,6 +1557,8 @@
 	uninstall-am uninstall-binPROGRAMS uninstall-docDATA \
 	uninstall-lyricsSCRIPTS uninstall-man uninstall-man1
 
+.PRECIOUS: Makefile
+
 
 #
 # Windows resource file

ncmpc-0.24.tar.xz/NEWS -> ncmpc-0.27.tar.xz/NEWS Changed

ncmpc-0.24.tar.xz/aclocal.m4 -> ncmpc-0.27.tar.xz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,45 +20,7 @@
 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'.])])
 
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 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.14.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -89,14 +51,14 @@
 # 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.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,15 +103,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,7 +141,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -371,7 +332,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -447,7 +408,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -537,8 +498,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -612,6 +573,9 @@
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
 fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -641,7 +605,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -652,7 +616,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -662,7 +626,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -683,7 +647,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -733,7 +697,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,7 +736,7 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -801,7 +765,7 @@
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -848,7 +812,7 @@
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -867,7 +831,7 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -948,7 +912,7 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1008,7 +972,7 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1036,7 +1000,7 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1055,7 +1019,7 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1191,8 +1155,10 @@
 m4_include([m4/ax_append_link_flags.m4])
 m4_include([m4/ax_check_compile_flag.m4])
 m4_include([m4/ax_check_link_flag.m4])
+m4_include([m4/ax_require_defined.m4])
 m4_include([m4/ax_with_curses.m4])
 m4_include([m4/glib-gettext.m4])
+m4_include([m4/mpd_with_flags.m4])
 m4_include([m4/nls.m4])
 m4_include([m4/pkg.m4])
 m4_include([m4/po.m4])

ncmpc-0.24.tar.xz/build/compile -> ncmpc-0.27.tar.xz/build/compile Changed

ncmpc-0.24.tar.xz/build/config.guess -> ncmpc-0.27.tar.xz/build/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2016-10-02'
 
 # 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
@@ -24,12 +24,12 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 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."
@@ -168,19 +168,29 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv[0-9]$.*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,9 @@
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +275,42 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +383,16 @@
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -393,7 +417,7 @@
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -579,8 +603,9 @@
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -617,13 +642,13 @@
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -662,11 +687,11 @@
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -679,12 +704,12 @@
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -789,14 +814,14 @@
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -878,7 +903,7 @@
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -901,7 +926,7 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -932,6 +957,9 @@
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -944,6 +972,9 @@
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -969,6 +1000,9 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1001,6 +1035,9 @@
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1020,7 +1057,7 @@
 	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
@@ -1099,7 +1136,7 @@
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1248,6 +1285,9 @@
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1261,9 +1301,9 @@
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1285,7 +1325,7 @@
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1316,7 +1356,7 @@
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1358,7 +1398,7 @@
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1369,23 +1409,25 @@
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches@gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp

ncmpc-0.24.tar.xz/build/config.sub -> ncmpc-0.27.tar.xz/build/config.sub Changed

ncmpc-0.24.tar.xz/build/depcomp -> ncmpc-0.27.tar.xz/build/depcomp Changed

ncmpc-0.24.tar.xz/build/install-sh -> ncmpc-0.27.tar.xz/build/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -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)
+        is_target_a_directory=always
+        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;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X$//$[^/]' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/\/$$/{
-		   s//\1/
-		   q
-		 }
-		 /^X$\/$.*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,81 @@
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
+            # lower collision chance
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
+            # that nobody tries to guess the $tmpdir name.
+            if (umask $mkdir_umask &&
+                $mkdirprog $mkdir_mode "$tmpdir" &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   test_tmpdir="$tmpdir/a"
+                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +377,51 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix='/';;
-	[-=!]*) prefix='./';;
-	*)  prefix='';;
+        /*) prefix='/';;
+        [-=!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +456,12 @@
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +474,24 @@
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1

ncmpc-0.24.tar.xz/build/missing -> ncmpc-0.27.tar.xz/build/missing Changed

ncmpc-0.24.tar.xz/config.h.in -> ncmpc-0.27.tar.xz/config.h.in Changed

ncmpc-0.24.tar.xz/configure -> ncmpc-0.27.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ncmpc 0.24.
+# Generated by GNU Autoconf 2.69 for ncmpc 0.27.
 #
 # Report bugs to <max@duempel.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='ncmpc'
 PACKAGE_TARNAME='ncmpc'
-PACKAGE_VERSION='0.24'
-PACKAGE_STRING='ncmpc 0.24'
+PACKAGE_VERSION='0.27'
+PACKAGE_STRING='ncmpc 0.27'
 PACKAGE_BUGREPORT='max@duempel.org'
 PACKAGE_URL=''
 
@@ -661,6 +661,8 @@
 ENABLE_LIRC_TRUE
 LIBLIRCCLIENT_LIBS
 LIBLIRCCLIENT_CFLAGS
+ENABLE_ASYNC_CONNECT_FALSE
+ENABLE_ASYNC_CONNECT_TRUE
 XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
@@ -692,9 +694,6 @@
 LIBMPDCLIENT_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 HAVE_WINDOWS_FALSE
 HAVE_WINDOWS_TRUE
 WINDRES
@@ -708,7 +707,11 @@
 build
 NCMPC_MINI_FALSE
 NCMPC_MINI_TRUE
-CURSES_LIB
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+CURSES_CFLAGS
+CURSES_LIBS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -772,6 +775,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -802,6 +806,8 @@
 enable_multibyte
 enable_locale
 enable_nls
+enable_tcp
+enable_async_connect
 enable_colors
 enable_lirc
 enable_help_screen
@@ -827,7 +833,8 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CURSES_LIB
+CURSES_LIBS
+CURSES_CFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -876,6 +883,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1128,6 +1136,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1265,7 +1282,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1378,7 +1395,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.24 to adapt to many kinds of systems.
+\`configure' configures ncmpc 0.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1418,6 +1435,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1448,7 +1466,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ncmpc 0.24:";;
+     short | recursive ) echo "Configuration of ncmpc 0.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1467,6 +1485,8 @@
   --disable-multibyte     Disable multibyte character support [default=yes]
   --disable-locale        Disable locale support [default=auto]
   --disable-nls           do not use Native Language Support
+  --disable-tcp           Disable TCP support [default=enabled]
+  --enable-async-connect  Disable asynchronous connect [default=yes]
   --enable-colors         Enable color support
   --enable-lirc           Enable LIRC support
   --enable-help-screen    Enable the help screen [default=yes]
@@ -1500,7 +1520,9 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CURSES_LIB  linker library for Curses, e.g. -lcurses
+  CURSES_LIBS linker library for Curses, e.g. -lcurses
+  CURSES_CFLAGS
+              preprocessor flags for Curses, e.g. -I/usr/include/ncursesw
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1584,7 +1606,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ncmpc configure 0.24
+ncmpc configure 0.27
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1953,7 +1975,7 @@
 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.24, which was
+It was created by ncmpc $as_me 0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2303,7 +2325,7 @@
 
 
 VERSION_MAJOR=0
-VERSION_MINOR=24
+VERSION_MINOR=27
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
@@ -2337,7 +2359,7 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2509,8 +2531,8 @@
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2529,7 +2551,7 @@
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2823,7 +2845,7 @@
 
 # Define the identity of the package.
  PACKAGE='ncmpc'
- VERSION='0.24'
+ VERSION='0.27'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2857,8 +2879,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # 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}'
@@ -4181,6 +4203,127 @@
 
 
 
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_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
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_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
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  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
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+
+
+
+
 # Check whether --with-ncurses was given.
 if test "${with_ncurses+set}" = set; then :
   withval=$with_ncurses;
@@ -4198,6 +4341,8 @@
 
 
     ax_saved_LIBS=$LIBS
+    ax_saved_CPPFLAGS=$CPPFLAGS
+
     if test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes; then :
   ax_with_plaincurses=no
 else
@@ -4207,17 +4352,68 @@
     ax_cv_curses_which=no
 
     # Test for NcursesW
+    if test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno; then :
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncursesw via pkg-config" >&5
+$as_echo_n "checking for ncursesw via pkg-config... " >&6; }
+
 
-    if test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno; then :
 
-        LIBS="$ax_saved_LIBS -lncursesw"
+    if test -n "$_ax_cv_ncursesw_libs"; then
+    pkg_cv__ax_cv_ncursesw_libs="$_ax_cv_ncursesw_libs"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncursesw_libs=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+    if test -n "$_ax_cv_ncursesw_cppflags"; then
+    pkg_cv__ax_cv_ncursesw_cppflags="$_ax_cv_ncursesw_cppflags"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncursesw_cppflags=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+    if test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"; then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NcursesW wide-character library" >&5
-$as_echo_n "checking for NcursesW wide-character library... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        # No suitable .pc file found, have to find flags via fallback
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncursesw via fallback" >&5
+$as_echo_n "checking for ncursesw via fallback... " >&6; }
 if ${ax_cv_ncursesw+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
+            $as_echo
+            pkg_cv__ax_cv_ncursesw_libs="-lncursesw"
+            pkg_cv__ax_cv_ncursesw_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncursesw_cppflags"
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for initscr() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4237,9 +4433,80 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_ncursesw=yes
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        ax_cv_ncursesw=yes
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        pkg_cv__ax_cv_ncursesw_libs="$pkg_cv__ax_cv_ncursesw_libs -ltinfow"
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncursesw_libs... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                            ax_cv_ncursesw=yes
+
+else
+
+                            ax_cv_ncursesw=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 else
-  ax_cv_ncursesw=no
+
+                    ax_cv_ncursesw=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -4247,6 +4514,19 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncursesw" >&5
 $as_echo "$ax_cv_ncursesw" >&6; }
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncursesw_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncursesw_cppflags"
+        ax_cv_ncursesw=yes
+
+fi
+
+
         if test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes; then :
 
             as_fn_error $? "--with-ncursesw specified but could not find NcursesW library" "$LINENO" 5
@@ -4257,7 +4537,8 @@
 
             ax_cv_curses=yes
             ax_cv_curses_which=ncursesw
-            CURSES_LIB="-lncursesw"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
 
 $as_echo "#define HAVE_NCURSESW 1" >>confdefs.h
 
@@ -4467,19 +4748,72 @@
 fi
 
 fi
+    unset pkg_cv__ax_cv_ncursesw_libs
+    unset pkg_cv__ax_cv_ncursesw_cppflags
 
     # Test for Ncurses
+    if test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno; then :
+
 
-    if test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncurses via pkg-config" >&5
+$as_echo_n "checking for ncurses via pkg-config... " >&6; }
 
-        LIBS="$ax_saved_LIBS -lncurses"
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ncurses library" >&5
-$as_echo_n "checking for Ncurses library... " >&6; }
+
+    if test -n "$_ax_cv_ncurses_libs"; then
+    pkg_cv__ax_cv_ncurses_libs="$_ax_cv_ncurses_libs"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncurses_libs=`$PKG_CONFIG --libs "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+    if test -n "$_ax_cv_ncurses_cppflags"; then
+    pkg_cv__ax_cv_ncurses_cppflags="$_ax_cv_ncurses_cppflags"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv__ax_cv_ncurses_cppflags=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+    if test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        # No suitable .pc file found, have to find flags via fallback
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ncurses via fallback" >&5
+$as_echo_n "checking for ncurses via fallback... " >&6; }
 if ${ax_cv_ncurses+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
+            $as_echo
+            pkg_cv__ax_cv_ncurses_libs="-lncurses"
+            pkg_cv__ax_cv_ncurses_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncurses_cppflags"
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for initscr() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -4499,9 +4833,81 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ax_cv_ncurses=yes
+
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
+                    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                        ax_cv_ncurses=yes
+
+else
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                        pkg_cv__ax_cv_ncurses_libs="$pkg_cv__ax_cv_ncurses_libs -ltinfo"
+
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs" >&5
+$as_echo_n "checking for nodelay() with $pkg_cv__ax_cv_ncurses_libs... " >&6; }
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char nodelay ();
+int
+main ()
+{
+return nodelay ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+                            ax_cv_ncurses=yes
+
+else
+
+                            ax_cv_ncurses=no
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 else
-  ax_cv_ncurses=no
+
+                    ax_cv_ncurses=no
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -4509,6 +4915,19 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_ncurses" >&5
 $as_echo "$ax_cv_ncurses" >&6; }
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_ncurses_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_ncurses_cppflags"
+        ax_cv_ncurses=yes
+
+fi
+
+
         if test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes; then :
 
             as_fn_error $? "--with-ncurses specified but could not find Ncurses library" "$LINENO" 5
@@ -4519,7 +4938,8 @@
 
             ax_cv_curses=yes
             ax_cv_curses_which=ncurses
-            CURSES_LIB="-lncurses"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
 
 $as_echo "#define HAVE_NCURSES 1" >>confdefs.h
 
@@ -4645,14 +5065,15 @@
 fi
 
 fi
+    unset pkg_cv__ax_cv_ncurses_libs
+    unset pkg_cv__ax_cv_ncurses_cppflags
 
-    # Test for plain Curses (or if CURSES_LIB was set by user)
-
+    # Test for plain Curses (or if CURSES_LIBS was set by user)
     if test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno; then :
 
-        if test "x$CURSES_LIB" != x; then :
+        if test "x$CURSES_LIBS" != x; then :
 
-            LIBS="$ax_saved_LIBS $CURSES_LIB"
+            LIBS="$ax_saved_LIBS $CURSES_LIBS"
 
 else
 
@@ -4700,9 +5121,9 @@
 
             ax_cv_curses=yes
             ax_cv_curses_which=plaincurses
-            if test "x$CURSES_LIB" = x; then :
+            if test "x$CURSES_LIBS" = x; then :
 
-                CURSES_LIB="-lcurses"
+                CURSES_LIBS="-lcurses"
 
 fi
 
@@ -4934,6 +5355,10 @@
 fi
 
     LIBS=$ax_saved_LIBS
+    CPPFLAGS=$ax_saved_CPPFLAGS
+
+    unset ax_saved_LIBS
+    unset ax_saved_CPPFLAGS
 
 
 if  test "x$ax_cv_curses" = xno ; then :
@@ -5282,126 +5707,6 @@
 fi
 
 
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  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_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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  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
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
 $as_echo_n "checking for GLIB... " >&6; }
@@ -5410,12 +5715,12 @@
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $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
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 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.14" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5427,12 +5732,12 @@
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $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
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.30\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.30") 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.14" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5453,18 +5758,18 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.14" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.14" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.30" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "glib 2.14 is required" "$LINENO" 5
+	as_fn_error $? "glib 2.30 is required" "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "glib 2.14 is required" "$LINENO" 5
+	as_fn_error $? "glib 2.30 is required" "$LINENO" 5
 else
 	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
 	GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -5482,12 +5787,12 @@
     pkg_cv_LIBMPDCLIENT_CFLAGS="$LIBMPDCLIENT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpdclient >= 2.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmpdclient >= 2.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpdclient >= 2.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpdclient >= 2.9") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBMPDCLIENT_CFLAGS=`$PKG_CONFIG --cflags "libmpdclient >= 2.3" 2>/dev/null`
+  pkg_cv_LIBMPDCLIENT_CFLAGS=`$PKG_CONFIG --cflags "libmpdclient >= 2.9" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5499,12 +5804,12 @@
     pkg_cv_LIBMPDCLIENT_LIBS="$LIBMPDCLIENT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpdclient >= 2.3\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmpdclient >= 2.3") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpdclient >= 2.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libmpdclient >= 2.9") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBMPDCLIENT_LIBS=`$PKG_CONFIG --libs "libmpdclient >= 2.3" 2>/dev/null`
+  pkg_cv_LIBMPDCLIENT_LIBS=`$PKG_CONFIG --libs "libmpdclient >= 2.9" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5525,9 +5830,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBMPDCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpdclient >= 2.3" 2>&1`
+	        LIBMPDCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpdclient >= 2.9" 2>&1`
         else
-	        LIBMPDCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpdclient >= 2.3" 2>&1`
+	        LIBMPDCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpdclient >= 2.9" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBMPDCLIENT_PKG_ERRORS" >&5
@@ -5545,17 +5850,6 @@
 
 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.
 if test "${enable_locale+set}" = set; then :
@@ -6595,6 +6889,10 @@
 fi
 
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -6798,7 +7096,7 @@
 
 
 
-      GETTEXT_MACRO_VERSION=0.18
+      GETTEXT_MACRO_VERSION=0.19
 
 
 
@@ -6806,15 +7104,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -6929,15 +7226,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -7007,15 +7303,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -7084,9 +7379,111 @@
 
 fi
 
+
+# Check whether --enable-tcp was given.
+if test "${enable_tcp+set}" = set; then :
+  enableval=$enable_tcp;
+else
+  enable_tcp=$disable_mini
+fi
+
+if test "x$enable_tcp" = xyes; then
+
+$as_echo "#define ENABLE_TCP 1" >>confdefs.h
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
+if ${ac_cv_search_gethostbyname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_gethostbyname=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_gethostbyname+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_gethostbyname+:} false; then :
+
+else
+  ac_cv_search_gethostbyname=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
+ac_res=$ac_cv_search_gethostbyname
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+	for ac_func in getaddrinfo
+do :
+  ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo"
+if test "x$ac_cv_func_getaddrinfo" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETADDRINFO 1
+_ACEOF
+
+fi
+done
+
+fi
+
+# Check whether --enable-async-connect was given.
+if test "${enable_async_connect+set}" = set; then :
+  enableval=$enable_async_connect;
+else
+  enable_async_connect=$disable_mini
+fi
+
+ if test x$enable_async_connect = xyes; then
+  ENABLE_ASYNC_CONNECT_TRUE=
+  ENABLE_ASYNC_CONNECT_FALSE='#'
+else
+  ENABLE_ASYNC_CONNECT_TRUE='#'
+  ENABLE_ASYNC_CONNECT_FALSE=
+fi
+
+if test "x$enable_async_connect" = xyes; then
+
+$as_echo "#define ENABLE_ASYNC_CONNECT 1" >>confdefs.h
+
+fi
+
 # Check whether --enable-colors was given.
 if test "${enable_colors+set}" = set; then :
-  enableval=$enable_colors; enable_colors=$enableval
+  enableval=$enable_colors;
 else
   enable_colors=auto
 fi
@@ -7144,6 +7541,142 @@
     pkg_cv_LIBLIRCCLIENT_CFLAGS="$LIBLIRCCLIENT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lirc\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lirc") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBLIRCCLIENT_CFLAGS=`$PKG_CONFIG --cflags "lirc" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBLIRCCLIENT_LIBS"; then
+    pkg_cv_LIBLIRCCLIENT_LIBS="$LIBLIRCCLIENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lirc\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "lirc") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBLIRCCLIENT_LIBS=`$PKG_CONFIG --libs "lirc" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBLIRCCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lirc" 2>&1`
+        else
+	        LIBLIRCCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lirc" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBLIRCCLIENT_PKG_ERRORS" >&5
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLIRCCLIENT" >&5
+$as_echo_n "checking for LIBLIRCCLIENT... " >&6; }
+
+if test -n "$LIBLIRCCLIENT_CFLAGS"; then
+    pkg_cv_LIBLIRCCLIENT_CFLAGS="$LIBLIRCCLIENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblircclient0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "liblircclient0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBLIRCCLIENT_CFLAGS=`$PKG_CONFIG --cflags "liblircclient0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBLIRCCLIENT_LIBS"; then
+    pkg_cv_LIBLIRCCLIENT_LIBS="$LIBLIRCCLIENT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblircclient0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "liblircclient0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBLIRCCLIENT_LIBS=`$PKG_CONFIG --libs "liblircclient0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBLIRCCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "liblircclient0" 2>&1`
+        else
+	        LIBLIRCCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "liblircclient0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBLIRCCLIENT_PKG_ERRORS" >&5
+
+	as_fn_error $? "lirc not found" "$LINENO" 5
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "lirc not found" "$LINENO" 5
+
+else
+	LIBLIRCCLIENT_CFLAGS=$pkg_cv_LIBLIRCCLIENT_CFLAGS
+	LIBLIRCCLIENT_LIBS=$pkg_cv_LIBLIRCCLIENT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBLIRCCLIENT" >&5
+$as_echo_n "checking for LIBLIRCCLIENT... " >&6; }
+
+if test -n "$LIBLIRCCLIENT_CFLAGS"; then
+    pkg_cv_LIBLIRCCLIENT_CFLAGS="$LIBLIRCCLIENT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"liblircclient0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "liblircclient0") 2>&5
   ac_status=$?
@@ -7194,11 +7727,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBLIRCCLIENT_PKG_ERRORS" >&5
 
-	as_fn_error $? "liblircclient0 not found" "$LINENO" 5
+	as_fn_error $? "lirc not found" "$LINENO" 5
+
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "liblircclient0 not found" "$LINENO" 5
+	as_fn_error $? "lirc not found" "$LINENO" 5
+
 else
 	LIBLIRCCLIENT_CFLAGS=$pkg_cv_LIBLIRCCLIENT_CFLAGS
 	LIBLIRCCLIENT_LIBS=$pkg_cv_LIBLIRCCLIENT_LIBS
@@ -7207,6 +7742,15 @@
 
 fi
 
+else
+	LIBLIRCCLIENT_CFLAGS=$pkg_cv_LIBLIRCCLIENT_CFLAGS
+	LIBLIRCCLIENT_LIBS=$pkg_cv_LIBLIRCCLIENT_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
 $as_echo "#define ENABLE_LIRC 1" >>confdefs.h
 
 fi
@@ -7248,54 +7792,28 @@
 
 
 
-as_ac_Lib=`$as_echo "ac_cv_lib_$(expr substr $CURSES_LIB 3 99)''_getmouse" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getmouse in -l$(expr substr $CURSES_LIB 3 99)" >&5
-$as_echo_n "checking for getmouse in -l$(expr substr $CURSES_LIB 3 99)... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$(expr substr $CURSES_LIB 3 99)  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char getmouse ();
-int
-main ()
-{
-return getmouse ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+	ac_save_CFLAGS="$CFLAGS"
+	ac_save_CXXFLAGS="$CXXFLAGS"
+	ac_save_LIBS="$LIBS"
+	CFLAGS="$CFLAGS $CURSES_CFLAGS"
+	CXXFLAGS="$CXXFLAGS $CURSES_CFLAGS"
+	LIBS="$LIBS $CURSES_LIBS"
+	ac_fn_c_check_func "$LINENO" "getmouse" "ac_cv_func_getmouse"
+if test "x$ac_cv_func_getmouse" = xyes; then :
   ax_cv_curses_mouse=yes
 else
   ax_cv_curses_mouse=no
 fi
 
+	CFLAGS="$ac_save_CFLAGS"
+	CXXFLAGS="$ac_save_CXXFLAGS"
+	LIBS="$ac_save_LIBS"
+
 
 # Check whether --enable-mouse was given.
 if test "${enable_mouse+set}" = set; then :
-  enableval=$enable_mouse; enable_mouse=$enableval
+  enableval=$enable_mouse;
 else
   enable_mouse=auto
 fi
@@ -7442,7 +7960,7 @@
 $as_echo_n "checking whether to include the lyrics screen... " >&6; }
 # Check whether --enable-lyrics-screen was given.
 if test "${enable_lyrics_screen+set}" = set; then :
-  enableval=$enable_lyrics_screen; enable_lyrics_screen=$enableval
+  enableval=$enable_lyrics_screen;
 else
   enable_lyrics_screen=no
 fi
@@ -7543,14 +8061,11 @@
 fi
 
 if test "x$enable_chat_screen" = "xauto"; then
-	enable_chat_screen=$have_libmpdclient_2_5
+	enable_chat_screen=yes
 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
 
@@ -7624,27 +8139,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -7702,27 +8227,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -7767,27 +8302,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -7834,27 +8379,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${LDFLAGS+:} false; then :
-  case " $LDFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${LDFLAGS+:} false; then :
+
+  case " $LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS already contains \$flag"; } >&5
   (: LDFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS \$flag\""; } >&5
-  (: LDFLAGS="$LDFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5
+  (: LDFLAGS="$LDFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      LDFLAGS="$LDFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  LDFLAGS="$flag"
+
+  LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : LDFLAGS=\"\$LDFLAGS\""; } >&5
+  (: LDFLAGS="$LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -7986,27 +8541,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8051,27 +8616,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8116,27 +8691,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8182,27 +8767,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8247,27 +8842,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8312,27 +8917,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8377,27 +8992,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8442,27 +9067,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8507,27 +9142,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8572,27 +9217,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8637,27 +9292,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8702,27 +9367,37 @@
 eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-if test x"`eval 'as_val=${'$as_CACHEVAR'};$as_echo "$as_val"'`" = xyes; then :
-  if ${CFLAGS+:} false; then :
-  case " $CFLAGS " in
-    *" $flag "*)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
   (: CFLAGS already contains $flag) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      ;;
-    *)
-      { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS \$flag\""; } >&5
-  (: CFLAGS="$CFLAGS $flag") 2>&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-      CFLAGS="$CFLAGS $flag"
-      ;;
-   esac
+     ;;
+esac
+
 else
-  CFLAGS="$flag"
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
 fi
 
 else
@@ -8879,6 +9554,10 @@
   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_ASYNC_CONNECT_TRUE}" && test -z "${ENABLE_ASYNC_CONNECT_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_ASYNC_CONNECT\" 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
@@ -9328,7 +10007,7 @@
 # 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.24, which was
+This file was extended by ncmpc $as_me 0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9394,7 +10073,7 @@
 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.24
+ncmpc config.status 0.27
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

ncmpc-0.24.tar.xz/configure.ac -> ncmpc-0.27.tar.xz/configure.ac Changed

@@ -1,8 +1,8 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.24, max@duempel.org)
+AC_INIT(ncmpc, 0.27, max@duempel.org)
 
 VERSION_MAJOR=0
-VERSION_MINOR=24
+VERSION_MINOR=27
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
@@ -99,17 +99,13 @@
 fi
 
 dnl Check for GLib
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
-	[AC_MSG_ERROR([glib 2.14 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30],,
+	[AC_MSG_ERROR([glib 2.30 is required])])
 
-dnl Check for libmpdclient 2.3
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.3],,
+dnl Check for libmpdclient 2.9
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
 	[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
 
 AC_ARG_ENABLE([locale],
@@ -153,11 +149,31 @@
   AM_PO_SUBDIRS
 fi
 
+dnl Networking
+
+AC_ARG_ENABLE(tcp,
+	AS_HELP_STRING([--disable-tcp],
+		[Disable TCP support @<:@default=enabled@:>@]),,
+	[enable_tcp=$disable_mini])
+if test "x$enable_tcp" = xyes; then
+	AC_DEFINE([ENABLE_TCP], 1, [Define to enable TCP support])
+	AC_SEARCH_LIBS([gethostbyname], [nsl])
+	AC_CHECK_FUNCS([getaddrinfo])
+fi
+
+AC_ARG_ENABLE([async-connect],
+	AS_HELP_STRING([--enable-async-connect],
+		[Disable asynchronous connect @<:@default=yes@:>@]),,
+		[enable_async_connect=$disable_mini])
+AM_CONDITIONAL(ENABLE_ASYNC_CONNECT, test x$enable_async_connect = xyes)
+if test "x$enable_async_connect" = xyes; then
+	AC_DEFINE([ENABLE_ASYNC_CONNECT], [1], [Enable asynchronous connect?])
+fi
+
 dnl enable colors
 AC_ARG_ENABLE([colors],
 	AS_HELP_STRING([--enable-colors],
-		[Enable color support]),
-		[enable_colors=$enableval],
+		[Enable color support]),,
 		[enable_colors=auto])
 AC_MSG_CHECKING([whether to include color support])
 AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
@@ -184,8 +200,12 @@
 		[Enable LIRC support]),,
 	[enable_lirc=no])
 if test x$enable_lirc = xyes; then
-	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-		[AC_MSG_ERROR([liblircclient0 not found])])
+	PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
+		[PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+			[AC_MSG_ERROR([lirc not found])]
+		)]
+	)
+
 	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 
@@ -207,16 +227,14 @@
 
 dnl Optional - curses getmouse support
 
-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
-		[getmouse],
+MPD_WITH_LIBRARY([CURSES],
+	[AC_CHECK_FUNC([getmouse],
 		[ax_cv_curses_mouse=yes],
-		[ax_cv_curses_mouse=no])
+		[ax_cv_curses_mouse=no])])
 
 AC_ARG_ENABLE([mouse], 
 	AS_HELP_STRING([--enable-mouse],
-		[Enable curses getmouse support @<:@default=yes@:>@]),
-		[enable_mouse=$enableval],
+		[Enable curses getmouse support @<:@default=yes@:>@]),,
 		[enable_mouse=auto])
 
 AC_MSG_CHECKING([whether to include mouse support])
@@ -293,8 +311,7 @@
 AC_MSG_CHECKING([whether to include the lyrics screen]) 
 AC_ARG_ENABLE([lyrics-screen], 
               AS_HELP_STRING([--enable-lyrics-screen],
-		[Enable lyrics screen @<:@default=no@:>@]),
-	[enable_lyrics_screen=$enableval],
+		[Enable lyrics screen @<:@default=no@:>@]),,
 	[enable_lyrics_screen=no])
 
 case "$host_os" in
@@ -352,13 +369,10 @@
 		[Enable chat screen @<:@default=no@:>@]),,
 	[enable_chat_screen=no])
 if test "x$enable_chat_screen" = "xauto"; then
-	enable_chat_screen=$have_libmpdclient_2_5
+	enable_chat_screen=yes
 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)

ncmpc-0.24.tar.xz/doc/config.sample -> ncmpc-0.27.tar.xz/doc/config.sample Changed

ncmpc-0.24.tar.xz/doc/doxygen.conf -> ncmpc-0.27.tar.xz/doc/doxygen.conf Changed

ncmpc-0.24.tar.xz/doc/ncmpc.1 -> ncmpc-0.27.tar.xz/doc/ncmpc.1 Changed

ncmpc-0.24.tar.xz/lyrics/10-hd.sh -> ncmpc-0.27.tar.xz/lyrics/10-hd.sh Changed

ncmpc-0.24.tar.xz/lyrics/20-lyricwiki.rb -> ncmpc-0.27.tar.xz/lyrics/20-lyricwiki.rb Changed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-#  (c) 2004-2008 The Music Player Daemon Project
+#  (c) 2004-2017 The Music Player Daemon Project
 #  http://www.musicpd.org/
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #
 
 require 'uri'
-require 'net/http'
+require 'open-uri'
 require 'cgi'
 
 # We need this because URI.escape doesn't escape ampersands.
@@ -33,7 +33,7 @@
 
 url = "http://lyrics.wikia.com/api.php?action=lyrics&fmt=xml&func=getSong" + \
     "&artist=#{escape(ARGV[0])}&song=#{escape(ARGV[1])}"
-response = Net::HTTP.get(URI.parse(url))
+response = open(URI.parse(url)).read
 
 if not response =~ /<url>\s*(.*?)\s*<\/url>/im
 	$stderr.puts "No URL in response!"
@@ -43,17 +43,12 @@
 url = $1
 exit(69) if url =~ /action=edit$/
 
-response = Net::HTTP.get(URI.parse(url))
-if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<!--/im
+response = open(URI.parse(url)).read
+if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<div class='lyricsbreak'>/im
 	$stderr.puts "No <div class='lyricbox'> in lyrics page!\n"
 	exit(1)
 end
 
-if not $1 =~ /^.*<\/div>(.*?)$/im
-	$stderr.puts "Couldn't remove leading XML tags in lyricbox!\n"
-	exit(1)
-end
-
 lyrics = $1.gsub(/<br \/>/, "\n")
 
 if lyrics.respond_to?(:force_encoding)

ncmpc-0.24.tar.xz/m4/ax_append_compile_flags.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_compile_flags.m4 Changed

@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -20,6 +20,8 @@
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and
 #   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
 #   AX_APPEND_LINK_FLAGS.
@@ -54,12 +56,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
 [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
 AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
 for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
+  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_COMPILE_FLAGS

ncmpc-0.24.tar.xz/m4/ax_append_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_flag.m4 Changed

@@ -49,21 +49,23 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 2
+#serial 6
 
 AC_DEFUN([AX_APPEND_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
-AS_VAR_SET_IF(FLAGS,
-  [case " AS_VAR_GET(FLAGS) " in
-    *" $1 "*)
-      AC_RUN_LOG([: FLAGS already contains $1])
-      ;;
-    *)
-      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
-      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
-      ;;
-   esac],
-  [AS_VAR_SET(FLAGS,["$1"])])
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
 AS_VAR_POPDEF([FLAGS])dnl
 ])dnl AX_APPEND_FLAG

ncmpc-0.24.tar.xz/m4/ax_append_link_flags.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_link_flags.m4 Changed

@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
 #   issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
 #   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
 #
@@ -52,12 +54,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_APPEND_LINK_FLAGS],
 [AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
 AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
 for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
+  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_LINK_FLAGS

ncmpc-0.24.tar.xz/m4/ax_check_compile_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_check_compile_flag.m4 Changed

ncmpc-0.24.tar.xz/m4/ax_check_link_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_check_link_flag.m4 Changed

ncmpc-0.27.tar.xz/m4/ax_require_defined.m4 Added

@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED

ncmpc-0.24.tar.xz/m4/ax_with_curses.m4 -> ncmpc-0.27.tar.xz/m4/ax_with_curses.m4 Changed

@@ -12,7 +12,9 @@
 #   present, along with the associated header file.  The NcursesW
 #   (wide-character) library is searched for first, followed by Ncurses,
 #   then the system-default plain Curses.  The first library found is the
-#   one returned.
+#   one returned. Finding libraries will first be attempted by using
+#   pkg-config, and should the pkg-config files not be available, will
+#   fallback to combinations of known flags itself.
 #
 #   The following options are understood: --with-ncursesw, --with-ncurses,
 #   --without-ncursesw, --without-ncurses.  The "--with" options force the
@@ -52,23 +54,29 @@
 #
 #   (These preprocessor symbols are discussed later in this document.)
 #
-#   The following output variable is defined by this macro; it is precious
-#   and may be overridden on the ./configure command line:
+#   The following output variables are defined by this macro; they are
+#   precious and may be overridden on the ./configure command line:
 #
-#     CURSES_LIB  - library to add to xxx_LDADD
+#     CURSES_LIBS  - library to add to xxx_LDADD
+#     CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
 #
-#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
-#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
-#   Makefile.am.  For example:
+#   In previous versions of this macro, the flags CURSES_LIB and
+#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
+#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
+#   eventually supersede the use of AX_WITH_CURSES. Neither the library
+#   listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
+#   respectively CPPFLAGS, by default. You need to add both to the
+#   appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
+#   example:
 #
-#     prog_LDADD = @CURSES_LIB@
+#     prog_LDADD = @CURSES_LIBS@
+#     prog_CPPFLAGS = @CURSES_CFLAGS@
 #
-#   If CURSES_LIB is set on the configure command line (such as by running
-#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
-#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
-#   override the standard #include search path.  If the user needs to
-#   specify an alternative path for a library (such as for a non-standard
-#   NcurseW), the user should use the LDFLAGS variable.
+#   If CURSES_LIBS is set on the configure command line (such as by running
+#   "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
+#   is <curses.h>. If the user needs to specify an alternative path for a
+#   library (such as for a non-standard NcurseW), the user should use the
+#   LDFLAGS variable.
 #
 #   The following shell variables may be defined by this macro:
 #
@@ -182,11 +190,66 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 15
+#serial 17
+
+# internal function to factorize common code that is used by both ncurses
+# and ncursesw
+AC_DEFUN([_FIND_CURSES_FLAGS], [
+    AC_MSG_CHECKING([for $1 via pkg-config])
+
+    AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
+    _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
+    _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
+
+    AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
+        AC_MSG_RESULT([no])
+        # No suitable .pc file found, have to find flags via fallback
+        AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
+            AS_ECHO()
+            pkg_cv__ax_cv_$1_libs="-l$1"
+            pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+
+            AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
+            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
+                [
+                    AC_MSG_RESULT([yes])
+                    AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                    AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                        ax_cv_$1=yes
+                        ],[
+                        AC_MSG_RESULT([no])
+                        m4_if(
+                            [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
+                            [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
+                        )
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+
+                        AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                        AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                            ax_cv_$1=yes
+                            ],[
+                            ax_cv_$1=no
+                        ])
+                    ])
+                ],[
+                    ax_cv_$1=no
+            ])
+        ])
+        ],[
+        AC_MSG_RESULT([yes])
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+        ax_cv_$1=yes
+    ])
+])
 
 AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
 AC_DEFUN([AX_WITH_CURSES], [
-    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
     AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
         [force the use of Ncurses or NcursesW])],
         [], [with_ncurses=check])
@@ -195,20 +258,17 @@
         [], [with_ncursesw=check])
 
     ax_saved_LIBS=$LIBS
+    ax_saved_CPPFLAGS=$CPPFLAGS
+
     AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
         [ax_with_plaincurses=no], [ax_with_plaincurses=check])
 
     ax_cv_curses_which=no
 
     # Test for NcursesW
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
+        _FIND_CURSES_FLAGS([ncursesw])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
-        LIBS="$ax_saved_LIBS -lncursesw"
-
-        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
-        ])
         AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
             AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
         ])
@@ -216,7 +276,8 @@
         AS_IF([test "x$ax_cv_ncursesw" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncursesw
-            CURSES_LIB="-lncursesw"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -318,16 +379,13 @@
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncursesw_libs
+    unset pkg_cv__ax_cv_ncursesw_cppflags
 
     # Test for Ncurses
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
+        _FIND_CURSES_FLAGS([ncurses])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
-        LIBS="$ax_saved_LIBS -lncurses"
-
-        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
-        ])
         AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
             AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
         ])
@@ -335,7 +393,8 @@
         AS_IF([test "x$ax_cv_ncurses" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncurses
-            CURSES_LIB="-lncurses"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
             AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
             AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -390,12 +449,13 @@
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncurses_libs
+    unset pkg_cv__ax_cv_ncurses_cppflags
 
-    # Test for plain Curses (or if CURSES_LIB was set by user)
-
+    # Test for plain Curses (or if CURSES_LIBS was set by user)
     AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
-        AS_IF([test "x$CURSES_LIB" != x], [
-            LIBS="$ax_saved_LIBS $CURSES_LIB"
+        AS_IF([test "x$CURSES_LIBS" != x], [
+            LIBS="$ax_saved_LIBS $CURSES_LIBS"
         ], [
             LIBS="$ax_saved_LIBS -lcurses"
         ])
@@ -408,8 +468,8 @@
         AS_IF([test "x$ax_cv_plaincurses" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=plaincurses
-            AS_IF([test "x$CURSES_LIB" = x], [
-                CURSES_LIB="-lcurses"
+            AS_IF([test "x$CURSES_LIBS" = x], [
+                CURSES_LIBS="-lcurses"
             ])
             AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -515,4 +575,8 @@
     AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
 
     LIBS=$ax_saved_LIBS
+    CPPFLAGS=$ax_saved_CPPFLAGS
+
+    unset ax_saved_LIBS
+    unset ax_saved_CPPFLAGS
 ])dnl

ncmpc-0.24.tar.xz/m4/glib-gettext.m4 -> ncmpc-0.27.tar.xz/m4/glib-gettext.m4 Changed

@@ -239,6 +239,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -280,7 +284,7 @@
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
+    dnl in configure.ac.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
@@ -309,9 +313,8 @@
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -380,7 +383,8 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
+  ],
+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -409,7 +413,7 @@
 dnl
 dnl Now the definitions that aclocal will find
 dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl

ncmpc-0.27.tar.xz/m4/mpd_with_flags.m4 Added

ncmpc-0.24.tar.xz/m4/nls.m4 -> ncmpc-0.27.tar.xz/m4/nls.m4 Changed

@@ -1,17 +1,17 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

ncmpc-0.24.tar.xz/m4/pkg.m4 -> ncmpc-0.27.tar.xz/m4/pkg.m4 Changed

@@ -1,29 +1,60 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -45,18 +76,19 @@
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,19 +125,17 @@
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -156,16 +189,40 @@
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
 
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -176,16 +233,18 @@
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -196,13 +255,15 @@
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -211,4 +272,4 @@
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR

ncmpc-0.24.tar.xz/m4/po.m4 -> ncmpc-0.27.tar.xz/m4/po.m4 Changed

@@ -1,16 +1,16 @@
-# po.m4 serial 21 (gettext-0.18.3)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -30,7 +30,7 @@
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.

ncmpc-0.24.tar.xz/m4/progtest.m4 -> ncmpc-0.27.tar.xz/m4/progtest.m4 Changed

@@ -1,22 +1,22 @@
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 # Search path for a program which passes the given test.
 
@@ -27,15 +27,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -55,7 +54,7 @@
 # Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
+AC_CACHE_VAL([ac_cv_path_$1],
 [case "[$]$1" in
   [[\\/]]* | ?:[[\\/]]*)
     ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
@@ -84,9 +83,9 @@
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
+  AC_MSG_RESULT([$][$1])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
-AC_SUBST($1)dnl
+AC_SUBST([$1])dnl
 ])

ncmpc-0.24.tar.xz/po/POTFILES.in -> ncmpc-0.27.tar.xz/po/POTFILES.in Changed

ncmpc-0.24.tar.xz/po/cs.gmo -> ncmpc-0.27.tar.xz/po/cs.gmo Changed

ncmpc-0.24.tar.xz/po/cs.po -> ncmpc-0.27.tar.xz/po/cs.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, 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:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Chyba: MPD verze %d.%d.%d je příliš stará (potřebuji %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Připojeno k %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Seznam skladeb zamíchán"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Seznam skladeb smazán"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Chyba: Příliš malá obrazovka"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Opakování je zapnuto"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Opakování je vypnuto"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Náhodné přehrávání je zapnuto"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Náhodné přehrávání je vypnuto"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Jednoduchý mód je zapnutý"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Jednoduchý mód je vypnutý"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Režim konzumace zapnut"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Režim konzumace vypnut"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Přerušení %d sekund"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databáze aktualizována"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhledávání: Zabalený"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Režim vyhledávání: Normální"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatické centrování zapnuto"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatické centrování vypnuto"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Všechny skladby"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Všichni interpreti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alba interpreta: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všechny skladby interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Písničky bez alba zpěváka: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Přidávám album %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Přidávám %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 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
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Přidávám '%s' do seznamu skladeb"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Probíhá aktualizace databáze"
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Aktualizace databáze %s zahájena"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Aktualizace databáze zahájena"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Najít"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Hledat rekurzivně"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Přeskočit"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nemohu najít '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Nahradit %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Heslo"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Uložit seznam skladeb jako"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Nahradit %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Přerušeno"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Uloženo %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Přidat"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Seznam skladeb"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Seznam skladeb %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Smazání této položky není možné"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Smazat seznam skladeb %s[%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Smazat seznam skladeb"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Seznam skladeb smazán"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Procházet"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "poznámka"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "soubor"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Název"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Název souboru"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Interpret + Název"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Chybný tag vyhledávání %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Vyhledávání"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Pro nové hledání stiskněte %s"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Hledání: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Hledání: Výsledky pro %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Hledání: Stiskněte %s pro nové hledání [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Režim vyhledávání: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Nové klávesové zkratky"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Klávesové zkratky nezměněny"
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Chyba: Nemohu vytvořit adresář ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Chyba: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapsat %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Odstraněno"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Vložte novou klávesu pro %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s přiřazeno k %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Použít klávesové zkratky "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Použít & Uložit klávesové zkratky  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Přidat novou klávesovou zkratku"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Poznámka: Zapomněl jste 'Uplatnit' změny?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Upravit klávesové zkratky"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Upravit klávesové zkratky pro %s"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Globální"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Obrazovka seznamu skladeb"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Obrazovka keydef"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Střed"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Obrazovka prohlížení"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Vytoupit do adresáře/Vybrat a přehrát skladbu"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Přidat skladbu do seznamu skladeb"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Smazat seznam skladeb"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Obrazovka vyhledávání"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Vybrat a přehrát"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Obrazovka textu písně"
 
@@ -558,7 +554,7 @@
 msgid "Delete saved lyrics"
 msgstr "Smazat uložený text písně"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Obrazovka výstupů"
 
@@ -566,7 +562,7 @@
 msgid "Enable/disable output"
 msgstr "Povolit/zakázat výstup"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Další obrazovka"
@@ -600,576 +596,582 @@
 msgid "Apply and save changes"
 msgstr "Aplikovat a uložit změny"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Nápověda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Žádný text písně"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Text písně"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "načítám..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Text písně uložen"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Text písně smazán"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Žádný uložený text písně"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Výstup '%s' povolen"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' zakázán"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Délka"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Skladatel"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Název"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Skladba"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Poznámka"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Cesta"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Počet interpretů"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Počet alb"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Počet skladeb"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Doba běhu"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Poslední aktualizace db"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Čas přehrávání"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Čas hraní DB"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Prohlížeč skladeb"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD statistiky"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Vybraná skladba"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Právě přehrávaná skladba"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Přehrávání:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pozastaveno]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Hlasitost n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hlasitost %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Obrazovka klávesových zkratek"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Posunout kurzor nahoru"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Posunout kurzoru dolů"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Přesunout kurzor na horní okraj obrazovky"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Přesunout kurzor doprostřed obrazovky"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Přesunout kurzor na dolní okraj obrazovky"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Přesunout kurzor na vrchol seznamu"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Přesunout kurzor na dno seznamu"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Výběr rozsahu"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Posunout o jeden řádek dolů"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Posunout o jeden řádek nahoru"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Posunout o jeden řádek dolů"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Posunout o půlku obrazovky nahoru"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Posunout o půlku obrazovky dolů"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Zvolit právě hrající skladbu"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Obrazovka nápovědy"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Přehrát/Vstoupit do adresáře"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Oříznout"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Následující stopa"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Předchozí stopa"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Přetočit vpřed"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Přetočit zpět"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Zvýšit hlasitost"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Snížit hlasitost"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Vybrat/Zrušit výběr skladby v seznamu skladeb"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Vybrat všechny vypsané položky"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Smazat skladbu ze seznamu skladeb"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Zamíchat seznam skladeb"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Vyčistit seznam skladeb"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Přepnout režim opakování"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Přepnout náhodný režim"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Přepnout jednoduchý mód"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Přepnout režim konzumace"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Zapnout režim přerušení"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Spustit aktualizaci databáze skladeb"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Uložit seznam skladeb"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Přidat url/soubor do seznamu skladeb"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Přejít do kořenového adresáře"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Přejít do nadřazeného adresáře"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Najít skladbu v prohlížeči"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Přesunout položku výše"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Přesunout položku níže"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Aktualizovat obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Zapnout režim automatické centrování"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Další obrazovka"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Předchozí obrazovka"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Přepnout na nedávnou obrazovku"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Najít vpřed"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Najít další vpřed"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Najít zpět"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Skočit na"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Obrazovka interpretů"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Změnit režim hledání"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Přerušit akci"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Aktualizovat text písně"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Nedefinováno"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Mezera"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Vstup"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Zpět"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Odstranit"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Dolů"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Doleva"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Doprava"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Domů"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Konec"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Klávesa %s je přiřazena k %s a %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Varování: Neznámá barva - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Neznámý příkaz"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Varování: Neznámé barevné pole - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminál postrádá podporu změny barev"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminál postrádá podporu barev"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Neplatná definice klávesové zkratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplné nastavení klávesových zkratek"
 
@@ -1183,47 +1185,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Chybí '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Chybné jméno barvy"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Neúplná definice barvy"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Neplatná definice barvy"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Neznámé jméno obrazovky"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Chybný vyhledávací mód"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Neznámý vyhledávací mód"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Neznámý parametr nastavení"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1231,14 +1233,53 @@
 "  Vojtěch Trefný https://launchpad.net/~vojtech.trefny\n"
 "  Zbyněk Schwarz https://launchpad.net/~tsbook"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Výběr rozsahu vypnut"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Výběr rozsahu zapnut"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Smazat seznam skladeb %s[%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Chyba: Příliš malá obrazovka"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Varování: Neznámá barva - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Připojeno k %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Seznam skladeb zamíchán"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Seznam skladeb smazán"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Uložit seznam skladeb jako"
+
+#~ msgid "Playlist"
+#~ msgstr "Seznam skladeb"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Seznam skladeb %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Obrazovka seznamu skladeb"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Zamíchat seznam skladeb"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Vyčistit seznam skladeb"
+
+#~ msgid "Save playlist"
+#~ msgstr "Uložit seznam skladeb"
+
 #~ msgid "Volume n/a "
 #~ msgstr "Hlasitost n/a "

ncmpc-0.24.tar.xz/po/da.gmo -> ncmpc-0.27.tar.xz/po/da.gmo Changed

ncmpc-0.24.tar.xz/po/da.po -> ncmpc-0.27.tar.xz/po/da.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.11.0\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fejl: MPD version %d.%d.%d er for gammel (mindst %s er nødvendig)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Forbundet til %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "tryk på %s for at redigere"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Afspilninsglisten blandet"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Sletter afspilningslisten"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fejl: Skærm for lille"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Gentagelse er slået til"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Gentagelse er slået fra"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Tilfældig orden slået til"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Tilfældig orden slået fra"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Single afspilning slået til"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Single afspilning slået fra"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "\"Consume mode\" er slået til"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "\"Consume mode\" er slået fra"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Søg (begynd forfra)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Søg normalt (start/slut)"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle kunstnere"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra kunstneren: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Tilføjer mappen %s...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Tilføjer '%s' til listen"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Databasen opdateres..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Database opdatering af %s startet"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Database opdatering startet"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Søg"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Søg (baglæns)"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Spring"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan ikke finde '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Erstat '%s' [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Adgangskode"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Gem afspilningslisten som"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Erstat '%s' [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Afbrudt"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Gemt %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Afspilningsliste"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Afspilningsliste på %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Sletning af dette emne ikke muligt"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Slet '%s' [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Slet afspilningsliste"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Afspilningslisten slettet"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Gennemse"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Kunstner + Titel"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Ugyldigt søge tag %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Søg"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryk på %s for en ny søgning"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Søg: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Søg: Resultater for %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Tryk på %s for en ny søgning [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Søg efter: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Taste bindinger opdaterede"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Taste bindinger uændrede!"
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fejl: Kunne ikke oprette mappe ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fejl: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s anvendes allerede til %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tildelt %s til %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "==> Anvend taste bindinger "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Anvend og gem taste bindinger  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Definér ny tast"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke at 'anvende' dine ændringer?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Modificer taste bindinger"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Modificer tast for '%s'"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Afspilningsliste"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Tastdefinitions skærm"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Gennemse"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Skift til bibliotek/Tilføj til afspilningslisten og afspil"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Tilføj spor til afspilningsliste"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Slet afspilningsliste"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Database søgning"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Vælg og afspil"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Sangtekst skærm"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Output skærm"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "Slå output til/fra"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Næste skærm"
@@ -601,578 +597,584 @@
 msgid "Apply and save changes"
 msgstr "Anvend og gem ændringer"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Hjælp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Ingen sangtekster"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Sangtekster"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "indlæser..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Sangtekster gemt"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Afspilningslisten slettet"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Gem sagtekster"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Output '%s' slået til"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Output '%s' slået fra"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Output"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Længde"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Sti"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bithastighed"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Antal kunstnere"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Antal albums"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Antal sange"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Seneste db opdatering"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Spilletid"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "DB spilletid"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Sang viser"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kb/sek"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD statistik"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Valgt nummer"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Nummer der afspilles"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kb/sek"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Afspiller:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volumen: n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Taste konfigurations skærm"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Flyt markør op"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Flyt markør ned"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Flyt cursor til toppen af skærmen"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Flyt cursor til midten af skærmen"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Flyt cursor til bunden af skærmen"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Flyt cursor til toppen af listen"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Flyt cursor til bunden af listen"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Side op"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Side ned"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Valg af interval"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Scroll en linie ned"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Scroll en linie op"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Scroll en linie ned"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Scroll en halv skærm op"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Scroll en halv skærm ned"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Vælg den sang der spilles nu"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Hjælp"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Afspil/Gå til mappe"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Beskær"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Næste"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Søg fremad"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Søg tilbage"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Hæv volumen"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Sænk volumen"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Marker/afmarker sang i afspilningsliste"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Vælg alle emner på listen"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Slet sang fra afspilningsliste"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Bland rækkefølgen i afspilningslisten"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Slet afspilningslisten"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Aktiver/deaktiver gentag"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Aktiver/deaktiver tilfældigt valg"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Aktiver/deaktiver enkelt valg"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Aktiver/deaktiver consume valg"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Aktiver/deaktiver crossfade mellem sange"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Opdater databasen"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Gem afspilningslisten"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Tilføj URL eller fil til afspilningslisten"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Gå til rod mappen"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå til forældre mappe"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Lokaliser sang i browseren"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flyt op"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flyt ned"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Genopfrisk skærm"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Ændre søge tilstand"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Aktiver/deaktiver automatisk centrering"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Næste skærm"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Forrige skærm"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Skift til seneste skærm"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Søg"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Gentag søg"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Søg baglæns"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Spring til"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Kunstner skærm"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Ændre søge tilstand"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Afbryd action"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Opdater sangtekster"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Udefineret"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Mellemrum"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Retur"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Tilbagetast"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Slet"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Op"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Venstre"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Højre"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Hjem"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Slut"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Skift+Tabulator"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tast %s tildelt %s og %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Advarsel: Ukendt farve - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Ukendt kommando"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Advarsel: Ukendt farve felt - %s.\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminalen understøtter ikke at ændre farver"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminalen understøtter ikke farver"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Fejl"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Forkert hotkey definition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Ufuldstændig hotkey konfiguration"
 
@@ -1186,61 +1188,100 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Dårligt farvenavn"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Ufuldstændig farve definition"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Ugyldigt tal."
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Forkert farve definition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Ukendt skærm navn"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Ugyldig søgetilstand"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Ukendt søgetilstand"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Ukendt konfigurations parameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 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:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Valg af interval slået fra"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Valg af interval slået til"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Slet '%s' [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Fejl: Skærm for lille"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Advarsel: Ukendt farve - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Forbundet til %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Afspilninsglisten blandet"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Sletter afspilningslisten"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Gem afspilningslisten som"
+
+#~ msgid "Playlist"
+#~ msgstr "Afspilningsliste"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Afspilningsliste på %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Afspilningsliste"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Bland rækkefølgen i afspilningslisten"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Slet afspilningslisten"
+
+#~ msgid "Save playlist"
+#~ msgstr "Gem afspilningslisten"
+
 #~ msgid "Search: "
 #~ msgstr "Søg: "

ncmpc-0.24.tar.xz/po/de.gmo -> ncmpc-0.27.tar.xz/po/de.gmo Changed

ncmpc-0.24.tar.xz/po/de.po -> ncmpc-0.27.tar.xz/po/de.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: ncmpc 0.12\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbinde mit %s…   [%s drücken, um abzubrechen]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fehler: MPD-Version %d.%d.%d ist zu alt (%s wird benötigt)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Verbunden mit %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Playlist gemischt"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Playlist gelöscht"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fehler: Anzeige zu klein"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Wiederhol-Modus ist aktiviert"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Wiederhol-Modus ist deaktiviert"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Zufalls-Modus ist aktiviert"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Zufalls-Modus ist deaktiviert"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Einzelabspiel-Modus ist aktiviert"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Einzelabspiel-Modus ist deaktiviert"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Verbrauchs-Modus Aktiviert"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Verbrauchs-Modus Deaktiviert"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle Stücke"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle Künstler"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alben des Künstlers: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle Lieder des Künstlers: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Titel von keinem Album des Künstlers: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Füge Album %s... hinzu"
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Hinzufügen %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Lade Playlist %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Füge '%s' der Playlist hinzu"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Datenbankaktualisierung läuft..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Datenbankaktualisierung von %s gestartet"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Datenbankaktualisierung gestartet"
 
@@ -203,95 +190,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Suche"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Suche rückwärts"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Springe zu"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kann '%s' nicht finden"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Ersetze %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Passwort"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Speichere Playlist als"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Ersetze %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Abbruch"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s gespeichert"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Playlist"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Playlist auf %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Dieses Objekt kann nicht gelöscht werden"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Lösche Playlist %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Lösche Playlist"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Playlist gelöscht"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Stöbern"
 
@@ -335,139 +329,139 @@
 msgid "comment"
 msgstr "Anmerkung"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "Datei"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Künstler + Titel"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag nicht erkannt: %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Suche"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Drücke %s für eine neue Suche"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Suche: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Suche: Ergebnisse für %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Suche: Drücke %s für eine neue Suche [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Suchmodus: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Du hast eine neue Tastenbelegung"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Tastenbelegung unverändert."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fehler: kann Verzeichnis ~/.ncmpc - %s nicht erstellen"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fehler: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s geschrieben"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Gib neue Taste für %s ein: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s wurde %s zugeordnet"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Tastenbelegung anwenden "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Tastenbelegung speichern und anwenden  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Füge neue Taste hinzu"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Tipp: Hast du vergessen, deine Änderungen 'Anzuwenden'?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Editiere Tastenbelegungen"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editiere Tasten für %s"
@@ -480,9 +474,10 @@
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Playlistenanzeige"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Tastenbelegungsanzeige"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -500,7 +495,7 @@
 msgid "Center"
 msgstr "Zentrieren"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Anzeige durchstöbern"
 
@@ -508,15 +503,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Verzeichnis öffnen/Stück auswählen und abspielen"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Song zur Playlist hinzufügen"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Lösche Playlist"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Suchanzeige"
 
@@ -524,7 +520,7 @@
 msgid "Select and play"
 msgstr "Auswählen und abspielen"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Liedtextanzeige"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "Lösche gespeicherte Texte"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Anzeige der Ausgabegeräte"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "Ausgabegerät aktivieren/deaktivieren"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Nächste Anzeige"
@@ -601,576 +597,582 @@
 msgid "Apply and save changes"
 msgstr "Änderungen bestätigen und speichern"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Hilfe"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Kein Liedtext verfügbar"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Liedtexte"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "lade..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Liedtext gespeichert"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Texte gelöscht"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Keine gespeicherten Texte"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Ausgabegerät '%s' aktiviert"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Ausgabegerät '%s' deaktiviert"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Ausgabegeräte"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Länge"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Name"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "CD"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Stück"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Anmerkung"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Pfad"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Anzahl der Künstler"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Anzahl der Alben"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Anzahl der Lieder"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Laufzeit"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Letzte db-Aktualisierung"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Spielzeit"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "DB Spielzeit"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Liedbetrachter"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD Statistik"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Lied anzeigen"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Gerade laufendes Lied"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Spiele:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Lautstärke n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Lautstärke %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Tastenkonfigurationsanzeige"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Cursor nach oben bewegen"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Cursor nach unten bewegen"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Markierung an den Anfang der Anzeige setzen"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Markierung in die Mitte der Anzeige setzen"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Markierung ans Ende der Anzeige setzen"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Markierung an den Anfang der Liste setzen"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Markierung ans Ende der Liste setzen"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Bild auf"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Bild ab"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Mehrfachauswahl"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Eine Zeile nach unten scrollen"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Eine Zeile nach oben scrollen"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Eine Zeile nach unten scrollen"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Die halbe Anzeige nach oben scrollen"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Die halbe Anzeige nach unten scrollen"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Derzeit spielenden Song auswählen"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Hilfeanzeige"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Abspielen/Verzeichnis öffnen"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Playlist auf das markierte Lied reduzieren"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Nächstes Stück"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Vorheriges Stück"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Vorspulen"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Zurückspulen"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Lautstärke erhöhen"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Lautstärke verringern"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Wähle Stück in der Playlist an/ab"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Alle angezeigten Lieder zur Playlist hinzufügen"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Lösche Song aus der Playlist"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Mische Playlist"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Lösche Playlist"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Schalte Wiederholungswiedergabe ein/aus"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Schalte Zufallswiedergabe ein/aus"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Einzelabspiel-Modus umschalten"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Verbrauchs-Modus Umschalten"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Schalte Crossfade-Wiedergabe ein/aus"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Starte eine Aktualisierung der Musikdatenbank"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Speichere Playlist"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Füge eine URL/Datei der Playlist hinzu"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Basis-Verzeichnis öffnen"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Übergeordnetes Verzeichnis öffnen"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Lied in Datenbank orten"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Bewege es nach oben"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Bewege es nach unten"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Aktualisiere Anzeige"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Wechsle den Suchmodus"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Schalte den Autozentrier-Modus ein/aus"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Nächste Anzeige"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Vorherige Anzeige"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Wechsle zur zuletzt benutzten Anzeige"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Vorwärtssuche"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Vorwärtssuche fortsetzen"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Rückwärtssuche"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Künstlerdatenbank"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Suchmodus wechseln"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Kommando Unterbrechen"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Liedtext aktualisieren"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Leertaste"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Entf"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Oben"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Unten"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Links"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Rechts"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Pos1"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Ende"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "Bild ab"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "Bild auf"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Einfg"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Taste %s ist %s und %s zugeordnet"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Warnung: Unbekannte Farbe - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Unbekannter Befehl"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Warnung: Unbekanntes Farbfeld - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Das Terminal unterstützt keine Farbwechsel"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Das Terminal unterstützt keine Farben"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Fehler"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Fehlerhafte Definition der Tastenbelegung"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Unvollständige Konfiguration für Tastenbelegung"
 
@@ -1184,47 +1186,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Es fehlt ein '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Ungültiger Farbname"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Unvollständige Farbkonfiguration"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Ungültige Zahl"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Fehlerhafte Farbdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Unbekannter Anzeigenname"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Ungültiger Suchmodus"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Unbekannter Suchmodus"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Unbekannter Konfigurationsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Übersetzer\n"
@@ -1237,14 +1239,53 @@
 "  Samuel Creshal https://launchpad.net/~samuel-creshal\n"
 "  cmdrhenner https://launchpad.net/~cmdrhenner"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Mehrfachauswahl deaktiviert"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Mehrfachauswahl aktiviert"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Lösche Playlist %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Fehler: Anzeige zu klein"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Warnung: Unbekannte Farbe - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Verbunden mit %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Playlist gemischt"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Playlist gelöscht"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Speichere Playlist als"
+
+#~ msgid "Playlist"
+#~ msgstr "Playlist"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Playlist auf %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Playlistenanzeige"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Mische Playlist"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Lösche Playlist"
+
+#~ msgid "Save playlist"
+#~ msgstr "Speichere Playlist"
+
 #~ msgid "Volume n/a "
 #~ msgstr "Lautstärke n/a "

ncmpc-0.24.tar.xz/po/eo.gmo -> ncmpc-0.27.tar.xz/po/eo.gmo Changed

ncmpc-0.24.tar.xz/po/eo.po -> ncmpc-0.27.tar.xz/po/eo.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-05-16 15:13+0000\n"
 "Last-Translator: Aleksej <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Konektiĝado al %s...  [Premu %s por ĉesigi]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Problemo: la versio %d.%d.%d de MPD estas tro malnova (necesas %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Konektite al %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
 msgstr ""
 
-#: src/player_command.c:187
-msgid "Cleared playlist"
+#: src/player_command.c:184
+msgid "Cleared queue"
 msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr ""
-
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr ""
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr ""
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Ĝisdatigis datumbazon"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr ""
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Aldonas \"%s\" al la ludlisto"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr ""
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr ""
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr ""
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr ""
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr ""
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr ""
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Ne troviĝis \"%s\""
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, c-format
+msgid "%s [%s/%s] "
+msgstr ""
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr ""
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
+#: src/screen_queue.c:249
+msgid "Save queue as"
 msgstr ""
 
-#: src/screen_queue.c:292
+#: src/screen_queue.c:282
 #, c-format
-msgid "Replace %s [%s/%s] ? "
+msgid "Replace %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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr ""
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Aldoni"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
 msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
+msgid "Queue on %s"
 msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:229
+#: src/screen_file.c:213
 #, c-format
-msgid "Delete playlist %s [%s/%s] ? "
+msgid "Delete playlist %s?"
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr ""
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr ""
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "dosiero"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titolo"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr ""
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr ""
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Dosiernomo"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr ""
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr ""
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr ""
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr ""
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
@@ -479,8 +473,8 @@
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
+#: src/screen_help.c:119 src/command.c:105
+msgid "Queue screen"
 msgstr ""
 
 #: src/screen_help.c:121
@@ -499,7 +493,7 @@
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr ""
 
@@ -507,15 +501,15 @@
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+msgid "Append song to queue"
 msgstr ""
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr ""
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr ""
 
@@ -523,7 +517,7 @@
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
@@ -557,7 +551,7 @@
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr ""
 
@@ -565,7 +559,7 @@
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 msgid "Chat screen"
 msgstr ""
 
@@ -597,576 +591,577 @@
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Helpo"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr ""
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr ""
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr ""
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr ""
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr ""
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr ""
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr ""
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr ""
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr ""
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr ""
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr ""
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr ""
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr ""
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr ""
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr ""
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr ""
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr ""
 
+#: src/command.c:132
+msgid "Select/deselect song in queue"
+msgstr ""
+
 #: src/command.c:134
-msgid "Select/deselect song in playlist"
+msgid "Select all listed items"
 msgstr ""
 
 #: src/command.c:136
-msgid "Select all listed items"
+msgid "Delete song from queue"
 msgstr ""
 
 #: src/command.c:138
-msgid "Delete song from playlist"
+msgid "Shuffle queue"
 msgstr ""
 
 #: src/command.c:140
-msgid "Shuffle playlist"
+msgid "Clear queue"
 msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
+msgid "Toggle repeat mode"
 msgstr ""
 
 #: src/command.c:144
-msgid "Toggle repeat mode"
+msgid "Toggle random mode"
 msgstr ""
 
 #: src/command.c:146
-msgid "Toggle random mode"
+msgid "Toggle single mode"
 msgstr ""
 
 #: src/command.c:148
-msgid "Toggle single mode"
+msgid "Toggle consume mode"
 msgstr ""
 
 #: src/command.c:150
-msgid "Toggle consume mode"
+msgid "Toggle crossfade mode"
 msgstr ""
 
 #: src/command.c:152
-msgid "Toggle crossfade mode"
+msgid "Start a music database update"
 msgstr ""
 
 #: src/command.c:154
-msgid "Start a music database update"
+msgid "Save queue"
 msgstr ""
 
 #: src/command.c:156
-msgid "Save playlist"
-msgstr ""
-
-#: src/command.c:158
-msgid "Add url/file to playlist"
+msgid "Add url/file to queue"
 msgstr ""
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr ""
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr ""
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr ""
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr ""
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
+#: src/colors.c:156
+msgid "Unknown color"
 msgstr ""
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+msgid "Unknown color field"
 msgstr ""
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1180,47 +1175,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1228,10 +1223,13 @@
 "  Kristjan SCHMIDT https://launchpad.net/~kristjan-eo\n"
 "  Max Kellermann https://launchpad.net/~max-duempel"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Connected to %s"
+#~ msgstr "Konektite al %s"

ncmpc-0.24.tar.xz/po/es.gmo -> ncmpc-0.27.tar.xz/po/es.gmo Changed

ncmpc-0.24.tar.xz/po/es.po -> ncmpc-0.27.tar.xz/po/es.po Changed

@@ -13,7 +13,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2012-01-30 07:08+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
 "Language-Team: es\n"
@@ -32,60 +32,48 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, 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:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too 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:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado a %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Lista de canciones barajada"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Vaciada la lista de canciones"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Error: La ventana/pantalla es muy pequeña"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo aleatorio desactivado"
 
@@ -94,11 +82,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -106,99 +94,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo compacto desactivado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Desvanecimiento de %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: simple"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas las pistas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos los artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes del artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas las pistas del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas del no álbum de artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Agregando álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Agregando %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Cargando la lista %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Añadiendo '%s' a la lista de canciones"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Actualizando la base de datos..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Ha comenzado la actualización de la base de datos %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Ha comenzado la actualización de la base de datos"
 
@@ -209,95 +196,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Buscar"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Buscar hacia atrás"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Saltar"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "No se pudo encontrar %s"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Sustituir %s [%s%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Contraseña"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Guardar la lista como"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Sustituir %s [%s%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Ejecución interrumpida"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s Guardada"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Añadir"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Lista de canciones"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lista de reproducción en %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "No se puede borrar el elemento"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Borrar la lista de reproducción %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Borrar la lista de canciones"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Lista de reproducción borrada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Navegar"
 
@@ -341,139 +335,139 @@
 msgid "comment"
 msgstr "comentario"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fichero"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etiqueta de búsqueda inválida: %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Búsqueda"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Pulsa %s para una nueva búsqueda"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Buscar: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Búsqueda: Resultados para %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Búsqueda: Pulsar %s para una nueva búsqueda [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Modo de búsqueda: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Has definido nuevas teclas de acceso rápido"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Las teclas de acceso rápido no han sido modificadas."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Error: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creado"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Borrado"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tecla de acceso rápido para %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s asignada a %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar las teclas de acceso rápido "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar y guardar las teclas de acceso rápido  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Introduce una nueva tecla"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Has olvidado 'Aplicar' tus cambios?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Cambia las teclas de acceso rápido"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia las teclas para %s"
@@ -486,9 +480,10 @@
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Lista de canciones"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Pantalla de teclas de acceso"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -506,7 +501,7 @@
 msgid "Center"
 msgstr "Centro"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Navegador"
 
@@ -514,15 +509,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Acceder al directorio/Seleccionar y reproducir canción"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Añadir la canción de la lista"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Borrar la lista de canciones"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Búsqueda"
 
@@ -530,7 +526,7 @@
 msgid "Select and play"
 msgstr "Seleccionar y reproducir"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Letras"
 
@@ -565,7 +561,7 @@
 msgid "Delete saved lyrics"
 msgstr "Borrar letras guardadas"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Pantalla de salidas"
 
@@ -573,7 +569,7 @@
 msgid "Enable/disable output"
 msgstr "Activar/desactivar la salida"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Pantalla siguiente"
@@ -607,576 +603,582 @@
 msgid "Apply and save changes"
 msgstr "Aplicar y guardar los cambios"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Ayuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "No hay letras disponibles"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Letras"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "cargando…"
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Letras guardadas"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Letras borradas"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "No hay letras guardadas"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Se activó la salida '%s'"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Se desactivó la salida '%s'"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Salidas"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Duración"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nombre"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Fecha"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Ruta"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Número de álbumes"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Número de canciones"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Tiempo de ejecución"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Actualización más reciente de la BD"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Tiempo de reproducción"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Duración de la BD"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Visor de la canción"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Estadísticas del MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Canción seleccionada"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Canción reproducida"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Escuchando:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Parado]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volumen n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volumen %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Configuración de teclas"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Salir"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Mover el cursor hacia arriba"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Mover el cursor hacia abajo"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Mover el cursor hasta el principio de la pantalla"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Mover el cursor hasta la mitad de la pantalla"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover el cursor hasta el final de la pantalla"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Mover el cursor hasta el principio de la lista"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover el cursor hasta el final de la lista"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Página arriba"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Página abajo"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Selección del rango"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Bajar una linea"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir una linea"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Bajar una linea"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir media pantalla"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Bajar media pantalla"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Seleccionar la actual canción en reproducción"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Ayuda"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar en el directorio"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Reducir lista de canciónes a canción marcado"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Siguiente"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Anterior"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Subir el volumen"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Bajar el volumen"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Seleccionar/Deseleccionar la canción en la lista"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Seleccionar todos"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Borrar la canción de la lista"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Aleatorizar lista de canciones"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Borrar la lista de canciones"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Alternar modo repetición"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Alternar modo aleatorio"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Alternar modo compacto"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Alternar modo completo"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Alternar modo crossfade"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Iniciar la actualización de la BD musical"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Guardar la lista de canciones"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Añadir una URL o fichero a la lista"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Entrar al directorio fundamental"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Entrar al directorio superior"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Encontrar la canción en el navegador"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Moverlo arriba"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Moverlo abajo"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Actualizar la ventana"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Alternar centrado automático de la ventana"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Pantalla siguiente"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Volver a la anterior pantalla"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Buscar hacia adelante"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Buscar siguiente"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Buscar hacia atrás"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Saltar a"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artistas"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Cambiar el modo de búsqueda"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interrumpir la acción"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Actualizar las letras"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Espacio"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Abajo"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Derecha"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "Pagina siguiente"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "Pagina anterior"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tabulador"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tecla %s asignada a %s y %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Advertencia: Color %s - no reconocido\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Comando desconocido"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Advertencia: Propiedad del color - %s no reconocida\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "La terminal no soporta el cambio de colores"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "La terminal no tiene la opcion de diferentes colores"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Error"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta de la tecla de acceso"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Configuración incompleta de la tecla de acceso"
 
@@ -1190,47 +1192,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Falta un '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Nombre de color incorrecto"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Definición de color incompleta"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Definición de color erronea"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Nombre de pantalla desconocido"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Modo de búsqueda inválido"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "No se reconoce el modo de búsqueda"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1243,14 +1245,53 @@
 "  Monkey https://launchpad.net/~monkey-libre\n"
 "  Paco Molinero https://launchpad.net/~franciscomol"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Selección de rango desactivada"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Selección de rango activada"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Borrar la lista de reproducción %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Error: La ventana/pantalla es muy pequeña"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Advertencia: Color %s - no reconocido\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Conectado a %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Lista de canciones barajada"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Vaciada la lista de canciones"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Guardar la lista como"
+
+#~ msgid "Playlist"
+#~ msgstr "Lista de canciones"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lista de reproducción en %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Lista de canciones"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Aleatorizar lista de canciones"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Borrar la lista de canciones"
+
+#~ msgid "Save playlist"
+#~ msgstr "Guardar la lista de canciones"
+
 #~ msgid "Volume n/a "
 #~ msgstr "Volumen n/a "

ncmpc-0.24.tar.xz/po/fi.gmo -> ncmpc-0.27.tar.xz/po/fi.gmo Changed

ncmpc-0.24.tar.xz/po/fi.po -> ncmpc-0.27.tar.xz/po/fi.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-03-06 16:02+0000\n"
 "Last-Translator: Sami Sankala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "e"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Yhdistetään kohteeseen %s... [Paina %s keskeyttääksesi]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Virhe: MPD versio %d.%d.%d on liian vanha (tarvitaan %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Yhdistetty kohteeseen %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "Painalla %s pääset näppäineditoriin"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Sekoitettu soittolista"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Tyhjennetty soittolista"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Virhe: Ruutu on liian pieni"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Jatkuva toisto on päällä"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Jatkuva toisto on poissa päältä"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Satunnaistoisto on päällä"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Satunnaistoisto poissa päältä"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Kertatoisto on päällä"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Kertatoisto on poissa päältä"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Kertakäyttökuuntelu päällä"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Kertakäyttökuuntelu poissa päältä"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Ristiinhäivytys %d sekuntia"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Tietokanta päivitetty"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Hakutyyli: 'Wrapped'"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Hakutyyli: Normaali"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Kaikki kappaleet"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Kaikki esittäjät"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Kaikki albumit esittäjältä: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Kaikki kappaleet esittäjältä: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Levy: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Kappaleet tuntemattomista albumeista esittäjältä: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Lisätään albumia %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Lisätään %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Ladataan soittolistaa %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Soittolistaan lisätään '%s'"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Tietokannan päivitys käynnissä..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Tietokannan %s päivitys käynnistyi"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Tietokannan päivitys käynnistyi"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Etsi"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Etsi alustapäin"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Siirry"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Haku '%s' ei tuottanut tuloksia"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Korvaa %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Salasana"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Tallenna soittolista nimellä"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Korvaa %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Keskeytetty"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Tallennettu %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Lisää"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Soittolista"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
+msgid "Queue on %s"
 msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Tämän kohteen poistaminen ei ole mahdollista"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr ""
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Poista soittolista"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Soittolista poistettu"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Selaa"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "kommentti"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "tiedosto"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Kappale"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Albumi"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Esittäjä + Kappale"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Haku"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Paina %s uuteen hakuun"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Haku: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Haku: Tulokset hauelle %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Haku: Paina %s hakeaksesi uudelleen [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Hakutyyli: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Uusia näppäinmäärittelyjä"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Näppäinmäärittelyjä ei muutettu"
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Virhe: Hakemistoa ~/ncmpc - %s ei pystytty luomaan"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Virhe: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Kirjoitettiin %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Asetettu %s %s:ksi"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Lisää uusi näppäin"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Huomio: Unohditko 'Toteuttaa' muutokset?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Muuta näppäinasetteluja"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Muokkaa %s näppäimiä"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr ""
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Soittolista näyttö"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Näppäinmäärittely ruutu"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Selailunäkymä"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Lisää kappale soittolistaan"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Poista soittolista"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Hakunäkymä"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Valitse ja toista"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Sanoitusnäkymä"
 
@@ -558,7 +554,7 @@
 msgid "Delete saved lyrics"
 msgstr "Poista tallennettut sanoitukset"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr ""
 
@@ -566,7 +562,7 @@
 msgid "Enable/disable output"
 msgstr "Ulostulo päälle/poissa"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Soittolista näyttö"
@@ -600,576 +596,577 @@
 msgid "Apply and save changes"
 msgstr "Toteuta ja tallenna muutokset"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Ohje"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Sanoituksia ei löytynyt"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Sanoitukset"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "latautuu..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Sanoitukset talletettu"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Sanoitukset poistettu"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Ei talletettuja sanoituksia"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Ulostulo '%s' päällä"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Ulostulo '%s' poissa päältä"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Ulostulot"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Kesto"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Säveltäjä"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nimi"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Levy"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Kappale"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr ""
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr ""
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr ""
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr ""
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr ""
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr ""
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr ""
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr ""
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr ""
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr ""
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr ""
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr ""
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr ""
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr ""
 
+#: src/command.c:132
+msgid "Select/deselect song in queue"
+msgstr ""
+
 #: src/command.c:134
-msgid "Select/deselect song in playlist"
+msgid "Select all listed items"
 msgstr ""
 
 #: src/command.c:136
-msgid "Select all listed items"
+msgid "Delete song from queue"
 msgstr ""
 
 #: src/command.c:138
-msgid "Delete song from playlist"
+msgid "Shuffle queue"
 msgstr ""
 
 #: src/command.c:140
-msgid "Shuffle playlist"
+msgid "Clear queue"
 msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
+msgid "Toggle repeat mode"
 msgstr ""
 
 #: src/command.c:144
-msgid "Toggle repeat mode"
+msgid "Toggle random mode"
 msgstr ""
 
 #: src/command.c:146
-msgid "Toggle random mode"
+msgid "Toggle single mode"
 msgstr ""
 
 #: src/command.c:148
-msgid "Toggle single mode"
+msgid "Toggle consume mode"
 msgstr ""
 
 #: src/command.c:150
-msgid "Toggle consume mode"
+msgid "Toggle crossfade mode"
 msgstr ""
 
 #: src/command.c:152
-msgid "Toggle crossfade mode"
+msgid "Start a music database update"
 msgstr ""
 
 #: src/command.c:154
-msgid "Start a music database update"
+msgid "Save queue"
 msgstr ""
 
 #: src/command.c:156
-msgid "Save playlist"
-msgstr ""
-
-#: src/command.c:158
-msgid "Add url/file to playlist"
+msgid "Add url/file to queue"
 msgstr ""
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr ""
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr ""
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr ""
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr ""
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
+#: src/colors.c:156
+msgid "Unknown color"
 msgstr ""
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+msgid "Unknown color field"
 msgstr ""
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1183,57 +1180,78 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 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:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Virhe: Ruutu on liian pieni"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Yhdistetty kohteeseen %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Sekoitettu soittolista"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Tyhjennetty soittolista"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Tallenna soittolista nimellä"
+
+#~ msgid "Playlist"
+#~ msgstr "Soittolista"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Soittolista näyttö"

ncmpc-0.24.tar.xz/po/fr.gmo -> ncmpc-0.27.tar.xz/po/fr.gmo Changed

ncmpc-0.24.tar.xz/po/fr.po -> ncmpc-0.27.tar.xz/po/fr.po Changed

@@ -10,7 +10,7 @@
 "Project-Id-Version: ncmpc 0.14.0\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-09-23 11:15+0000\n"
 "Last-Translator: Thibault Févry <Unknown>\n"
 "Language-Team: <fr@li.org>\n"
@@ -29,58 +29,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Connexion à %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erreur: la version %d.%d.%d de MPD est trop ancienne (%s requise)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Connecté à %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Liste de lecture aléatoire"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Liste de lecture vidée"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erreur: Ecran trop petit"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Répétition activé"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Répétition désactivé"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Mode Aléatoire activé"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Mode Aléatoire désactivé"
 
@@ -89,11 +77,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Mode seul activé"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Mode seul désactivé"
 
@@ -101,99 +89,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Toutes les pistes"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Tous les artistes"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums de l'artiste : %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Toutes les pistes de l'artiste : %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Piste sans album de l'artiste : %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Ajout de l'album %s en cours..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Ajout de %s en cours..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 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
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Ajout de '%s' à la liste de lecture"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Mise à jour de la base de données en cours..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Mise à jour de la base de données de %s commençée"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Début de la mise à jour de la base de données"
 
@@ -204,95 +191,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Trouver"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Trouver avant"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Sauter"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Impossible de trouver '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Remplacer %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Mot de passe"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Enregistrer la liste de lecture sous"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Remplacer %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Annulé"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s enregistré"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Liste de lecture"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Liste de lecture sur %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Impossible d'effacer ce type d'objet"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Effacer la liste de lecture %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Effacer la liste de lecture"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Liste de lecture effacée"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Parcourir"
 
@@ -336,139 +330,139 @@
 msgid "comment"
 msgstr "commentaire"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fichier"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titre"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artiste + Titre"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Mauvais champ recherché %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Rechercher"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Appuyez sur %s pour une nouvelle recherche"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Rechercher: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Rechercher: Résultats pour %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Rechercher: Appuyez sur %s pour une nouvelle recherche [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Mode de recherche : %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Vous avez une nouvelle correspondance de touches"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "La correspondance des touches n'a pas été changée."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erreur: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s écrit"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Effacé"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entrez la nouvelle touche pour %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assignée à %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Appliquer la correspondance des touches "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Appliquer et Enregistrer la correspondance des touches  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Ajouter une nouvelle touche"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Note: Auriez-vous oublié d''Appliquer' vos changements?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Editer les correspondances de touches"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editer les touches pour %s"
@@ -481,9 +475,10 @@
 msgid "Global"
 msgstr "Globales"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Ecran de Liste de lecture"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Écran du paramétrage des raccourcis"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -501,7 +496,7 @@
 msgid "Center"
 msgstr "Centrer"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Ecran de Navigation"
 
@@ -509,15 +504,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Entrer dans le répertoire/Sélectionner et lire la chanson"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Ajouter la chanson à la liste de lecture"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Effacer la liste de lecture"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Ecran de recherche"
 
@@ -525,7 +521,7 @@
 msgid "Select and play"
 msgstr "Sélectionner et Lire"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Ecran des paroles"
 
@@ -560,7 +556,7 @@
 msgid "Delete saved lyrics"
 msgstr "Supprimer les paroles sauvées"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Ecran des sorties"
 
@@ -568,7 +564,7 @@
 msgid "Enable/disable output"
 msgstr "Activer/désactiver une sortie"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Ecran suivant"
@@ -602,576 +598,582 @@
 msgid "Apply and save changes"
 msgstr "Appliquer et sauvegarder les changements"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Aide"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Pas de paroles"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Paroles"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "Chargement..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Paroles enregistrées"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Paroles supprimées"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Aucune parole sauvée"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Sortie %s activée"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Sortie %s désactivée"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Sorties"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Durée"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Compositeur"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nom"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disque"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Piste"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Date"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Style"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Commentaire"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Chemin"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Débit"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Nombre d'artistes"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Nombre d'albums"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Nombre de chansons"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Temps de service"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Mise à jour de la BD la plus récente"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Temps de lecture"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Temps de lecture de la BD"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Visualiseur de chanson"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Statistiques MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Chanson sélectionnée"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Chanson actuellement jouée"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "En Lecture:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[En Pause]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Ecran de configuration des touches"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Déplacer le curseur vers le haut"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Déplacer le curseur vers le bas"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Déplacer le curseur vers le haut de l'écran"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Déplacer le curseur vers le milieu de l'écran"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Déplacer le curseur vers le bas de l'écran"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Déplacer le curseur vers le haut de la liste"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Déplacer le curseur vers le bas de la liste"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Monter d'une page"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Descendre d'une page"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Sélection multi-ligne"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Défiler d'une ligne vers le bas"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Défiler d'une ligne vers le haut"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Défiler d'une ligne vers le bas"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Défiler d'une moitié d'écran vers le haut"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Défiler d'une moitié d'écran vers le bas"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Sélectionner la chanson actuellement jouée"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Ecran d'aide"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Jouer/Entrer dans le répertoire"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Couper"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Avancer"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Reculer"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Augmenter le volume"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Diminuer le volume"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Sélectionner/Désélectionner la chanson dans la liste de lecture"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Selectionner tous les éléments listés"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Enlever la chanson de la liste de lecture"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Liste de lecture aléatoire"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Vider la liste de lecture"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Activer/désactiver le mode répétition"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Activer/désactiver le mode aléatoire"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Basculer le mode seul"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Basculer le mode consommation"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Activer/désactiver le mode de fondu"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Mettre à jour la base de données musicale"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Enregistrer la liste de lecture"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Ajouter une url/un fichier à la liste de lecture"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Aller au répertoire racine"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Aller au répertoire supérieur"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Localiser la chanson dans le navigateur"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Déplacer l'élément vers le haut"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Déplacer l'élément vers le bas"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Rafraîchir l'écran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Activer le mode d'auto-centrage"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Ecran suivant"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Ecran précédent"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Passer à l'écran le plus récent"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Chercher après"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Chercher après/suivant"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Chercher avant"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Aller à"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Ecran sur l'Artiste"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Changer le mode de recherche"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interrompre l'action"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Mettre à jour les paroles"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Espace"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Entrée"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Suppr"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Haut"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Bas"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Gauche"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Droite"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Début"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageBas"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageHaut"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Echap"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Inser"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "La touche %s est assignée à %s et à %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Attention: Couleur inconnue - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Commande inconnue"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Attention: Champ de couleur inconnu - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Le terminal ne supporte pas le changement de couleurs"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Le terminal ne dispose pas de la gestion des couleurs"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Erreur"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Définition de raccourci malformée"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Configuration de raccourci incomplète"
 
@@ -1185,47 +1187,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Manque '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Mauvais nom de couleur"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Définition de couleur incomplète"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Nombre invalide"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Définition de couleur malformée"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Nom d'écran inconnu"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Mode de recherche invalide"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Mode de recherche inconnu"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Traduction française : Yann Cézard <eesprit@free.fr>\n"
@@ -1238,14 +1240,53 @@
 "  Thibault Févry https://launchpad.net/~thibaultfevry\n"
 "  Yann Cézard https://launchpad.net/~eesprit"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Sélection multi-ligne désactivée"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Sélection multi-ligne activée"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Effacer la liste de lecture %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Erreur: Ecran trop petit"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Attention: Couleur inconnue - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Connecté à %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Liste de lecture aléatoire"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Liste de lecture vidée"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Enregistrer la liste de lecture sous"
+
+#~ msgid "Playlist"
+#~ msgstr "Liste de lecture"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Liste de lecture sur %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Ecran de Liste de lecture"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Liste de lecture aléatoire"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Vider la liste de lecture"
+
+#~ msgid "Save playlist"
+#~ msgstr "Enregistrer la liste de lecture"
+
 #~ msgid "Volume n/a "
 #~ msgstr "Volume n/a "

ncmpc-0.24.tar.xz/po/gl.gmo -> ncmpc-0.27.tar.xz/po/gl.gmo Changed

ncmpc-0.24.tar.xz/po/gl.po -> ncmpc-0.27.tar.xz/po/gl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-03-25 19:34+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectandose con %s... [Prema %s para interromper]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erro: a versión %d.%d.%d do MPD é moi antiga (precisase a %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado a %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Lista de reprodución aleatoria"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista limpada"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erro: A pantalla é moi pequena"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Activado o modo de repetición"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo aleatório activado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo aleatório desactivado"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo completo desactivado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento cruzado %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo de busca: Limitada"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo de busca: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo de autocentrado: activado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo de autocentrado: desactivado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas as pistas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes do artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as pistas do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas de ningún álbum do artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Engadindo álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Engadindo %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 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
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Engadindo «%s» á lista de reprodución"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "A base de datos estase actualizando..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Comezou a actualización da base de datos de %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Comezou a actualización da base de datos"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Buscar"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Buscar cara atrás"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Ir a"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Non se puido atopar «%s»"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Substituir %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Contrasinal"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Gardar a lista de reprodución como"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Substituir %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Interrompido"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Gardouse %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Engadir"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Lista de reprodución"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lista de reprodución en %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Non é possíbel borrar este elemento"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Borrar a lista de reprodución %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Borrar a lista de reprodución"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Lista de reprodución borrada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Explorar"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "comentário"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "ficheiro"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etiqueta de busca errónea %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Buscar"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Prema %s para unha nova busca"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Buscar: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Buscar: Resultados para %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Buscar: Prema %s para unha nova busca [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Modo da busca: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Ten novos atallos de teclado"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Non se cambiaron os atallos de teclado"
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Erro: Non se puido crear o cartafol ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Escribiuse %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Borrada"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduza un novo atallo para %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Asignouse %s a %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar os atallos de teclado "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar e guardar os atallos de teclado  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Engadir un novo atallo"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Esquecuse de «Aplicar» os cambios?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Editar os atallos de teclado"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar atallos para %s"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Pantalla da lista de reprodución"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Pantalla de atallos"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Centrar"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Pantalla do explorador"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Entre no cartafol/Seleccione e reproduza a canción"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Engadir a canción á lista de reprodución"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Borrar a lista de reprodución"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Pantalla de busca"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Seleccionar e reproducir"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Pantalla das letras de cancións"
 
@@ -558,7 +554,7 @@
 msgid "Delete saved lyrics"
 msgstr "Eliminar as letras de cancións gardadas"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Pantalla de saída"
 
@@ -566,7 +562,7 @@
 msgid "Enable/disable output"
 msgstr "Activar/Desactivar a saída"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Seguinte pantalla"
@@ -600,576 +596,582 @@
 msgid "Apply and save changes"
 msgstr "Aplicar e gardar os cambios"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Axuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Sen letras de cancións"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Letras de cancións"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "cargando..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Letras de cancións gardadas"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Letras de cancións eliminadas"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Letras de cancións sen gardar"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Activouse a saída «%s»"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Desactivouse a saída «%s»"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Saídas"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Duración"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Pista"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Xénero"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Comentario"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Ruta"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Número de álbumes"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Número de cancións"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Tempo de execución"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Actualización máis recente da BD"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Tempo de reprodución"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Duraciónacumulada da BD"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Visor da canción"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Estatísticas do MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Canción seleccionada"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Canción que se está reproducindo"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Reproducindo:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[En Pausa]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Pantalla de configuración dos atallos"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Saír"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Mover o cursor cara enriba"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Mover o cursor cara embaixo"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Mover o cursor até ao comezo da pantalla"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Mover o cursor até á metade da pantalla"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover o cursor até ao pe da pantalla"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Mover o cursor até ao comezo da lista"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover o cursor até ao pe da lista"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Páxina enriba"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Páxina embaixo"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Selección do rango"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Baixar unha liña"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir unha liña"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Baixar unha liña"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir media pantalla"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Baixar media pantalla"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Seleccionar a cannción actual canción en reprodución"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Pantalla de axuda"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Reproducir/Entrar nun cartafol"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Deter"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Seguinte pista"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Avanzar"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Retroceder"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Diminuir volume"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Seleccionar/deseleccionar a canción na lista de reprodución"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Seleccionar todos os elementos da lista"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Borrar a canción da lista de reproducción"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Lista de reproducción aleatoria"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Limpar a lista"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Activar/desactivar o modo repetición"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Activar/desactivar o modo aleatorio"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Alternar o modo compacto"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Alternar o modo completo"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Activar/desactivar o modo de esvaecimento cruzado"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Comezar unha actualización da BD"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Gardar a lista de reprodución"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Engadir url/ficheiro á lista de reprodución"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Ir ao cartafol raíz"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Ir ao cartafol pai"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Atopar a canción no explorador"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Movera o elemento cara arriba."
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Mover o elemento cara abaixo"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Actualizar a pantalla"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Alternar o modo de autocentrado"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Seguinte pantalla"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Pantalla anterior"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Volvar á pantalla anterior"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Buscar cara adiante"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Buscar cara adiante, seguinte"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Buscar cara atrás"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Ir a"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Pantalla de Artistas"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Cambiar o modo de buscas"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interromper a acción"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Actualizar as letras de cancións"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Sen definir"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Espazo"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Entrar"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Retroceso"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Arriba"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Inicio"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "Fin"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PáxEmbaixo"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PáxEnriba"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tabulador"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Maiús + Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A tecla %s asignouse a %s e a %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Aviso: Cor descoñecida - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Orde descoñecida"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Aviso: Campo de cor descoñecido - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "A terminal non admite o cambio das cores"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "A terminal non ten funcionalidades de cor"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Definición incorrecta da tecla de acceso rápido."
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Configuraión incompleta da tecla de acceso rápido"
 
@@ -1183,47 +1185,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Falta o signo «=»"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Nome de cor incorrecto"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Definición incompleta da cor"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Número incorrecto"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Definición incorrecta da cor"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Nome de pantalla descoñecido"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "O modo de busca é incorrecto"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Modo de busca descoñecido"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "ashtophet\n"
@@ -1233,14 +1235,53 @@
 "  Johám-Luís Miguéns Vila https://launchpad.net/~miluxovi\n"
 "  Miguel Anxo Bouzada https://launchpad.net/~mbouzada"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "A selección de rango está desactivada"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "A selección de rango está sactivada"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Borrar a lista de reprodución %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Erro: A pantalla é moi pequena"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Aviso: Cor descoñecida - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Conectado a %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Lista de reprodución aleatoria"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Lista limpada"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Gardar a lista de reprodución como"
+
+#~ msgid "Playlist"
+#~ msgstr "Lista de reprodución"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lista de reprodución en %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Pantalla da lista de reprodución"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Lista de reproducción aleatoria"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Limpar a lista"
+
+#~ msgid "Save playlist"
+#~ msgstr "Gardar a lista de reprodución"
+
 #~ msgid "Volume n/a "
 #~ msgstr "Volume n/a "

ncmpc-0.24.tar.xz/po/he.gmo -> ncmpc-0.27.tar.xz/po/he.gmo Changed

ncmpc-0.24.tar.xz/po/he.po -> ncmpc-0.27.tar.xz/po/he.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-09-07 20:35+0200\n"
 "Last-Translator: zeltak <Unknown>\n"
 "Language-Team: he <he@li.org>\n"
@@ -22,58 +22,46 @@
 msgid "n"
 msgstr "לא"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "מתחבר ל %s [לחץ על %s לביטול]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "שגיאה: גרסת התוכנה %d.%d.%d ישנה מדי (צריך %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "מתחבר ל %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "%s לעורך המקשים לחץ"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "רשימת שירים מעורבבת"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "רשימת שירים מנוקה"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "שגיאה: המסך קטן מידי"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "מצב חזרה מופעל"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "מצב חזרה מופסק"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "מצב רנדומלי מופעל"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "מצב רנדומלי מופסק"
 
@@ -82,11 +70,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "מצב יחיד מופעל"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "מצב יחיד מופסק"
 
@@ -94,99 +82,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "מצב מתכלה מופעל"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "מצב יחיד מופסק"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "קרוספייד שניות %d"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "בסיס הנתונים עודכן"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "מצב סופי: כרוך"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "מצב סופי: נורמלי"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "מצב מרכז אוטומטי: מופעל"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "מצב מרכז אוטומטי: מופסק"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "כל השירים"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "כל האמנים"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "כל השירים של אומן: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "אלבום:%s-%s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "טוען...."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "מוסיף %s לרשימת השירים"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "עדכון בסיס הנתנונים פועל...."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "עדכון בסיס הנתנונים החל %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "עדכון בסיס הנתנונים החל"
 
@@ -197,95 +184,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "חיפוש"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "חיפוש לאחור"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "קפיצה"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "לא ניתן למצוא את '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "החלף  %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "סיסמה"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "שמירת רשימת שירים כ"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "החלף  %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "בוטל"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "שמירת %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "הוסף"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "רשימת שירים"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "רשימת שירים ב %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "מחיקת פריט זה בלתי אפשרית"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "%s [%s/%s] ? מחיקת רשימת שירים "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "מחק רשימת שירים"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "רשימת שירים נמחקה"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "דפדף"
 
@@ -329,139 +323,139 @@
 msgid "comment"
 msgstr "הערות"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "קובץ"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "שם"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "אומן"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "אלבום"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "שם קובץ"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "אומן+שם"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "חיפוש לא תקין של תגית %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "אין טעון לחיפוש תגית %s"
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "חיפוש"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "לחץ %s לביצוע חיפוש חדש"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "חיפוש: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "חיפוש: תוצאוצ חיפוש ל %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "חיפוש: לחץ %s לחיפוש חדש [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "צורת חיפוש: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "יש תצורת מקשים חדשה"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "תצורת מקשים לא שונתה."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "שגיאה: לא ניתן ליצור את התיקיה ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "שגיאה:  %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "נכתב %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "נמחק"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "הכנס מקש חדש ל %s "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "שגיאה: המקש %s כבר קיים ל %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "הוקצה  %s ל %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "=====> ישם תצורת מקשים "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "=====> ישם ושמור תצורת מקשים  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "הוסף מקש חדש"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "הזהרה: האם שכחת 'לישם' את השינוים"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "ערוך את תצורת המקשים"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "ערוך את המקש ל %s"
@@ -474,9 +468,10 @@
 msgid "Global"
 msgstr "גלובלי"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "מסך רשימת שירים"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "מסך שוני מקשים"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -494,7 +489,7 @@
 msgid "Center"
 msgstr "מרכז"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "דפדף במסך"
 
@@ -502,15 +497,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "הכנס תיקיה/בחר ונגן שיר"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "הוסף שיר לרשימת שירים"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "מחק רשימת שירים"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "חפש במסך"
 
@@ -518,7 +514,7 @@
 msgid "Select and play"
 msgstr "בחר ונגן"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "מסך מילות השיר"
 
@@ -552,7 +548,7 @@
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "מסך הפלט"
 
@@ -560,7 +556,7 @@
 msgid "Enable/disable output"
 msgstr "אשר/אסור על פלט"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "מסך הבא"
@@ -594,576 +590,582 @@
 msgid "Apply and save changes"
 msgstr "ישם ושמור שינויים"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "עזרה"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "אין מילים לשיר"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "מילים"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "טוען...."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "מילים לשיר נשמרו"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "פלט  '%s' אפשרי"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "פלט  '%s' אינו אפשרי"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "פלטים"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "מלחון"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "שם"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "דיסק"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "רצועה"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "תאריך"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "ג'אנר"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "הערה"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "נתיב"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "ביטרייט"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "מספר אומנים"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "מספר אלבומים"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "מספר שירים"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "זמן פעילות"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "עדכון עדכני אחרון של בסיב נתונים"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "זמן נגינה"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "זמן נגינה בסיס נתונים"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "הצגת השיר"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "סטטיסטיקה MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "בחר שיר"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "שיר עכשווי"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "מנגן:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[הפסקה]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "ב n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "ווליום %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "מסך קינפוג מקשים"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "צא מהתוכנה"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "הזז סמן למעלה"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "הזז סמן למטה"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "הזז סמן לקצה העליון של המסך"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "הזז סמן לאמצע של המסך"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "הזז סמן לקצה התחתון של המסך"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "הזז סמן לקצה העליון של הרשימה"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "הזז סמן לקצה התחתון של הרשימה"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "דף למעלה"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "דף למטה"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "בחירת טווח"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "גלול שורה אחת"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "גלול שורה אחת למעלה"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "גלול שורה אחת"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "גלול חצי מסך למעלה"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "גלול חצי מסך למטה"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "בחר בשיר שכרגע מנגן"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "מסך עזרה"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "נגן/הכנס תיקיה"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "הפסק"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "עצור"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "חתוך"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "רצועה הבאה"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "רצועה קודמת"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "דלג קדימה"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "דלג אחורה"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "הגבר"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "הנמך"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "בחר/הסר שיר ברשימת שירים"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "בחר את הכל"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "מחק שיר מרשימת השירים"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "ערבב את רשימת שירים"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "מחק את רשימת שירים"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "הפעל מצב חזרה"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "הפעל מצב רנדומלי"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "הפעל מצב יחיד"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "הפעל מצב מתכלה"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "הפעל קרוספייד"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "התחל עדכון בסיס הנתונים המוזיקלי"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "שמור רשימת שירים"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "הוסף לינק/קובץ לרשימת שירים"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "לך לתיקיה שורש"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "לך לתיקיה עליונה"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "מצא שיר בדפדפן"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "הזז למעלה"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "הזז למטה"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "רענן מסך"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "הפעל מצב חיפוש"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "הפעל מירכוז אוטומטי"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "מסך הבא"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "מסך קודם"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "החלף למסך אחרון"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "מצא קדימה"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "מצא קדימה הבא"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "מצא אחורה"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "קפוץ ל"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "מסך אומן"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "שנה תצורת מסך"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "הפסק פעולה"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "רענן מילים לשיר"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "לא מוגדר"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "רווח"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "הכנס"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "אחורה"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "מחק"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "למעלה"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "למטה"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "שמאלה"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "חמינה"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "בית"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "סוף"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "דף למטה"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "דף למעלה"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "טאב"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "מקש %s מוקצה ל %s ו %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "אזהרה: צבע לא מוכר  - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "פקודה לא ידועה"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "אזהרה: צבע לא מוכ בתחום  - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "המסוף ללא תמיכה בצבעים"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "המסוף ללא  יכולת תמיכה בצבעים"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "שגיאה"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "הגדרת המקשים החמים שגויה"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "פקודה לא ידועה"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "הגדרת המקשים החמים חסרה"
 
@@ -1177,56 +1179,95 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "חסר '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "צבע שגוי"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "הגדרת צבעים חסרה"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "מספר לא תקין"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "הגדרת צבעים שגויה"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "שם מסך לא ידוע"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "חיפוש לא תקין"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "מצב חיפוש לא ידוע"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "פרמטר קונפיג לא ידוע"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  zeltak https://launchpad.net/~zeltak"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "טווח בחירה מאושר"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "טווח בחירה מבוטל"
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "%s [%s/%s] ? מחיקת רשימת שירים "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "שגיאה: המסך קטן מידי"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "אזהרה: צבע לא מוכר  - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "מתחבר ל %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "רשימת שירים מעורבבת"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "רשימת שירים מנוקה"
+
+#~ msgid "Save playlist as"
+#~ msgstr "שמירת רשימת שירים כ"
+
+#~ msgid "Playlist"
+#~ msgstr "רשימת שירים"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "רשימת שירים ב %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "מסך רשימת שירים"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "ערבב את רשימת שירים"
+
+#~ msgid "Clear playlist"
+#~ msgstr "מחק את רשימת שירים"
+
+#~ msgid "Save playlist"
+#~ msgstr "שמור רשימת שירים"

ncmpc-0.24.tar.xz/po/hu.gmo -> ncmpc-0.27.tar.xz/po/hu.gmo Changed

ncmpc-0.24.tar.xz/po/hu.po -> ncmpc-0.27.tar.xz/po/hu.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, 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:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Hiba: a(z) %d.%d.%d MPD verzió túl régi (%s kell)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Csatlakoztatva ide: %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "nyomj %s-t a szerkesztéshez"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lejátszólista összekeverve"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lejátszólista törölve"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Hiba: a képernyő túl kicsi"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Ismétlő mód be"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Ismétlő mód ki"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Véletlen mód be"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Véletlen mód ki"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Egyszeri lejátszás mód be"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Egyszeri lejátszás mód ki"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Fogyasztó mód be"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Fogyasztó mód ki"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Egymásba mosás %d másodperc"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Keresési mód: újrakezdő"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Keresési mód: normál"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Középre igazítás bekapcsolva"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Középre igazítás kikapcsolva"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Minden szám"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Minden előadó"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s előadó minden száma"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "%s könyvtár hozzáadása...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 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
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "'%s' hozzáadása a lejátszólistához"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Adatbázis frissítés folyamatban..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "%s adatbázis frissítése elkezdődött"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Adatbázis frissítés elindult"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Keresés"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Keresés visszafelé"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Ugrás"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "'%s' nem található"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Cserélni a következőt: %s [%s/%s]? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Jelszó"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Lejátszólista mentése másként"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 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:236 src/screen_keydef.c:269
-#: ../src/screen_lyrics.c:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Megszakítva"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s elmentve"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Lejátszólista"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lejátszólista itt: %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Ez az elem nem törölhető"
 
-#: 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]? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Lejátszólista törlése"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Lejátszólista törölve"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Tallózás"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "megjegyzés"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fájl"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Cím"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Előadó és Cím"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Hibás keresési elem %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Keresés"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Új kereséshez nyomj %s gombot"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Keresés: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Keresés: találatok a következőhöz %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Keresés: új kereséshez nyomj %s gombot [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Keresési mód: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Új billentyű beállításaid vannak"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "A billentyű beállítások változatlanok."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Hiba: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s elmentve"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Törölve"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Nyomd meg az új gombot a következőhöz: %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s hozzárendelve a következőhöz: %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Billentyű beállítások használata "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Alkalmaz és Menti a billentyű beállításokat  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Új gomb hozzáadása"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 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:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Billentyűk változtatása"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Gombok módosítása a következőhöz: %s"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Általános"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Lejátszólista"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Billentyű beállító képernyő"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Közép"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Tallózás"
 
@@ -507,15 +502,16 @@
 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:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Szám hozzáadása a lejátszólistához"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Kereső képernyő"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Kiválasztás és lejátszás"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Dalszöveg képernyő"
 
@@ -557,7 +553,7 @@
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Kimenetek"
 
@@ -565,7 +561,7 @@
 msgid "Enable/disable output"
 msgstr "Kimenet engedélyezése/tiltása"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Kövezkező képernyő"
@@ -599,576 +595,582 @@
 msgid "Apply and save changes"
 msgstr "Alkalmaz és menti a változásokat"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Súgó"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Nincs dalszöveg"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Dalszövegek"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "betöltés..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Dalszövegek elmentve"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Kimenet engedélyezve: %s"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Kimenet tiltva: %s"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Kimenetek"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Hossz"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Zeneszerző"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Név"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Lemez"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Szám"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Elérési út"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitráta"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Előadók száma"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Albumok száma"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Zenék száma"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Üzemidő"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Legutóbbi adatbázis frissítés"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Lejátszási idő"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Teljes adatbázis lejátszási ideje"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Szám néző"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD statisztika"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Kiválasztott zene"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Jelenlegi zene"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Ami szól:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Szüneteltetve]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Hangerő ismeretlen"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hangerő %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Billentyű beállító képernyő"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Kilép"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Kurzormozgatás felfelé"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Kurzormozgatás lefelé"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Kurzor mozgatása a képernyő tetejére"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Kurzor mozgatása a képernyő közepére"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Kurzor mozgatása a képernyő aljára"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Kurzor mozgatása a lista tetejére"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Kurzor mozgatása a lista aljára"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Egy oldalt fel"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Egy oldalt le"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Tartomány kiválasztása"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Görgetés egy sorral le"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Görgetés egy sorral fel"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Görgetés egy sorral le"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Görgetés fél képernyőnyivel fel"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Görgetés fél képernyőnyivel le"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Most lejátszott szám kiválasztása"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Segítség"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Lejátszás/Belépés könyvtárba"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Szüneteltetés"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Leállítás"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Vágás"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Tekerés előre"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Tekerés hátra"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Hangerő növelése"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Hangerő csökkentése"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Szám kiválasztása a lejátszólistában"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Minden listázott elem kiválasztása"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Szám törlése a lejátszólistából"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Lejátszólista összekeverése"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Lejátszólista törlése"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Ismétlő mód ki- és bekapcsolása"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Véletlenszerű lejátszás ki- és bekapcsolása"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Egyszeri mód átkapcsolása"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Fogyasztó mód átkapcsolása"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Egymásba mosás ki- és bekapcsolása"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "A zenei adatbázis frissítésének indítása"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Lejátszólista mentése"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "URL vagy fájl hozzáadása a lejátszólistához"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Mozgás a gyökér könyvtárba"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Mozgás a szülő könyvtárba"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Szám megtekintése a tallozóban"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Elem mozgatása fel"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Elem mozgatása le"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Képernyő frissítése"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Középre igazítás ki- és bekapcsolása"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Kövezkező képernyő"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Előző képernyő"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Váltás a legutóbbi képernyőre"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Keresés előre"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Következő keresése előre"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Keresés hátra"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Ugrás oda"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Előadó képernyő"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Kereső mód váltása"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "parancs megszakítása"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Dalszövegek frissítése"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Meghatározatlan"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Szóköz"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "A(z) %s gomb a követlezőkhoz van rendelve: %s és %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Figyelem: ismeretlen szín - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Ismeretlen parancs"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Figyelem: ismeretlen szín mező - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "A terminál nem támogatja a színek változtatását"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "A terminál nem támogatja a színeket"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Hiba"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Hibás gyorsbillentyű definíció"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Hiányos gyorsbillentyű definíció"
 
@@ -1182,61 +1184,100 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Hiányzó egyenlőség jel"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Hibás szín megnevezés"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Hiányos szín megadás"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Érvénytelen szám"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Hibás szín megadás"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Ismeretlen képernyő név"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Érvénytelen keresési mód"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Ismeretlen keresési mód"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 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:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Tartomány kiválasztás letiltva"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Tartomány kiválasztás engedélyezve"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Törlöd a %s lejátszólistát [%s/%s]? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Hiba: a képernyő túl kicsi"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Figyelem: ismeretlen szín - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Csatlakoztatva ide: %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Lejátszólista összekeverve"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Lejátszólista törölve"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Lejátszólista mentése másként"
+
+#~ msgid "Playlist"
+#~ msgstr "Lejátszólista"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lejátszólista itt: %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Lejátszólista"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Lejátszólista összekeverése"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Lejátszólista törlése"
+
+#~ msgid "Save playlist"
+#~ msgstr "Lejátszólista mentése"
+
 #~ msgid "Search: "
 #~ msgstr "Keresés: "

ncmpc-0.24.tar.xz/po/it.gmo -> ncmpc-0.27.tar.xz/po/it.gmo Changed

ncmpc-0.24.tar.xz/po/it.po -> ncmpc-0.27.tar.xz/po/it.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-10-31 19:53+0000\n"
 "Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -27,60 +27,48 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Collegandosi a %s... [Preme %s per annullare]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 "Errore: La versione di MPD %d.%d.%d è troppo vecchia (bisogna avere al meno "
 "la %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Connesso a %s"
-
-#. 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:339
 #, c-format
 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:755
-msgid "Shuffled playlist"
-msgstr "Lista di canzoni mescolata"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista di canzoni vuotata"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Errore: La finestra è tropo piccola"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo ripetizione attivato"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo ripetizione disattivato"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo randomizzato attivo"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo randomizzato disattivato"
 
@@ -89,11 +77,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo singolo attivato"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo singolo disattivato"
 
@@ -101,99 +89,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo consumazione attivato"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo consumazione disattivato"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Database aggiornato"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo di ricerca: semplice"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo di ricerca: Normale"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo di auto-centrato: attivato"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo di auto-centrato: disattivato"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Tutte le piste"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Tutti gli artisti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album del artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Tutte le piste del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Aggiungendo album %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Aggiungendo %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Caricando la lista %s"
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Aggiungendo '%s' alla lista di canzoni"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Aggiornamento del database in corso..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Iniziato l'aggiornamento del database %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Iniziato l'aggiornamento del database."
 
@@ -204,95 +191,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Cerca"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr ""
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Salta"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Non si ha potuto trovare %s"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Sostituire %s [%s%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Password"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Salvare la lista come"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Sostituire %s [%s%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Annullato"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s salvato"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Playlist"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lista di canzoni in %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Non è possibile rimuovere questo elemento."
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Rimuovere la playlist %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Rimuove la playlist"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Playlist rimossa."
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Esplora"
 
@@ -336,139 +330,139 @@
 msgid "comment"
 msgstr "commentare"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titolo"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nome del file"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artista + Titolo"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Etichetta di ricerca invalida: %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Cerca"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Preme %s per una nuova ricerca"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Cerca: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Errore: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s creato"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Rimosso"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Introduce tasto di acceso veloce per %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s assegnato a %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Introduce un nuovo tasto"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Hai dimenticato 'Applicare' i tuoi cambiamenti?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Cambia i tasti di acceso veloce"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Cambia i tasti per %s"
@@ -481,9 +475,10 @@
 msgid "Global"
 msgstr "Globale"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Lista di canzoni"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Schermo di tasti di acceso"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -501,7 +496,7 @@
 msgid "Center"
 msgstr "Centrare"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr ""
 
@@ -509,15 +504,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Accedere alla cartella/Selezionare e riprodurre la canzone"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Aggiungere la canzone alla lista"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Rimuove la playlist"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Ricerca"
 
@@ -525,7 +521,7 @@
 msgid "Select and play"
 msgstr "Seleziona e riprodurre"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Lettere"
 
@@ -560,7 +556,7 @@
 msgid "Delete saved lyrics"
 msgstr "Rimuovere le lettere"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Schermo di uscite"
 
@@ -568,7 +564,7 @@
 msgid "Enable/disable output"
 msgstr "Attivare/disattivare le uscite"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Lista di canzoni"
@@ -602,576 +598,577 @@
 msgid "Apply and save changes"
 msgstr "Applicare e salvare i cambiamenti"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Aiuto"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Non ci sono testi disponibili"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Testi"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "caricamento in corso..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Testi salvati"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Testi rimossi"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Non ci sono testi salvati"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "La uscita '%s' è attivata"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "La uscita '%s' è disattivata"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Uscite"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Durata"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Compositore"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Brano"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Genero"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Commento"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Path"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Numero di artisti"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Numero di albums"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Numero di brani"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Tempo in attività"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Aggiornamento più recente del database"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Tempo di riproduzione"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Durata del database"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Visore di canzoni"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Statistiche del MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Brano selezionato"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Brano riprodotto"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Riproducendo:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pausato]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Esci"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Muovi cursore in alto"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Muovi cursore in basso"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Muovi cursore in cima allo schermo"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Muovi cursore in mezzo allo schermo"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Muovi cursore in fondo allo schermo"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Muovi cursore in cima alla lista"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Muovi cursore in fondo alla lista"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Pagina sopra"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Pagina sotto"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr ""
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr ""
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Esegui/Entra nella cartella"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Prossima traccia"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Traccia precedente"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Alza volume"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Abbassa volume"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+msgid "Select/deselect song in queue"
 msgstr ""
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Seleziona tutti gli oggetti della lista"
 
+#: src/command.c:136
+msgid "Delete song from queue"
+msgstr ""
+
 #: src/command.c:138
-msgid "Delete song from playlist"
+msgid "Shuffle queue"
 msgstr ""
 
 #: src/command.c:140
-msgid "Shuffle playlist"
+msgid "Clear queue"
 msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
+msgid "Toggle repeat mode"
 msgstr ""
 
 #: src/command.c:144
-msgid "Toggle repeat mode"
+msgid "Toggle random mode"
 msgstr ""
 
 #: src/command.c:146
-msgid "Toggle random mode"
+msgid "Toggle single mode"
 msgstr ""
 
 #: src/command.c:148
-msgid "Toggle single mode"
+msgid "Toggle consume mode"
 msgstr ""
 
 #: src/command.c:150
-msgid "Toggle consume mode"
+msgid "Toggle crossfade mode"
 msgstr ""
 
 #: src/command.c:152
-msgid "Toggle crossfade mode"
+msgid "Start a music database update"
 msgstr ""
 
 #: src/command.c:154
-msgid "Start a music database update"
+msgid "Save queue"
 msgstr ""
 
 #: src/command.c:156
-msgid "Save playlist"
-msgstr "Salva playlist"
-
-#: src/command.c:158
-msgid "Add url/file to playlist"
+msgid "Add url/file to queue"
 msgstr ""
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr ""
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr ""
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr ""
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr ""
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
+#: src/colors.c:156
+msgid "Unknown color"
 msgstr ""
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+msgid "Unknown color field"
 msgstr ""
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1185,47 +1182,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1233,10 +1230,40 @@
 "  Max Kellermann https://launchpad.net/~max-duempel\n"
 "  simone.sandri https://launchpad.net/~lexluxsox"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Rimuovere la playlist %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Errore: La finestra è tropo piccola"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Connesso a %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Lista di canzoni mescolata"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Lista di canzoni vuotata"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Salvare la lista come"
+
+#~ msgid "Playlist"
+#~ msgstr "Playlist"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lista di canzoni in %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Lista di canzoni"
+
+#~ msgid "Save playlist"
+#~ msgstr "Salva playlist"

ncmpc-0.24.tar.xz/po/ko.gmo -> ncmpc-0.27.tar.xz/po/ko.gmo Changed

ncmpc-0.24.tar.xz/po/ko.po -> ncmpc-0.27.tar.xz/po/ko.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "%s(으)로 연결중입니다. [취소하려면 %s키를 누르십시오]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "MPD 버전 %d%d%d (은)는 너무 낮습니다. (필요한 버전 %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "%s로 접속함"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "키 편집기 사용을 위하여 %s(을)를 누르십시오."
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "섞여진 연주목록"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "지워진 연주목록"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "오류: 화면이 너무 작습니다."
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "반복 모드 켜짐"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "반복 모드 꺼짐"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "무작위 모드 켜짐"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "무작위 모드 꺼짐"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "싱글 모드 켜짐"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "싱글 모드 꺼짐"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "소비 모드 켜짐"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "소비 모드 꺼짐"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "곡바뀜 %d 초"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "데이터베이스를 업데이트 하였습니다."
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "찾기 방식: 줄 이어짐"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "찾기 방식: 보통"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "자동 가운데 방식: 켜짐"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "자동 가운데 방식: 꺼짐"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "모든 트랙"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "모든 아티스트"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "아티스트의 모든 트랙: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "앨범: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "올리는 중..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "'%s'(을)를 연주목록에 더하기"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "데이터베이스 업데이트를 실행 중..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "%s 데이터베이스 업데이트를 시작합니다."
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "데이터베이스 업데이트를 시작합니다."
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "찾기"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "거꾸로 찾기"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "이동"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "'%s'(을)를 찾을 수 없습니다."
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "변경하기 %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "열쇠글"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "연주목록으로 저장"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "변경하기 %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "중단됨"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s(으)로 저장함"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "더하기"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "연주 목록"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "%s 상의 연주목록"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "이 항목을 지우는 것은 가능하지 않습니다."
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "연주목록 %s [%s/%s] 삭제하기 ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "연주목록 지우기"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "연주목록을 삭제하였습니다."
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "열람"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "주석"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "파일"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "제목"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "아티스트"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "앨범"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "파일이름"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "아티스트 + 제목"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "잘못된 찾기 태그 %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "찾기 태그 %s위한 인자가 없습니다."
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "찾기"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "새로운 찾기를 위하여 %s(을)를 누르십시오."
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "찾기: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "찾기: %s 결과 [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "찾기: %s(을)를 눌러 새롭게 찾기 [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "찾기 방식: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "새로운 키 조합을 지정하였습니다."
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "키 조합을 바꾸지 않았습니다."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "오류: ~/.ncmpc 폴더를 만들 수 없습니다. - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "오류: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "%s(을)를 썼습니다."
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "삭제됨"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "%s(을)를 위한 새 키를 입력하세요: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "오류: 키 %s(은)는 이미 %s(을)를 위하여 사용합니다."
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s(을)를 %s(으)로 지정하였습니다."
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> 키 조합을 적용 "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> 키 조합을 적용하고 저장  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "새로운 키 더하기"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "주의: 변경사항 '적용하기'를 잊었나요?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "키 조합 편집하기"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "%s(을)를 위한 키 편집"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "전체"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "연주목록 화면"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "키설정 화면"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "가운데"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "열람하기 화면"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "디렉토리를 입력하고 곡을 선택하여 연주합니다."
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "연주목록에 곡을 더하기"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "연주목록 지우기"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "찾기 화면"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "선택하고 연주"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "가사 화면"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "가사 저장하기"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "출력 화면"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "출력 사용하기/안하기"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "다음 화면"
@@ -601,578 +597,584 @@
 msgid "Apply and save changes"
 msgstr "적용하고 변경사항을 저장하기"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "도움말"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "가사 없음"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "가사"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "올리는 중..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "가사를 저장하였습니다."
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "연주목록을 삭제하였습니다."
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "가사 저장하기"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "출력 '%s'(을)를 사용합니다"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "출력 '%s'(을)를 사용 안합니다"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "출력"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "길이"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "작곡가"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "이름"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "디스크"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "트랙"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "날짜"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "장르"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "주석"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "경로"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "비트 전송률"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "아티스트 수"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "앨범 수"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "곡 수"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "업타임"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "가장 최근의 데이타베이스 업데이트"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "연주시간"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "데이타베이스 연주시간"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "곡 보기"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD 통계"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "선택한 곡"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "현재 연주중인 곡"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "연주중:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[멈춰짐]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "음량 없음"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "음량 %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "키 설정 화면"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "커서를 위로 올리기"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "커서를 아래로 내리기"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "커서를 화면 맨 위로 옮기기"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "커서를 화면 가운데로 옮기기"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "커서를 화면 맨 아래로 옮기기"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "커서를 리스트 맨 위로 옮기기"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "커서를 리스트 맨 아래로 옮기기"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "위쪽 페이지"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "아래쪽 페이지"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "범위 선택"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "한 줄 아래로 내리기"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "한 줄 위로 올리기"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "한 줄 아래로 내리기"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "화면 반 위로 올리기"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "화면 반 아래로 내리기"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "현재 재생중인 곡을 선택"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "도움말 화면"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "연주/디렉토리 입력"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "일시정지"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "멈춤"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "연주중인 곡만 선택"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "다음 트랙"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "앞으로 찾기"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "뒤로 찾기"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "음량 높이기"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "음량 낮추기"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "연주목록에서 곡 선택/해제"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "나열한 항목 모두 선택하기"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "연주목록에서 곡 삭제하기"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "연주목록 섞기"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "연주목록 비우기"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "반복연주 모드 토클"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "무작위연주 모드 토클"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "싱글 모드 토글"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "소비 모드 토글"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "곡바꿈 모드 토글"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "음악 데이타베이스 업데이트를 시작"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "연주목록 저장"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "연주목록에 url/파일 더하기"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "루트 디렉토리로 가기"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "상위 디렉토리로 가기"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "열람 화면에 곡을 위치하기"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "항목 위로 올리기"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "항목 아래로 내리기"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "화면 갱신하기"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "찾기 모드 토글"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "자동 가운데 모드 토글"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "다음 화면"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "이전 화면"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "가장 최근 화면으로 교환"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "앞으로 찾기"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "앞으로 다음 찾기"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "뒤로 찾기"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "직접 이동"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "아티스트 화면"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "찾기 모드 변경"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "백그라운드 실행을 중지"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "가사 업데이트"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "정의되지 않음"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "지우기"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "키 %s (이)가 %s (와)과 %s (으)로 지정되었습니다."
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "경고: 알 수 없는 색상 - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "알 수 없는 명령"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "경고: 알 수 없는 색상 항목 - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "색상 변경 지원이 부족한 터미널입니다."
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "색상 기능이 없는 터미널입니다."
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "오류"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "잘못된 단축키 정의"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "알 수 없는 명령"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "단축키 설정이 불완전합니다."
 
@@ -1186,61 +1188,100 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "'=' 기호가 없습니다."
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "잘못된 색상 이름"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "불완전한 색상 지정"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "유효하지 않은 숫자"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "잘못된 색상 지정"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "알 수 없는 화면 이름"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "잘못된 검색 모드"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "알 수 없는 검색 모드"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "알 수 없는 설정 요소"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  atie https://launchpad.net/~atie-at-matrix\n"
 "  bluejay https://launchpad.net/~jaypedia"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "범위 선택 기능을 사용하지 않습니다."
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "범위 선택 기능을 사용합니다."
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "연주목록 %s [%s/%s] 삭제하기 ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "오류: 화면이 너무 작습니다."
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "경고: 알 수 없는 색상 - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "%s로 접속함"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "섞여진 연주목록"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "지워진 연주목록"
+
+#~ msgid "Save playlist as"
+#~ msgstr "연주목록으로 저장"
+
+#~ msgid "Playlist"
+#~ msgstr "연주 목록"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "%s 상의 연주목록"
+
+#~ msgid "Playlist screen"
+#~ msgstr "연주목록 화면"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "연주목록 섞기"
+
+#~ msgid "Clear playlist"
+#~ msgstr "연주목록 비우기"
+
+#~ msgid "Save playlist"
+#~ msgstr "연주목록 저장"
+
 #~ msgid "Search: "
 #~ msgstr "찾기: "

ncmpc-0.24.tar.xz/po/nb.gmo -> ncmpc-0.27.tar.xz/po/nb.gmo Changed

ncmpc-0.24.tar.xz/po/nb.po -> ncmpc-0.27.tar.xz/po/nb.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.11.0\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon %s"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Koblet til %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "trykk %s for å rette"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Tilfeldigjort spillelisten"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Sletter spillelisten"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Feil: Skjermbildet er for lite"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle artister"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laster..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Legger '%s' til spillelisten"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Databasen oppdateres..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "oppdaterer databasen ifra %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Oppdaterer databasen"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Søk"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Søk (bakover)"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Hopp"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Fant ikke '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Erstatt '%s' [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Passord"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Lagre spillelisten som"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Erstatt '%s' [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Avbrutt"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Lagret %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Legg til"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Spilleliste"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Spilleliste på %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Kan ikke slette dette elementet"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Slette '%s' [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Slett spilleliste"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Spillelisten slettet"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Filer"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Tittel"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Filnavn"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artist + tittel"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Søk"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Trykk på %s for ett nytt søk"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Søk: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Søk: Resultater %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Trykk på %s for ett nytt søk [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Søk etter: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Du har nye tastatursnarveier"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Tastatursnarveier uforandret!"
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Feil: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Skrev %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Slettet"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tast for %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Tasten %s brukes allerede for %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Satte %s = %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "==> Bruk snarveier "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "==> Bruk og Lagre snarveier  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Legg til ny tast"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Du glemte vel ikke å legge til de nye endringene?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Endre tast"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Endre taster for '%s'"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Spilleliste"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Hjelp"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Sentrer"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Filer"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Velg bibliotek/Legg til spillisten og spill sang"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Legg sang til spillelisten"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Slett spilleliste"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Database søk"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Legg til spillelisten og spill"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
@@ -557,7 +553,7 @@
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr ""
 
@@ -565,7 +561,7 @@
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Neste skjerm"
@@ -599,576 +595,582 @@
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Hjelp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Ingen sangtekst"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Sangtekster"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "laster..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Sangteksten er lagret"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr ""
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr ""
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Lengde"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Komponist"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Navn"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Plate"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Spor"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Dato"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Sjanger"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr ""
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Antall artister"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Antall albumer"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Antall sanger"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Oppetid"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Nyeste db oppdatering"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Spilletid"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "DB spilletid"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD statestikk"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Spiller:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pause]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volum: n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volum: %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Tastaturkonfigurasjon"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Flytt markør opp"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Flytt markør ned"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Flytt peker til toppen av skjermen"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Markøren en side opp"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Markøren en side ned"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr ""
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr ""
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Hjelp"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Spill/Velg mappe"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Neste"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Forrige"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Spol/Søk framover"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Spol/Søk tilbake"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Øk volumet"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Demp volumet"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Legg til/Fjern fra spillelisten"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Velg alle i listen"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Ta bort/slett"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Tilfeldiggjør spilleliste"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Tøm spillelisten"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Repeat På/Av"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Random På/Av"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Crossfade På/Av"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Oppdater databasen"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Lagre spillelisten"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Legg til URL eller fil til spillelisten"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Gå til rotmappe"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå ett nivå opp"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flytt opp"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flytt ned"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Oppdater skjermbilde"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Endre søkeinnstillinger"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Automatisk sentrering på/av"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Neste skjerm"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Forrige skjerm"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Søk fremover"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Søk neste (fremover)"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Søk bakover"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Gå til"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artistskjerm"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Endre søkemodus"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Oppdater sangtekster"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Ikke definert"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Mellomrom"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Tilbaketast"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Del"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Opp"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Ned"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Venstrepil"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Høyrepil"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Ins"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "%s-tasten satt til %s og %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Advarsel: Kjenner ikke til fargen %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Ukjent kommando"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Advarsel: %s er ikke definert.\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminalen mangler støtte for omdefinering av farger"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminalen mangler støtte for farger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Feil"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Malformert hurtigtastdefinisjon"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Uferdig hurtigtastkonfigurasjon"
 
@@ -1182,47 +1184,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Mangler '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Ugyldig fargenavn"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Uferdig fargedefinisjon"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Ugyldig tall"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Malformert fargedefinisjon"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Ukjent skjermnavn"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Ukjent konfiurasjonsparameter"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1232,10 +1234,49 @@
 "  Ole R. Thorsen https://launchpad.net/~ole-rth\n"
 "  Niels Anker https://launchpad.net/~nanker"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Slette '%s' [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Feil: Skjermbildet er for lite"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Advarsel: Kjenner ikke til fargen %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Koblet til %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Tilfeldigjort spillelisten"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Sletter spillelisten"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Lagre spillelisten som"
+
+#~ msgid "Playlist"
+#~ msgstr "Spilleliste"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Spilleliste på %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Spilleliste"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Tilfeldiggjør spilleliste"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Tøm spillelisten"
+
+#~ msgid "Save playlist"
+#~ msgstr "Lagre spillelisten"

ncmpc-0.24.tar.xz/po/ncmpc.pot -> ncmpc-0.27.tar.xz/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: 2014-07-14 11:56+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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,59 +18,55 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/max/git/ncmpc/src/i18n.h:42
+#: src/i18n.h:42
 msgid "y"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/i18n.h:43
+#: src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:244 /home/max/git/ncmpc/src/main.c:266
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:294
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:316
+#: src/main.c:214
 #, c-format
 msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:496
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/player_command.c:175
-#: /home/max/git/ncmpc/src/screen_queue.c:740
+#: src/player_command.c:174
+#: src/screen_queue.c:739
 msgid "Shuffled queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/player_command.c:185
+#: src/player_command.c:184
 msgid "Cleared queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:204 /home/max/git/ncmpc/src/screen.c:271
-msgid "Error: Screen too small"
-msgstr ""
-
-#: /home/max/git/ncmpc/src/screen.c:393
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:394
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:398
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:399
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -79,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: /home/max/git/ncmpc/src/screen.c:408
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:409
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -91,180 +87,187 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: /home/max/git/ncmpc/src/screen.c:417
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:418
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:421
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:433
+#: src/screen.c:198
 msgid "Database updated"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:513
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:514
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:519
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:520
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:72
-#: /home/max/git/ncmpc/src/screen_artist.c:364
+#: src/screen_artist.c:72
+#: src/screen_artist.c:354
 msgid "All tracks"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:396
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:401
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:410
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:413
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:417
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:462
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:464
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_browser.c:127
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_browser.c:168
-#: /home/max/git/ncmpc/src/screen_browser.c:261
-#: /home/max/git/ncmpc/src/screen_browser.c:286
+#: src/screen_browser.c:168
+#: src/screen_browser.c:261
+#: src/screen_browser.c:286
 #, c-format
 msgid "Adding '%s' to queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_client.c:87
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_client.c:99
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_client.c:102
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_chat.c:59
+#: 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 ""
 
-#: /home/max/git/ncmpc/src/screen_chat.c:177
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_chat.c:186
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_chat.c:199
-#: /home/max/git/ncmpc/src/title_bar.c:91
+#: src/screen_chat.c:199
+#: src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_find.c:81
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_utils.c:114
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, c-format
+msgid "%s [%s/%s] "
+msgstr ""
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr ""
 
 #. query the user for a filename
-#: /home/max/git/ncmpc/src/screen_queue.c:249
+#: src/screen_queue.c:249
 msgid "Save queue as"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_queue.c:282
+#: src/screen_queue.c:282
 #, c-format
-msgid "Replace %s [%s/%s] ? "
+msgid "Replace %s?"
 msgstr ""
 
 #. translators: a dialog was aborted by the user
-#: /home/max/git/ncmpc/src/screen_queue.c:290
-#: /home/max/git/ncmpc/src/screen_file.c:230
-#: /home/max/git/ncmpc/src/screen_keydef.c:278
-#: /home/max/git/ncmpc/src/screen_lyrics.c:372
+#: src/screen_queue.c:289
+#: src/screen_file.c:220
+#: src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr ""
 
 #. success
-#: /home/max/git/ncmpc/src/screen_queue.c:314
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr ""
 
 #. get path
-#: /home/max/git/ncmpc/src/screen_queue.c:391
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_queue.c:498
-#: /home/max/git/ncmpc/src/title_bar.c:76
+#: src/screen_queue.c:497
+#: src/title_bar.c:76
 msgid "Queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_queue.c:500
+#: src/screen_queue.c:499
 #, c-format
 msgid "Queue on %s"
 msgstr ""
@@ -272,928 +275,920 @@
 #. translators: the "delete" command is only possible
 #. for playlists; the user attempted to delete a song
 #. or a directory or something else
-#: /home/max/git/ncmpc/src/screen_file.c:216
+#: src/screen_file.c:206
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_file.c:223
+#: src/screen_file.c:213
 #, c-format
-msgid "Delete playlist %s [%s/%s] ? "
+msgid "Delete playlist %s?"
 msgstr ""
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: /home/max/git/ncmpc/src/screen_file.c:243
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: /home/max/git/ncmpc/src/screen_file.c:297
-#: /home/max/git/ncmpc/src/title_bar.c:77
+#: src/screen_file.c:287
+#: src/title_bar.c:77
 msgid "Browse"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:46
+#: src/screen_search.c:46
 msgid "artist"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:47
+#: src/screen_search.c:47
 msgid "album"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:48
+#: src/screen_search.c:48
 msgid "title"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:49
+#: src/screen_search.c:49
 msgid "track"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:50
+#: src/screen_search.c:50
 msgid "name"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:51
+#: src/screen_search.c:51
 msgid "genre"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:52
+#: src/screen_search.c:52
 msgid "date"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:53
+#: src/screen_search.c:53
 msgid "composer"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:54
+#: src/screen_search.c:54
 msgid "performer"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:55
+#: src/screen_search.c:55
 msgid "comment"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:62
+#: src/screen_search.c:62
 msgid "file"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:80
-#: /home/max/git/ncmpc/src/screen_song.c:47
+#: src/screen_search.c:80
+#: src/screen_song.c:47
 msgid "Title"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:81
-#: /home/max/git/ncmpc/src/screen_song.c:46
-#: /home/max/git/ncmpc/src/title_bar.c:79
+#: src/screen_search.c:81
+#: src/screen_song.c:46
+#: src/title_bar.c:79
 msgid "Artist"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:82
-#: /home/max/git/ncmpc/src/screen_song.c:48
+#: src/screen_search.c:82
+#: src/screen_song.c:48
 msgid "Album"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:83
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:84
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:226
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:230
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:338
-#: /home/max/git/ncmpc/src/screen_help.c:150
-#: /home/max/git/ncmpc/src/title_bar.c:82
+#: src/screen_search.c:328
+#: src/screen_help.c:150
+#: src/title_bar.c:82
 msgid "Search"
 msgstr ""
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: /home/max/git/ncmpc/src/screen_search.c:384
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:411
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:414
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:418
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_search.c:442
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:141
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:143
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:153
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:164
-#: /home/max/git/ncmpc/src/screen_keydef.c:173
+#: src/screen_keydef.c:164
+#: src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:171
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:257
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:272
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:283
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:289
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:298
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:324
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:326
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:354
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:417
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:424
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_keydef.c:426
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:39
+#: src/screen_help.c:39
 msgid "Movement"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:84
+#: src/screen_help.c:84
 msgid "Global"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:119
-#: /home/max/git/ncmpc/src/command.c:107
+#: src/screen_help.c:119
+#: src/command.c:105
 msgid "Queue screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:121
+#: src/screen_help.c:121
 msgid "Play"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:124
+#: src/screen_help.c:124
 msgid "Move song up"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:125
+#: src/screen_help.c:125
 msgid "Move song down"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:128
+#: src/screen_help.c:128
 msgid "Center"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:134
-#: /home/max/git/ncmpc/src/command.c:109
+#: src/screen_help.c:134
+#: src/command.c:107
 msgid "Browse screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:136
+#: src/screen_help.c:136
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:138
-#: /home/max/git/ncmpc/src/screen_help.c:153
+#: src/screen_help.c:138
+#: src/screen_help.c:153
 msgid "Append song to queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:140
+#: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:148
-#: /home/max/git/ncmpc/src/command.c:220
+#: src/screen_help.c:148
+#: src/command.c:218
 msgid "Search screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:151
+#: src/screen_help.c:151
 msgid "Select and play"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:160
-#: /home/max/git/ncmpc/src/command.c:230
+#: src/screen_help.c:160
+#: src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:162
+#: src/screen_help.c:162
 msgid "View Lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:163
+#: src/screen_help.c:163
 msgid "(Re)load lyrics"
 msgstr ""
 
 #. to translators: this hotkey aborts the retrieval of lyrics
 #. from the server
-#: /home/max/git/ncmpc/src/screen_help.c:166
+#: src/screen_help.c:166
 msgid "Interrupt retrieval"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:167
+#: src/screen_help.c:167
 msgid "Download lyrics for currently playing song"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:168
+#: src/screen_help.c:168
 msgid "Add or edit lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:169
+#: src/screen_help.c:169
 msgid "Save lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:170
+#: src/screen_help.c:170
 msgid "Delete saved lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:175
-#: /home/max/git/ncmpc/src/command.c:245
+#: src/screen_help.c:175
+#: src/command.c:243
 msgid "Outputs screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:177
+#: src/screen_help.c:177
 msgid "Enable/disable output"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:182
-#: /home/max/git/ncmpc/src/command.c:250
+#: src/screen_help.c:182
+#: src/command.c:248
 msgid "Chat screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:184
+#: src/screen_help.c:184
 msgid "Write a message"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:189
+#: src/screen_help.c:189
 msgid "Keydef screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:191
+#: src/screen_help.c:191
 msgid "Edit keydefs for selected command"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:192
+#: src/screen_help.c:192
 msgid "Remove selected keydef"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:193
+#: src/screen_help.c:193
 msgid "Add a keydef"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:194
+#: src/screen_help.c:194
 msgid "Go up a level"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:195
+#: src/screen_help.c:195
 msgid "Apply and save changes"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_help.c:241
-#: /home/max/git/ncmpc/src/title_bar.c:74
+#: src/screen_help.c:241
+#: src/title_bar.c:74
 msgid "Help"
 msgstr ""
 
 #. translators: no lyrics were found for the song
-#: /home/max/git/ncmpc/src/screen_lyrics.c:208
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:226
+#: src/screen_lyrics.c:226
 #, c-format
 msgid "Lyrics timeout occurred after %d seconds"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:327
-#: /home/max/git/ncmpc/src/screen_lyrics.c:336
-#: /home/max/git/ncmpc/src/screen_lyrics.c:346
-#: /home/max/git/ncmpc/src/title_bar.c:85
+#: src/screen_lyrics.c:327
+#: src/screen_lyrics.c:336
+#: src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr ""
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: /home/max/git/ncmpc/src/screen_lyrics.c:330
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:361
+#: src/screen_lyrics.c:361
 msgid "Editor not configured"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:367
-#, c-format
-msgid "Do you really want to start an editor and edit these lyrics [%s/%s]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:387
-#: /home/max/git/ncmpc/src/screen_lyrics.c:411
+#: src/screen_lyrics.c:385
+#: src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:413
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:416
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: /home/max/git/ncmpc/src/screen_lyrics.c:438
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:445
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_lyrics.c:448
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_outputs.c:70
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_outputs.c:81
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_outputs.c:171
-#: /home/max/git/ncmpc/src/title_bar.c:88
+#: src/screen_outputs.c:161
+#: src/title_bar.c:88
 msgid "Outputs"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:49
+#: src/screen_song.c:49
 msgid "Length"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:50
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:51
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:52
+#: src/screen_song.c:52
 msgid "Name"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:53
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:54
+#: src/screen_song.c:54
 msgid "Track"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:55
+#: src/screen_song.c:55
 msgid "Date"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:56
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:57
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:58
+#: src/screen_song.c:58
 msgid "Path"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:59
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:60
+#: src/screen_song.c:60
 msgid "Format"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:76
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:77
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:78
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:79
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:80
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:81
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:82
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:184
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:333
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:388
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:398
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:403
+#: src/screen_song.c:425
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_song.c:413
-#, c-format
-msgid "%u:%u:%u"
-msgstr ""
-
-#: /home/max/git/ncmpc/src/status_bar.c:121
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/status_bar.c:124
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/title_bar.c:99
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/title_bar.c:101
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:92
-msgid "Scroll up one line"
+#: src/command.c:90
+msgid "Scroll down one line"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:94
-msgid "Scroll down one line"
+#: src/command.c:92
+msgid "Scroll up one line"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:96
+#: src/command.c:94
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:134
+#: src/command.c:132
 msgid "Select/deselect song in queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:138
+#: src/command.c:136
 msgid "Delete song from queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:140
+#: src/command.c:138
 msgid "Shuffle queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:142
+#: src/command.c:140
 msgid "Clear queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:144
+#: src/command.c:142
 msgid "Toggle repeat mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:156
+#: src/command.c:154
 msgid "Save queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:158
+#: src/command.c:156
 msgid "Add url/file to queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: /home/max/git/ncmpc/src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: /home/max/git/ncmpc/src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:205
+#: src/command.c:203
 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
-#: /home/max/git/ncmpc/src/command.c:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:226
+#: src/command.c:224
 msgid "View the selected and the currently playing song"
 msgstr ""
 
 #. translators: interrupt the current background action,
 #. e.g. stop loading lyrics from the internet
-#: /home/max/git/ncmpc/src/command.c:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:292
+#: src/command.c:290
 msgid "Undefined"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:294
+#: src/command.c:292
 msgid "Space"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:296
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:298
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:300
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:302
+#: src/command.c:300
 msgid "Up"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:304
+#: src/command.c:302
 msgid "Down"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:306
+#: src/command.c:304
 msgid "Left"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:308
+#: src/command.c:306
 msgid "Right"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:310
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:312
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:314
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:316
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:318
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:320
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:322
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:324
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:328
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:332
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:334
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/command.c:494 /home/max/git/ncmpc/src/command.c:500
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/colors.c:155
-#, c-format
-msgid "Warning: Unknown color - %s\n"
+#: src/colors.c:156
+msgid "Unknown color"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/colors.c:194
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+msgid "Unknown color field"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/colors.c:228
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/colors.c:237
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: /home/max/git/ncmpc/src/conf.c:99
+#: src/conf.c:99
 msgid "Error"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:107 /home/max/git/ncmpc/src/conf.c:116
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: /home/max/git/ncmpc/src/conf.c:140
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: /home/max/git/ncmpc/src/conf.c:153
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1201,60 +1196,60 @@
 #. "elapsed" or "remaining" time of a song being
 #. played; in this case, the configuration file
 #. contained an invalid setting
-#: /home/max/git/ncmpc/src/conf.c:189
+#: src/conf.c:189
 msgid "Bad time display type"
 msgstr ""
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: /home/max/git/ncmpc/src/conf.c:202
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:253
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:263
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:269
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:277
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: /home/max/git/ncmpc/src/conf.c:311
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:339
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:362
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/conf.c:555
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: /home/max/git/ncmpc/src/options.c:232 /home/max/git/ncmpc/src/options.c:235
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/list_window.c:575
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/list_window.c:580
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""

ncmpc-0.24.tar.xz/po/nl.gmo -> ncmpc-0.27.tar.xz/po/nl.gmo Changed

ncmpc-0.24.tar.xz/po/nl.po -> ncmpc-0.27.tar.xz/po/nl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbind met %s... [druk %s om af te breken]"
 
-#: src/main.c:339
+#: src/main.c:214
 #, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Verbonden met %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
 msgstr ""
 
-#: src/player_command.c:187
-msgid "Cleared playlist"
+#: src/player_command.c:184
+msgid "Cleared queue"
 msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fout: Scherm te klein"
-
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Herhaling modus aan"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Herhaling modus uit"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Willekeurige modus is aan"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Willekeurige modus is uit"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Database bijgewerkt"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle nummers"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle artiesten"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle nummers van artiest: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laden..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Toevoegen '%s' aan afspeellijst"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Update database draait..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Database update van %s begonnen"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Database update begonnen"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Vind"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr ""
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Spring"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Niet mogelijk '%s' te vinden"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Vervang %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Wachtwoord"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Afspeellijst opslaan als"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Vervang %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Afgebroken"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Opgeslagen %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Voeg toe"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Afspeellijst"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
+msgid "Queue on %s"
 msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr ""
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr ""
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Afspeellijst verwijderen"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr ""
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Blader"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "opmerking"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "bestand"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artiest + Titel"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr ""
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr ""
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Zoeken"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr ""
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Zoeken: Resultaten voor %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr ""
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr ""
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr ""
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fout: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr ""
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr ""
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr ""
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr ""
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr ""
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr ""
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr ""
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr ""
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr ""
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr ""
@@ -479,8 +473,8 @@
 msgid "Global"
 msgstr "Algemeen"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
+#: src/screen_help.c:119 src/command.c:105
+msgid "Queue screen"
 msgstr ""
 
 #: src/screen_help.c:121
@@ -499,7 +493,7 @@
 msgid "Center"
 msgstr ""
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr ""
 
@@ -507,15 +501,15 @@
 msgid "Enter directory/Select and play song"
 msgstr ""
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+msgid "Append song to queue"
 msgstr ""
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Afspeellijst verwijderen"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr ""
 
@@ -523,7 +517,7 @@
 msgid "Select and play"
 msgstr ""
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr ""
 
@@ -558,7 +552,7 @@
 msgid "Delete saved lyrics"
 msgstr "Afspeellijst verwijderen"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr ""
 
@@ -566,7 +560,7 @@
 msgid "Enable/disable output"
 msgstr ""
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 msgid "Chat screen"
 msgstr ""
 
@@ -598,577 +592,578 @@
 msgid "Apply and save changes"
 msgstr ""
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Documentatie"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr ""
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Songteksten"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "laden..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr ""
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Songteksten"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr ""
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr ""
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr ""
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Uitvoerapparaten"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr ""
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Componist"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Naam"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Schijf"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Nummer"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Opmerking"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Locatie"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitsnelheid"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Aantal artiesten"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Aantal albums"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Aantal nummers"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr ""
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr ""
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr ""
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr ""
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr ""
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Speelt:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr ""
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/b"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr ""
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr ""
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr ""
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr ""
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr ""
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr ""
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr ""
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr ""
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr ""
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr ""
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr ""
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr ""
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr ""
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr ""
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr ""
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr ""
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr ""
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr ""
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr ""
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr ""
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr ""
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr ""
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr ""
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr ""
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr ""
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr ""
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr ""
 
+#: src/command.c:132
+msgid "Select/deselect song in queue"
+msgstr ""
+
 #: src/command.c:134
-msgid "Select/deselect song in playlist"
+msgid "Select all listed items"
 msgstr ""
 
 #: src/command.c:136
-msgid "Select all listed items"
+msgid "Delete song from queue"
 msgstr ""
 
 #: src/command.c:138
-msgid "Delete song from playlist"
+msgid "Shuffle queue"
 msgstr ""
 
 #: src/command.c:140
-msgid "Shuffle playlist"
+msgid "Clear queue"
 msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
+msgid "Toggle repeat mode"
 msgstr ""
 
 #: src/command.c:144
-msgid "Toggle repeat mode"
+msgid "Toggle random mode"
 msgstr ""
 
 #: src/command.c:146
-msgid "Toggle random mode"
+msgid "Toggle single mode"
 msgstr ""
 
 #: src/command.c:148
-msgid "Toggle single mode"
+msgid "Toggle consume mode"
 msgstr ""
 
 #: src/command.c:150
-msgid "Toggle consume mode"
+msgid "Toggle crossfade mode"
 msgstr ""
 
 #: src/command.c:152
-msgid "Toggle crossfade mode"
+msgid "Start a music database update"
 msgstr ""
 
 #: src/command.c:154
-msgid "Start a music database update"
+msgid "Save queue"
 msgstr ""
 
 #: src/command.c:156
-msgid "Save playlist"
+msgid "Add url/file to queue"
 msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
-msgstr ""
-
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr ""
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr ""
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr ""
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr ""
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr ""
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr ""
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr ""
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr ""
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr ""
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr ""
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr ""
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr ""
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr ""
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr ""
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr ""
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr ""
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr ""
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr ""
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr ""
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr ""
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr ""
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr ""
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr ""
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr ""
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr ""
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
+#: src/colors.c:156
+msgid "Unknown color"
 msgstr ""
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+msgid "Unknown color field"
 msgstr ""
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr ""
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr ""
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr ""
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr ""
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr ""
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr ""
 
@@ -1182,57 +1177,69 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr ""
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr ""
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr ""
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr ""
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr ""
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr ""
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr ""
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Hipska https://launchpad.net/~hipska\n"
 "  Tom Postma https://launchpad.net/~bluegen89"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Fout: Scherm te klein"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Verbonden met %s"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Afspeellijst opslaan als"
+
+#~ msgid "Playlist"
+#~ msgstr "Afspeellijst"

ncmpc-0.24.tar.xz/po/pl.gmo -> ncmpc-0.27.tar.xz/po/pl.gmo Changed

ncmpc-0.24.tar.xz/po/pl.po -> ncmpc-0.27.tar.xz/po/pl.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: ncmpc 0.19\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-07-23 21:08+0200\n"
 "Last-Translator:  <krzysztof.krakowiak@gmail.com>\n"
 "Language-Team: Polish\n"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Łączenie z %s... [Wciśnij %s by anulować]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Błąd: MPD w wersji %d.%d.%d jest za stary (potrzebny jest %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Połączony z %s"
-
-#. 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:339
 #, 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:755
-msgid "Shuffled playlist"
-msgstr "Przetasowano listę odtwarzania"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Wyczyszczono listę odtwarzania"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Błąd: Ekran za mały"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Tryb powtarzania jest włączony"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Tryb powtarzania jest wyłączony"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Tryb losowy jest włączony"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Tryb losowy jest wyłączony"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Tryb pojedynczej piosenki jest włączony"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Tryb pojedynczej piosenki jest wyłączony"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Tryb pożerania jest włączony"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Tryb pożerania jest wyłączony"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Przenikaj %d sekund"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Baza zaktualizowana"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Tryb wyszukiwania: Zawinięty"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Tryb wyszukiwania: Normalny"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Tryb automatycznego centrowania: Włączony"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Tryb automatycznego centrowania: Wyłączony"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Wszystkie ścieżki"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Wszyscy artyści"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy artysty: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Wszystkie piosenki artysty: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Albumy: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Ścieżki bez albumów lub artystów: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Dodawanie albumu %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Dodawanie %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Ładowany listy odtwarzania %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Dodawanie '%s' do listy odtwarzania"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Aktualizacja bazy w toku..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Aktualizacja bazy %s rozpoczęta"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Aktualizacja bazy rozpoczęta"
 
@@ -203,95 +190,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Znajdź"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Znajdź wstecz"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Skocz"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nie można znaleźć '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Zamień %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Hasło"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Zapisz listę odtwarzania jako"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Zamień %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Anulowano"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Zapisano %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Lista odtwarzania"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lista odtwarzania na %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Usunięcie tego elementu nie jest możliwe"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Usuń listę odtwarzania %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Usuń listę odtwarzania"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Lista odtwarzania usunięta"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Przeglądaj"
 
@@ -335,139 +329,139 @@
 msgid "comment"
 msgstr "komentarz"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "plik"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artysta"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artysta + Tytuł"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Nieprawidłowy wyszukiwany znacznik %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Znajdź"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Wciśnij %s by rozpocząć nowe wyszukiwanie"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Znajdź: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Znajdź: Wyniki dla %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Znajdź: Wciśnij %s by rozpocząć nowe wyszkuwanie [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Tryb szukania: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Masz nowe wiązania klawiszy"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Wiązania klawiszy niezmienione."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Błąd: Nie można stworzyć katalogu ~/.ncmpc -%s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Błąd: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapisano %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Usunięto"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Podaj nowy skrót dla %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Przypisano klawisz %s do %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Zastosuj wiązania klawiszy "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Zastosuj i Zapisz wiązania klawiszy "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Dodaj nowy klawisz"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Informacja: Zapomniałeś 'Zastosować' swoje zmiany?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Edytuj wiązania klawiszy"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Edytuj klawisze dla %s"
@@ -480,9 +474,10 @@
 msgid "Global"
 msgstr "Globalne"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Ekran listy odtwarzania"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Ekran definicji klawiszy"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -500,7 +495,7 @@
 msgid "Center"
 msgstr "Wycentruj"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Ekran przeglądania"
 
@@ -508,15 +503,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Podaj katalog/Wybierz i odtwarzaj piosenkę"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Dodaj piosenkę do listy odtwarzania"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Ekran wyszukiwania"
 
@@ -524,7 +520,7 @@
 msgid "Select and play"
 msgstr "Wybierz i odtwarzaj"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Ekran z tekstem piosenki"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "Usuń zapisany tekst piosenki"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Ekran z wyjściami dźwiękowymi"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "Włącz/wyłącz wyjście"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Następny ekran"
@@ -601,576 +597,582 @@
 msgid "Apply and save changes"
 msgstr "Zastosuj i zapisz zmiany"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Pomoc"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Brak tekstu piosenki"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Teskt piosenki"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "ładowanie..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Tekst piosenki zapisany"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Teskt piosenki usunięty"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Brak zapisanego tesktu piosenki"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Wyjście '%s' włączone"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Wyjście '%s' wyłączone"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Wyjścia"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Długość"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Kompozytor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nazwa"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Dysk"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Ścieżka"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Rodzaj"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Komentarz"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Ścieżka"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Przepływność bitowa"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Ilość artystów"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Ilość albumów"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Ilość piosenek"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr ""
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Ostatnia aktualizacja bazy"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Czas odtwarzania"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "czas odtwarzania w bazie"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Przeglądarka piosenek"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "statystyki MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Wybrana piosenka"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Obecnie odtwarzana piosenka"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Odtwarzanie:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pauza]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Głośność: b/d"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Głóśność %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Ekran konfiguracji klawiszy"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Wyjdź"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Przesuń kursor w górę"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Przesuń kursor w dół"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Przesuń kursor na początek ekranu"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Przesuń kursor na środek ekranu"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Przesuń kursor na koniec ekranu"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Przesuń kursor na początek listy"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Przesuń kursor na koniec listy"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Przesuń o stronę do góry"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Przesuń o stronę w dół"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Wybór zakresu"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Przesuń o linijkę w dół"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Przesuń o linijkę do góry"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Przesuń o linijkę w dół"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Przesuń o pół ekranu do góry"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Przesuń o pół ekranu w dół"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Zaznacz obecnie odtwarzaną piosenkę"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Ekran pomocy"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Odtwarzaj/Przejdź do katalogu"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Wstrzymanie"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Zatrzymanie"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Przycięcie"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Następna ścieżka"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Poprzednia ściężka"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Przewiń naprzód"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Przewiń wstecz"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Zgłośnij"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Przycisz"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Zaznacz/odznacz piosenkę na liście odtwarzania"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Zazczacz wszystkie wylistowane pozycje"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Usuń piosenkę z listy odtwarzania"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Tasuj listę odtwarzania"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Wyczyść listę odtwarzania"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Przełącz tryb powtarzania"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Przełącz tryb losowy"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Przełącz tryb pojedynczej piosenki"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Przełącz tryb pożerania"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Przełącz tryb przenikania"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Włącz aktualizacje bazy piosenek"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Zapisz listę odtwarzania"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Dodaj url/plik do playlisty"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Przejdź do katalogu głównego"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Przejdź do nadrzędnego katalogu"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Zlokalizuj piosenkę w przeglądarce"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Przesuń element w górę"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Przesuń element w dół"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Odświerz ekran"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Przełącz tryb wyszukiwania"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Przełącz tryb automatycznego centrowania"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Następny ekran"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Poprzedni ekran"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Przełącz do najbardziej aktualnego ekranu"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Wyszukaj naprzód"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Znajdź następne"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Wyszukaj wstecz"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Skocz do"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Ekran artysty"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Zmień tryb wyszukiwania"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Przerwij zadanie"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Zaktualizuj tekst piosenki"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Spacja"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr ""
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr ""
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr ""
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Góra"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Dół"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Lewo"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Prawo"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr ""
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr ""
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr ""
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr ""
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr ""
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr ""
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr ""
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr ""
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Klawisz %s przypisany do %s oraz %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Ostrzeżenie: Nieznany kolor - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Nieznane polecenie"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Ostrzeżenie: Nieznany kolor pola - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminal nie obsługuje zmiany kolorów"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminal nie obsługuje kolorów"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Błąd"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Nieprawidłowa definicja skrótu klaiwszowego"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Niekompletna konfiguracja skrótów klawiszowych"
 
@@ -1184,54 +1186,93 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Brakujący '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Zła nazwa koloru"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Niekompletna definicja koloru"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Nieprawidłowy numer"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Nieprawidłowa definicja koloru"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Nieznana nazwa ekranu"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Nieprawidłowy tryb wyszukiwania"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Nieznany tryb wyszukiwania"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Nieznany parametr konfiguracyjny"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Wielozaznaczanie wyłączone"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Wielozaznaczanie włączone"
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Usuń listę odtwarzania %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Błąd: Ekran za mały"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Ostrzeżenie: Nieznany kolor - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Połączony z %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Przetasowano listę odtwarzania"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Wyczyszczono listę odtwarzania"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Zapisz listę odtwarzania jako"
+
+#~ msgid "Playlist"
+#~ msgstr "Lista odtwarzania"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lista odtwarzania na %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Ekran listy odtwarzania"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Tasuj listę odtwarzania"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Wyczyść listę odtwarzania"
+
+#~ msgid "Save playlist"
+#~ msgstr "Zapisz listę odtwarzania"

ncmpc-0.24.tar.xz/po/pt_BR.gmo -> ncmpc-0.27.tar.xz/po/pt_BR.gmo Changed

ncmpc-0.24.tar.xz/po/pt_BR.po -> ncmpc-0.27.tar.xz/po/pt_BR.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-12-19 01:05+0000\n"
 "Last-Translator: Jamerson Albuquerque Tiossi <jamersontiossi@yahoo.com.br>\n"
 "Language-Team: \n"
@@ -25,58 +25,46 @@
 msgid "n"
 msgstr "n (não)"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectando a %s... [Pressione %s para abortar]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erro: Versão do MPD %d.%d.%d é muito antiga (necessária %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado à %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "press %s para o editor de teclas"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lista de Reprodução misturada"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista de Reprodução apagada"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erro: Tela é muito pequena"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo de Repetição está ligado"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo de Repetição está desligado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo Aleatório está ligado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo Aleatório está desligado"
 
@@ -85,11 +73,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo de Faixa Única está ligado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo de Faixa Única está desligado"
 
@@ -97,99 +85,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo de Deleção de Faixa Reproduzida está ligado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo de Deleção de Faixa Reproduzida está desligado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Inter-mixagem de %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Banco de Dados atualizado"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo de Busca: Envolvido"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo de Busca: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo de Auto-Centralização: Ligado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo de Auto-Centralização: Desligado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas as faixas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbuns do artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as faixas do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Faixas sem álbuns do artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Adicionando álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Adicionando %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 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
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Adicionando '%s' á Lista de Reprodução"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Atualização de Banco de Dados em progresso..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Atualização do Banco de Dados %s começou"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Atualização de Banco de Dados iniciada"
 
@@ -200,95 +187,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Procurar"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Procurar para trás"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Pular"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "'%s' não pôde ser encontrado"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Substituir %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Senha"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Salvar Lista de Reprodução como"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Substituir %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Abortado"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s salvo"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Lista de Reprodução"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Lista de Reprodução em %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Deletar este item não é possível"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Deletar Lista de Reprodução %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Deletar Lista de Reprodução"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Lista de Reprodução deletada"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Navegar"
 
@@ -332,139 +326,139 @@
 msgid "comment"
 msgstr "comentário"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "arquivo"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Título"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artista"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Álbum"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Nome de Arquivo"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artista + Título"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Tag de pesquisa ruim %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Pesquisa"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Pressione %s para uma nova pesquisa"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Pesquisa: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Pesquisa: Resultados para %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Pesquisa: Pressione %s para uma nova pesquisa [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Modo de Pesquisa: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Você tem novas teclas de atalho"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Teclas de atalho inalteradas."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, 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:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Erro: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Gravei %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Deletada"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Entre nova tecla para %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Tecla %s definida para %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Aplicar teclas de atalho "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Aplicar e salvar teclas de atalho  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Adicionar nova tecla"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Nota: Você esqueceu de 'Aplicar' suas mudanças?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Editar teclas de atalho"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Editar teclas para %s"
@@ -477,9 +471,10 @@
 msgid "Global"
 msgstr "Global"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Tela da Lista de Reprodução"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Tela de definição de teclas"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -497,7 +492,7 @@
 msgid "Center"
 msgstr "Centralizar"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Tela de Navegação"
 
@@ -505,15 +500,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Adentrar diretório/Selecionar e reproduzir trilha"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Adicionar trilha à Lista de Reprodução"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Deletar Lista de Reprodução"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Tela de pesquisa"
 
@@ -521,7 +517,7 @@
 msgid "Select and play"
 msgstr "Selecionar e reproduzir"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Tela de Letra de Música"
 
@@ -556,7 +552,7 @@
 msgid "Delete saved lyrics"
 msgstr "Apagar letras salvas"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Tela de Saídas"
 
@@ -564,7 +560,7 @@
 msgid "Enable/disable output"
 msgstr "Habilitar/desabilitar saída"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Próxima tela"
@@ -598,576 +594,582 @@
 msgid "Apply and save changes"
 msgstr "Aplicar mudanças e salvar"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Ajuda"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Sem letra de música"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Letra de Música"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "carregando..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Letra de Música salva"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Letras apagadas"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Sem letras salvas"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Saída '%s' habilitada"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Saída '%s' desabilitada"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Saídas"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Duração"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Compositor"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Nome"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disco"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Faixa"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Data"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Estilo"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Comentário"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Caminho"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Taxa de Amostragem"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Número de artistas"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Número de álbuns"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Número de faixas"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Tempo rodando"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Atualização do BD mais recente"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Tempo de reprodução"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Tempo de reprodução do BD"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Visualizador de Trilha"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Estatísticas do MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Faixa selecionada"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Faixa atualmente em reprodução"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Reproduzindo:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pausado]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volume n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volume %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Tela de configuração de teclas"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Sair"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Mover cursor para cima"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Mover cursor para baixo"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Mover cursor para o topo da tela"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Mover cursor para o meio da tela"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Mover cursor para o final da tela"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Mover cursor para o topo da lista"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Mover cursor para o final da lista"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Sobe uma página"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Desce uma página"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Seleção de Intervalo"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Descer uma linha"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Subir uma linha"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Descer uma linha"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Subir meia tela"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Descer meia tela"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Selecionar faixa atualmente em reprodução"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Tela de Ajuda"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Reproduzir/Adentrar diretório"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pause"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Parar"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Cortar"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Próxima faixa"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Correr para frente"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Correr para trás"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Aumentar volume"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Abaixar volume"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Selecionar/De-selecionar trilha na Lista de Reprodução"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Selecionar todos os itens listados"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Deletar faixa da lista de reprodução"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Randomizar lista de reprodução"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Limpar lista de reprodução"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Liga/Desliga modo de repetição"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Liga/Desliga modo aleatório"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Liga/Desliga modo de única reprodução"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Liga/Desliga modo de deleção de faixa reproduzida"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Liga/Desliga inter-mixagem"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Iniciar a atualização do banco de dados de faixas"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Salvar lista de reprodução"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Adicionar URL/arquivo à lista de reprodução"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Ir para raiz"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Ir para diretório pai"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Localizar musica no navegador"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Mover item para cima"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Mover item para baixo"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Redesenhar tela"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Liga/Desliga modo de centralização automática"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Próxima tela"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Tela anterior"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Troca para a tela mais recente"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Pesquisa para frente"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Pesquisa para a frente - próximo"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Pesquisa para trás"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Pular para"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Tela de artista"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Mudar modo de pesquisa"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Interromper ação"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Atualizar letra de música"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Não-definido"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Espaço"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Cima"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Baixo"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Esquerda"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Direita"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tecla %s definida para %s e %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Aviso: Cor desconhecida - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Comando desconhecido"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Aviso: Campo de cor desconhecido - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminal não tem suporte para mudar cores"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminal não tem capacidade para trabalhar com cores"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Erro"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Definição de tecla de atalho malformada"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Configuração de teclas de atalho incompleta"
 
@@ -1181,47 +1183,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Falta '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Nome de cor ruim"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Definição de cor incompleta"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Número inválido"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Definição de cor malformada"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Nome de tela desconhecido"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Modo de pesquisa inválido"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Modo de pesquisa desconhecido"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Traduzido por Carlos Eduardo C. B. Shinagawa <cadu.coelho at gmail.com>\n"
@@ -1233,10 +1235,49 @@
 "  Max Kellermann https://launchpad.net/~max-duempel\n"
 "  Osni Leandro https://launchpad.net/~osni"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Seleção de intervalo desabilitada"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Seleção de intervalo habilitada"
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Deletar Lista de Reprodução %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Erro: Tela é muito pequena"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Aviso: Cor desconhecida - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Conectado à %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Lista de Reprodução misturada"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Lista de Reprodução apagada"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Salvar Lista de Reprodução como"
+
+#~ msgid "Playlist"
+#~ msgstr "Lista de Reprodução"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Lista de Reprodução em %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Tela da Lista de Reprodução"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Randomizar lista de reprodução"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Limpar lista de reprodução"
+
+#~ msgid "Save playlist"
+#~ msgstr "Salvar lista de reprodução"

ncmpc-0.24.tar.xz/po/ru.gmo -> ncmpc-0.27.tar.xz/po/ru.gmo Changed

ncmpc-0.24.tar.xz/po/ru.po -> ncmpc-0.27.tar.xz/po/ru.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -25,58 +25,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Подключение к %s...  [Нажмите %s для отмены]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Ошибка: MPD версии %d.%d.%d устарел (необходим %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Подключено к %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "%s - редактор клавиш"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Плейлист перемешан"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Плейлист очищен"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Ошибка: экран слишком мал"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Повтор включен"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Повтор выключен"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Случайный режим включен"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Случайный режим выключен"
 
@@ -85,11 +73,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Одиночный режим включен"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Одиночный режим выключен"
 
@@ -97,99 +85,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Режим удаления после проигрывания включен"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Режим удаления после проигрывания выключен"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавный переход %d секунд"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "База обновлена"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Режим поиска: циклический"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Режим поиска: нормальный"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Режим автоцентрирования: вкл."
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Режим автоцентрирования: выкл."
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Все композиции"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Все исполнители"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбомы исполнителя: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Все композиции исполнителя: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Композиции исполнителя: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Добавляется альбом %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Добавляется %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Загружается плейлист %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "В плейлист добавляется '%s'"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Идёт обновление базы..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Обновление базы %s запущено"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Начато обновление базы"
 
@@ -200,95 +187,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Поиск"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Поиск назад"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Перейти"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Не удалось найти '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Заменить %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Пароль"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Сохранить плейлист как"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Заменить %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Прервано"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Сохранено в %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Добавить"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Плейлист"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Плейлист на %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Удаление этого элемента невозможно"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Удалить плейлист %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Удалить плейлист"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Плейлист удалён"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Навигация"
 
@@ -332,139 +326,139 @@
 msgid "comment"
 msgstr "comment"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Композиция"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Альбом"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Исполнитель + Композиция"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Неверный тег поиска %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Не задан критерий поиска по тегу %s"
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Поиск"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Нажмите %s для нового поиска"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Поиск: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Поиск: результаты поиска '%s' в поле [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Поиск: нажмите %s для поиска по полю [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Поле для поиска: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Новые клавиатурные комбинации задействованы"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Клавиатурные комбинации не изменились."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Ошибка: не удалось создать директорию ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Ошибка: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Записано %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Удалено"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Нажмите новую клавишу для %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Ошибка: клавиша %s уже используется для %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Назначено %s для %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Применить клавиатурные комбинации "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Применить и сохранить клавиатурные комбинации  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Добавить новую клавишу"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Внимание: вы не забыли применить сделанные изменения?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Изменение клавиатурных комбинаций"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Изменение клавиатурных комбинаций для %s"
@@ -477,9 +471,10 @@
 msgid "Global"
 msgstr "Глобальные"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Экран плейлиста"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Экран клавиатурных комбинаций"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -497,7 +492,7 @@
 msgid "Center"
 msgstr "Центрировать"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Экран навигации"
 
@@ -505,15 +500,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Перейти в директорию/Выбрать и проиграть композицию"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Добавить композицию в плейлист"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Удалить плейлист"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Экран поиска"
 
@@ -521,7 +517,7 @@
 msgid "Select and play"
 msgstr "Выбрать и проиграть"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Экран текста песни"
 
@@ -556,7 +552,7 @@
 msgid "Delete saved lyrics"
 msgstr "Удалить сохранённый текст"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Экран аудиовыходов"
 
@@ -564,7 +560,7 @@
 msgid "Enable/disable output"
 msgstr "Вкл/выкл аудиовыход"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Следующий экран"
@@ -598,577 +594,583 @@
 msgid "Apply and save changes"
 msgstr "Применить и сохранить изменения"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Помощь"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Текст отсутствует"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Текст"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "загружается..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Текст сохранён"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Текст удалён"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Сохранённый текст отсутствует"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Аудиовыход '%s' включен"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Аудиовыход '%s' выключен"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Аудиовыходы"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Длительность"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Название"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Диск"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Дата"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Комментарий"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Путь"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Количество исполнителей"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Количество альбомов"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Количество композиций"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Время работы"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Последнее обновление базы"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Время воспроизведения"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Время воспроизведения базы"
 
 # Several translations for Song Viewer:
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Информация о композиции"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d кбит/с"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Статистика MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Выбранная композиция"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Проигрываемая композиция"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d кбит/с"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Проигрывается:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Пауза]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Громкость н/д"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Громкость %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Экран клавиатурных комбинаций"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Выход"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Курсор вверх"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Курсор вниз"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Переместить курсор в верх экрана"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Переместить курсор в середину экрана"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Переместить курсор в низ экрана"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Переместить курсор в начало списка"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Переместить курсор в конец списка"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "На страницу вверх"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "На страницу вниз"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Выбор диапазона"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Прокрутка на одну строку вниз"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Прокрутка на одну строку вверх"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Прокрутка на одну строку вниз"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Прокрутка на половину экрана вверх"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Прокрутка на половину экрана вниз"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Выбрать текущую композицию"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Экран помощи"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Воспроизвести/Перейти в директорию"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Пауза"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Останов"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Удалить из плейлиста все композиции кроме текущей"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Следующая композиция"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Предыдущая композиция"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Перемотка вперёд"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Перемотка назад"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Увеличить громкость"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Уменьшить громкость"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Добавить/убрать композицию из плейлиста"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Добавить все композиции в плейлист"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Удалить композицию из плейлиста"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Перемешать плейлист"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Очистить плейлист"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Вкл/выкл режим повтора"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Вкл/выкл случайный режим"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Вкл/выкл одиночный режим"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Вкл/выкл режим удаления после проигрывания"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Вкл/выкл режим плавного перехода"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Обновить музыкальную базу"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Сохранить плейлист"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Добавить url/файл в плейлист"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Перейти к корневой директории"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Перейти к родительской директории"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Перейти к файлу композиции"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Переместить вверх"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Переместить вниз"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Обновить экран"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Переключить режим поиска"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Вкл/выкл режим автоцентрирования"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Следующий экран"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Предыдущий экран"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Последний посещённый экран"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Поиск вперёд"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Продолжить поиск вперёд"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Поиск назад"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Перейти к"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Экран исполнителей"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Изменить поле для поиска"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Прервать операцию"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Обновить текст"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Не задано"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Пробел"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Ввод"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Вверх"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Вниз"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Влево"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Вправо"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "В начало"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "В конец"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Клавиша %s назначена для %s и %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Внимание: неизвестный цвет - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Неизвестная команда"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Внимание: неизвестное цветовое поле - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Терминал не поддерживает смену цветов"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Терминал не поддерживает цвета"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Неправильное значение клавиатурной комбинации"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Неопределённое значение клавиатурной комбинации"
 
@@ -1182,58 +1184,97 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Пропущен символ '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Неверное название цвета"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Неопределённое значение цвета"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Неверное число"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Неправильное значение цвета"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Неизвестное название экрана"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Неверный режим поиска"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Неизвестный режим поиска"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Неизвестный параметр конфигурации"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr "Перевод: Max Arnold <lwarxx@gmail.com>"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Выбор диапазона выключен"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Выбор диапазона включен"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Удалить плейлист %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Ошибка: экран слишком мал"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Внимание: неизвестный цвет - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Подключено к %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Плейлист перемешан"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Плейлист очищен"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Сохранить плейлист как"
+
+#~ msgid "Playlist"
+#~ msgstr "Плейлист"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Плейлист на %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Экран плейлиста"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Перемешать плейлист"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Очистить плейлист"
+
+#~ msgid "Save playlist"
+#~ msgstr "Сохранить плейлист"
+
 #, fuzzy
 #~ msgid "DB last updated"
 #~ msgstr "База обновлена"

ncmpc-0.24.tar.xz/po/sk.gmo -> ncmpc-0.27.tar.xz/po/sk.gmo Changed

ncmpc-0.24.tar.xz/po/sk.po -> ncmpc-0.27.tar.xz/po/sk.po Changed

@@ -7,7 +7,7 @@
 "Project-Id-Version: ncmpc 0.11.1\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -26,58 +26,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, 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:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Chyba: MPD verzie %d.%d.%d je príliš staré (%s je potrebná)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Pripojený k %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "stlačte %s pre editor klávesov"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Zamiešaný playlist"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Vyčistený playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Chyba: Okno je príliš malé"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Režim opakovania zapnutý"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Režim opakovania vypnutý"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Náhodný režim zapnutý"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Náhodný režim vypnutý"
 
@@ -86,11 +74,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Jednotlivý režim zapnutý"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Jednotlivý režim vypnutý"
 
@@ -98,99 +86,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Spotrebný režim zapnutý"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Spotrebný režim vypnutý"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Prelínanie %d sekúnd"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhľadávania: Zabalený"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Režim vyhľadávanie: Normálny"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatické centrovanie: Zapnuté"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatické centrovanie: Vypnuté"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Všetky stopy"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Všetci interpreti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všetky stopy od interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Pridávam adresár %s...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Pridávam '%s' do playlistu"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Prebieha aktualizácia databáze..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Aktualizácia databáze %s začala"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Bola spustená aktualizácia databáze"
 
@@ -201,95 +188,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Vyhľadať"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Vyhľadať spätne"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Skok"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Nepodarilo sa nájsť '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Nahradiť %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Heslo"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Uložiť playlist ako"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Nahradiť %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Zrušené"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Uložený %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Pridať"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Playlist"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Playlist na %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Zmazanie tejto položky nie je možné"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Vymazať playlist %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Vymazať playlist"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Playlist vymazaný"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Listovať"
 
@@ -333,139 +327,139 @@
 msgid "comment"
 msgstr "komentár"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "súbor"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Názov"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Interpret"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Interpret + Názov"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Zlá značka vyhľadávania %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Hľadanie"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Stlačte %s pre nové hľadanie"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Vyhľadať: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Hľadanie: Výsledky pre reťazec %s[%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Hľadanie: Stlačte %s pre opätovné hľadanie [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Režim vyhľadávania: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Nastavili ste nové priradenie klávesov"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Priradenie klávesov sa nezmenilo."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Chyba: Nepodarilo sa vytvoriť adresár ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Chyba: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Zapísané %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Vymazané"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Zadajte nový kláves pre %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s priradené k %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Použiť nastavenie klávesov "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Použiť & Uložiť nastavenie klávesov  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Pridať nový kláves"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Poznámka: Zabudli ste 'Použiť' vaše zmeny?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Upraviť priradenie klávesov"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Upraviť klávesy pre %s"
@@ -478,9 +472,10 @@
 msgid "Global"
 msgstr "Globálne"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Okno playlistu"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Obrazovka s nastavením kláves"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -498,7 +493,7 @@
 msgid "Center"
 msgstr "Do stredu"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Okno listovania"
 
@@ -506,15 +501,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Vstúpiť do adresára/Vybrať a prehrať skladbu"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Pridať skladbu do playlistu"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Vymazať playlist"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Okno vyhľadávania"
 
@@ -522,7 +518,7 @@
 msgid "Select and play"
 msgstr "Vybrať a prehrať"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Okno textu piesne"
 
@@ -558,7 +554,7 @@
 msgid "Delete saved lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Obrazovka výstupov"
 
@@ -566,7 +562,7 @@
 msgid "Enable/disable output"
 msgstr "Povoliť/vypnúť výstup"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Ďalšia obrazovka"
@@ -600,578 +596,584 @@
 msgid "Apply and save changes"
 msgstr "Použiť a uložiť zmeny"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Pomoc"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Bez textu"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Text piesne"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "načítam..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Text piesne uložený"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Playlist vymazaný"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Uložiť text piesne"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Výstup '%s' povolený"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Výstup '%s' vypnutý"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Dĺžka"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Skladateľ"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Názov"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Disk"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Stopa"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Dátum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Komentár"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Cesta"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bitový tok"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Počet interpretov"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Počet albumov"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Počet piesní"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Uptime"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Najčerstvejší update databáze"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Čas hrania"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Čas hrania databáze"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Prehliadač piesní"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Štatistiky MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Vybraná pieseň"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Momentálne prehrávaná pieseň"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Prehrávam:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pozastavené]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Hlasitosť n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Hlasitosť %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Okno nastavenia klávesov"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Ukončiť"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Presunúť kurzor nahor"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Presunúť kurzor nadol"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Presunúť na vrch obrazovky"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Presunúť kurzor do stredu obrazovky"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Presunúť kurzor na spodok obrazovky"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Presunúť kurzor na začiatok zoznamu"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Presunúť kurzor na koniec zoznamu"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Page up"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Page down"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Výber rozsahu"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Posun o jeden riadok nadol"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Posun o jeden riadok nahor"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Posun o jeden riadok nadol"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Posun o polovicu obrazovky nahor"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Posun o polovicu obrazovky nadol"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Zvoľiť práve prehrávanú skladbu"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Okno s pomocou"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Prehrať/Vstúpiť do adresára"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stop"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Orezať"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Ďalšia stopa"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Predchádzajúca stopa"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Posunúť vpred"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Posunúť vzad"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Pridať hlasitosť"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Stíšiť"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Vybrať/odvybrať skladbu v playliste"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Vybrať všetky položky v zozname"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Vymazať skladbu z playlistu"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Zamiešať playlist"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Vyčistiť playlist"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Prepnúť režim opakovania"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Prepnúť náhodný režim"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Prepnúť jednotlivý režim"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Prepnúť spotrebný režim"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Prepnúť režím prelínania skladieb"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Spustiť aktualizáciu hudobnej databáze"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Uložiť playlist"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Pridať url/súbor do playlistu"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Prejsť do koreňového adresára"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Prejsť do nadradeného adresára"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Nájsť skladbu v prehliadači"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Presunúť položku nahor"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Presunúť položku nadol"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Obnoviť obrazovku"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 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:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Prepnúť automatický režim centrovania"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Ďalšia obrazovka"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Predchádzajúca obrazovka"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Prepnúť na predchádzajúcu obrazovku"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Hľadať vpred"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Pokračovať v hľadaní vpred"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Hľadať vzad"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Skok na"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Okno interpreta"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Zmeniť režim vyhľadávania"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Akcia prerušenia"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Obnoviť text"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Neurčené"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Medzera"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Hore"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Dole"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Vľavo"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Vpravo"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Kláves %s priradený k %s a %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Varovania: Neznáma farba - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Neznámy príkaz"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Varovanie: Neznáme farebné pole - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminál nemá podporu pre zmenu farieb"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminál nemá schopnosti zobrazovania farieb"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Chyba"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Chybne zadaná definícia klávesovej skratky"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Neúplná konfigurácie klavesových skratiek"
 
@@ -1185,47 +1187,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Chýba '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Nesprávny názov farby"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Neúplná definícia farby"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Neplatné číslo"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Zle zadaná definícia farby"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Neznámy názov obrazovky"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Neplatný režim vyhľadávania"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Neznámy režim vyhľadávania"
 
-#: src/conf.c:564
+#: src/conf.c:552
 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:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Jozef Riha <jose1711@gmail.com>\n"
@@ -1234,14 +1236,53 @@
 "  Jose Riha https://launchpad.net/~jose1711\n"
 "  Roman Horník https://launchpad.net/~roman.hornik"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Výber rozsahu vypnutý"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Výber rozsahu zapnutý"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Vymazať playlist %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Chyba: Okno je príliš malé"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Varovania: Neznáma farba - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Pripojený k %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Zamiešaný playlist"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Vyčistený playlist"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Uložiť playlist ako"
+
+#~ msgid "Playlist"
+#~ msgstr "Playlist"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Playlist na %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Okno playlistu"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Zamiešať playlist"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Vyčistiť playlist"
+
+#~ msgid "Save playlist"
+#~ msgstr "Uložiť playlist"
+
 #~ msgid "Explicitly download lyrics"
 #~ msgstr "Explicitne sťahovať texty"

ncmpc-0.24.tar.xz/po/sv.gmo -> ncmpc-0.27.tar.xz/po/sv.gmo Changed

ncmpc-0.24.tar.xz/po/sv.po -> ncmpc-0.27.tar.xz/po/sv.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.12\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Ansluter till %s... [Tryck %s för att avbryta]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fel: MPD version %d.%d.%d är för gammal (%s krävs)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Ansluten till %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "tryck på %s för att korrigera"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Spellistan slumpsorterades"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Spellistan rensad"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fel: Terminalen är för liten"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Upprepningsläge på"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Upprepningsläge av"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Slumpningsläge på"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Slumpningsläge av"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Förtäringsläge på"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Förtäringsläge av"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Mjuk övergång %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Sökläge: Börja om"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Sökläge: Till början/slut"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering påslaget"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering avslaget"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alla spår"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alla artister"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alla spår av artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laddar..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Lägger till '%s' till spellista"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Databasen uppdateras..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Uppdaterar databasen ifrån %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Databasuppdatering påbörjad"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Sök"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Sök bakåt"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Hopp"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Kan inte hitta '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Ersätt %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Lösenord"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Spara spellistan som"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Ersätt %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Avbrutet"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "%s sparad"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Spellista"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Spellista på %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Du kan inte ta bort det här föremålet"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Ta bort spellista %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Ta bort spellista"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Spellista borttagen"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Filer"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "kommentar"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "fil"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Titel"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Artist"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Album"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Filnamn"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Artist + titel"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Felaktig söktyp %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, 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:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Sök"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Tryck %s för ny sökning"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Sök: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Sökresultat för %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Tryck %s för ny sökning [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Sök efter: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Tangentdefinitioner uppdaterade"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Tangentdefinitioner oförändrade."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Fel: Kunde inte skapa mappen ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Fel: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Sparade %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Borttagen"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Ny tangent för %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, 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:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "%s tilldelad %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Verkställ "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Verkställ och spara  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Lägg till ny tangent"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "OBS! Glömde du att 'Verkställa' dina ändringar?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Ändra tangentdefinitioner"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Ändra tangenter för kommandot %s"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "Globala"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Spellista"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Hjälp"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "Centrera"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Filer"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Välj katalog/Markera och spela upp"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Lägg till i spellista"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Ta bort spellista"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Databassökning"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "Lägg till spellistan och spela"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Texter"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "Spara texter"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Utgångar"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "Slå på/av utgång"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Nästa skärm"
@@ -601,578 +597,584 @@
 msgid "Apply and save changes"
 msgstr "Verkställ och spara förändringar"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Hjälp"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Ingen text"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Texter"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "laddar..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Text sparad"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 #, fuzzy
 msgid "Lyrics deleted"
 msgstr "Spellista borttagen"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 #, fuzzy
 msgid "No saved lyrics"
 msgstr "Spara texter"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Utgång '%s' påslagen"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Utgång '%s' avslagen"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Utgångar"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Längd"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Kompositör"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Namn"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Skiva"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Spår"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Datum"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Genre"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Kommentar"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Sökväg"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Bithastighet"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Antal artister"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Antal album"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Antal låtar"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Upptid"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Senaste databasuppdateringen"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Speltid"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr ""
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Spår"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD-statistik"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Markerad låt"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr ""
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kb/s"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Spelar:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Pausad]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Volym: n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Volym: %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Tangentdefinitioner"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Markör uppåt"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Markör nedåt"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Flytta markören längst upp"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Flytta markören till mitten"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Flytta markören längst ner"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Flytta markören längst upp i listan"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Flytta markören längst ner i listan"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Markören en skärm uppåt"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Markören en skärm nedåt"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr ""
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Gå ner en rad"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Gå upp en rad"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Gå ner en rad"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Gå upp en halv skärm"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Gå ner en halv skärm"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr ""
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Hjälp"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Spela upp/Välj"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Stoppa"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Beskär"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Nästa spår"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Föregående spår"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Sök framåt"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Sök bakåt"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Höj volymen"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Sänk volymen"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Markera/avmarkera spår till spellistan"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Markera alla listade föremål"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Ta bort låt från spellista"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Slumpsportera spellista"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Rensa spellista"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Repeat på/av"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Slumpning på/av"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr ""
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr ""
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Mjuk övergång på/av"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Updatera musikdatabasen"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Spara spellista"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Lägg till url eller fil till spellistan"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Gå till rotkatalogen"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Gå upp en nivå"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Hitta spår i Filer"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Flytta upp"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Flytta ner"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Uppdatera fönster"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Ändra sökinställningar"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Automatisk centrering på/av"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Nästa skärm"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Tidigare skärm"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr ""
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Sök"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Nästa träff"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Föregående träff"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Hoppa till"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Artister"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Ändra måltyp för databassökning"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Avbryt handling"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Uppdatera texter"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Ej definierad"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Mellanslag"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Bakstegstangent"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Uppåtpil"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Nedåtpil"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Vänsterpil"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Högerpil"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+tabb"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Tangent %s tilldelad %s och %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Varning: Okänd färg - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Okänt kommando"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Varning: %s ej definierad.\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Terminalen saknar stöd för växling av färger"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Terminalen saknar stöd för färger"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Fel"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Dålig tangentdefinition"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Inkomplett tangentdefinition"
 
@@ -1186,47 +1188,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Saknar '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Felaktigt färgnamn"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Inkomplett färgdefinition"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Ogiltigt nummer"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Felaktig färgdefinition"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Skärmnamn okänt"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr ""
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr ""
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Okänd konfigurationsinställning"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1235,10 +1237,49 @@
 "  Rickard Närström https://launchpad.net/~riccetn\n"
 "  nanker https://launchpad.net/~nanker"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr ""
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr ""
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Ta bort spellista %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Fel: Terminalen är för liten"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Varning: Okänd färg - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Ansluten till %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Spellistan slumpsorterades"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Spellistan rensad"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Spara spellistan som"
+
+#~ msgid "Playlist"
+#~ msgstr "Spellista"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Spellista på %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Spellista"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Slumpsportera spellista"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Rensa spellista"
+
+#~ msgid "Save playlist"
+#~ msgstr "Spara spellista"

ncmpc-0.24.tar.xz/po/uk.gmo -> ncmpc-0.27.tar.xz/po/uk.gmo Changed

ncmpc-0.24.tar.xz/po/uk.po -> ncmpc-0.27.tar.xz/po/uk.po Changed

@@ -7,7 +7,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr "невідомо"
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Встановлення з'єднання з %s...  [Натисніть %s щоб припинити]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Помилка: MPD версії %d.%d.%d застаріла (необхідна %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Встановлене з'єднання з %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "натисніть %s щоб редагувати клавіші"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Перемішаний перелік програвання"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Очищений перелік програвання"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Помилка: екран занадто маленький"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Режим повторення увімкнений"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Режим повторення вимкнений"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Режим випадкового програвання увімкнений"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Режим випадкового програвання вимкнений"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Режим повторення однієї доріжки увімкнений"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Режим повторення однієї доріжки вимкнений"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Режим вичерпання увімкнений"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Режим вичерпання вимкнений"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавний перехід: %dс"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "База даних оновлена"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Режим пошуку: завернутий (розділений???)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Режим пошуку: звичайний"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Режим автоматичного центрування: увімкнено"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Режим автоматичного центрування: вимкнено"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Всі доріжки"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Всі виконавці"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбоми виконавця: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Всі доріжки виконавця: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Доріжки без альбому виконавця: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Додається альбом %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Додається %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Завантажується перелік програвання %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "Додається '%s' до переліку програвання"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "Виконується оновлення бази даних..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "Оновлення бази даних %s розпочате"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "Початок оновлення бази даних"
 
@@ -203,95 +190,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "Знайти"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "Знайти позаду"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "Перейти"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "Не вдається знайти '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "Замінити %s [%s/%s] ? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "Пароль"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "Зберегти перелік програвання як"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "Замінити %s [%s/%s] ? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "Перервано"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "Збережений %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "Додати"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "Перелік програвання"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "Перелік програвання %s"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "Видалити цей елемент неможливо"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "Видалити перелік програвання %s [%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "Видалити перелік програвання"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "Перелік програвання видалений"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "Огляд"
 
@@ -335,139 +329,139 @@
 msgid "comment"
 msgstr "comment"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "file"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "Назва"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "Альбом"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "Назва файлу"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "Виконавець + Назва"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "Неправильна мітка %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "Немає аргументу для пошуку за міткою %s"
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "Пошук"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "Натисніть %s для нового пошуку"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "Пошук: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "Пошук: наслідки пошуку для %s [%s]"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "Пошук: натисніть %s для нового пошуку [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "Режим пошуку: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "Ви маєте нову прив'язку клавіші"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "Прив'язки клавіш не змінені."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "Помилка: неможливо створити теку ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "Помилка: %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "Записаний %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "Видалена"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "Введіть нову клавішу для %s: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "Помилка: клавіша %s вже використовується для %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "Призначення %s до %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "===> Застосування прив'язки клавіші "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "===> Застосування та збереження прив'язки клавіші  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "Додати нову клавішу"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "Примітка: ви забули \"Застосувати\" зроблені зміни?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "Редагувати прив'язки клавіш"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "Редагувати клавішу для %s"
@@ -480,9 +474,10 @@
 msgid "Global"
 msgstr "Загальні"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "Екран переліку програвання"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "Екран призначення клавіш"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -500,7 +495,7 @@
 msgid "Center"
 msgstr "По центру"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "Екран перегляду"
 
@@ -508,15 +503,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "Ввести теку чи вибрати та програти пісню"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "Долучити пісню до переліку програвання"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "Видалити перелік програвання"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "Екран пошуку"
 
@@ -524,7 +520,7 @@
 msgid "Select and play"
 msgstr "Вибрати та програти"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "Екран текстів пісень"
 
@@ -559,7 +555,7 @@
 msgid "Delete saved lyrics"
 msgstr "Видалити збережений текст пісні"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "Екран виходів"
 
@@ -567,7 +563,7 @@
 msgid "Enable/disable output"
 msgstr "Увімкнути/вимкнути вихід"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "Наступний екран"
@@ -601,576 +597,582 @@
 msgid "Apply and save changes"
 msgstr "Застосувати та зберегти зміни"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "Допомога"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "Немає тексту пісні"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "Тексти пісень"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "завантаження..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "Текст пісні збережений"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "Текст пісні видалений"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "Немає збереженого тексту пісні"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "Вихід '%s' увімкнений"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "Вихід '%s' вимкнений"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "Виходи"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "Композитор"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "Назва"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "Диск"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "Доріжка"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "Дата"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "Примітка"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "Шлях"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "Бітрейт"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "Кількість виконавців"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "Кількість альбомів"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "Кількість пісень"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "Час роботи"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "Останнє оновлення бази даних"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "Час програвання"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "Час програвання всієї БД"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "Переглядач пісень"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d кбіт/с"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "Статистика MPD"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "Вибрана пісня"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "Пісня, що зараз програється"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d кбіт/с"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "Програється:"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "[Призупинено]"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "Гучність недоступна"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "Гучність %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "Екран конфігурації клавіш"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "Вийти"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "Перемістити курсор доверху"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "Перемістити курсор донизу"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "Перемістити курсор на початок екрану"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "Перемістити курсор до середини екрану"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "Перемістити курсор в кінець екрану"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "Перемістити курсор на початок переліку"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "Перемістити курсор в кінець переліку"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "Сторінка догори"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "Сторінка донизу"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "Вибір обсягу"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "Прогорнути один рядок донизу"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "Прогорнути один рядок догори"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "Прогорнути один рядок донизу"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "Прогорнути півекрану догори"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "Прогорнути півекрану донизу"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "Вибрати пісню, що зараз програється"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "Екран допомоги"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "Програти чи увійти до каталогу"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "Призупинити"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "Обрізати"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "Наступна доріжка"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "Попередня доріжка"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "Шукати попереду"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "Шукати позаду"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "Збільшити гучність"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "Зменшити гучність"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "Вибрати чи зняти виділення пісні в переліку програвання"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "Вибрати всі перелічені елементи"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "Видалити пісню з переліку програвання"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "Перемішати перелік програвання"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "Очистити перелік програвання"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "Перемкнути режим повторення"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "Перемкнути випадковий режим"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "Перемкнути режим повторення однієї пісні"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "Перемкнути режим вичерпання"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "Перемкнути режим плавного переходу"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "Розпочати оновлення бази даних музики"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "Зберегти перелік програвання"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "Додати url-посилання чи файл до переліку програвання"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "Перейти до кореневої теки"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "Перейти до батьківської теки"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "Визначити розміщення пісні в оглядачі"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "Перемістити елемент догори"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "Перемістити елемент донизу"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "Оновити екран"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "Перемкнути режим пошуку"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "Перемкнути режим автоматичного центрування"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "Наступний екран"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "Попередній екран"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "Поміняти останні екрани"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "Знайти попереду"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "Знайти попереду наступне"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "Знайти позаду"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "Перейти до"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "Екран виконавців"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "Змінити режим пошуку"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "Припинити дію"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "Оновити текст пісні"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "Не визначений"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "Клавіша %s призначена до %s та %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "Застереження: невідомий колір - %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "Невідома команда"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "Застереження: невідоме поле кольору - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "Терміналу бракує підтримки зміни кольорів"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "Терміналу бракує підтримки можливостей кольорів"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "Помилка"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "Неправильне визначення гарячої клавіші"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "Невідома команда"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "Незавершена конфігурація гарячих клавіш"
 
@@ -1184,54 +1186,93 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "Відсутній \"=\""
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "Неправильна назва кольору"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "Незавершене визначення кольору"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "Неправильне число"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "Неправильне визначення кольору"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "Невідома назва екрану"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "Помилковий режим пошуку"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "Невідомий режим пошуку"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "Невідомий конфігураційний параметр"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr "Oleksandr Kovalenko <alx.kovalenko@gmail.com>"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "Вибір обсягу вимкнений"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "Вибір обсягу увімкнений"
+
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "Видалити перелік програвання %s [%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "Помилка: екран занадто маленький"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "Застереження: невідомий колір - %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "Встановлене з'єднання з %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "Перемішаний перелік програвання"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "Очищений перелік програвання"
+
+#~ msgid "Save playlist as"
+#~ msgstr "Зберегти перелік програвання як"
+
+#~ msgid "Playlist"
+#~ msgstr "Перелік програвання"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "Перелік програвання %s"
+
+#~ msgid "Playlist screen"
+#~ msgstr "Екран переліку програвання"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "Перемішати перелік програвання"
+
+#~ msgid "Clear playlist"
+#~ msgstr "Очистити перелік програвання"
+
+#~ msgid "Save playlist"
+#~ msgstr "Зберегти перелік програвання"

ncmpc-0.24.tar.xz/po/zh_CN.gmo -> ncmpc-0.27.tar.xz/po/zh_CN.gmo Changed

ncmpc-0.24.tar.xz/po/zh_CN.po -> ncmpc-0.27.tar.xz/po/zh_CN.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\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"
+"POT-Creation-Date: 2017-03-20 21:11+0100\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"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "连接到 %s... [按 %s 键取消]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "错误: MPD版本%d.%d.%d过低(需要 %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "连接到 %s"
-
-#. 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:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "按 %s 编辑快捷键"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "乱序播放列表"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "清空播放列表"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "错误: 屏幕太小"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "重复播放 开"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "重复播放 关"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "随机播放 开"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "随机播放 关"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "单曲播放 开"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "单曲播放 关"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "消除模式 开"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "消除模式 关"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "淡入淡出 %d 秒"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "数据库已更新"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "查找模式: 循环"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "查找模式: 普通"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "自动居中模式: 开"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "自动居中模式: 关"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "全部音轨"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "全部艺术家"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s 的专辑:"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s 的所有曲目"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "专辑: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "艺术家的无专辑曲目: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "添加专辑 %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "添加 %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "加载播放列表 %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"
 msgstr "添加 '%s' 到播放列表"
 
-#: src/screen_client.c:93
+#: src/screen_client.c:41
 msgid "Database update running..."
 msgstr "正在更新数据库..."
 
-#: src/screen_client.c:105
+#: src/screen_client.c:49
 #, c-format
 msgid "Database update of %s started"
 msgstr "开始更新数据库 %s"
 
-#: src/screen_client.c:108
+#: src/screen_client.c:52
 msgid "Database update started"
 msgstr "更新数据库中"
 
@@ -202,95 +189,102 @@
 "version 0.17.0 to use the chat feature)"
 msgstr ""
 
-#: src/screen_chat.c:179
+#: src/screen_chat.c:177
 msgid "Your message"
 msgstr ""
 
-#: src/screen_chat.c:188
+#: src/screen_chat.c:186
 msgid "Message could not be sent"
 msgstr ""
 
-#: src/screen_chat.c:201 ../src/title_bar.c:94
+#: src/screen_chat.c:199 src/title_bar.c:91
 msgid "Chat"
 msgstr ""
 
-#: src/screen_find.c:28
+#: src/screen_find.c:29
 msgid "Find"
 msgstr "查找"
 
-#: src/screen_find.c:29
+#: src/screen_find.c:30
 msgid "Find backward"
 msgstr "查找前一个"
 
-#: src/screen_find.c:30
+#: src/screen_find.c:31
 msgid "Jump"
 msgstr "跳转"
 
-#: src/screen_find.c:80
+#: src/screen_find.c:82
 #, c-format
 msgid "Unable to find '%s'"
 msgstr "找不到 '%s'"
 
-#: src/screen_utils.c:115
+#. NOTE: if one day a translator decides to use a multi-byte character
+#. for one of the yes/no keys, we'll have to parse it properly
+#: src/screen_utils.c:80
+#, fuzzy, c-format
+msgid "%s [%s/%s] "
+msgstr "替换 %s [%s/%s]? "
+
+#: src/screen_utils.c:121
 msgid "Password"
 msgstr "密码"
 
 #. query the user for a filename
-#: src/screen_queue.c:256
-msgid "Save playlist as"
-msgstr "播放列表另存为"
+#: src/screen_queue.c:249
+msgid "Save queue as"
+msgstr ""
 
-#: src/screen_queue.c:292
-#, c-format
-msgid "Replace %s [%s/%s] ? "
+#: src/screen_queue.c:282
+#, fuzzy, c-format
+msgid "Replace %s?"
 msgstr "替换 %s [%s/%s]? "
 
 #. 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:382
+#: src/screen_queue.c:289 src/screen_file.c:220 src/screen_keydef.c:271
+#: src/screen_lyrics.c:370
 msgid "Aborted"
 msgstr "已放弃"
 
 #. success
-#: src/screen_queue.c:324
+#: src/screen_queue.c:313
 #, c-format
 msgid "Saved %s"
 msgstr "保存到 %s"
 
 #. get path
-#: src/screen_queue.c:401
+#: src/screen_queue.c:390
 msgid "Add"
 msgstr "增加"
 
-#: src/screen_queue.c:508 ../src/title_bar.c:79
-msgid "Playlist"
-msgstr "列表"
+#: src/screen_queue.c:497 src/title_bar.c:76
+msgid "Queue"
+msgstr ""
 
-#: src/screen_queue.c:510
+#: src/screen_queue.c:499
 #, c-format
-msgid "Playlist on %s"
-msgstr "%s 上的播放列表"
+msgid "Queue on %s"
+msgstr ""
 
 #. 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:206
 msgid "Deleting this item is not possible"
 msgstr "此项目不能被删除"
 
-#: src/screen_file.c:229
-#, c-format
-msgid "Delete playlist %s [%s/%s] ? "
-msgstr "确定要删除列表 %s[%s/%s] ? "
+#: src/screen_file.c:213
+#, fuzzy, c-format
+msgid "Delete playlist %s?"
+msgstr "删除播放列表"
 
 #. translators: MPD deleted the playlist, as requested by the
 #. user
-#: src/screen_file.c:249
+#: src/screen_file.c:233
 msgid "Playlist deleted"
 msgstr "播放列表已删除"
 
 #. translators: caption of the browser screen
-#: src/screen_file.c:303 ../src/title_bar.c:80
+#: src/screen_file.c:287 src/title_bar.c:77
 msgid "Browse"
 msgstr "目录"
 
@@ -334,139 +328,139 @@
 msgid "comment"
 msgstr "注释"
 
-#: src/screen_search.c:64
+#: src/screen_search.c:62
 msgid "file"
 msgstr "文件"
 
-#: src/screen_search.c:82 ../src/screen_song.c:46
+#: src/screen_search.c:80 src/screen_song.c:47
 msgid "Title"
 msgstr "标题"
 
-#: src/screen_search.c:83 ../src/screen_song.c:45 ../src/title_bar.c:82
+#: src/screen_search.c:81 src/screen_song.c:46 src/title_bar.c:79
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/screen_search.c:84 ../src/screen_song.c:47
+#: src/screen_search.c:82 src/screen_song.c:48
 msgid "Album"
 msgstr "专辑"
 
-#: src/screen_search.c:85
+#: src/screen_search.c:83
 msgid "Filename"
 msgstr "文件名"
 
-#: src/screen_search.c:86
+#: src/screen_search.c:84
 msgid "Artist + Title"
 msgstr "艺术家 + 标题"
 
-#: src/screen_search.c:232
+#: src/screen_search.c:216
 #, c-format
 msgid "Bad search tag %s"
 msgstr "不正确的搜索条目 %s"
 
-#: src/screen_search.c:236
+#: src/screen_search.c:220
 #, c-format
 msgid "No argument for search tag %s"
 msgstr "搜索条目 %s 没有参数"
 
-#: src/screen_search.c:344 ../src/screen_help.c:150 ../src/title_bar.c:85
+#: src/screen_search.c:328 src/screen_help.c:150 src/title_bar.c:82
 msgid "Search"
 msgstr "查找"
 
 #. if( pattern==NULL )
 #. search_new(screen, c);
 #. else
-#: src/screen_search.c:385
+#: src/screen_search.c:374
 #, c-format
 msgid "Press %s for a new search"
 msgstr "按 %s 开始新的搜索"
 
-#: src/screen_search.c:412
+#: src/screen_search.c:401
 #, c-format
 msgid "Search: %s"
 msgstr "查找: %s"
 
-#: src/screen_search.c:415
+#: src/screen_search.c:404
 #, c-format
 msgid "Search: Results for %s [%s]"
 msgstr "查找: %s [%s] 的结果"
 
-#: src/screen_search.c:419
+#: src/screen_search.c:408
 #, c-format
 msgid "Search: Press %s for a new search [%s]"
 msgstr "查找: 按 %s 开始新的搜索 [%s]"
 
-#: src/screen_search.c:443
+#: src/screen_search.c:432
 #, c-format
 msgid "Search mode: %s"
 msgstr "搜索模式: %s"
 
-#: src/screen_keydef.c:131
+#: src/screen_keydef.c:141
 msgid "You have new key bindings"
 msgstr "你有新绑定的快捷键"
 
-#: src/screen_keydef.c:133
+#: src/screen_keydef.c:143
 msgid "Keybindings unchanged."
 msgstr "取消快捷键变更."
 
-#: src/screen_keydef.c:143
+#: src/screen_keydef.c:153
 #, c-format
 msgid "Error: Unable to create directory ~/.ncmpc - %s"
 msgstr "错误: 无法创建文件夹 ~/.ncmpc - %s"
 
-#: src/screen_keydef.c:152 ../src/screen_keydef.c:159
+#: src/screen_keydef.c:164 src/screen_keydef.c:173
 #, c-format
 msgid "Error: %s - %s"
 msgstr "错误 %s - %s"
 
-#: src/screen_keydef.c:161
+#: src/screen_keydef.c:171
 #, c-format
 msgid "Wrote %s"
 msgstr "写入 %s"
 
-#: src/screen_keydef.c:245
+#: src/screen_keydef.c:250
 msgid "Deleted"
 msgstr "已删除"
 
-#: src/screen_keydef.c:264
+#: src/screen_keydef.c:265
 #, c-format
 msgid "Enter new key for %s: "
 msgstr "为 %s 输入新的按键: "
 
-#: src/screen_keydef.c:274
+#: src/screen_keydef.c:276
 msgid "Ctrl-Space can't be used"
 msgstr ""
 
-#: src/screen_keydef.c:280
+#: src/screen_keydef.c:282
 #, c-format
 msgid "Error: key %s is already used for %s"
 msgstr "键 %s 已经绑定到 %s"
 
-#: src/screen_keydef.c:289
+#: src/screen_keydef.c:291
 #, c-format
 msgid "Assigned %s to %s"
 msgstr "分配 %s 到 %s"
 
-#: src/screen_keydef.c:315
+#: src/screen_keydef.c:317
 msgid "===> Apply key bindings "
 msgstr "应用快捷键设置 "
 
-#: src/screen_keydef.c:317
+#: src/screen_keydef.c:319
 msgid "===> Apply & Save key bindings  "
 msgstr "应用 & 保存快捷键设置  "
 
-#: src/screen_keydef.c:345
+#: src/screen_keydef.c:347
 msgid "Add new key"
 msgstr "添加新的键"
 
-#: src/screen_keydef.c:409
+#: src/screen_keydef.c:410
 msgid "Note: Did you forget to 'Apply' your changes?"
 msgstr "提示: 你忘记了保存你的设置?"
 
-#: src/screen_keydef.c:416
+#: src/screen_keydef.c:417
 msgid "Edit key bindings"
 msgstr "编辑快捷键设置"
 
-#: src/screen_keydef.c:418
+#: src/screen_keydef.c:419
 #, c-format
 msgid "Edit keys for %s"
 msgstr "为 %s 编辑快捷键"
@@ -479,9 +473,10 @@
 msgid "Global"
 msgstr "全局设定"
 
-#: src/screen_help.c:119 ../src/command.c:107
-msgid "Playlist screen"
-msgstr "列表页面"
+#: src/screen_help.c:119 src/command.c:105
+#, fuzzy
+msgid "Queue screen"
+msgstr "键定义页面"
 
 #: src/screen_help.c:121
 msgid "Play"
@@ -499,7 +494,7 @@
 msgid "Center"
 msgstr "当前播放项居中显示"
 
-#: src/screen_help.c:134 ../src/command.c:109
+#: src/screen_help.c:134 src/command.c:107
 msgid "Browse screen"
 msgstr "目录页面"
 
@@ -507,15 +502,16 @@
 msgid "Enter directory/Select and play song"
 msgstr "进入选中目录/播放选中歌曲"
 
-#: src/screen_help.c:138 ../src/screen_help.c:153
-msgid "Append song to playlist"
+#: src/screen_help.c:138 src/screen_help.c:153
+#, fuzzy
+msgid "Append song to queue"
 msgstr "添加到播放列表"
 
 #: src/screen_help.c:140
 msgid "Delete playlist"
 msgstr "删除播放列表"
 
-#: src/screen_help.c:148 ../src/command.c:220
+#: src/screen_help.c:148 src/command.c:218
 msgid "Search screen"
 msgstr "查找页面"
 
@@ -523,7 +519,7 @@
 msgid "Select and play"
 msgstr "选中并播放"
 
-#: src/screen_help.c:160 ../src/command.c:230
+#: src/screen_help.c:160 src/command.c:228
 msgid "Lyrics screen"
 msgstr "歌词页面"
 
@@ -558,7 +554,7 @@
 msgid "Delete saved lyrics"
 msgstr "删除已保存歌词"
 
-#: src/screen_help.c:175 ../src/command.c:245
+#: src/screen_help.c:175 src/command.c:243
 msgid "Outputs screen"
 msgstr "输出页面"
 
@@ -566,7 +562,7 @@
 msgid "Enable/disable output"
 msgstr "启用/禁用音频输出"
 
-#: src/screen_help.c:182 ../src/command.c:250
+#: src/screen_help.c:182 src/command.c:248
 #, fuzzy
 msgid "Chat screen"
 msgstr "下一页面"
@@ -600,576 +596,582 @@
 msgid "Apply and save changes"
 msgstr "保存设置"
 
-#: src/screen_help.c:241 ../src/title_bar.c:77
+#: src/screen_help.c:241 src/title_bar.c:74
 msgid "Help"
 msgstr "帮助"
 
 #. translators: no lyrics were found for the song
-#: src/screen_lyrics.c:214
+#: src/screen_lyrics.c:208
 msgid "No lyrics"
 msgstr "无歌词"
 
-#: src/screen_lyrics.c:232
+#: src/screen_lyrics.c:226
 #, 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
+#: src/screen_lyrics.c:327 src/screen_lyrics.c:336 src/screen_lyrics.c:346
+#: src/title_bar.c:85
 msgid "Lyrics"
 msgstr "歌词"
 
 #. translators: this message is displayed
 #. while data is retrieved
-#: src/screen_lyrics.c:338
+#: src/screen_lyrics.c:330
 msgid "loading..."
 msgstr "正在载入..."
 
-#: src/screen_lyrics.c:371
+#: src/screen_lyrics.c:361
 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]? "
+#: src/screen_lyrics.c:367
+msgid "Do you really want to start an editor and edit these lyrics?"
 msgstr ""
 
-#: src/screen_lyrics.c:396 ../src/screen_lyrics.c:420
+#: src/screen_lyrics.c:385 src/screen_lyrics.c:409
 msgid "Can't start editor"
 msgstr ""
 
-#: src/screen_lyrics.c:422
+#: src/screen_lyrics.c:411
 #, c-format
 msgid "Editor exited unexpectedly (%d)"
 msgstr ""
 
-#: src/screen_lyrics.c:425
+#: src/screen_lyrics.c:414
 #, c-format
 msgid "Editor exited unexpectedly (signal %d)"
 msgstr ""
 
 #. lyrics for the song were saved on hard disk
-#: src/screen_lyrics.c:447
+#: src/screen_lyrics.c:436
 msgid "Lyrics saved"
 msgstr "歌词已保存"
 
-#: src/screen_lyrics.c:454
+#: src/screen_lyrics.c:443
 msgid "Lyrics deleted"
 msgstr "歌词已被删除"
 
-#: src/screen_lyrics.c:457
+#: src/screen_lyrics.c:446
 msgid "No saved lyrics"
 msgstr "没有歌词"
 
-#: src/screen_outputs.c:73
+#: src/screen_outputs.c:60
 #, c-format
 msgid "Output '%s' enabled"
 msgstr "启用 '%s' 输出"
 
-#: src/screen_outputs.c:84
+#: src/screen_outputs.c:71
 #, c-format
 msgid "Output '%s' disabled"
 msgstr "禁用 '%s' 输出"
 
-#: src/screen_outputs.c:175 ../src/title_bar.c:91
+#: src/screen_outputs.c:161 src/title_bar.c:88
 msgid "Outputs"
 msgstr "输出"
 
-#: src/screen_song.c:48
+#: src/screen_song.c:49
 msgid "Length"
 msgstr "时长"
 
-#: src/screen_song.c:49
+#: src/screen_song.c:50
 msgid "Position"
 msgstr ""
 
-#: src/screen_song.c:50
+#: src/screen_song.c:51
 msgid "Composer"
 msgstr "作曲"
 
-#: src/screen_song.c:51
+#: src/screen_song.c:52
 msgid "Name"
 msgstr "名字"
 
-#: src/screen_song.c:52
+#: src/screen_song.c:53
 msgid "Disc"
 msgstr "碟片"
 
-#: src/screen_song.c:53
+#: src/screen_song.c:54
 msgid "Track"
 msgstr "音轨"
 
-#: src/screen_song.c:54
+#: src/screen_song.c:55
 msgid "Date"
 msgstr "日期"
 
-#: src/screen_song.c:55
+#: src/screen_song.c:56
 msgid "Genre"
 msgstr "流派"
 
-#: src/screen_song.c:56
+#: src/screen_song.c:57
 msgid "Comment"
 msgstr "注释"
 
-#: src/screen_song.c:57
+#: src/screen_song.c:58
 msgid "Path"
 msgstr "路径"
 
-#: src/screen_song.c:58
+#: src/screen_song.c:59
 msgid "Bitrate"
 msgstr "比特率"
 
-#: src/screen_song.c:74
+#: src/screen_song.c:60
+msgid "Format"
+msgstr ""
+
+#: src/screen_song.c:76
 msgid "Number of artists"
 msgstr "艺术家总数"
 
-#: src/screen_song.c:75
+#: src/screen_song.c:77
 msgid "Number of albums"
 msgstr "专辑总数"
 
-#: src/screen_song.c:76
+#: src/screen_song.c:78
 msgid "Number of songs"
 msgstr "歌曲总数"
 
-#: src/screen_song.c:77
+#: src/screen_song.c:79
 msgid "Uptime"
 msgstr "启动时间"
 
-#: src/screen_song.c:78
+#: src/screen_song.c:80
 msgid "Most recent db update"
 msgstr "最新DB更新"
 
-#: src/screen_song.c:79
+#: src/screen_song.c:81
 msgid "Playtime"
 msgstr "播放时间"
 
-#: src/screen_song.c:80
+#: src/screen_song.c:82
 msgid "DB playtime"
 msgstr "DB 播放时间"
 
-#: src/screen_song.c:182
+#: src/screen_song.c:171
 msgid "Song viewer"
 msgstr "歌曲查看器"
 
-#: src/screen_song.c:326
-#, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
-
-#: src/screen_song.c:351
+#: src/screen_song.c:320
 msgid "MPD statistics"
 msgstr "MPD统计"
 
-#: src/screen_song.c:406
+#: src/screen_song.c:410
 msgid "Selected song"
 msgstr "选中曲目"
 
-#: src/screen_song.c:416
+#: src/screen_song.c:420
 msgid "Currently playing song"
 msgstr "当前播放曲目"
 
-#: src/status_bar.c:124
+#: src/screen_song.c:425
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/status_bar.c:121
 msgid "Playing:"
 msgstr "播放中"
 
-#: src/status_bar.c:127
+#: src/status_bar.c:124
 msgid "[Paused]"
 msgstr "暂停"
 
-#: src/title_bar.c:101
+#: src/title_bar.c:99
 #, c-format
 msgid "Volume n/a"
 msgstr "音量 n/a"
 
-#: src/title_bar.c:103
+#: src/title_bar.c:101
 #, c-format
 msgid "Volume %d%%"
 msgstr "音量 %d%%"
 
-#: src/command.c:65
+#: src/command.c:63
 msgid "Key configuration screen"
 msgstr "快捷键设置页面"
 
-#: src/command.c:68
+#: src/command.c:66
 msgid "Quit"
 msgstr "退出"
 
-#: src/command.c:72
+#: src/command.c:70
 msgid "Move cursor up"
 msgstr "向上移动光标"
 
-#: src/command.c:74
+#: src/command.c:72
 msgid "Move cursor down"
 msgstr "向下移动光标"
 
-#: src/command.c:76
+#: src/command.c:74
 msgid "Move cursor to the top of screen"
 msgstr "光标移到顶部"
 
-#: src/command.c:78
+#: src/command.c:76
 msgid "Move cursor to the middle of screen"
 msgstr "光标移到中部"
 
-#: src/command.c:80
+#: src/command.c:78
 msgid "Move cursor to the bottom of screen"
 msgstr "光标移到底部"
 
-#: src/command.c:82
+#: src/command.c:80
 msgid "Move cursor to the top of the list"
 msgstr "光标移到列表顶部"
 
-#: src/command.c:84
+#: src/command.c:82
 msgid "Move cursor to the bottom of the list"
 msgstr "光标移到列表底部"
 
-#: src/command.c:86
+#: src/command.c:84
 msgid "Page up"
 msgstr "上一页"
 
-#: src/command.c:88
+#: src/command.c:86
 msgid "Page down"
 msgstr "下一页"
 
-#: src/command.c:90
+#: src/command.c:88
 msgid "Range selection"
 msgstr "区段选择"
 
+#: src/command.c:90
+msgid "Scroll down one line"
+msgstr "向下滚动一行"
+
 #: src/command.c:92
 msgid "Scroll up one line"
 msgstr "向上滚动一行"
 
 #: src/command.c:94
-msgid "Scroll down one line"
-msgstr "向下滚动一行"
-
-#: src/command.c:96
 msgid "Scroll up half a screen"
 msgstr "向上滚动半屏"
 
-#: src/command.c:98
+#: src/command.c:96
 msgid "Scroll down half a screen"
 msgstr "向下滚动半屏"
 
-#: src/command.c:100
+#: src/command.c:98
 msgid "Select currently playing song"
 msgstr "选择当前播放曲目"
 
-#: src/command.c:105
+#: src/command.c:103
 msgid "Help screen"
 msgstr "帮助页面"
 
-#: src/command.c:114
+#: src/command.c:112
 msgid "Play/Enter directory"
 msgstr "播放/进入 目录"
 
-#: src/command.c:116
+#: src/command.c:114
 msgid "Pause"
 msgstr "暂停"
 
-#: src/command.c:118
+#: src/command.c:116
 msgid "Stop"
 msgstr "停止"
 
-#: src/command.c:120
+#: src/command.c:118
 msgid "Crop"
 msgstr "剪切"
 
-#: src/command.c:122
+#: src/command.c:120
 msgid "Next track"
 msgstr "下一曲"
 
-#: src/command.c:124
+#: src/command.c:122
 msgid "Previous track"
 msgstr "上一曲"
 
-#: src/command.c:126
+#: src/command.c:124
 msgid "Seek forward"
 msgstr "快进"
 
-#: src/command.c:128
+#: src/command.c:126
 msgid "Seek backward"
 msgstr "快退"
 
-#: src/command.c:130
+#: src/command.c:128
 msgid "Increase volume"
 msgstr "增加音量"
 
-#: src/command.c:132
+#: src/command.c:130
 msgid "Decrease volume"
 msgstr "降低音量"
 
-#: src/command.c:134
-msgid "Select/deselect song in playlist"
+#: src/command.c:132
+#, fuzzy
+msgid "Select/deselect song in queue"
 msgstr "添加/删除选中文件到播放列表"
 
-#: src/command.c:136
+#: src/command.c:134
 msgid "Select all listed items"
 msgstr "选中所有列出的项"
 
-#: src/command.c:138
-msgid "Delete song from playlist"
+#: src/command.c:136
+#, fuzzy
+msgid "Delete song from queue"
 msgstr "从播放列表中删除歌曲"
 
+#: src/command.c:138
+msgid "Shuffle queue"
+msgstr ""
+
 #: src/command.c:140
-msgid "Shuffle playlist"
-msgstr "随机列表"
+msgid "Clear queue"
+msgstr ""
 
 #: src/command.c:142
-msgid "Clear playlist"
-msgstr "清除播放列表"
-
-#: src/command.c:144
 msgid "Toggle repeat mode"
 msgstr "切换重复模式"
 
-#: src/command.c:146
+#: src/command.c:144
 msgid "Toggle random mode"
 msgstr "切换随机模式"
 
-#: src/command.c:148
+#: src/command.c:146
 msgid "Toggle single mode"
 msgstr "切换单曲模式"
 
-#: src/command.c:150
+#: src/command.c:148
 msgid "Toggle consume mode"
 msgstr "切换消除模式"
 
-#: src/command.c:152
+#: src/command.c:150
 msgid "Toggle crossfade mode"
 msgstr "切换淡入淡出模式"
 
-#: src/command.c:154
+#: src/command.c:152
 msgid "Start a music database update"
 msgstr "更新此数据库"
 
-#: src/command.c:156
-msgid "Save playlist"
-msgstr "保存播放列表"
+#: src/command.c:154
+msgid "Save queue"
+msgstr ""
 
-#: src/command.c:158
-msgid "Add url/file to playlist"
+#: src/command.c:156
+#, fuzzy
+msgid "Add url/file to queue"
 msgstr "添加链接/路径到播放列表"
 
-#: src/command.c:161
+#: src/command.c:159
 msgid "Go to root directory"
 msgstr "进入根目录"
 
-#: src/command.c:163
+#: src/command.c:161
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
-#: src/command.c:166
+#: src/command.c:164
 msgid "Locate song in browser"
 msgstr "定位到音乐所在目录"
 
-#: src/command.c:170
+#: src/command.c:168
 msgid "Move item up"
 msgstr "上移"
 
-#: src/command.c:172
+#: src/command.c:170
 msgid "Move item down"
 msgstr "下移"
 
-#: src/command.c:174
+#: src/command.c:172
 msgid "Refresh screen"
 msgstr "刷新页面"
 
 #. translators: toggle between wrapping and non-wrapping
 #. search
-#: src/command.c:181
+#: src/command.c:179
 msgid "Toggle find mode"
 msgstr "切换查找模式"
 
 #. translators: the auto center mode always centers the song
 #. currently being played
-#: src/command.c:185
+#: src/command.c:183
 msgid "Toggle auto center mode"
 msgstr "切换自动居中模式"
 
-#: src/command.c:190
+#: src/command.c:188
 msgid "Next screen"
 msgstr "下一页面"
 
-#: src/command.c:192
+#: src/command.c:190
 msgid "Previous screen"
 msgstr "上一页面"
 
-#: src/command.c:194
+#: src/command.c:192
 msgid "Swap to most recent screen"
 msgstr "切换到最近一个页面"
 
-#: src/command.c:199
+#: src/command.c:197
 msgid "Forward find"
 msgstr "前向查找"
 
-#: src/command.c:201
+#: src/command.c:199
 msgid "Forward find next"
 msgstr "查找下一个"
 
-#: src/command.c:203
+#: src/command.c:201
 msgid "Backward find"
 msgstr "后向查找"
 
-#: src/command.c:205
+#: src/command.c:203
 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:210
+#: src/command.c:208
 msgid "Jump to"
 msgstr "跳转到"
 
-#: src/command.c:216
+#: src/command.c:214
 msgid "Artist screen"
 msgstr "艺术家页面"
 
-#: src/command.c:222
+#: src/command.c:220
 msgid "Change search mode"
 msgstr "更改搜索模式"
 
-#: src/command.c:226
+#: src/command.c:224
 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:234
+#: src/command.c:232
 msgid "Interrupt action"
 msgstr "中断后台操作"
 
-#: src/command.c:236
+#: src/command.c:234
 msgid "Update Lyrics"
 msgstr "更新歌词"
 
-#: src/command.c:240
+#: src/command.c:238
 msgid "Edit the current item"
 msgstr ""
 
-#: src/command.c:297
+#: src/command.c:290
 msgid "Undefined"
 msgstr "未定义的"
 
-#: src/command.c:299
+#: src/command.c:292
 msgid "Space"
 msgstr "Space"
 
-#: src/command.c:301
+#: src/command.c:294
 msgid "Enter"
 msgstr "Enter"
 
-#: src/command.c:303
+#: src/command.c:296
 msgid "Backspace"
 msgstr "Backspace"
 
-#: src/command.c:305
+#: src/command.c:298
 msgid "Delete"
 msgstr "Delete"
 
-#: src/command.c:307
+#: src/command.c:300
 msgid "Up"
 msgstr "Up"
 
-#: src/command.c:309
+#: src/command.c:302
 msgid "Down"
 msgstr "Down"
 
-#: src/command.c:311
+#: src/command.c:304
 msgid "Left"
 msgstr "Left"
 
-#: src/command.c:313
+#: src/command.c:306
 msgid "Right"
 msgstr "Right"
 
-#: src/command.c:315
+#: src/command.c:308
 msgid "Home"
 msgstr "Home"
 
-#: src/command.c:317
+#: src/command.c:310
 msgid "End"
 msgstr "End"
 
-#: src/command.c:319
+#: src/command.c:312
 msgid "PageDown"
 msgstr "PageDown"
 
-#: src/command.c:321
+#: src/command.c:314
 msgid "PageUp"
 msgstr "PageUp"
 
-#: src/command.c:323
+#: src/command.c:316
 msgid "Tab"
 msgstr "Tab"
 
-#: src/command.c:325
+#: src/command.c:318
 msgid "Shift+Tab"
 msgstr "Shift+Tab"
 
-#: src/command.c:327
+#: src/command.c:320
 msgid "Esc"
 msgstr "Esc"
 
-#: src/command.c:329
+#: src/command.c:322
 msgid "Insert"
 msgstr "Insert"
 
-#: src/command.c:333
+#: src/command.c:326
 #, c-format
 msgid "F%d"
 msgstr ""
 
-#: src/command.c:337
+#: src/command.c:330
 #, c-format
 msgid "Ctrl-%c"
 msgstr ""
 
-#: src/command.c:339
+#: src/command.c:332
 #, c-format
 msgid "Alt-%c"
 msgstr ""
 
-#: src/command.c:503 ../src/command.c:509
+#: src/command.c:477 src/command.c:483
 #, c-format
 msgid "Key %s assigned to %s and %s"
 msgstr "按键 %s 分配给 %s 和 %s"
 
-#: src/colors.c:158
-#, c-format
-msgid "Warning: Unknown color - %s\n"
-msgstr "警告: 未知的颜色 -  %s\n"
+#: src/colors.c:156
+#, fuzzy
+msgid "Unknown color"
+msgstr "未知命令"
 
-#: src/colors.c:198
-#, c-format
-msgid "Warning: Unknown color field - %s\n"
+#: src/colors.c:196
+#, fuzzy
+msgid "Unknown color field"
 msgstr "警告: 未知的颜色块 - %s\n"
 
-#: src/colors.c:231
+#: src/colors.c:230
 msgid "Terminal lacks support for changing colors"
 msgstr "终端不支持改变颜色"
 
-#: src/colors.c:242
+#: src/colors.c:239
 msgid "Terminal lacks color capabilities"
 msgstr "终端不支持彩色"
 
 #. To translators: prefix for error messages
-#: src/conf.c:98
+#: src/conf.c:99
 msgid "Error"
 msgstr "错误"
 
-#: src/conf.c:106 ../src/conf.c:115
+#: src/conf.c:107 src/conf.c:116
 msgid "Malformed hotkey definition"
 msgstr "不正确的快捷键定义"
 
 #. the hotkey configuration contains an unknown
 #. command
-#: src/conf.c:142
+#: src/conf.c:140
 msgid "Unknown command"
 msgstr "未知命令"
 
 #. the hotkey configuration line is incomplete
-#: src/conf.c:155
+#: src/conf.c:153
 msgid "Incomplete hotkey configuration"
 msgstr "不完整的快捷键配置"
 
@@ -1183,47 +1185,47 @@
 
 #. an equals sign '=' was expected while parsing a
 #. configuration file line
-#: src/conf.c:204
+#: src/conf.c:202
 msgid "Missing '='"
 msgstr "缺少 '='"
 
-#: src/conf.c:260
+#: src/conf.c:253
 msgid "Bad color name"
 msgstr "错误的颜色名"
 
-#: src/conf.c:269
+#: src/conf.c:263
 msgid "Incomplete color definition"
 msgstr "不完整的颜色定义"
 
-#: src/conf.c:275
+#: src/conf.c:269
 msgid "Invalid number"
 msgstr "无效的数字"
 
-#: src/conf.c:283
+#: src/conf.c:277
 msgid "Malformed color definition"
 msgstr "不正确的颜色定义"
 
 #. an unknown screen name was specified in the
 #. configuration file
-#: src/conf.c:317
+#: src/conf.c:311
 msgid "Unknown screen name"
 msgstr "未知的页面名"
 
-#: src/conf.c:346
+#: src/conf.c:339
 msgid "Invalid search mode"
 msgstr "无效的搜索模式"
 
-#: src/conf.c:369
+#: src/conf.c:362
 msgid "Unknown search mode"
 msgstr "未知的搜索模式"
 
-#: src/conf.c:564
+#: src/conf.c:552
 msgid "Unknown configuration parameter"
 msgstr "未知的配置参数"
 
 #. To translators: these credits are shown
 #. when ncmpc is started with "--version"
-#: src/options.c:234 ../src/options.c:237
+#: src/options.c:232 src/options.c:235
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -1232,14 +1234,53 @@
 "deactivatedaccount\n"
 "  snowdream https://launchpad.net/~yanghui"
 
-#: src/list_window.c:588
+#: src/list_window.c:575
 msgid "Range selection disabled"
 msgstr "禁用区段选取"
 
-#: src/list_window.c:593
+#: src/list_window.c:580
 msgid "Range selection enabled"
 msgstr "开启区段选取"
 
+#~ msgid "Delete playlist %s [%s/%s] ? "
+#~ msgstr "确定要删除列表 %s[%s/%s] ? "
+
+#~ msgid "Error: Screen too small"
+#~ msgstr "错误: 屏幕太小"
+
+#~ msgid "Warning: Unknown color - %s\n"
+#~ msgstr "警告: 未知的颜色 -  %s\n"
+
+#~ msgid "Connected to %s"
+#~ msgstr "连接到 %s"
+
+#~ msgid "Shuffled playlist"
+#~ msgstr "乱序播放列表"
+
+#~ msgid "Cleared playlist"
+#~ msgstr "清空播放列表"
+
+#~ msgid "Save playlist as"
+#~ msgstr "播放列表另存为"
+
+#~ msgid "Playlist"
+#~ msgstr "列表"
+
+#~ msgid "Playlist on %s"
+#~ msgstr "%s 上的播放列表"
+
+#~ msgid "Playlist screen"
+#~ msgstr "列表页面"
+
+#~ msgid "Shuffle playlist"
+#~ msgstr "随机列表"
+
+#~ msgid "Clear playlist"
+#~ msgstr "清除播放列表"
+
+#~ msgid "Save playlist"
+#~ msgstr "保存播放列表"
+
 #~ msgid "Volume n/a "
 #~ msgstr "音量 n/a "

ncmpc-0.24.tar.xz/src/Compiler.h -> ncmpc-0.27.tar.xz/src/Compiler.h Changed

@@ -20,19 +20,44 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#define GCC_CHECK_VERSION(major, minor) \
-  (defined(__GNUC__) &&                                                 \
-   (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
+#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)
 
 #ifdef __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#  define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#else
+#  define GCC_VERSION 0
+#endif
+
+#ifdef __clang__
+#  define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
 #else
-#define GCC_VERSION 0
+#  define CLANG_VERSION 0
 #endif
 
-#if GCC_CHECK_VERSION(4,0)
+/**
+ * Are we building with the specified version of gcc (not clang or any
+ * other compiler) or newer?
+ */
+#define GCC_CHECK_VERSION(major, minor) \
+  (!CLANG_VERSION && \
+   GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+/**
+ * Are we building with clang (any version) or at least the specified
+ * gcc version?
+ */
+#define CLANG_OR_GCC_VERSION(major, minor) \
+  (CLANG_VERSION || GCC_CHECK_VERSION(major, minor))
+
+/**
+ * Are we building with gcc (not clang or any other compiler) and a
+ * version older than the specified one?
+ */
+#define GCC_OLDER_THAN(major, minor) \
+  (GCC_VERSION && !CLANG_VERSION && \
+   GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
+
+#if CLANG_OR_GCC_VERSION(4,0)
 
 /* GCC 4.x */
 
@@ -92,7 +117,7 @@
 
 #endif
 
-#if GCC_CHECK_VERSION(4,3)
+#if CLANG_OR_GCC_VERSION(4,3)
 
 #define gcc_hot __attribute__((hot))
 #define gcc_cold __attribute__((cold))
@@ -104,7 +129,7 @@
 
 #endif /* ! GCC_UNUSED >= 40300 */
 
-#if GCC_CHECK_VERSION(4,6) && !defined(__clang__)
+#if GCC_CHECK_VERSION(4,6)
 #define gcc_flatten __attribute__((flatten))
 #else
 #define gcc_flatten
@@ -113,7 +138,7 @@
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict
-#elif GCC_CHECK_VERSION(4,0)
+#elif CLANG_OR_GCC_VERSION(4,0)
 /* "__restrict__" is a GCC extension for C++ */
 #define gcc_restrict __restrict__
 #else
@@ -126,12 +151,12 @@
 #if defined(__cplusplus)
 
 /* support for C++11 "override" was added in gcc 4.7 */
-#if !defined(__clang__) && !GCC_CHECK_VERSION(4,7)
+#if GCC_OLDER_THAN(4,7)
 #define override
 #define final
 #endif
 
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)
 #define gcc_alignas(T, fallback) alignas(T)
 #else
 #define gcc_alignas(T, fallback) gcc_aligned(fallback)

ncmpc-0.27.tar.xz/src/aconnect.c Added

@@ -0,0 +1,163 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "aconnect.h"
+#include "net/async_rconnect.h"
+#include "net/socket.h"
+#include "Compiler.h"
+
+#include <mpd/client.h>
+#include <mpd/async.h>
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+struct aconnect {
+	const struct aconnect_handler *handler;
+	void *handler_ctx;
+
+	struct async_rconnect *rconnect;
+
+	int fd;
+	guint source_id;
+};
+
+static gboolean
+aconnect_source_callback(gcc_unused GIOChannel *source,
+			 gcc_unused GIOCondition condition,
+			 gpointer data)
+{
+	struct aconnect *ac = data;
+	assert(ac->source_id != 0);
+	ac->source_id = 0;
+
+	char buffer[256];
+	ssize_t nbytes = recv(ac->fd, buffer, sizeof(buffer) - 1, 0);
+	if (nbytes < 0) {
+		snprintf(buffer, sizeof(buffer),
+			 "Failed to receive from MPD: %s",
+			 strerror(errno));
+		close_socket(ac->fd);
+		ac->handler->error(buffer, ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	if (nbytes == 0) {
+		close_socket(ac->fd);
+		ac->handler->error("MPD closed the connection",
+				   ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	buffer[nbytes] = 0;
+
+	struct mpd_async *async = mpd_async_new(ac->fd);
+	if (async == NULL) {
+		close_socket(ac->fd);
+		ac->handler->error("Out of memory", ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	struct mpd_connection *c = mpd_connection_new_async(async, buffer);
+	if (c == NULL) {
+		mpd_async_free(async);
+		ac->handler->error("Out of memory", ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	ac->handler->success(c, ac->handler_ctx);
+	g_free(ac);
+	return false;
+}
+
+static void
+aconnect_rconnect_success(int fd, void *ctx)
+{
+	struct aconnect *ac = ctx;
+	assert(ac->rconnect != NULL);
+	ac->rconnect = NULL;
+
+	ac->fd = fd;
+
+	GIOChannel *channel = g_io_channel_unix_new(fd);
+	ac->source_id = g_io_add_watch(channel, G_IO_IN,
+				       aconnect_source_callback, ac);
+	g_io_channel_unref(channel);
+}
+
+static void
+aconnect_rconnect_error(const char *message, void *ctx)
+{
+	struct aconnect *ac = ctx;
+	assert(ac->rconnect != NULL);
+	ac->rconnect = NULL;
+
+	ac->handler->error(message, ac->handler_ctx);
+	g_free(ac);
+}
+
+static const struct async_rconnect_handler aconnect_rconnect_handler = {
+	.success = aconnect_rconnect_success,
+	.error = aconnect_rconnect_error,
+};
+
+void
+aconnect_start(struct aconnect **acp,
+	       const char *host, unsigned port,
+	       const struct aconnect_handler *handler, void *ctx)
+{
+	struct aconnect *ac = g_new(struct aconnect, 1);
+	ac->handler = handler;
+	ac->handler_ctx = ctx;
+
+	*acp = ac;
+
+	async_rconnect_start(&ac->rconnect, host, port,
+			     &aconnect_rconnect_handler, ac);
+}
+
+void
+aconnect_cancel(struct aconnect *ac)
+{
+	if (ac->rconnect != NULL)
+		async_rconnect_cancel(ac->rconnect);
+	else {
+		g_source_remove(ac->source_id);
+		close_socket(ac->fd);
+	}
+
+	g_free(ac);
+}

ncmpc-0.27.tar.xz/src/aconnect.h Added

@@ -0,0 +1,50 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ACONNECT_H
+#define ACONNECT_H
+
+#include <mpd/client.h>
+
+struct mpd_connection;
+struct aconnect;
+
+struct aconnect_handler {
+	void (*success)(struct mpd_connection *c, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+void
+aconnect_start(struct aconnect **acp,
+	       const char *host, unsigned port,
+	       const struct aconnect_handler *handler, void *ctx);
+
+void
+aconnect_cancel(struct aconnect *ac);
+
+#endif

ncmpc-0.27.tar.xz/src/callbacks.c Added

@@ -0,0 +1,65 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "callbacks.h"
+#include "screen_utils.h"
+#include "screen_status.h"
+#include "mpdclient.h"
+
+static bool
+_mpdclient_auth_callback(struct mpdclient *c, gint recursion)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	mpd_connection_clear_error(connection);
+	if (recursion > 2)
+		return false;
+
+	char *password = screen_read_password(NULL);
+	if (password == NULL)
+		return false;
+
+	mpd_send_password(connection, password);
+	g_free(password);
+
+	mpd_response_finish(connection);
+	mpdclient_update(c);
+
+	if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+	    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_PASSWORD)
+		return _mpdclient_auth_callback(c, ++recursion);
+
+	return true;
+}
+
+bool
+mpdclient_auth_callback(struct mpdclient *c)
+{
+	return _mpdclient_auth_callback(c, 0);
+}
+
+void
+mpdclient_error_callback(const char *message)
+{
+	screen_status_message(message);
+	screen_bell();
+	doupdate();
+}

ncmpc-0.27.tar.xz/src/callbacks.h Added

@@ -0,0 +1,64 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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_CALLBACKS_H
+#define NCMPC_CALLBACKS_H
+
+#include <mpd/client.h>
+
+#include <stdbool.h>
+
+struct mpdclient;
+
+/**
+ * A connection to MPD has been established.
+ */
+void
+mpdclient_connected_callback(void);
+
+/**
+ * An attempt to connect to MPD has failed.
+ * mpdclient_error_callback() has been called already.
+ */
+void
+mpdclient_failed_callback(void);
+
+/**
+ * The connection to MPD was lost.  If this was due to an error, then
+ * mpdclient_error_callback() has already been called.
+ */
+void
+mpdclient_lost_callback(void);
+
+/**
+ * To be implemented by the application: mpdclient.c calls this to
+ * display an error message.
+ *
+ * @param message a human-readable error message in the locale charset
+ */
+void
+mpdclient_error_callback(const char *message);
+
+bool
+mpdclient_auth_callback(struct mpdclient *c);
+
+void
+mpdclient_idle_callback(enum mpd_idle events);
+
+#endif

ncmpc-0.24.tar.xz/src/charset.c -> ncmpc-0.27.tar.xz/src/charset.c Changed

ncmpc-0.24.tar.xz/src/charset.h -> ncmpc-0.27.tar.xz/src/charset.h Changed

ncmpc-0.24.tar.xz/src/colors.c -> ncmpc-0.27.tar.xz/src/colors.c Changed

ncmpc-0.24.tar.xz/src/colors.h -> ncmpc-0.27.tar.xz/src/colors.h Changed

ncmpc-0.24.tar.xz/src/command.c -> ncmpc-0.27.tar.xz/src/command.c Changed

ncmpc-0.24.tar.xz/src/command.h -> ncmpc-0.27.tar.xz/src/command.h Changed

ncmpc-0.24.tar.xz/src/conf.c -> ncmpc-0.27.tar.xz/src/conf.c Changed

ncmpc-0.24.tar.xz/src/conf.h -> ncmpc-0.27.tar.xz/src/conf.h Changed

ncmpc-0.27.tar.xz/src/db_completion.c Added

@@ -0,0 +1,65 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "db_completion.h"
+#include "charset.h"
+#include "mpdclient.h"
+
+GList *
+gcmp_list_from_path(struct mpdclient *c, const gchar *path,
+		    GList *list, gint types)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return list;
+
+	mpd_send_list_meta(connection, path);
+
+	struct mpd_entity *entity;
+	while ((entity = mpd_recv_entity(connection)) != NULL) {
+		char *name;
+
+		if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
+		    types & GCMP_TYPE_DIR) {
+			const struct mpd_directory *dir =
+				mpd_entity_get_directory(entity);
+			gchar *tmp = utf8_to_locale(mpd_directory_get_path(dir));
+			name = g_strconcat(tmp, "/", NULL);
+			g_free(tmp);
+		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
+			   types & GCMP_TYPE_FILE) {
+			const struct mpd_song *song =
+				mpd_entity_get_song(entity);
+			name = utf8_to_locale(mpd_song_get_uri(song));
+		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
+			   types & GCMP_TYPE_PLAYLIST) {
+			const struct mpd_playlist *playlist =
+				mpd_entity_get_playlist(entity);
+			name = utf8_to_locale(mpd_playlist_get_path(playlist));
+		} else {
+			mpd_entity_free(entity);
+			continue;
+		}
+
+		list = g_list_append(list, name);
+		mpd_entity_free(entity);
+	}
+
+	return list;
+}

ncmpc-0.27.tar.xz/src/db_completion.h Added

@@ -0,0 +1,40 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 DB_COMPLETION_H
+#define DB_COMPLETION_H
+
+#include <glib.h>
+
+struct mpdclient;
+
+#define GCMP_TYPE_DIR       (0x01 << 0)
+#define GCMP_TYPE_FILE      (0x01 << 1)
+#define GCMP_TYPE_PLAYLIST  (0x01 << 2)
+#define GCMP_TYPE_RFILE     (GCMP_TYPE_DIR | GCMP_TYPE_FILE)
+#define GCMP_TYPE_RPLAYLIST (GCMP_TYPE_DIR | GCMP_TYPE_PLAYLIST)
+
+/**
+ * Create a list suitable for GCompletion from path.
+ */
+GList *
+gcmp_list_from_path(struct mpdclient *c, const gchar *path,
+		    GList *list, gint types);
+
+#endif

ncmpc-0.24.tar.xz/src/defaults.h -> ncmpc-0.27.tar.xz/src/defaults.h Changed

ncmpc-0.24.tar.xz/src/filelist.c -> ncmpc-0.27.tar.xz/src/filelist.c Changed

ncmpc-0.24.tar.xz/src/filelist.h -> ncmpc-0.27.tar.xz/src/filelist.h Changed

ncmpc-0.24.tar.xz/src/gidle.c -> ncmpc-0.27.tar.xz/src/gidle.c Changed

ncmpc-0.24.tar.xz/src/gidle.h -> ncmpc-0.27.tar.xz/src/gidle.h Changed

ncmpc-0.24.tar.xz/src/hscroll.c -> ncmpc-0.27.tar.xz/src/hscroll.c Changed

ncmpc-0.24.tar.xz/src/hscroll.h -> ncmpc-0.27.tar.xz/src/hscroll.h Changed

ncmpc-0.24.tar.xz/src/i18n.h -> ncmpc-0.27.tar.xz/src/i18n.h Changed

ncmpc-0.27.tar.xz/src/keyboard.c Added

@@ -0,0 +1,88 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "keyboard.h"
+#include "command.h"
+#include "ncmpc.h"
+#include "ncmpc_curses.h"
+#include "screen.h"
+#include "Compiler.h"
+
+#include <glib.h>
+
+#include <unistd.h>
+
+static bool
+ignore_key(int key)
+{
+	return key == ERR || key == '\0';
+}
+
+gcc_pure
+static command_t
+translate_key(int key)
+{
+#ifdef HAVE_GETMOUSE
+	if (key == KEY_MOUSE)
+		return CMD_MOUSE_EVENT;
+#endif
+
+	return get_key_command(key);
+}
+
+static gboolean
+keyboard_event(gcc_unused GIOChannel *source,
+	       gcc_unused GIOCondition condition,
+	       gcc_unused gpointer data)
+{
+	int key = wgetch(screen.main_window.w);
+	if (ignore_key(key))
+		return true;
+
+	command_t cmd = translate_key(key);
+	if (cmd == CMD_NONE)
+		return true;
+
+	begin_input_event();
+
+	if (!do_input_event(cmd))
+		return FALSE;
+
+	end_input_event();
+	return TRUE;
+}
+
+void
+keyboard_init(void)
+{
+	GIOChannel *channel = g_io_channel_unix_new(STDIN_FILENO);
+	g_io_add_watch(channel, G_IO_IN, keyboard_event, NULL);
+	g_io_channel_unref(channel);
+}
+
+void
+keyboard_unread(int key)
+{
+	if (ignore_key(key))
+		return;
+
+	command_t cmd = translate_key(key);
+	if (cmd != CMD_NONE)
+		do_input_event(cmd);
+}

ncmpc-0.27.tar.xz/src/keyboard.h Added

ncmpc-0.24.tar.xz/src/lirc.c -> ncmpc-0.27.tar.xz/src/lirc.c Changed

ncmpc-0.24.tar.xz/src/lirc.h -> ncmpc-0.27.tar.xz/src/lirc.h Changed

ncmpc-0.24.tar.xz/src/list_window.c -> ncmpc-0.27.tar.xz/src/list_window.c Changed

ncmpc-0.24.tar.xz/src/list_window.h -> ncmpc-0.27.tar.xz/src/list_window.h Changed

ncmpc-0.24.tar.xz/src/lyrics.c -> ncmpc-0.27.tar.xz/src/lyrics.c Changed

ncmpc-0.24.tar.xz/src/lyrics.h -> ncmpc-0.27.tar.xz/src/lyrics.h Changed

ncmpc-0.24.tar.xz/src/main.c -> ncmpc-0.27.tar.xz/src/main.c Changed

@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,17 +20,20 @@
 #include "config.h"
 #include "ncmpc.h"
 #include "mpdclient.h"
-#include "gidle.h"
+#include "callbacks.h"
 #include "charset.h"
 #include "options.h"
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
-#include "screen_utils.h"
 #include "screen_status.h"
+#include "xterm_title.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
+#include "keyboard.h"
+#include "lirc.h"
+#include "signals.h"
 
 #ifndef NCMPC_MINI
 #include "conf.h"
@@ -40,10 +43,6 @@
 #include "lyrics.h"
 #endif
 
-#ifdef ENABLE_LIRC
-#include "lirc.h"
-#endif
-
 #include <mpd/client.h>
 
 #include <stdlib.h>
@@ -64,7 +63,6 @@
 static struct mpdclient *mpd = NULL;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, update_source_id;
-static int sigwinch_pipes[2];
 
 #ifndef NCMPC_MINI
 static guint check_key_bindings_source_id;
@@ -74,97 +72,26 @@
 static void
 update_xterm_title(void)
 {
-	struct mpd_status *status = NULL;
-	const struct mpd_song *song = NULL;
-	if (mpd) {
-		status = mpd->status;
-		song = mpd->song;
-	}
+	const struct mpd_song *song = mpd->song;
 
 	char tmp[BUFSIZE];
-	if (options.xterm_title_format && status && song &&
-	    mpd_status_get_state(status) == MPD_STATE_PLAY)
-		strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
-	else
-		g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+	const char *new_title = NULL;
+	if (options.xterm_title_format && mpd->playing && song)
+		new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+			? tmp
+			: NULL;
+
+	if (new_title == NULL)
+		new_title = PACKAGE " version " VERSION;
 
 	static char title[BUFSIZE];
-	if (strncmp(title, tmp, BUFSIZE)) {
-		g_strlcpy(title, tmp, BUFSIZE);
-		set_xterm_title("%s", title);
+	if (strncmp(title, new_title, BUFSIZE)) {
+		g_strlcpy(title, new_title, BUFSIZE);
+		set_xterm_title(title);
 	}
 }
 #endif
 
-static void
-exit_and_cleanup(void)
-{
-	screen_exit();
-#ifndef NCMPC_MINI
-	set_xterm_title("");
-#endif
-	printf("\n");
-
-	if (mpd) {
-		mpdclient_disconnect(mpd);
-		mpdclient_free(mpd);
-	}
-}
-
-#ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
-{
-	g_main_loop_quit(main_loop);
-}
-
-
-static void
-catch_sigcont(gcc_unused int sig)
-{
-	char irrelevant = 'a';
-	if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
-		exit(EXIT_FAILURE);
-}
-
-void
-sigstop(void)
-{
-	def_prog_mode();  /* save the tty modes */
-	endwin();         /* end curses mode temporarily */
-	kill(0, SIGSTOP); /* issue SIGSTOP */
-}
-
-static gboolean
-sigwinch_event(gcc_unused GIOChannel *source,
-               gcc_unused GIOCondition condition, gcc_unused gpointer data)
-{
-	char ignoreme[64];
-	if (1 > read(sigwinch_pipes[0], ignoreme, 64))
-		exit(EXIT_FAILURE);
-
-	endwin();
-	refresh();
-	screen_resize(mpd);
-
-	return TRUE;
-}
-
-static void
-catch_sigwinch(gcc_unused int sig)
-{
-	char irrelevant = 'a';
-	if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
-		exit(EXIT_FAILURE);
-}
-#endif /* WIN32 */
-
-static void
-idle_callback(enum mpd_error error,
-	      gcc_unused enum mpd_server_error server_error,
-	      const char *message, enum mpd_idle events,
-	      gcc_unused void *ctx);
-
 static gboolean
 timer_mpd_update(gpointer data);
 
@@ -191,14 +118,7 @@
 static bool
 should_enable_update_timer(void)
 {
-	return (mpdclient_is_connected(mpd) &&
-		(mpd->source == NULL || /* "idle" not supported */
-		 (mpd->status != NULL &&
-		  mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
-#ifndef NCMPC_MINI
-		|| options.display_time
-#endif
-		;
+	return mpd->playing;
 }
 
 static void
@@ -211,15 +131,10 @@
 }
 
 static void
-check_reconnect(void);
-
-static void
 do_mpd_update(void)
 {
 	if (mpdclient_is_connected(mpd) &&
-	    (mpd->source == NULL || mpd->events != 0 ||
-	     (mpd->status != NULL &&
-	      mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
+	    (mpd->events != 0 || mpd->playing))
 		mpdclient_update(mpd);
 
 #ifndef NCMPC_MINI
@@ -229,54 +144,6 @@
 
 	screen_update(mpd);
 	mpd->events = 0;
-
-	mpdclient_put_connection(mpd);
-	check_reconnect();
-}
-
-#if LIBMPDCLIENT_CHECK_VERSION(2,4,0)
-
-static char *
-settings_name(const struct mpd_settings *settings)
-{
-	const char *host = mpd_settings_get_host(settings);
-	if (host == NULL)
-		host = _("unknown");
-
-	if (host[0] == '/')
-		return g_strdup(host);
-
-	unsigned port = mpd_settings_get_port(settings);
-	if (port == 0 || port == 6600)
-		return g_strdup(host);
-
-	return g_strdup_printf("%s:%u", host, port);
-}
-
-#endif
-
-static char *
-default_settings_name(void)
-{
-#if LIBMPDCLIENT_CHECK_VERSION(2,4,0)
-	struct mpd_settings *settings =
-		mpd_settings_new(options.host, options.port, 0,
-				 NULL, options.password);
-	if (settings == NULL)
-		return g_strdup(_("unknown"));
-
-	char *name = settings_name(settings);
-	mpd_settings_free(settings);
-
-	return name;
-#else
-	/*
-	 * localhost is actually not correct, we only know that
-	 * mpd_connection_new() has connected to the "default host".
-	 */
-	const char *name = options.host ?: "localhost";
-	return g_strdup(name);
-#endif
 }
 
 /**
@@ -286,30 +153,29 @@
 static gboolean
 timer_reconnect(gcc_unused gpointer data)
 {
-	assert(!mpdclient_is_connected(mpd));
+	assert(mpdclient_is_dead(mpd));
 
 	reconnect_source_id = 0;
 
-	char *name = default_settings_name();
+	char *name = mpdclient_settings_name(mpd);
 	screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
 			     name, get_key_names(CMD_QUIT, false));
 	g_free(name);
 	doupdate();
 
-	mpdclient_disconnect(mpd);
-	if (!mpdclient_connect(mpd, options.host, options.port,
-			       options.timeout_ms,
-			       options.password)) {
-		/* try again in 5 seconds */
-		reconnect_source_id = g_timeout_add(5000,
-						    timer_reconnect, NULL);
-		return FALSE;
-	}
+	mpdclient_connect(mpd);
 
-	struct mpd_connection *connection = mpdclient_get_connection(mpd);
+	return FALSE;
+}
+
+void
+mpdclient_connected_callback(void)
+{
+	assert(reconnect_source_id == 0);
 
 #ifndef NCMPC_MINI
 	/* quit if mpd is pre 0.14 - song id not supported by mpd */
+	struct mpd_connection *connection = mpdclient_get_connection(mpd);
 	if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0) {
 		const unsigned *version =
 			mpd_connection_get_server_version(connection);
@@ -320,15 +186,12 @@
 		doupdate();
 
 		/* try again after 30 seconds */
-		reconnect_source_id = g_timeout_add(30000,
-						    timer_reconnect, NULL);
-		return FALSE;
+		reconnect_source_id =
+			g_timeout_add_seconds(30, timer_reconnect, NULL);
+		return;
 	}
 #endif
 
-	mpd->source = mpd_glib_new(connection,
-				   idle_callback, mpd);
-
 	screen_status_clear_message();
 	doupdate();
 
@@ -338,75 +201,40 @@
 	do_mpd_update();
 
 	auto_update_timer();
+}
 
-	return FALSE;
+void
+mpdclient_failed_callback(void)
+{
+	assert(reconnect_source_id == 0);
+
+	/* try again in 5 seconds */
+	reconnect_source_id = g_timeout_add_seconds(5, timer_reconnect, NULL);
 }
 
-static void
-check_reconnect(void)
+void
+mpdclient_lost_callback(void)
 {
-	if (!mpdclient_is_connected(mpd) && reconnect_source_id == 0)
-		/* reconnect when the connection is lost */
-		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
-						    NULL);
+	assert(reconnect_source_id == 0);
+
+	screen_update(mpd);
+
+	reconnect_source_id = g_timeout_add_seconds(1, timer_reconnect, NULL);
 }
 
 /**
  * This function is called by the gidle.c library when MPD sends us an
  * idle event (or when the connection dies).
  */
-static void
-idle_callback(enum mpd_error error, enum mpd_server_error server_error,
-	      const char *message, enum mpd_idle events,
-	      void *ctx)
+void
+mpdclient_idle_callback(gcc_unused enum mpd_idle events)
 {
-	struct mpdclient *c = ctx;
-
-	c->idle = false;
-
-	assert(mpdclient_is_connected(c));
-
-	if (error != MPD_ERROR_SUCCESS) {
-		if (error == MPD_ERROR_SERVER &&
-		    server_error == MPD_SERVER_ERROR_UNKNOWN_CMD) {
-			/* the "idle" command is not supported - fall
-			   back to timer based polling */
-			mpd_glib_free(c->source);
-			c->source = NULL;
-			auto_update_timer();
-			return;
-		}
-
-		char *allocated;
-		if (error == MPD_ERROR_SERVER)
-			message = allocated = utf8_to_locale(message);
-		else
-			allocated = NULL;
-		screen_status_message(message);
-		g_free(allocated);
-		screen_bell();
-		doupdate();
-
-		mpdclient_disconnect(c);
-		screen_update(mpd);
-		reconnect_source_id = g_timeout_add(1000, timer_reconnect,
-						    NULL);
-		return;
-	}
-
-	c->events |= events;
-	mpdclient_update(c);
-
 #ifndef NCMPC_MINI
 	if (options.enable_xterm_title)
 		update_xterm_title();
 #endif
 
 	screen_update(mpd);
-	c->events = 0;
-
-	mpdclient_put_connection(c);
-	check_reconnect();
 	auto_update_timer();
 }
 
@@ -432,16 +260,15 @@
 	screen_update(mpd);
 	mpd->events = 0;
 
-	mpdclient_put_connection(mpd);
-	check_reconnect();
 	auto_update_timer();
 }
 
-int do_input_event(command_t cmd)
+bool
+do_input_event(command_t cmd)
 {
 	if (cmd == CMD_QUIT) {
 		g_main_loop_quit(main_loop);
-		return -1;
+		return false;
 	}
 
 	screen_cmd(mpd, cmd);
@@ -450,23 +277,7 @@
 		/* make sure we don't update the volume yet */
 		disable_update_timer();
 
-	return 0;
-}
-
-static gboolean
-keyboard_event(gcc_unused GIOChannel *source,
-	       gcc_unused GIOCondition condition,
-	       gcc_unused gpointer data)
-{
-	begin_input_event();
-
-	command_t cmd = get_keyboard_command();
-	if (cmd != CMD_NONE)
-		if (do_input_event(cmd) != 0)
-			return FALSE;
-
-	end_input_event();
-	return TRUE;
+	return true;
 }
 
 #ifndef NCMPC_MINI
@@ -552,59 +363,6 @@
 	/* parse command line options - 2 pass */
 	options_parse(argc, argv);
 
-#ifndef WIN32
-	/* setup signal behavior - SIGINT */
-	struct sigaction act;
-	sigemptyset(&act.sa_mask);
-	act.sa_flags = 0;
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGINT, &act, NULL) < 0) {
-		perror("signal");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behavior - SIGTERM */
-
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGTERM, &act, NULL) < 0) {
-		perror("sigaction()");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behavior - SIGCONT */
-
-	act.sa_handler = catch_sigcont;
-	if (sigaction(SIGCONT, &act, NULL) < 0) {
-		perror("sigaction(SIGCONT)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup signal behaviour - SIGHUP*/
-
-	act.sa_handler = catch_sigint;
-	if (sigaction(SIGHUP, &act, NULL) < 0) {
-		perror("sigaction(SIGHUP)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* setup SIGWINCH */
-
-	act.sa_flags = SA_RESTART;
-	act.sa_handler = catch_sigwinch;
-	if (sigaction(SIGWINCH, &act, NULL) < 0) {
-		perror("sigaction(SIGWINCH)");
-		exit(EXIT_FAILURE);
-	}
-
-	/* ignore SIGPIPE */
-
-	act.sa_handler = SIG_IGN;
-	if (sigaction(SIGPIPE, &act, NULL) < 0) {
-		perror("sigaction(SIGPIPE)");
-		exit(EXIT_FAILURE);
-	}
-#endif
-
 	ncu_init();
 
 #ifdef ENABLE_LYRICS_SCREEN
@@ -612,7 +370,9 @@
 #endif
 
 	/* create mpdclient instance */
-	mpd = mpdclient_new();
+	mpd = mpdclient_new(options.host, options.port,
+			    options.timeout_ms,
+			    options.password);
 
 	/* initialize curses */
 	screen_init(mpd);
@@ -621,44 +381,27 @@
 	main_loop = g_main_loop_new(NULL, FALSE);
 
 	/* watch out for keyboard input */
-	GIOChannel *keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
-	g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
+	keyboard_init();
 
-#ifdef ENABLE_LIRC
 	/* watch out for lirc input */
-	int lirc_socket = ncmpc_lirc_open();
-	GIOChannel *lirc_channel = NULL;
-	if (lirc_socket >= 0) {
-		lirc_channel = g_io_channel_unix_new(lirc_socket);
-		g_io_add_watch(lirc_channel, G_IO_IN, lirc_event, NULL);
-	}
-#endif
+	ncmpc_lirc_init();
 
-#ifndef WIN32
-	GIOChannel *sigwinch_channel = NULL;
-	if (!pipe(sigwinch_pipes) &&
-		!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
-		sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
-		g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, NULL);
-	}
-	else {
-		perror("sigwinch pipe creation failed");
-		exit(EXIT_FAILURE);
-	}
-#endif
+	signals_init(main_loop, mpd);
 
 	/* attempt to connect */
-	reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
+	reconnect_source_id = g_idle_add(timer_reconnect, NULL);
 
 	auto_update_timer();
 
 #ifndef NCMPC_MINI
-	check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
+	check_key_bindings_source_id =
+		g_timeout_add_seconds(10, timer_check_key_bindings, NULL);
 #endif
 
-	screen_paint(mpd);
+	screen_paint(mpd, true);
 
 	g_main_loop_run(main_loop);
+	g_main_loop_unref(main_loop);
 
 	/* cleanup */
 
@@ -674,19 +417,16 @@
 		g_source_remove(check_key_bindings_source_id);
 #endif
 
-	g_main_loop_unref(main_loop);
-	g_io_channel_unref(keyboard_channel);
-	g_io_channel_unref(sigwinch_channel);
-	close(sigwinch_pipes[0]);
-	close(sigwinch_pipes[1]);
-
-#ifdef ENABLE_LIRC
-	if (lirc_socket >= 0)
-		g_io_channel_unref(lirc_channel);
-	ncmpc_lirc_close();
+	signals_deinit();
+	ncmpc_lirc_deinit();
+
+	screen_exit();
+#ifndef NCMPC_MINI
+	set_xterm_title("");
 #endif
+	printf("\n");
 
-	exit_and_cleanup();
+	mpdclient_free(mpd);
 
 #ifdef ENABLE_LYRICS_SCREEN
 	lyrics_deinit();

ncmpc-0.24.tar.xz/src/match.c -> ncmpc-0.27.tar.xz/src/match.c Changed

ncmpc-0.24.tar.xz/src/match.h -> ncmpc-0.27.tar.xz/src/match.h Changed

ncmpc-0.24.tar.xz/src/mpdclient.c -> ncmpc-0.27.tar.xz/src/mpdclient.c Changed

@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,47 +18,113 @@
  */
 
 #include "mpdclient.h"
+#include "callbacks.h"
 #include "filelist.h"
-#include "screen_client.h"
 #include "config.h"
-#include "options.h"
-#include "strfsong.h"
-#include "utils.h"
 #include "gidle.h"
+#include "charset.h"
+
+#ifdef ENABLE_ASYNC_CONNECT
+#include "aconnect.h"
+#endif
 
 #include <mpd/client.h>
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-
-#define BUFSIZE 1024
-
-/* sort by song format */
-gint
-compare_filelistentry_format(gconstpointer filelist_entry1,
-			     gconstpointer filelist_entry2,
-			     const char *song_format)
-{
-	const struct mpd_entity *e1 =
-		((const struct filelist_entry *)filelist_entry1)->entity;
-	const struct mpd_entity *e2 =
-		((const struct filelist_entry *)filelist_entry2)->entity;
-
-	int n = 0;
-	if (e1 && e2 &&
-	    mpd_entity_get_type(e1) == MPD_ENTITY_TYPE_SONG &&
-	    mpd_entity_get_type(e2) == MPD_ENTITY_TYPE_SONG) {
-		char key1[BUFSIZE], key2[BUFSIZE];
-		strfsong(key1, BUFSIZE, song_format, mpd_entity_get_song(e1));
-		strfsong(key2, BUFSIZE, song_format, mpd_entity_get_song(e2));
-		n = strcmp(key1,key2);
+#include <assert.h>
+
+static gboolean
+mpdclient_enter_idle_callback(gpointer user_data)
+{
+	struct mpdclient *c = user_data;
+	assert(c->enter_idle_source_id != 0);
+	assert(c->source != NULL);
+	assert(!c->idle);
+
+	c->enter_idle_source_id = 0;
+	c->idle = mpd_glib_enter(c->source);
+	return false;
+}
+
+static void
+mpdclient_schedule_enter_idle(struct mpdclient *c)
+{
+	assert(c != NULL);
+	assert(c->source != NULL);
+
+	if (c->enter_idle_source_id == 0)
+		/* automatically re-enter MPD "idle" mode */
+		c->enter_idle_source_id =
+			g_idle_add(mpdclient_enter_idle_callback, c);
+}
+
+static void
+mpdclient_cancel_enter_idle(struct mpdclient *c)
+{
+	if (c->enter_idle_source_id != 0) {
+		g_source_remove(c->enter_idle_source_id);
+		c->enter_idle_source_id = 0;
 	}
+}
 
-	return n;
+static void
+mpdclient_invoke_error_callback(enum mpd_error error,
+				const char *message)
+{
+	char *allocated;
+	if (error == MPD_ERROR_SERVER)
+		/* server errors are UTF-8, the others are locale */
+		message = allocated = utf8_to_locale(message);
+	else
+		allocated = NULL;
+
+	mpdclient_error_callback(message);
+	g_free(allocated);
 }
 
+static void
+mpdclient_invoke_error_callback1(struct mpdclient *c)
+{
+	assert(c != NULL);
+	assert(c->connection != NULL);
+
+	struct mpd_connection *connection = c->connection;
+
+	enum mpd_error error = mpd_connection_get_error(connection);
+	assert(error != MPD_ERROR_SUCCESS);
+
+	mpdclient_invoke_error_callback(error,
+					mpd_connection_get_error_message(connection));
+}
+
+static void
+mpdclient_gidle_callback(enum mpd_error error,
+			 gcc_unused enum mpd_server_error server_error,
+			 const char *message, enum mpd_idle events,
+			 void *ctx)
+{
+	struct mpdclient *c = ctx;
+
+	c->idle = false;
+
+	assert(mpdclient_is_connected(c));
+
+	if (error != MPD_ERROR_SUCCESS) {
+		mpdclient_invoke_error_callback(error, message);
+		mpdclient_disconnect(c);
+		mpdclient_lost_callback();
+		return;
+	}
+
+	c->events |= events;
+	mpdclient_update(c);
+
+	mpdclient_idle_callback(c->events);
+
+	c->events = 0;
+
+	if (c->source != NULL)
+		mpdclient_schedule_enter_idle(c);
+}
 
 /****************************************************************************/
 /*** mpdclient functions ****************************************************/
@@ -73,24 +139,70 @@
 
 	if (error == MPD_ERROR_SERVER &&
 	    mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PERMISSION &&
-	    screen_auth(c))
+	    mpdclient_auth_callback(c))
 		return true;
 
-	mpdclient_ui_error(mpd_connection_get_error_message(c->connection));
+	mpdclient_invoke_error_callback(error,
+					mpd_connection_get_error_message(c->connection));
 
-	if (!mpd_connection_clear_error(c->connection))
+	if (!mpd_connection_clear_error(c->connection)) {
 		mpdclient_disconnect(c);
+		mpdclient_lost_callback();
+	}
 
 	return false;
 }
 
+#ifdef ENABLE_ASYNC_CONNECT
+#ifndef WIN32
+
+static bool
+is_local_socket(const char *host)
+{
+	return *host == '/' || *host == '@';
+}
+
+static bool
+settings_is_local_socket(const struct mpd_settings *settings)
+{
+	const char *host = mpd_settings_get_host(settings);
+	return host != NULL && is_local_socket(host);
+}
+
+#endif
+#endif
+
 struct mpdclient *
-mpdclient_new(void)
+mpdclient_new(const gchar *host, unsigned port,
+	      unsigned timeout_ms, const gchar *password)
 {
 	struct mpdclient *c = g_new0(struct mpdclient, 1);
+
+#ifdef ENABLE_ASYNC_CONNECT
+	c->settings = mpd_settings_new(host, port, timeout_ms,
+				       NULL, NULL);
+	if (c->settings == NULL)
+		g_error("Out of memory");
+
+#ifndef WIN32
+	c->settings2 = host == NULL && port == 0 &&
+		settings_is_local_socket(c->settings)
+		? mpd_settings_new(host, 6600, timeout_ms, NULL, NULL)
+		: NULL;
+#endif
+
+#else
+	c->host = host;
+	c->port = port;
+#endif
+
+	c->timeout_ms = timeout_ms;
+	c->password = password;
+
 	playlist_init(&c->playlist);
 	c->volume = -1;
 	c->events = 0;
+	c->playing = false;
 
 	return c;
 }
@@ -102,12 +214,81 @@
 
 	mpdclient_playlist_free(&c->playlist);
 
+#ifdef ENABLE_ASYNC_CONNECT
+	mpd_settings_free(c->settings);
+
+#ifndef WIN32
+	if (c->settings2 != NULL)
+		mpd_settings_free(c->settings2);
+#endif
+#endif
+
 	g_free(c);
 }
 
+static char *
+settings_name(const struct mpd_settings *settings)
+{
+	assert(settings != NULL);
+
+	const char *host = mpd_settings_get_host(settings);
+	if (host == NULL)
+		host = "unknown";
+
+	if (host[0] == '/')
+		return g_strdup(host);
+
+	unsigned port = mpd_settings_get_port(settings);
+	if (port == 0 || port == 6600)
+		return g_strdup(host);
+
+	return g_strdup_printf("%s:%u", host, port);
+}
+
+char *
+mpdclient_settings_name(const struct mpdclient *c)
+{
+	assert(c != NULL);
+
+#ifdef ENABLE_ASYNC_CONNECT
+	return settings_name(c->settings);
+#else
+	struct mpd_settings *settings =
+		mpd_settings_new(c->host, c->port, 0, NULL, NULL);
+	if (settings == NULL)
+		return g_strdup("unknown");
+
+	char *name = settings_name(settings);
+	mpd_settings_free(settings);
+	return name;
+#endif
+}
+
+static void
+mpdclient_status_free(struct mpdclient *c)
+{
+	if (c->status == NULL)
+		return;
+
+	mpd_status_free(c->status);
+	c->status = NULL;
+
+	c->volume = -1;
+	c->playing = false;
+}
+
 void
 mpdclient_disconnect(struct mpdclient *c)
 {
+#ifdef ENABLE_ASYNC_CONNECT
+	if (c->async_connect != NULL) {
+		aconnect_cancel(c->async_connect);
+		c->async_connect = NULL;
+	}
+#endif
+
+	mpdclient_cancel_enter_idle(c);
+
 	if (c->source != NULL) {
 		mpd_glib_free(c->source);
 		c->source = NULL;
@@ -120,9 +301,7 @@
 	}
 	c->connection = NULL;
 
-	if (c->status)
-		mpd_status_free(c->status);
-	c->status = NULL;
+	mpdclient_status_free(c);
 
 	playlist_clear(&c->playlist);
 
@@ -133,87 +312,140 @@
 	c->events |= MPD_IDLE_ALL;
 }
 
-bool
-mpdclient_connect(struct mpdclient *c,
-		  const gchar *host,
-		  gint port,
-		  unsigned timeout_ms,
-		  const gchar *password)
+static bool
+mpdclient_connected(struct mpdclient *c,
+		    struct mpd_connection *connection)
 {
-	/* close any open connection */
-	if (c->connection)
-		mpdclient_disconnect(c);
-
-	/* connect to MPD */
-	c->connection = mpd_connection_new(host, port, timeout_ms);
-	if (c->connection == NULL)
-		g_error("Out of memory");
+	c->connection = connection;
 
-	if (mpd_connection_get_error(c->connection) != MPD_ERROR_SUCCESS) {
-		mpdclient_handle_error(c);
+	if (mpd_connection_get_error(connection) != MPD_ERROR_SUCCESS) {
+		mpdclient_invoke_error_callback1(c);
 		mpdclient_disconnect(c);
+		mpdclient_failed_callback();
 		return false;
 	}
 
+#ifdef ENABLE_ASYNC_CONNECT
+	if (c->timeout_ms > 0)
+		mpd_connection_set_timeout(connection, c->timeout_ms);
+#endif
+
 	/* send password */
-	if (password != NULL && !mpd_run_password(c->connection, password)) {
-		mpdclient_handle_error(c);
+	if (c->password != NULL &&
+	    !mpd_run_password(connection, c->password)) {
+		mpdclient_invoke_error_callback1(c);
 		mpdclient_disconnect(c);
+		mpdclient_failed_callback();
 		return false;
 	}
 
+	c->source = mpd_glib_new(connection,
+				 mpdclient_gidle_callback, c);
+	mpdclient_schedule_enter_idle(c);
+
 	++c->connection_id;
 
+	mpdclient_connected_callback();
 	return true;
 }
 
+#ifdef ENABLE_ASYNC_CONNECT
+
+static void
+mpdclient_aconnect_start(struct mpdclient *c,
+			 const struct mpd_settings *settings);
+
+static void
+mpdclient_connect_success(struct mpd_connection *connection, void *ctx)
+{
+	struct mpdclient *c = ctx;
+	assert(c->async_connect != NULL);
+	c->async_connect = NULL;
+
+	mpdclient_connected(c, connection);
+}
+
+static void
+mpdclient_connect_error(const char *message, void *ctx)
+{
+	struct mpdclient *c = ctx;
+	assert(c->async_connect != NULL);
+	c->async_connect = NULL;
+
+#ifndef WIN32
+	if (!c->connecting2 && c->settings2 != NULL) {
+		c->connecting2 = true;
+		mpdclient_aconnect_start(c, c->settings2);
+		return;
+	}
+#endif
+
+	mpdclient_error_callback(message);
+	mpdclient_failed_callback();
+}
+
+static const struct aconnect_handler mpdclient_connect_handler = {
+	.success = mpdclient_connect_success,
+	.error = mpdclient_connect_error,
+};
+
+static void
+mpdclient_aconnect_start(struct mpdclient *c,
+			 const struct mpd_settings *settings)
+{
+	aconnect_start(&c->async_connect,
+		       mpd_settings_get_host(settings),
+		       mpd_settings_get_port(settings),
+		       &mpdclient_connect_handler, c);
+}
+
+#endif
+
+void
+mpdclient_connect(struct mpdclient *c)
+{
+	/* close any open connection */
+	mpdclient_disconnect(c);
+
+#ifdef ENABLE_ASYNC_CONNECT
+#ifndef WIN32
+	c->connecting2 = false;
+#endif
+	mpdclient_aconnect_start(c, c->settings);
+#else
+	/* connect to MPD */
+	struct mpd_connection *connection =
+		mpd_connection_new(c->host, c->port, c->timeout_ms);
+	if (connection == NULL)
+		g_error("Out of memory");
+
+	mpdclient_connected(c, connection);
+#endif
+}
+
 bool
 mpdclient_update(struct mpdclient *c)
 {
 	struct mpd_connection *connection = mpdclient_get_connection(c);
 
-	c->volume = -1;
-
 	if (connection == NULL)
 		return false;
 
-	/* always announce these options as long as we don't have
-	   "idle" support */
-	if (c->source == NULL)
-		c->events |= MPD_IDLE_PLAYER|MPD_IDLE_OPTIONS;
-
 	/* free the old status */
-	if (c->status)
-		mpd_status_free(c->status);
+	mpdclient_status_free(c);
 
 	/* retrieve new status */
 	c->status = mpd_run_status(connection);
 	if (c->status == NULL)
 		return mpdclient_handle_error(c);
 
-	if (c->source == NULL &&
-	    c->update_id != mpd_status_get_update_id(c->status)) {
-		c->events |= MPD_IDLE_UPDATE;
-
-		if (c->update_id > 0)
-			c->events |= MPD_IDLE_DATABASE;
-	}
-
-	c->update_id = mpd_status_get_update_id(c->status);
-
-	if (c->source == NULL &&
-	    c->volume != mpd_status_get_volume(c->status))
-		c->events |= MPD_IDLE_MIXER;
-
 	c->volume = mpd_status_get_volume(c->status);
+	c->playing = mpd_status_get_state(c->status) == MPD_STATE_PLAY;
 
 	/* check if the playlist needs an update */
 	if (c->playlist.version != mpd_status_get_queue_version(c->status)) {
 		bool retval;
 
-		if (c->source == NULL)
-			c->events |= MPD_IDLE_QUEUE;
-
 		if (!playlist_is_empty(&c->playlist))
 			retval = mpdclient_playlist_update_changes(c);
 		else
@@ -237,21 +469,13 @@
 	if (c->source != NULL && c->idle) {
 		c->idle = false;
 		mpd_glib_leave(c->source);
+
+		mpdclient_schedule_enter_idle(c);
 	}
 
 	return c->connection;
 }
 
-void
-mpdclient_put_connection(struct mpdclient *c)
-{
-	assert(c->source == NULL || c->connection != NULL);
-
-	if (c->source != NULL && !c->idle) {
-		c->idle = mpd_glib_enter(c->source);
-	}
-}
-
 static struct mpd_status *
 mpdclient_recv_status(struct mpdclient *c)
 {
@@ -351,39 +575,26 @@
 bool
 mpdclient_cmd_volume_up(struct mpdclient *c)
 {
+	if (c->volume < 0 || c->volume >= 100)
+		return true;
+
 	struct mpd_connection *connection = mpdclient_get_connection(c);
 	if (connection == NULL)
 		return false;
 
-	if (c->status == NULL ||
-	    mpd_status_get_volume(c->status) == -1)
-		return true;
-
-	if (c->volume < 0)
-		c->volume = mpd_status_get_volume(c->status);
-
-	if (c->volume >= 100)
-		return true;
-
 	return mpdclient_cmd_volume(c, ++c->volume);
 }
 
 bool
 mpdclient_cmd_volume_down(struct mpdclient *c)
 {
+	if (c->volume <= 0)
+		return true;
+
 	struct mpd_connection *connection = mpdclient_get_connection(c);
 	if (connection == NULL)
 		return false;
 
-	if (c->status == NULL || mpd_status_get_volume(c->status) < 0)
-		return true;
-
-	if (c->volume < 0)
-		c->volume = mpd_status_get_volume(c->status);
-
-	if (c->volume <= 0)
-		return true;
-
 	return mpdclient_cmd_volume(c, --c->volume);
 }
 
@@ -599,7 +810,6 @@
 	return true;
 }
 
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
 /* The client-to-client protocol (MPD 0.17.0) */
 
 bool
@@ -668,7 +878,6 @@
 
 	return message;
 }
-#endif
 
 /****************************************************************************/
 /*** Playlist management functions ******************************************/

ncmpc-0.24.tar.xz/src/mpdclient.h -> ncmpc-0.27.tar.xz/src/mpdclient.h Changed

@@ -1,6 +1,7 @@
 #ifndef MPDCLIENT_H
 #define MPDCLIENT_H
 
+#include "config.h"
 #include "playlist.h"
 #include "Compiler.h"
 
@@ -9,26 +10,71 @@
 struct filelist;
 
 struct mpdclient {
+#ifdef ENABLE_ASYNC_CONNECT
+	/**
+	 * These settings are used to connect to MPD asynchronously.
+	 */
+	struct mpd_settings *settings;
+
+#ifndef WIN32
+	/**
+	 * A second set of settings, just in case #settings did not
+	 * work.  This is only used if #settings refers to a local
+	 * socket path, and this one is supposed to be a fallback to
+	 * IP on the default port (6600).
+	 */
+	struct mpd_settings *settings2;
+#endif
+
+#else
+	const char *host;
+	unsigned port;
+#endif
+
+	unsigned timeout_ms;
+
+	const char *password;
+
 	/* playlist */
 	struct mpdclient_playlist playlist;
 
+#ifdef ENABLE_ASYNC_CONNECT
+	struct aconnect *async_connect;
+#endif
+
 	struct mpd_connection *connection;
 
 	/**
+	 * Tracks idle events.  It is automatically called by
+	 * mpdclient_get_connection().
+	 */
+	struct mpd_glib_source *source;
+
+	struct mpd_status *status;
+	const struct mpd_song *song;
+
+	/**
+	 * The GLib source id which re-enters MPD idle mode before the
+	 * next main loop interation.
+	 */
+	unsigned enter_idle_source_id;
+
+	/**
 	 * This attribute is incremented whenever the connection changes
 	 * (i.e. on disconnection and (re-)connection).
 	 */
 	unsigned connection_id;
 
+	int volume;
+
 	/**
-	 * 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
-	 * mpdclient library; the user of this library has to
-	 * initialize it.  However, it is freed when the MPD
-	 * connection is closed.
+	 * A bit mask of idle events occurred since the last update.
 	 */
-	struct mpd_glib_source *source;
+	enum mpd_idle events;
+
+#if defined(ENABLE_ASYNC_CONNECT) && !defined(WIN32)
+	bool connecting2;
+#endif
 
 	/**
 	 * This attribute is true when the connection is currently in
@@ -36,16 +82,10 @@
 	 */
 	bool idle;
 
-	struct mpd_status *status;
-	const struct mpd_song *song;
-
-	int volume;
-	unsigned update_id;
-
 	/**
-	 * A bit mask of idle events occurred since the last update.
+	 * Is MPD currently playing?
 	 */
-	enum mpd_idle events;
+	bool playing;
 };
 
 enum {
@@ -61,11 +101,9 @@
 		| MPD_IDLE_OUTPUT
 		| MPD_IDLE_OPTIONS
 		| MPD_IDLE_UPDATE
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
 		| MPD_IDLE_STICKER
 		| MPD_IDLE_SUBSCRIPTION
 		| MPD_IDLE_MESSAGE
-#endif
 };
 
 /** functions ***************************************************************/
@@ -81,10 +119,21 @@
 }
 
 struct mpdclient *
-mpdclient_new(void);
+mpdclient_new(const gchar *host, unsigned port,
+	      unsigned timeout_ms, const gchar *password);
 
 void mpdclient_free(struct mpdclient *c);
 
+/**
+ * Determine a human-readable "name" of the settings currently used to
+ * connect to MPD.
+ *
+ * @return an allocated string that needs to be freed (with g_free())
+ * by the caller
+ */
+char *
+mpdclient_settings_name(const struct mpdclient *c);
+
 gcc_pure
 static inline bool
 mpdclient_is_connected(const struct mpdclient *c)
@@ -92,6 +141,21 @@
 	return c->connection != NULL;
 }
 
+/**
+ * Is this object "dead"?  i.e. not connected and not currently doing
+ * anything to connect.
+ */
+gcc_pure
+static inline bool
+mpdclient_is_dead(const struct mpdclient *c)
+{
+	return c->connection == NULL
+#ifdef ENABLE_ASYNC_CONNECT
+		&& c->async_connect == NULL
+#endif
+		;
+}
+
 gcc_pure
 static inline bool
 mpdclient_is_playing(const struct mpdclient *c)
@@ -110,9 +174,8 @@
 		: NULL;
 }
 
-bool
-mpdclient_connect(struct mpdclient *c, const gchar *host, gint port,
-		  unsigned timeout_ms, const gchar *password);
+void
+mpdclient_connect(struct mpdclient *c);
 
 void
 mpdclient_disconnect(struct mpdclient *c);
@@ -123,16 +186,6 @@
 struct mpd_connection *
 mpdclient_get_connection(struct mpdclient *c);
 
-void
-mpdclient_put_connection(struct mpdclient *c);
-
-/**
- * To be implemented by the application: mpdclient.c calls this to
- * display an error message.
- */
-void
-mpdclient_ui_error(const char *message);
-
 /*** MPD Commands  **********************************************************/
 
 bool
@@ -165,7 +218,6 @@
 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);
 
@@ -181,7 +233,6 @@
 
 struct mpd_message *
 mpdclient_recv_message(struct mpdclient *c);
-#endif
 
 /*** playlist functions  **************************************************/
 
@@ -197,10 +248,4 @@
 bool
 mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
-/* sort by song format */
-gcc_pure
-gint compare_filelistentry_format(gconstpointer filelist_entry1,
-				  gconstpointer filelist_entry2,
-				  const char *song_format);
-
 #endif

ncmpc-0.24.tar.xz/src/ncfix.h -> ncmpc-0.27.tar.xz/src/ncfix.h Changed

ncmpc-0.24.tar.xz/src/ncmpc.h -> ncmpc-0.27.tar.xz/src/ncmpc.h Changed

ncmpc-0.24.tar.xz/src/ncmpc_curses.h -> ncmpc-0.27.tar.xz/src/ncmpc_curses.h Changed

ncmpc-0.24.tar.xz/src/ncu.c -> ncmpc-0.27.tar.xz/src/ncu.c Changed

ncmpc-0.24.tar.xz/src/ncu.h -> ncmpc-0.27.tar.xz/src/ncu.h Changed

ncmpc-0.27.tar.xz/src/net Added

ncmpc-0.27.tar.xz/src/net/async_connect.c Added

@@ -0,0 +1,132 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "async_connect.h"
+#include "../Compiler.h"
+
+#include <glib.h>
+
+#ifdef WIN32
+#include <ws2tcpip.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+struct async_connect {
+	const struct async_connect_handler *handler;
+	void *handler_ctx;
+
+	socket_t fd;
+
+	guint source_id;
+};
+
+static gboolean
+async_connect_source_callback(gcc_unused GIOChannel *source,
+			      gcc_unused GIOCondition condition,
+			      gpointer data)
+{
+	struct async_connect *ac = data;
+
+	const int fd = ac->fd;
+	const struct async_connect_handler *const handler = ac->handler;
+	void *const ctx = ac->handler_ctx;
+	g_free(ac);
+
+	int s_err = 0;
+	socklen_t s_err_size = sizeof(s_err);
+
+	if (getsockopt(fd, SOL_SOCKET, SO_ERROR,
+		       (char*)&s_err, &s_err_size) < 0)
+		s_err = -last_socket_error();
+
+	if (s_err == 0) {
+		handler->success(fd, ctx);
+	} else {
+		close_socket(fd);
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to connect socket: %s",
+			 strerror(-s_err));
+		handler->error(msg, ctx);
+	}
+
+	return false;
+}
+
+void
+async_connect_start(struct async_connect **acp,
+		    const struct sockaddr *address, size_t address_size,
+		    const struct async_connect_handler *handler, void *ctx)
+{
+	socket_t fd = create_socket(address->sa_family, SOCK_STREAM, 0);
+	if (fd == INVALID_SOCKET) {
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to create socket: %s",
+			 strerror(errno));
+		handler->error(msg, ctx);
+		return;
+	}
+
+	if (connect(fd, address, address_size) == 0) {
+		handler->success(fd, ctx);
+		return;
+	}
+
+	const int e = last_socket_error();
+	if (!would_block(e)) {
+		close_socket(fd);
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to connect socket: %s",
+			 strerror(e));
+		handler->error(msg, ctx);
+		return;
+	}
+
+	struct async_connect *ac = g_new(struct async_connect, 1);
+	ac->handler = handler;
+	ac->handler_ctx = ctx;
+	ac->fd = fd;
+
+	GIOChannel *channel = g_io_channel_unix_new(fd);
+	ac->source_id = g_io_add_watch(channel, G_IO_OUT,
+				       async_connect_source_callback, ac);
+	g_io_channel_unref(channel);
+
+	*acp = ac;
+}
+
+void
+async_connect_cancel(struct async_connect *ac)
+{
+	g_source_remove(ac->source_id);
+	close_socket(ac->fd);
+	g_free(ac);
+}

ncmpc-0.27.tar.xz/src/net/async_connect.h Added

@@ -0,0 +1,56 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_ASYNC_CONNECT_H
+#define NET_ASYNC_CONNECT_H
+
+#include "socket.h"
+
+#include <stddef.h>
+
+struct sockaddr;
+struct async_connect;
+
+struct async_connect_handler {
+	void (*success)(socket_t fd, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+/**
+ * Create a socket and connect it to the given address.
+ */
+void
+async_connect_start(struct async_connect **acp,
+		    const struct sockaddr *address,
+		    size_t address_size,
+		    const struct async_connect_handler *handler, void *ctx);
+
+void
+async_connect_cancel(struct async_connect *ac);
+
+#endif

ncmpc-0.27.tar.xz/src/net/async_rconnect.c Added

@@ -0,0 +1,145 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "async_rconnect.h"
+#include "async_connect.h"
+#include "resolver.h"
+#include "../Compiler.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+struct async_rconnect {
+	const struct async_rconnect_handler *handler;
+	void *handler_ctx;
+
+	const char *host;
+	struct resolver *resolver;
+
+	struct async_connect *connect;
+
+	char *last_error;
+};
+
+static void
+async_rconnect_next(struct async_rconnect *rc);
+
+static void
+async_rconnect_success(socket_t fd, void *ctx)
+{
+	struct async_rconnect *rc = ctx;
+
+	rc->handler->success(fd, rc->handler_ctx);
+	g_free(rc->last_error);
+	resolver_free(rc->resolver);
+	g_free(rc);
+}
+
+static void
+async_rconnect_error(const char *message, void *ctx)
+{
+	struct async_rconnect *rc = ctx;
+
+	g_free(rc->last_error);
+	rc->last_error = g_strdup(message);
+
+	async_rconnect_next(rc);
+}
+
+static const struct async_connect_handler async_rconnect_connect_handler = {
+	.success = async_rconnect_success,
+	.error = async_rconnect_error,
+};
+
+static void
+async_rconnect_next(struct async_rconnect *rc)
+{
+	const struct resolver_address *a = resolver_next(rc->resolver);
+	if (a == NULL) {
+		char msg[256];
+
+		if (rc->last_error == 0) {
+			snprintf(msg, sizeof(msg),
+				 "Host '%s' has no address",
+				 rc->host);
+		} else {
+			snprintf(msg, sizeof(msg),
+				 "Failed to connect to host '%s': %s",
+				 rc->host, rc->last_error);
+			g_free(rc->last_error);
+		}
+
+		rc->handler->error(msg, rc->handler_ctx);
+		resolver_free(rc->resolver);
+		g_free(rc);
+		return;
+	}
+
+	async_connect_start(&rc->connect, a->addr, a->addrlen,
+			    &async_rconnect_connect_handler, rc);
+}
+
+void
+async_rconnect_start(struct async_rconnect **rcp,
+		     const char *host, unsigned port,
+		     const struct async_rconnect_handler *handler, void *ctx)
+{
+	struct resolver *r = resolver_new(host, port);
+	if (host == NULL)
+		host = "[default]";
+
+	if (r == NULL) {
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to resolve host '%s'",
+			 host);
+		handler->error(msg, ctx);
+		return;
+	}
+
+	struct async_rconnect *rc = g_new(struct async_rconnect, 1);
+	rc->handler = handler;
+	rc->handler_ctx = ctx;
+	rc->host = host;
+	rc->resolver = r;
+	rc->last_error = NULL;
+	*rcp = rc;
+
+	async_rconnect_next(rc);
+}
+
+void
+async_rconnect_cancel(struct async_rconnect *rc)
+{
+	g_free(rc->last_error);
+	async_connect_cancel(rc->connect);
+	resolver_free(rc->resolver);
+	g_free(rc);
+}

ncmpc-0.27.tar.xz/src/net/async_rconnect.h Added

@@ -0,0 +1,52 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_ASYNC_RCONNECT_H
+#define NET_ASYNC_RCONNECT_H
+
+#include <mpd/client.h>
+
+struct async_rconnect;
+
+struct async_rconnect_handler {
+	void (*success)(int fd, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+/**
+ * Resolve a host name and connect to it asynchronously.
+ */
+void
+async_rconnect_start(struct async_rconnect **rcp,
+		     const char *host, unsigned port,
+		     const struct async_rconnect_handler *handler, void *ctx);
+
+void
+async_rconnect_cancel(struct async_rconnect *rc);
+
+#endif

ncmpc-0.27.tar.xz/src/net/resolver.c Added

@@ -0,0 +1,200 @@
+/* libmpdclient
+   (c) 2003-2017 The Music Player Daemon Project
+   This project's homepage is: http://www.musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "resolver.h"
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef WIN32
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#else
+#  include <sys/socket.h>
+#  include <sys/un.h>
+#ifdef ENABLE_TCP
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+#endif
+
+struct resolver {
+	enum {
+		TYPE_ZERO, TYPE_ONE, TYPE_ANY
+	} type;
+
+#ifdef ENABLE_TCP
+#ifdef HAVE_GETADDRINFO
+	struct addrinfo *ai;
+	const struct addrinfo *next;
+#else
+	struct sockaddr_in sin;
+#endif
+#endif
+
+	struct resolver_address current;
+
+#ifndef WIN32
+	struct sockaddr_un saun;
+#endif
+};
+
+struct resolver *
+resolver_new(const char *host, unsigned port)
+{
+	struct resolver *resolver;
+
+	resolver = malloc(sizeof(*resolver));
+	if (resolver == NULL)
+		return NULL;
+
+	if (host[0] == '/' || host[0] == '@') {
+#ifndef WIN32
+		size_t path_length = strlen(host);
+		if (path_length >= sizeof(resolver->saun.sun_path)) {
+			free(resolver);
+			return NULL;
+		}
+
+		resolver->saun.sun_family = AF_UNIX;
+		memcpy(resolver->saun.sun_path, host, path_length + 1);
+
+		if (host[0] == '@')
+			/* abstract socket */
+			resolver->saun.sun_path[0] = 0;
+
+		resolver->current.family = PF_UNIX;
+		resolver->current.protocol = 0;
+		resolver->current.addrlen = sizeof(resolver->saun);
+		resolver->current.addr = (const struct sockaddr *)&resolver->saun;
+		resolver->type = TYPE_ONE;
+#else /* WIN32 */
+		/* there are no UNIX domain sockets on Windows */
+		free(resolver);
+		return NULL;
+#endif /* WIN32 */
+	} else {
+#ifdef ENABLE_TCP
+#ifdef HAVE_GETADDRINFO
+		struct addrinfo hints;
+		char service[20];
+		int ret;
+
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_protocol = IPPROTO_TCP;
+
+		snprintf(service, sizeof(service), "%d", port);
+
+		ret = getaddrinfo(host, service, &hints, &resolver->ai);
+		if (ret != 0) {
+			free(resolver);
+			return NULL;
+		}
+
+		resolver->next = resolver->ai;
+		resolver->type = TYPE_ANY;
+#else
+		const struct hostent *he;
+
+		he = gethostbyname(host);
+		if (he == NULL) {
+			free(resolver);
+			return NULL;
+		}
+
+		if (he->h_addrtype != AF_INET) {
+			free(resolver);
+			return NULL;
+		}
+
+
+		memset(&resolver->sin, 0, sizeof(resolver->sin));
+		resolver->sin.sin_family = AF_INET;
+		resolver->sin.sin_port = htons(port);
+		memcpy((char *)&resolver->sin.sin_addr.s_addr,
+		       (char *)he->h_addr, he->h_length);
+
+		resolver->current.family = PF_INET;
+		resolver->current.protocol = 0;
+		resolver->current.addrlen = sizeof(resolver->sin);
+		resolver->current.addr = (const struct sockaddr *)&resolver->sin;
+
+		resolver->type = TYPE_ONE;
+#endif
+#else /* !ENABLE_TCP */
+		(void)port;
+		free(resolver);
+		return NULL;
+#endif
+	}
+
+	return resolver;
+}
+
+void
+resolver_free(struct resolver *resolver)
+{
+#if defined(ENABLE_TCP) && defined(HAVE_GETADDRINFO)
+	if (resolver->type == TYPE_ANY)
+		freeaddrinfo(resolver->ai);
+#endif
+	free(resolver);
+}
+
+const struct resolver_address *
+resolver_next(struct resolver *resolver)
+{
+	if (resolver->type == TYPE_ZERO)
+		return NULL;
+
+	if (resolver->type == TYPE_ONE) {
+		resolver->type = TYPE_ZERO;
+		return &resolver->current;
+	}
+
+#if defined(ENABLE_TCP) && defined(HAVE_GETADDRINFO)
+	if (resolver->next == NULL)
+		return NULL;
+
+	resolver->current.family = resolver->next->ai_family;
+	resolver->current.protocol = resolver->next->ai_protocol;
+	resolver->current.addrlen = resolver->next->ai_addrlen;
+	resolver->current.addr = resolver->next->ai_addr;
+
+	resolver->next = resolver->next->ai_next;
+
+	return &resolver->current;
+#else
+	return NULL;
+#endif
+}

ncmpc-0.27.tar.xz/src/net/resolver.h Added

@@ -0,0 +1,52 @@
+/* libmpdclient
+   (c) 2003-2017 The Music Player Daemon Project
+   This project's homepage is: http://www.musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef LIBMPDCLIENT_RESOLVER_H
+#define LIBMPDCLIENT_RESOLVER_H
+
+#include <stddef.h>
+
+struct resolver;
+
+struct resolver_address {
+	int family;
+	int protocol;
+	size_t addrlen;
+	const struct sockaddr *addr;
+};
+
+struct resolver *
+resolver_new(const char *host, unsigned port);
+
+void
+resolver_free(struct resolver *resolver);
+
+const struct resolver_address *
+resolver_next(struct resolver *resolver);
+
+#endif

ncmpc-0.27.tar.xz/src/net/socket.c Added

@@ -0,0 +1,76 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "socket.h"
+
+#ifndef WIN32
+#include <fcntl.h>
+#endif
+
+static void
+socket_set_cloexec(socket_t fd)
+{
+#ifndef WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
+	(void)fd;
+#endif
+}
+
+static void
+socket_set_nonblock(socket_t fd)
+{
+#ifdef WIN32
+	u_long val = 1;
+	ioctlsocket(fd, FIONBIO, &val);
+#else
+	int flags = fcntl(fd, F_GETFL);
+	if (flags >= 0)
+		fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#endif
+}
+
+socket_t
+create_socket(int domain, int type, int protocol)
+{
+	socket_t fd;
+
+#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
+	fd = socket(domain, type | SOCK_CLOEXEC | SOCK_NONBLOCK, protocol);
+	if (fd != INVALID_SOCKET || errno != EINVAL)
+		return fd;
+#endif
+
+	fd = socket(domain, type, protocol);
+	if (fd != INVALID_SOCKET) {
+		socket_set_cloexec(fd);
+		socket_set_nonblock(fd);
+	}
+
+	return fd;
+}

ncmpc-0.27.tar.xz/src/net/socket.h Added

@@ -0,0 +1,75 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_SOCKET_H
+#define NET_SOCKET_H
+
+#include "types.h"
+
+#include <stdbool.h>
+
+#ifndef WIN32
+#include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#endif
+
+socket_t
+create_socket(int domain, int type, int protocol);
+
+static inline void
+close_socket(socket_t s)
+{
+#ifdef WIN32
+	closesocket(s);
+#else
+	close(s);
+#endif
+}
+
+static inline int
+last_socket_error(void)
+{
+#ifdef WIN32
+	return WSAGetLastError();
+#else
+	return errno;
+#endif
+}
+
+static inline bool
+would_block(int e)
+{
+#ifdef WIN32
+	return e == WSAEINPROGRESS || e == WSAEWOULDBLOCK;
+#else
+	return e == EINPROGRESS || e == EAGAIN;
+#endif
+}
+
+#endif

ncmpc-0.27.tar.xz/src/net/types.h Added

@@ -0,0 +1,44 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_TYPES_H
+#define NET_TYPES_H
+
+#ifdef WIN32
+
+#include <winsock2.h>
+typedef SOCKET socket_t;
+
+#else
+
+typedef int socket_t;
+#define INVALID_SOCKET -1
+
+#endif
+
+#endif

ncmpc-0.24.tar.xz/src/options.c -> ncmpc-0.27.tar.xz/src/options.c Changed

ncmpc-0.24.tar.xz/src/options.h -> ncmpc-0.27.tar.xz/src/options.h Changed

ncmpc-0.24.tar.xz/src/paint.h -> ncmpc-0.27.tar.xz/src/paint.h Changed

ncmpc-0.24.tar.xz/src/player_command.c -> ncmpc-0.27.tar.xz/src/player_command.c Changed

ncmpc-0.24.tar.xz/src/player_command.h -> ncmpc-0.27.tar.xz/src/player_command.h Changed

ncmpc-0.24.tar.xz/src/playlist.c -> ncmpc-0.27.tar.xz/src/playlist.c Changed

ncmpc-0.24.tar.xz/src/playlist.h -> ncmpc-0.27.tar.xz/src/playlist.h Changed

ncmpc-0.24.tar.xz/src/plugin.c -> ncmpc-0.27.tar.xz/src/plugin.c Changed

ncmpc-0.24.tar.xz/src/plugin.h -> ncmpc-0.27.tar.xz/src/plugin.h Changed

ncmpc-0.24.tar.xz/src/progress_bar.c -> ncmpc-0.27.tar.xz/src/progress_bar.c Changed

ncmpc-0.24.tar.xz/src/progress_bar.h -> ncmpc-0.27.tar.xz/src/progress_bar.h Changed

ncmpc-0.27.tar.xz/src/save_playlist.c Added

@@ -0,0 +1,174 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "save_playlist.h"
+#include "db_completion.h"
+#include "screen_status.h"
+#include "config.h"
+#include "i18n.h"
+#include "charset.h"
+#include "mpdclient.h"
+#include "utils.h"
+#include "wreadln.h"
+#include "screen_utils.h"
+#include "Compiler.h"
+
+#include <mpd/client.h>
+
+#include <glib.h>
+
+#include <string.h>
+
+#ifndef NCMPC_MINI
+
+typedef struct
+{
+	GList **list;
+	struct mpdclient *c;
+} completion_callback_data_t;
+
+/**
+ * Wrapper for strncmp().  We are not allowed to pass &strncmp to
+ * g_completion_set_compare(), because strncmp() takes size_t where
+ * g_completion_set_compare passes a gsize value.
+ */
+static gint
+completion_strncmp(const gchar *s1, const gchar *s2, gsize n)
+{
+	return strncmp(s1, s2, n);
+}
+
+static void
+save_pre_completion_cb(GCompletion *gcmp, gcc_unused gchar *line,
+		       void *data)
+{
+	completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+	GList **list = tmp->list;
+	struct mpdclient *c = tmp->c;
+
+	if( *list == NULL ) {
+		/* create completion list */
+		*list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST);
+		g_completion_add_items(gcmp, *list);
+	}
+}
+
+static void
+save_post_completion_cb(gcc_unused GCompletion *gcmp,
+			gcc_unused gchar *line, GList *items,
+			gcc_unused void *data)
+{
+	if (g_list_length(items) >= 1)
+		screen_display_completion_list(items);
+}
+
+#endif
+
+int
+playlist_save(struct mpdclient *c, char *name, char *defaultname)
+{
+	struct mpd_connection *connection;
+	gchar *filename;
+
+#ifdef NCMPC_MINI
+	(void)defaultname;
+#endif
+
+#ifndef NCMPC_MINI
+	if (name == NULL) {
+		/* initialize completion support */
+		GCompletion *gcmp = g_completion_new(NULL);
+		g_completion_set_compare(gcmp, completion_strncmp);
+		GList *list = NULL;
+		completion_callback_data_t data = {
+			.list = &list,
+			.c = c,
+		};
+		wrln_completion_callback_data = &data;
+		wrln_pre_completion_callback = save_pre_completion_cb;
+		wrln_post_completion_callback = save_post_completion_cb;
+
+
+		/* query the user for a filename */
+		filename = screen_readln(_("Save queue as"),
+					 defaultname,
+					 NULL,
+					 gcmp);
+		if (filename == NULL)
+			return -1;
+
+		/* destroy completion support */
+		wrln_completion_callback_data = NULL;
+		wrln_pre_completion_callback = NULL;
+		wrln_post_completion_callback = NULL;
+		g_completion_free(gcmp);
+		list = string_list_free(list);
+		filename = g_strstrip(filename);
+	} else
+#endif
+		filename=g_strdup(name);
+
+	/* send save command to mpd */
+
+	connection = mpdclient_get_connection(c);
+	if (connection == NULL) {
+		g_free(filename);
+		return -1;
+	}
+
+	char *filename_utf8 = locale_to_utf8(filename);
+	if (!mpd_run_save(connection, filename_utf8)) {
+		if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+		    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
+		    mpd_connection_clear_error(connection)) {
+			char *buf = g_strdup_printf(_("Replace %s?"), filename);
+			bool replace = screen_get_yesno(buf, false);
+			g_free(buf);
+
+			if (!replace) {
+				g_free(filename_utf8);
+				g_free(filename);
+				screen_status_printf(_("Aborted"));
+				return -1;
+			}
+
+			if (!mpd_run_rm(connection, filename_utf8) ||
+			    !mpd_run_save(connection, filename_utf8)) {
+				mpdclient_handle_error(c);
+				g_free(filename_utf8);
+				g_free(filename);
+				return -1;
+			}
+		} else {
+			mpdclient_handle_error(c);
+			g_free(filename_utf8);
+			g_free(filename);
+			return -1;
+		}
+	}
+
+	c->events |= MPD_IDLE_STORED_PLAYLIST;
+
+	g_free(filename_utf8);
+
+	/* success */
+	screen_status_printf(_("Saved %s"), filename);
+	g_free(filename);
+	return 0;
+}

ncmpc-0.27.tar.xz/src/save_playlist.h Added

@@ -0,0 +1,28 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 SAVE_PLAYLIST_H
+#define SAVE_PLAYLIST_H
+
+struct mpdclient;
+
+int
+playlist_save(struct mpdclient *c, char *name, char *defaultname);
+
+#endif

ncmpc-0.24.tar.xz/src/screen.c -> ncmpc-0.27.tar.xz/src/screen.c Changed

ncmpc-0.24.tar.xz/src/screen.h -> ncmpc-0.27.tar.xz/src/screen.h Changed

ncmpc-0.24.tar.xz/src/screen_artist.c -> ncmpc-0.27.tar.xz/src/screen_artist.c Changed

ncmpc-0.24.tar.xz/src/screen_artist.h -> ncmpc-0.27.tar.xz/src/screen_artist.h Changed

ncmpc-0.24.tar.xz/src/screen_browser.c -> ncmpc-0.27.tar.xz/src/screen_browser.c Changed

ncmpc-0.24.tar.xz/src/screen_browser.h -> ncmpc-0.27.tar.xz/src/screen_browser.h Changed

ncmpc-0.24.tar.xz/src/screen_chat.c -> ncmpc-0.27.tar.xz/src/screen_chat.c Changed

ncmpc-0.24.tar.xz/src/screen_chat.h -> ncmpc-0.27.tar.xz/src/screen_chat.h Changed

ncmpc-0.24.tar.xz/src/screen_client.c -> ncmpc-0.27.tar.xz/src/screen_client.c Changed

ncmpc-0.24.tar.xz/src/screen_client.h -> ncmpc-0.27.tar.xz/src/screen_client.h Changed

ncmpc-0.24.tar.xz/src/screen_file.c -> ncmpc-0.27.tar.xz/src/screen_file.c Changed

ncmpc-0.24.tar.xz/src/screen_file.h -> ncmpc-0.27.tar.xz/src/screen_file.h Changed

ncmpc-0.24.tar.xz/src/screen_find.c -> ncmpc-0.27.tar.xz/src/screen_find.c Changed

ncmpc-0.24.tar.xz/src/screen_find.h -> ncmpc-0.27.tar.xz/src/screen_find.h Changed

ncmpc-0.24.tar.xz/src/screen_help.c -> ncmpc-0.27.tar.xz/src/screen_help.c Changed

ncmpc-0.24.tar.xz/src/screen_help.h -> ncmpc-0.27.tar.xz/src/screen_help.h Changed

ncmpc-0.27.tar.xz/src/screen_init.c Added

@@ -0,0 +1,177 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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.h"
+#include "screen_interface.h"
+#include "screen_list.h"
+#include "config.h"
+#include "i18n.h"
+#include "utils.h"
+#include "options.h"
+#include "colors.h"
+
+#include <stdlib.h>
+
+#ifndef NCMPC_MINI
+/** welcome message time [s] */
+static const GTime SCREEN_WELCOME_TIME = 10;
+#endif
+
+/* minimum window size */
+static const unsigned SCREEN_MIN_COLS = 14;
+static const unsigned SCREEN_MIN_ROWS = 5;
+
+void
+screen_exit(void)
+{
+	if (screen.current_page->close != NULL)
+		screen.current_page->close();
+
+	screen_list_exit();
+
+	string_list_free(screen.find_history);
+	g_free(screen.buf);
+	g_free(screen.findbuf);
+
+	title_bar_deinit(&screen.title_bar);
+	delwin(screen.main_window.w);
+	progress_bar_deinit(&screen.progress_bar);
+	status_bar_deinit(&screen.status_bar);
+
+#ifndef NCMPC_MINI
+	if (screen.welcome_source_id != 0)
+		g_source_remove(screen.welcome_source_id);
+#endif
+}
+
+void
+screen_resize(struct mpdclient *c)
+{
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
+		screen_exit();
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
+		exit(EXIT_FAILURE);
+	}
+
+#ifdef PDCURSES
+	resize_term(rows, cols);
+#else 
+	resizeterm(rows, cols);
+#endif
+
+	title_bar_resize(&screen.title_bar, cols);
+
+	/* main window */
+	screen.main_window.cols = cols;
+	screen.main_window.rows = rows - 4;
+	wresize(screen.main_window.w, screen.main_window.rows, cols);
+
+	/* progress window */
+	progress_bar_resize(&screen.progress_bar, cols, rows - 2, 0);
+
+	/* status window */
+	status_bar_resize(&screen.status_bar, cols, rows - 1, 0);
+
+	screen.buf_size = cols;
+	g_free(screen.buf);
+	screen.buf = g_malloc(cols);
+
+	/* resize all screens */
+	screen_list_resize(screen.main_window.cols, screen.main_window.rows);
+
+	/* ? - without this the cursor becomes visible with aterm & Eterm */
+	curs_set(1);
+	curs_set(0);
+
+	screen_paint(c, true);
+}
+
+#ifndef NCMPC_MINI
+static gboolean
+welcome_timer_callback(gpointer data)
+{
+	struct mpdclient *c = data;
+
+	screen.welcome_source_id = 0;
+
+	paint_top_window(c);
+	doupdate();
+
+	return false;
+}
+#endif
+
+void
+screen_init(struct mpdclient *c)
+{
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
+		exit(EXIT_FAILURE);
+	}
+
+	screen.buf = g_malloc(cols);
+	screen.buf_size = cols;
+	screen.findbuf = NULL;
+
+#ifndef NCMPC_MINI
+	if (options.welcome_screen_list)
+		screen.welcome_source_id =
+			g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+					      welcome_timer_callback, c);
+#endif
+
+	/* create top window */
+	title_bar_init(&screen.title_bar, cols, 0, 0);
+
+	/* create main window */
+	window_init(&screen.main_window, rows - 4, cols, 2, 0);
+
+	if (!options.hardware_cursor)
+		leaveok(screen.main_window.w, TRUE);
+
+	keypad(screen.main_window.w, TRUE);
+
+	/* create progress window */
+	progress_bar_init(&screen.progress_bar, cols, rows - 2, 0);
+
+	/* create status window */
+	status_bar_init(&screen.status_bar, cols, rows - 1, 0);
+
+#ifdef ENABLE_COLORS
+	if (options.enable_colors) {
+		/* set background attributes */
+		wbkgd(stdscr, COLOR_PAIR(COLOR_LIST));
+		wbkgd(screen.main_window.w,     COLOR_PAIR(COLOR_LIST));
+		wbkgd(screen.title_bar.window.w, COLOR_PAIR(COLOR_TITLE));
+		wbkgd(screen.progress_bar.window.w,
+		      COLOR_PAIR(COLOR_PROGRESSBAR));
+		wbkgd(screen.status_bar.window.w, COLOR_PAIR(COLOR_STATUS));
+		colors_use(screen.progress_bar.window.w, COLOR_PROGRESSBAR);
+	}
+#endif
+
+	/* initialize screens */
+	screen_list_init(screen.main_window.w,
+			 screen.main_window.cols, screen.main_window.rows);
+
+	if (screen.current_page->open != NULL)
+		screen.current_page->open(c);
+}

ncmpc-0.24.tar.xz/src/screen_interface.h -> ncmpc-0.27.tar.xz/src/screen_interface.h Changed

ncmpc-0.24.tar.xz/src/screen_keydef.c -> ncmpc-0.27.tar.xz/src/screen_keydef.c Changed

ncmpc-0.24.tar.xz/src/screen_keydef.h -> ncmpc-0.27.tar.xz/src/screen_keydef.h Changed

ncmpc-0.24.tar.xz/src/screen_list.c -> ncmpc-0.27.tar.xz/src/screen_list.c Changed

ncmpc-0.24.tar.xz/src/screen_list.h -> ncmpc-0.27.tar.xz/src/screen_list.h Changed

ncmpc-0.24.tar.xz/src/screen_lyrics.c -> ncmpc-0.27.tar.xz/src/screen_lyrics.c Changed

ncmpc-0.24.tar.xz/src/screen_lyrics.h -> ncmpc-0.27.tar.xz/src/screen_lyrics.h Changed

ncmpc-0.24.tar.xz/src/screen_outputs.c -> ncmpc-0.27.tar.xz/src/screen_outputs.c Changed

ncmpc-0.24.tar.xz/src/screen_outputs.h -> ncmpc-0.27.tar.xz/src/screen_outputs.h Changed

ncmpc-0.27.tar.xz/src/screen_paint.c Added

@@ -0,0 +1,94 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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.h"
+#include "screen_interface.h"
+#include "config.h"
+#include "mpdclient.h"
+#include "options.h"
+#include "player_command.h"
+
+#include <mpd/client.h>
+
+#include <assert.h>
+
+void
+paint_top_window(const struct mpdclient *c)
+{
+	const char *title =
+#ifndef NCMPC_MINI
+		screen.welcome_source_id == 0 &&
+#endif
+		screen.current_page->get_title != NULL
+		? screen.current_page->get_title(screen.buf, screen.buf_size)
+		: "";
+	assert(title != NULL);
+
+	title_bar_paint(&screen.title_bar, title, c->status);
+}
+
+static void
+update_progress_window(struct mpdclient *c, bool repaint)
+{
+	unsigned elapsed;
+	if (c->status == NULL)
+		elapsed = 0;
+	else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
+		elapsed = seek_target_time;
+	else
+		elapsed = mpd_status_get_elapsed_time(c->status);
+
+	unsigned duration = mpdclient_is_playing(c)
+		? mpd_status_get_total_time(c->status)
+		: 0;
+
+	if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
+	    repaint)
+		progress_bar_paint(&screen.progress_bar);
+}
+
+void
+screen_paint(struct mpdclient *c, bool main_dirty)
+{
+	/* update title/header window */
+	paint_top_window(c);
+
+	/* paint the bottom window */
+
+	update_progress_window(c, true);
+	status_bar_paint(&screen.status_bar, c->status, c->song);
+
+	/* paint the main window */
+
+	if (main_dirty) {
+		wclear(screen.main_window.w);
+		if (screen.current_page->paint != NULL)
+			screen.current_page->paint();
+	}
+
+	/* move the cursor to the origin */
+
+	if (!options.hardware_cursor)
+		wmove(screen.main_window.w, 0, 0);
+
+	wnoutrefresh(screen.main_window.w);
+
+	/* tell curses to update */
+	doupdate();
+}

ncmpc-0.24.tar.xz/src/screen_queue.c -> ncmpc-0.27.tar.xz/src/screen_queue.c Changed

ncmpc-0.24.tar.xz/src/screen_queue.h -> ncmpc-0.27.tar.xz/src/screen_queue.h Changed

ncmpc-0.24.tar.xz/src/screen_search.c -> ncmpc-0.27.tar.xz/src/screen_search.c Changed

ncmpc-0.24.tar.xz/src/screen_search.h -> ncmpc-0.27.tar.xz/src/screen_search.h Changed

ncmpc-0.24.tar.xz/src/screen_song.c -> ncmpc-0.27.tar.xz/src/screen_song.c Changed

ncmpc-0.24.tar.xz/src/screen_song.h -> ncmpc-0.27.tar.xz/src/screen_song.h Changed

ncmpc-0.24.tar.xz/src/screen_status.c -> ncmpc-0.27.tar.xz/src/screen_status.c Changed

ncmpc-0.24.tar.xz/src/screen_status.h -> ncmpc-0.27.tar.xz/src/screen_status.h Changed

ncmpc-0.24.tar.xz/src/screen_text.c -> ncmpc-0.27.tar.xz/src/screen_text.c Changed

ncmpc-0.24.tar.xz/src/screen_text.h -> ncmpc-0.27.tar.xz/src/screen_text.h Changed

ncmpc-0.24.tar.xz/src/screen_utils.c -> ncmpc-0.27.tar.xz/src/screen_utils.c Changed

ncmpc-0.24.tar.xz/src/screen_utils.h -> ncmpc-0.27.tar.xz/src/screen_utils.h Changed

ncmpc-0.27.tar.xz/src/signals.c Added

@@ -0,0 +1,119 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "signals.h"
+#include "screen.h"
+#include "Compiler.h"
+
+#include <glib-unix.h>
+
+#include <stdbool.h>
+
+static int sigwinch_pipes[2];
+
+static gboolean
+handle_quit_signal(gpointer data)
+{
+	GMainLoop *main_loop = data;
+
+	g_main_loop_quit(main_loop);
+	return false;
+}
+
+static gboolean
+sigwinch_event(gcc_unused GIOChannel *source,
+               gcc_unused GIOCondition condition, gpointer data)
+{
+	struct mpdclient *c = data;
+
+	char ignoreme[64];
+	if (1 > read(sigwinch_pipes[0], ignoreme, 64))
+		exit(EXIT_FAILURE);
+
+	endwin();
+	refresh();
+	screen_resize(c);
+
+	return TRUE;
+}
+
+static void
+catch_sigwinch(gcc_unused int sig)
+{
+	if (1 != write(sigwinch_pipes[1], "", 1))
+		exit(EXIT_FAILURE);
+}
+
+void
+signals_init(GMainLoop *main_loop, struct mpdclient *c)
+{
+	/* setup quit signals */
+	g_unix_signal_add(SIGTERM, handle_quit_signal, main_loop);
+	g_unix_signal_add(SIGINT, handle_quit_signal, main_loop);
+	g_unix_signal_add(SIGHUP, handle_quit_signal, main_loop);
+
+	/* setup signal behavior - SIGCONT */
+
+	struct sigaction act;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+
+	act.sa_handler = catch_sigwinch;
+	if (sigaction(SIGCONT, &act, NULL) < 0) {
+		perror("sigaction(SIGCONT)");
+		exit(EXIT_FAILURE);
+	}
+
+	/* setup SIGWINCH */
+
+	act.sa_flags = SA_RESTART;
+	act.sa_handler = catch_sigwinch;
+	if (sigaction(SIGWINCH, &act, NULL) < 0) {
+		perror("sigaction(SIGWINCH)");
+		exit(EXIT_FAILURE);
+	}
+
+#ifndef WIN32
+	if (!pipe(sigwinch_pipes) &&
+		!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
+		GIOChannel *sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
+		g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, c);
+		g_io_channel_unref(sigwinch_channel);
+	}
+	else {
+		perror("sigwinch pipe creation failed");
+		exit(EXIT_FAILURE);
+	}
+#endif
+
+	/* ignore SIGPIPE */
+
+	act.sa_handler = SIG_IGN;
+	if (sigaction(SIGPIPE, &act, NULL) < 0) {
+		perror("sigaction(SIGPIPE)");
+		exit(EXIT_FAILURE);
+	}
+}
+
+void
+signals_deinit(void)
+{
+	close(sigwinch_pipes[0]);
+	close(sigwinch_pipes[1]);
+}

ncmpc-0.27.tar.xz/src/signals.h Added

@@ -0,0 +1,49 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 SIGNALS_H
+#define SIGNALS_H
+
+#include <glib.h>
+
+struct mpdclient;
+
+#ifdef WIN32
+
+static inline void
+signals_init(GMainLoop *main_loop, struct mpdclient *c)
+{
+	(void)main_loop;
+	(void)c;
+}
+
+static inline void
+signals_deinit(void) {}
+
+#else
+
+void
+signals_init(GMainLoop *main_loop, struct mpdclient *c);
+
+void
+signals_deinit(void);
+
+#endif
+
+#endif

ncmpc-0.24.tar.xz/src/song_paint.c -> ncmpc-0.27.tar.xz/src/song_paint.c Changed

ncmpc-0.24.tar.xz/src/song_paint.h -> ncmpc-0.27.tar.xz/src/song_paint.h Changed

ncmpc-0.24.tar.xz/src/status_bar.c -> ncmpc-0.27.tar.xz/src/status_bar.c Changed

ncmpc-0.24.tar.xz/src/status_bar.h -> ncmpc-0.27.tar.xz/src/status_bar.h Changed

ncmpc-0.24.tar.xz/src/strfsong.c -> ncmpc-0.27.tar.xz/src/strfsong.c Changed

ncmpc-0.24.tar.xz/src/strfsong.h -> ncmpc-0.27.tar.xz/src/strfsong.h Changed

ncmpc-0.27.tar.xz/src/time_format.c Added

@@ -0,0 +1,76 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "time_format.h"
+#include "i18n.h"
+
+#include <glib.h>
+
+void
+format_duration_short(char *buffer, size_t length, unsigned duration)
+{
+	if (duration < 3600)
+		g_snprintf(buffer, length,
+			   "%i:%02i", duration / 60, duration % 60);
+	else
+		g_snprintf(buffer, length,
+			   "%i:%02i:%02i", duration / 3600,
+			   (duration % 3600) / 60, duration % 60);
+}
+
+void
+format_duration_long(char *p, size_t length, unsigned long duration)
+{
+	unsigned bytes_written = 0;
+
+	if (duration / 31536000 > 0) {
+		if (duration / 31536000 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
+		duration %= 31536000;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+	if (duration / 604800 > 0) {
+		if (duration / 604800 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("week"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 604800, _("weeks"));
+		duration %= 604800;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+	if (duration / 86400 > 0) {
+		if (duration / 86400 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("day"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 86400, _("days"));
+		duration %= 86400;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+
+	g_snprintf(p, length, "%02lu:%02lu:%02lu", duration / 3600,
+		   duration % 3600 / 60, duration % 3600 % 60);
+}

ncmpc-0.27.tar.xz/src/time_format.h Added

@@ -0,0 +1,31 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 TIME_FORMAT_H
+#define TIME_FORMAT_H
+
+#include <stddef.h>
+
+void
+format_duration_short(char *buffer, size_t length, unsigned duration);
+
+void
+format_duration_long(char *buffer, size_t length, unsigned long duration);
+
+#endif

ncmpc-0.24.tar.xz/src/title_bar.c -> ncmpc-0.27.tar.xz/src/title_bar.c Changed

ncmpc-0.24.tar.xz/src/title_bar.h -> ncmpc-0.27.tar.xz/src/title_bar.h Changed

ncmpc-0.24.tar.xz/src/utils.c -> ncmpc-0.27.tar.xz/src/utils.c Changed

ncmpc-0.24.tar.xz/src/utils.h -> ncmpc-0.27.tar.xz/src/utils.h Changed

ncmpc-0.24.tar.xz/src/window.h -> ncmpc-0.27.tar.xz/src/window.h Changed

ncmpc-0.24.tar.xz/src/wreadln.c -> ncmpc-0.27.tar.xz/src/wreadln.c Changed

ncmpc-0.24.tar.xz/src/wreadln.h -> ncmpc-0.27.tar.xz/src/wreadln.h Changed

ncmpc-0.27.tar.xz/src/xterm_title.c Added

@@ -0,0 +1,42 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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 "xterm_title.h"
+#include "options.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void
+set_xterm_title(const char *title)
+{
+	/* the current xterm title exists under the WM_NAME property */
+	/* and can be retrieved with xprop -id $WINDOWID */
+
+	if (!options.enable_xterm_title)
+		return;
+
+	if (getenv("WINDOWID") == NULL) {
+		options.enable_xterm_title = FALSE;
+		return;
+	}
+
+	printf("\033]0;%s\033\\", title);
+	fflush(stdout);
+}

ncmpc-0.27.tar.xz/src/xterm_title.h Added